From: Akihiko Odaki <akihiko.odaki@gmail.com>
To: Vladislav Yaroshchuk <vladislav.yaroshchuk@jetbrains.com>,
qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, alex.bennee@linaro.org,
jasowang@redhat.com, phillip.ennen@gmail.com, armbru@redhat.com,
dirty@apple.com, f4bug@amsat.org, r.bolshakov@yadro.com,
agraf@csgraf.de, phillip@axleos.com, roman@roolebo.dev,
hsp.cat7@gmail.com, hello@adns.io, qemu_oss@crudebyte.com,
eblake@redhat.com, kraxel@redhat.com
Subject: Re: [PATCH v15 5/8] net/vmnet: implement bridged mode (vmnet-bridged)
Date: Sat, 26 Feb 2022 02:50:04 +0900 [thread overview]
Message-ID: <6543543b-f934-7d97-dcc9-493a19c438af@gmail.com> (raw)
In-Reply-To: <20220225171402.64861-6-Vladislav.Yaroshchuk@jetbrains.com>
On 2022/02/26 2:13, Vladislav Yaroshchuk wrote:
> Signed-off-by: Vladislav Yaroshchuk <Vladislav.Yaroshchuk@jetbrains.com>
> ---
> net/vmnet-bridged.m | 129 ++++++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 124 insertions(+), 5 deletions(-)
>
> diff --git a/net/vmnet-bridged.m b/net/vmnet-bridged.m
> index c735901666..a19b10909e 100644
> --- a/net/vmnet-bridged.m
> +++ b/net/vmnet-bridged.m
> @@ -10,16 +10,135 @@
>
> #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();
> + 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 bool get_valid_ifnames(char *output_buf)
> +{
> + xpc_object_t shared_if_list = vmnet_copy_shared_interface_list();
> + __block const char *ifname = NULL;
> + __block int str_offset = 0;
> + bool interfaces_available = true;
> +
> + if (!xpc_array_get_count(shared_if_list)) {
> + interfaces_available = false;
> + goto done;
> + }
> +
> + xpc_array_apply(
> + shared_if_list,
> + ^bool(size_t index, xpc_object_t value) {
> + /* build list of strings like "en0 en1 en2 " */
> + ifname = xpc_string_get_string_ptr(value);
> + strcpy(output_buf + str_offset, ifname);
> + strcpy(output_buf + str_offset + strlen(ifname), " ");
> + str_offset += strlen(ifname) + 1;
> + return true;
> + });
> +
> +done:
> + xpc_release(shared_if_list);
> + return interfaces_available;
> +}
> +
> +static bool validate_options(const Netdev *netdev, Error **errp)
> +{
> + const NetdevVmnetBridgedOptions *options = &(netdev->u.vmnet_bridged);
> + char ifnames[256];
I'm not sure if it always fits in 256.
> +
> + if (!validate_ifname(options->ifname)) {
> + if (get_valid_ifnames(ifnames)) {
> + error_setg(errp,
> + "unsupported ifname '%s', expected one of [ %s]",
> + options->ifname,
> + ifnames);
> + return false;
> + }
> + 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(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);
> + if (!validate_options(netdev, errp)) {
> + g_assert_not_reached();
> + }
> + return vmnet_if_create(nc, build_if_desc(netdev), errp);
> }
next prev parent reply other threads:[~2022-02-25 18:24 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-25 17:13 [PATCH v15 0/8] Add vmnet.framework based network backend Vladislav Yaroshchuk
2022-02-25 17:13 ` [PATCH v15 1/8] net/vmnet: add vmnet dependency and customizable option Vladislav Yaroshchuk
2022-02-25 17:13 ` [PATCH v15 2/8] net/vmnet: add vmnet backends to qapi/net Vladislav Yaroshchuk
2022-02-28 10:07 ` Markus Armbruster
2022-02-28 10:47 ` Vladislav Yaroshchuk
2022-02-25 17:13 ` [PATCH v15 3/8] net/vmnet: implement shared mode (vmnet-shared) Vladislav Yaroshchuk
2022-02-25 17:46 ` Akihiko Odaki
2022-02-26 8:37 ` Vladislav Yaroshchuk
2022-02-26 9:16 ` Akihiko Odaki
2022-02-26 11:33 ` Vladislav Yaroshchuk
2022-02-26 12:26 ` Akihiko Odaki
2022-02-28 11:59 ` Vladislav Yaroshchuk
2022-03-01 5:52 ` Akihiko Odaki
2022-03-01 8:09 ` Vladislav Yaroshchuk
2022-03-01 8:21 ` Akihiko Odaki
2022-03-03 15:43 ` Vladislav Yaroshchuk
2022-03-03 18:34 ` Akihiko Odaki
2022-03-04 4:39 ` Akihiko Odaki
2022-03-04 1:37 ` Jason Wang
2022-03-04 4:37 ` Akihiko Odaki
2022-03-07 3:59 ` Jason Wang
2022-03-07 4:25 ` Akihiko Odaki
2022-03-07 4:51 ` Jason Wang
2022-03-07 6:54 ` Akihiko Odaki
2022-02-25 17:13 ` [PATCH v15 4/8] net/vmnet: implement host mode (vmnet-host) Vladislav Yaroshchuk
2022-02-25 17:13 ` [PATCH v15 5/8] net/vmnet: implement bridged mode (vmnet-bridged) Vladislav Yaroshchuk
2022-02-25 17:50 ` Akihiko Odaki [this message]
2022-02-25 17:14 ` [PATCH v15 6/8] net/vmnet: update qemu-options.hx Vladislav Yaroshchuk
2022-02-25 17:14 ` [PATCH v15 7/8] net/vmnet: update hmp-commands.hx Vladislav Yaroshchuk
2022-02-25 17:14 ` [PATCH v15 8/8] net/vmnet: update MAINTAINERS list 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=6543543b-f934-7d97-dcc9-493a19c438af@gmail.com \
--to=akihiko.odaki@gmail.com \
--cc=agraf@csgraf.de \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=dirty@apple.com \
--cc=eblake@redhat.com \
--cc=f4bug@amsat.org \
--cc=hello@adns.io \
--cc=hsp.cat7@gmail.com \
--cc=jasowang@redhat.com \
--cc=kraxel@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=phillip.ennen@gmail.com \
--cc=phillip@axleos.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu_oss@crudebyte.com \
--cc=r.bolshakov@yadro.com \
--cc=roman@roolebo.dev \
--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).