From: Jason Wang <jasowang@redhat.com>
To: jasowang@redhat.com, qemu-devel@nongnu.org, peter.maydell@linaro.org
Cc: Vladislav Yaroshchuk <vladislav.yaroshchuk@jetbrains.com>,
Akihiko Odaki <akihiko.odaki@gmail.com>,
Vladislav Yaroshchuk <Vladislav.Yaroshchuk@jetbrains.com>
Subject: [PULL 5/8] net/vmnet: implement bridged mode (vmnet-bridged)
Date: Wed, 18 May 2022 11:12:11 +0800 [thread overview]
Message-ID: <20220518031214.93760-6-jasowang@redhat.com> (raw)
In-Reply-To: <20220518031214.93760-1-jasowang@redhat.com>
From: Vladislav Yaroshchuk <vladislav.yaroshchuk@jetbrains.com>
Reviewed-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Tested-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Signed-off-by: Vladislav Yaroshchuk <Vladislav.Yaroshchuk@jetbrains.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/vmnet-bridged.m | 137 ++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 132 insertions(+), 5 deletions(-)
diff --git a/net/vmnet-bridged.m b/net/vmnet-bridged.m
index 91c1a2f2c7..46d2282863 100644
--- a/net/vmnet-bridged.m
+++ b/net/vmnet-bridged.m
@@ -10,16 +10,143 @@
#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>
+
+static bool validate_ifname(const char *ifname)
+{
+ xpc_object_t shared_if_list = vmnet_copy_shared_interface_list();
+ bool match = false;
+ if (!xpc_array_get_count(shared_if_list)) {
+ goto done;
+ }
+
+ match = !xpc_array_apply(
+ shared_if_list,
+ ^bool(size_t index, xpc_object_t value) {
+ return strcmp(xpc_string_get_string_ptr(value), ifname) != 0;
+ });
+
+done:
+ xpc_release(shared_if_list);
+ return match;
+}
+
+
+static char* get_valid_ifnames()
+{
+ xpc_object_t shared_if_list = vmnet_copy_shared_interface_list();
+ __block char *if_list = NULL;
+ __block char *if_list_prev = NULL;
+
+ if (!xpc_array_get_count(shared_if_list)) {
+ goto done;
+ }
+
+ xpc_array_apply(
+ shared_if_list,
+ ^bool(size_t index, xpc_object_t value) {
+ /* build list of strings like "en0 en1 en2 " */
+ if_list = g_strconcat(xpc_string_get_string_ptr(value),
+ " ",
+ if_list_prev,
+ NULL);
+ g_free(if_list_prev);
+ if_list_prev = if_list;
+ return true;
+ });
+
+done:
+ xpc_release(shared_if_list);
+ return if_list;
+}
+
+
+static bool validate_options(const Netdev *netdev, Error **errp)
+{
+ const NetdevVmnetBridgedOptions *options = &(netdev->u.vmnet_bridged);
+ char* if_list;
+
+ if (!validate_ifname(options->ifname)) {
+ if_list = get_valid_ifnames();
+ if (if_list) {
+ error_setg(errp,
+ "unsupported ifname '%s', expected one of [ %s]",
+ options->ifname,
+ if_list);
+ g_free(if_list);
+ } else {
+ error_setg(errp,
+ "unsupported ifname '%s', no supported "
+ "interfaces available",
+ options->ifname);
+ }
+ return false;
+ }
+
+#if !defined(MAC_OS_VERSION_11_0) || \
+ MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_11_0
+ if (options->has_isolated) {
+ error_setg(errp,
+ "vmnet-bridged.isolated feature is "
+ "unavailable: outdated vmnet.framework API");
+ return false;
+ }
+#endif
+ return true;
+}
+
+
+static xpc_object_t build_if_desc(const Netdev *netdev)
+{
+ 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_string(if_desc,
+ vmnet_shared_interface_name_key,
+ options->ifname);
+
+#if defined(MAC_OS_VERSION_11_0) && \
+ MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_VERSION_11_0
+ xpc_dictionary_set_bool(if_desc,
+ vmnet_enable_isolation_key,
+ options->isolated);
+#endif
+ return if_desc;
+}
+
+
+static NetClientInfo net_vmnet_bridged_info = {
+ .type = NET_CLIENT_DRIVER_VMNET_BRIDGED,
+ .size = sizeof(VmnetState),
+ .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;
+ int result = -1;
+
+ if (!validate_options(netdev, errp)) {
+ return result;
+ }
+
+ if_desc = build_if_desc(netdev);
+ result = vmnet_if_create(nc, if_desc, errp);
+ xpc_release(if_desc);
+ return result;
}
--
2.25.1
next prev parent reply other threads:[~2022-05-18 3:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-18 3:12 [PULL 0/8] Net patches Jason Wang
2022-05-18 3:12 ` [PULL 1/8] net/vmnet: add vmnet dependency and customizable option Jason Wang
2022-05-18 3:12 ` [PULL 2/8] net/vmnet: add vmnet backends to qapi/net Jason Wang
2022-05-18 3:12 ` [PULL 3/8] net/vmnet: implement shared mode (vmnet-shared) Jason Wang
2022-05-18 3:12 ` [PULL 4/8] net/vmnet: implement host mode (vmnet-host) Jason Wang
2022-05-18 3:12 ` Jason Wang [this message]
2022-05-18 3:12 ` [PULL 6/8] net/vmnet: update qemu-options.hx Jason Wang
2022-05-18 3:12 ` [PULL 7/8] net/vmnet: update hmp-commands.hx Jason Wang
2022-05-18 3:12 ` [PULL 8/8] tulip: Assign default MAC address if not specified Jason Wang
2022-05-18 14:10 ` [PULL 0/8] Net patches Richard Henderson
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=20220518031214.93760-6-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=akihiko.odaki@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=vladislav.yaroshchuk@jetbrains.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).