From: Jason Wang <jasowang@redhat.com>
To: peter.maydell@linaro.org
Cc: Jason Wang <jasowang@redhat.com>,
qemu-devel@nongnu.org,
Vladislav Yaroshchuk <yaroshchuk2000@gmail.com>
Subject: [PULL 11/13] net/vmnet: implement bridged mode (vmnet-bridged)
Date: Mon, 10 Jan 2022 11:39:58 +0800 [thread overview]
Message-ID: <20220110034000.20221-12-jasowang@redhat.com> (raw)
In-Reply-To: <20220110034000.20221-1-jasowang@redhat.com>
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
next prev parent reply other threads:[~2022-01-10 3:49 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-10 3:39 [PULL 00/13] Net patches Jason Wang
2022-01-10 3:39 ` [PULL 01/13] hw/net/vmxnet3: Log guest-triggerable errors using LOG_GUEST_ERROR Jason Wang
2022-01-10 3:39 ` [PULL 02/13] net/tap: Set return code on failure Jason Wang
2022-01-10 3:39 ` [PULL 03/13] net: Fix uninitialized data usage Jason Wang
2022-01-10 3:39 ` [PULL 04/13] net/colo-compare.c: Optimize compare order for performance Jason Wang
2022-01-10 3:39 ` [PULL 05/13] net/colo-compare.c: Update the default value comments Jason Wang
2022-01-10 3:39 ` [PULL 06/13] net/filter: Optimize filter_send to coroutine Jason Wang
2022-01-10 3:39 ` [PULL 07/13] net/vmnet: add vmnet dependency and customizable option Jason Wang
2022-01-10 3:39 ` [PULL 08/13] net/vmnet: add vmnet backends to qapi/net Jason Wang
2022-01-10 3:39 ` [PULL 09/13] net/vmnet: implement shared mode (vmnet-shared) Jason Wang
2022-01-10 3:39 ` [PULL 10/13] net/vmnet: implement host mode (vmnet-host) Jason Wang
2022-01-10 3:39 ` Jason Wang [this message]
2022-01-10 3:39 ` [PULL 12/13] net/vmnet: update qemu-options.hx Jason Wang
2022-01-10 3:40 ` [PULL 13/13] net/vmnet: update MAINTAINERS list Jason Wang
2022-01-10 16:49 ` [PULL 00/13] Net patches Peter Maydell
2022-01-11 2:09 ` Jason Wang
2022-01-11 22:02 ` Vladislav Yaroshchuk
2022-01-12 5:39 ` Jason Wang
2022-01-12 6:19 ` Vladislav Yaroshchuk
2022-01-12 7:49 ` Jason Wang
2022-01-12 7:10 ` Roman Bolshakov
2022-01-12 7:51 ` Jason Wang
2022-01-12 13:16 ` Vladislav Yaroshchuk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220110034000.20221-12-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=yaroshchuk2000@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).