[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL V2 10/13] net/vmnet: implement host mode (vmnet-host)
|
From: |
Jason Wang |
|
Subject: |
[PULL V2 10/13] net/vmnet: implement host mode (vmnet-host) |
|
Date: |
Wed, 12 Jan 2022 16:32:17 +0800 |
From: Vladislav Yaroshchuk <yaroshchuk2000@gmail.com>
Signed-off-by: Vladislav Yaroshchuk <yaroshchuk2000@gmail.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/vmnet-host.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 87 insertions(+), 6 deletions(-)
diff --git a/net/vmnet-host.c b/net/vmnet-host.c
index 4a5ef99..9c2e760 100644
--- a/net/vmnet-host.c
+++ b/net/vmnet-host.c
@@ -9,16 +9,97 @@
*/
#include "qemu/osdep.h"
+#include "qemu/uuid.h"
#include "qapi/qapi-types-net.h"
-#include "vmnet_int.h"
-#include "clients.h"
-#include "qemu/error-report.h"
#include "qapi/error.h"
+#include "clients.h"
+#include "vmnet_int.h"
#include <vmnet/vmnet.h>
+typedef struct VmnetHostState {
+ VmnetCommonState cs;
+ QemuUUID network_uuid;
+} VmnetHostState;
+
+static xpc_object_t create_if_desc(const Netdev *netdev,
+ NetClientState *nc,
+ Error **errp)
+{
+ const NetdevVmnetHostOptions *options = &(netdev->u.vmnet_host);
+ VmnetCommonState *cs = DO_UPCAST(VmnetCommonState, nc, nc);
+ VmnetHostState *hs = DO_UPCAST(VmnetHostState, cs, cs);
+
+ xpc_object_t if_desc = xpc_dictionary_create(NULL, NULL, 0);
+
+ xpc_dictionary_set_uint64(
+ if_desc,
+ vmnet_operation_mode_key,
+ VMNET_HOST_MODE
+ );
+
+ xpc_dictionary_set_bool(
+ if_desc,
+ vmnet_enable_isolation_key,
+ options->isolated
+ );
+
+ if (options->has_net_uuid) {
+ if (qemu_uuid_parse(options->net_uuid, &hs->network_uuid) < 0) {
+ error_setg(errp, "Invalid UUID provided in 'net-uuid'");
+ }
+
+ xpc_dictionary_set_uuid(
+ if_desc,
+ vmnet_network_identifier_key,
+ hs->network_uuid.data
+ );
+ }
+
+ if (options->has_start_address ||
+ options->has_end_address ||
+ options->has_subnet_mask) {
+
+ if (options->has_start_address &&
+ options->has_end_address &&
+ options->has_subnet_mask) {
+
+ xpc_dictionary_set_string(if_desc,
+ vmnet_start_address_key,
+ options->start_address);
+ xpc_dictionary_set_string(if_desc,
+ vmnet_end_address_key,
+ options->end_address);
+ xpc_dictionary_set_string(if_desc,
+ vmnet_subnet_mask_key,
+ options->subnet_mask);
+ } else {
+ error_setg(
+ errp,
+ "'start-address', 'end-address', 'subnet_mask' "
+ "should be provided together"
+ );
+ }
+ }
+
+ return if_desc;
+}
+
+static NetClientInfo net_vmnet_host_info = {
+ .type = NET_CLIENT_DRIVER_VMNET_HOST,
+ .size = sizeof(VmnetHostState),
+ .receive = vmnet_receive_common,
+ .cleanup = vmnet_cleanup_common,
+};
+
int net_init_vmnet_host(const Netdev *netdev, const char *name,
- NetClientState *peer, Error **errp) {
- error_setg(errp, "vmnet-host is not implemented yet");
- return -1;
+ NetClientState *peer, Error **errp)
+{
+ NetClientState *nc;
+ xpc_object_t if_desc;
+
+ nc = qemu_new_net_client(&net_vmnet_host_info,
+ peer, "vmnet-host", name);
+ if_desc = create_if_desc(netdev, nc, errp);
+ return vmnet_if_create(nc, if_desc, errp, NULL);
}
--
2.7.4
- [PULL V2 00/13] Net patches, Jason Wang, 2022/01/12
- [PULL V2 01/13] hw/net/vmxnet3: Log guest-triggerable errors using LOG_GUEST_ERROR, Jason Wang, 2022/01/12
- [PULL V2 06/13] net/filter: Optimize filter_send to coroutine, Jason Wang, 2022/01/12
- [PULL V2 03/13] net: Fix uninitialized data usage, Jason Wang, 2022/01/12
- [PULL V2 04/13] net/colo-compare.c: Optimize compare order for performance, Jason Wang, 2022/01/12
- [PULL V2 05/13] net/colo-compare.c: Update the default value comments, Jason Wang, 2022/01/12
- [PULL V2 02/13] net/tap: Set return code on failure, Jason Wang, 2022/01/12
- [PULL V2 07/13] net/vmnet: add vmnet dependency and customizable option, Jason Wang, 2022/01/12
- [PULL V2 08/13] net/vmnet: add vmnet backends to qapi/net, Jason Wang, 2022/01/12
- [PULL V2 09/13] net/vmnet: implement shared mode (vmnet-shared), Jason Wang, 2022/01/12
- [PULL V2 10/13] net/vmnet: implement host mode (vmnet-host),
Jason Wang <=
- [PULL V2 12/13] net/vmnet: update qemu-options.hx, Jason Wang, 2022/01/12
- [PULL V2 11/13] net/vmnet: implement bridged mode (vmnet-bridged), Jason Wang, 2022/01/12
- [PULL V2 13/13] net/vmnet: update MAINTAINERS list, Jason Wang, 2022/01/12
- Re: [PULL V2 00/13] Net patches, Peter Maydell, 2022/01/13