[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/13] net/vmnet: implement bridged mode (vmnet-bridged)
From: |
Jason Wang |
Subject: |
[PULL 11/13] net/vmnet: implement bridged mode (vmnet-bridged) |
Date: |
Mon, 10 Jan 2022 11:39:58 +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-bridged.m | 98 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 92 insertions(+), 6 deletions(-)
diff --git a/net/vmnet-bridged.m b/net/vmnet-bridged.m
index 4e42a90..3c9da9d 100644
--- a/net/vmnet-bridged.m
+++ b/net/vmnet-bridged.m
@@ -10,16 +10,102 @@
#include "qemu/osdep.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 VmnetBridgedState {
+ VmnetCommonState cs;
+} VmnetBridgedState;
+
+static bool validate_ifname(const char *ifname)
+{
+ xpc_object_t shared_if_list = vmnet_copy_shared_interface_list();
+ __block bool match = false;
+
+ xpc_array_apply(
+ shared_if_list,
+ ^bool(size_t index, xpc_object_t value) {
+ if (strcmp(xpc_string_get_string_ptr(value), ifname) == 0) {
+ match = true;
+ return false;
+ }
+ return true;
+ });
+
+ return match;
+}
+
+static const char *get_valid_ifnames(void)
+{
+ xpc_object_t shared_if_list = vmnet_copy_shared_interface_list();
+ __block char *if_list = NULL;
+
+ xpc_array_apply(
+ shared_if_list,
+ ^bool(size_t index, xpc_object_t value) {
+ if_list = g_strconcat(xpc_string_get_string_ptr(value),
+ " ",
+ if_list,
+ NULL);
+ return true;
+ });
+
+ if (if_list) {
+ return if_list;
+ }
+ return "[no interfaces]";
+}
+
+static xpc_object_t create_if_desc(const Netdev *netdev, Error **errp)
+{
+ const NetdevVmnetBridgedOptions *options = &(netdev->u.vmnet_bridged);
+ xpc_object_t if_desc = xpc_dictionary_create(NULL, NULL, 0);
+
+ xpc_dictionary_set_uint64(
+ if_desc,
+ vmnet_operation_mode_key,
+ VMNET_BRIDGED_MODE
+ );
+
+ xpc_dictionary_set_bool(
+ if_desc,
+ vmnet_enable_isolation_key,
+ options->isolated
+ );
+
+ if (validate_ifname(options->ifname)) {
+ xpc_dictionary_set_string(if_desc,
+ vmnet_shared_interface_name_key,
+ options->ifname);
+ } else {
+ return NULL;
+ }
+ return if_desc;
+}
+
+static NetClientInfo net_vmnet_bridged_info = {
+ .type = NET_CLIENT_DRIVER_VMNET_BRIDGED,
+ .size = sizeof(VmnetBridgedState),
+ .receive = vmnet_receive_common,
+ .cleanup = vmnet_cleanup_common,
+};
+
int net_init_vmnet_bridged(const Netdev *netdev, const char *name,
NetClientState *peer, Error **errp)
{
- error_setg(errp, "vmnet-bridged is not implemented yet");
- return -1;
-}
+ NetClientState *nc = qemu_new_net_client(&net_vmnet_bridged_info,
+ peer, "vmnet-bridged", name);
+ xpc_object_t if_desc = create_if_desc(netdev, errp);;
+
+ if (!if_desc) {
+ error_setg(errp,
+ "unsupported ifname, should be one of: %s",
+ get_valid_ifnames());
+ return -1;
+ }
+
+ return vmnet_if_create(nc, if_desc, errp, NULL);
+}
\ No newline at end of file
--
2.7.4
- [PULL 00/13] Net patches, Jason Wang, 2022/01/09
- [PULL 02/13] net/tap: Set return code on failure, Jason Wang, 2022/01/09
- [PULL 01/13] hw/net/vmxnet3: Log guest-triggerable errors using LOG_GUEST_ERROR, Jason Wang, 2022/01/09
- [PULL 05/13] net/colo-compare.c: Update the default value comments, Jason Wang, 2022/01/09
- [PULL 03/13] net: Fix uninitialized data usage, Jason Wang, 2022/01/09
- [PULL 04/13] net/colo-compare.c: Optimize compare order for performance, Jason Wang, 2022/01/09
- [PULL 06/13] net/filter: Optimize filter_send to coroutine, Jason Wang, 2022/01/09
- [PULL 09/13] net/vmnet: implement shared mode (vmnet-shared), Jason Wang, 2022/01/09
- [PULL 11/13] net/vmnet: implement bridged mode (vmnet-bridged),
Jason Wang <=
- [PULL 07/13] net/vmnet: add vmnet dependency and customizable option, Jason Wang, 2022/01/09
- [PULL 10/13] net/vmnet: implement host mode (vmnet-host), Jason Wang, 2022/01/09
- [PULL 12/13] net/vmnet: update qemu-options.hx, Jason Wang, 2022/01/09
- [PULL 08/13] net/vmnet: add vmnet backends to qapi/net, Jason Wang, 2022/01/09
- [PULL 13/13] net/vmnet: update MAINTAINERS list, Jason Wang, 2022/01/09
- Re: [PULL 00/13] Net patches, Peter Maydell, 2022/01/10