Skip to contentSkip to conversation

Add vmnet.framework based network backend

PATCH Superseded Vladislav Yaroshchuk 3 participants 13 messages Nov 8, 2021 – Nov 19, 2021

Subsystems (2)

v4 of 13 Superseded Latest is v13 →

lore
Share & tools
lore
#0 lore raw

v4 cover Add vmnet.framework based network backend

macOS provides networking API for VMs called 'vmnet.framework':
https://developer.apple.com/documentation/vmnet

We can provide its support as the new QEMU network backends which represent three different vmnet.framework interface usage modes:

* vmnet-shared:
allows the guest to communicate with other guests in shared mode and also with external network (Internet) via NAT. Has (macOS-provided) DHCP server; subnet mask and IP range can be configured;

* vmnet-host:
allows the guest to communicate with other guests in host mode. By default has enabled DHCP as vmnet-shared, but providing network unique id (uuid) can make vmnet-host interfaces isolated from each other and also disables DHCP.

* vmnet-bridged:
bridges the guest with a physical network interface.

This backends cannot work on macOS Catalina 10.15 cause we use vmnet.framework API provided only with macOS 11 and newer. Seems that it is not a problem, because QEMU guarantees to work on two most recent versions of macOS which now are Big Sur (11) and Monterey (12).

Also, we have one inconvenient restriction: vmnet.framework interfaces can create only privileged user:
$ sudo qemu-system-x86_64 -nic vmnet-shared

Attempt of vmnet-* netdev creation being unprivileged user fails with vmnet's 'general failure'.

This happens because vmnet.framework requires com.apple.vm.networking entitlement which is: "restricted to developers of virtualization software. To request this entitlement, contact your Apple representative." as Apple documentation says:
https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_vm_networking

One more note: we still have quite useful but not supported 'vmnet.framework' features as creating port forwarding rules, IPv6 NAT prefix specifying and so on.

Nevertheless, new backends work fine and tested within qemu-system-x86-64 on macOS Bir Sur 11.5.2 host with such nic models:
* e1000-82545em
* virtio-net-pci
* vmxnet3

The guests were:
* macOS 10.15.7
* Ubuntu Bionic (server cloudimg)

This series partially reuses patches by Phillip Tennen:
https://patchew.org/QEMU/[email protected]/
So I included his signed-off line into one of the commit messages and also here.

v1 -> v2:
Since v1 minor typos were fixed, patches rebased onto latest master, redundant changes removed (small commits squashed)

v2 -> v3:
- QAPI style fixes
- Typos fixes in comments
- #include's updated to be in sync with recent master
v3 -> v4:
- Support vmnet interfaces isolation feature
- Support vmnet-host network uuid setting feature
- Refactored sources a bit

Vladislav Yaroshchuk (6):
net/vmnet: add vmnet dependency and customizable option net/vmnet: add vmnet backends to qapi/net net/vmnet: implement shared mode (vmnet-shared) net/vmnet: implement host mode (vmnet-host) net/vmnet: implement bridged mode (vmnet-bridged) net/vmnet: update qemu-options.hx

 meson.build                   |   4 +
 meson_options.txt             |   2 +
 net/clients.h                 |  11 ++
 net/meson.build               |   7 +
 net/net.c                     |  10 ++
 net/vmnet-bridged.m           | 111 ++++++++++++
 net/vmnet-common.m            | 325 ++++++++++++++++++++++++++++++++++
 net/vmnet-host.c              | 111 ++++++++++++
 net/vmnet-shared.c            |  86 +++++++++
 net/vmnet_int.h               |  48 +++++
 qapi/net.json                 | 122 ++++++++++++-
 qemu-options.hx               |  23 +++
 scripts/meson-buildoptions.sh |   3 +
 13 files changed, 861 insertions(+), 2 deletions(-)
 create mode 100644 net/vmnet-bridged.m
 create mode 100644 net/vmnet-common.m
 create mode 100644 net/vmnet-host.c
 create mode 100644 net/vmnet-shared.c
 create mode 100644 net/vmnet_int.h
Signature · 1 line
2.23.0
#1 lore raw

PATCH v4 1/6 net/vmnet: add vmnet dependency and customizable option

---
 meson.build                   | 4 ++++
 meson_options.txt             | 2 ++
 scripts/meson-buildoptions.sh | 3 +++
 3 files changed, 9 insertions(+)
meson.build +4 -0
index 47df10afc2..5e163946d3 100644
@@ -473,6 +473,8 @@ if cocoa.found() and get_option('gtk').enabled()
   error('Cocoa and GTK+ cannot be enabled at the same time')
 endif
 
+vmnet = dependency('appleframeworks', modules: 'vmnet', required: get_option('vmnet'))
+
 seccomp = not_found
 if not get_option('seccomp').auto() or have_system or have_tools
   seccomp = dependency('libseccomp', version: '>=2.3.0',
@@ -1451,6 +1453,7 @@ config_host_data.set('CONFIG_SECCOMP', seccomp.found())
 config_host_data.set('CONFIG_SNAPPY', snappy.found())
 config_host_data.set('CONFIG_USB_LIBUSB', libusb.found())
 config_host_data.set('CONFIG_VDE', vde.found())
+config_host_data.set('CONFIG_VMNET', vmnet.found())
 config_host_data.set('CONFIG_VHOST_USER_BLK_SERVER', have_vhost_user_blk_server)
 config_host_data.set('CONFIG_VNC', vnc.found())
 config_host_data.set('CONFIG_VNC_JPEG', jpeg.found())
@@ -3379,6 +3382,7 @@ endif
 summary_info += {'JACK support':      jack}
 summary_info += {'brlapi support':    brlapi}
 summary_info += {'vde support':       vde}
+summary_info += {'vmnet.framework support': vmnet}
 summary_info += {'netmap support':    have_netmap}
 summary_info += {'l2tpv3 support':    have_l2tpv3}
 summary_info += {'Linux AIO support': libaio}
meson_options.txt +2 -0
index e740dce2a5..77a6bb1955 100644
@@ -147,6 +147,8 @@ option('netmap', type : 'feature', value : 'auto',
        description: 'netmap network backend support')
 option('vde', type : 'feature', value : 'auto',
        description: 'vde network backend support')
+option('vmnet', type : 'feature', value : 'auto',
+       description: 'vmnet.framework network backend support')
 option('virglrenderer', type : 'feature', value : 'auto',
        description: 'virgl rendering support')
 option('vnc', type : 'feature', value : 'auto',
scripts/meson-buildoptions.sh +3 -0
index 55b8a78560..ba3a705724 100644
@@ -82,6 +82,7 @@ meson_options_help() {
   printf "%s\n" '  u2f             U2F emulation support'
   printf "%s\n" '  usb-redir       libusbredir support'
   printf "%s\n" '  vde             vde network backend support'
+  printf "%s\n" '  vmnet           vmnet.framework network backend support'
   printf "%s\n" '  vhost-user-blk-server'
   printf "%s\n" '                  build vhost-user-blk server'
   printf "%s\n" '  virglrenderer   virgl rendering support'
@@ -240,6 +241,8 @@ _meson_option_parse() {
     --disable-usb-redir) printf "%s" -Dusb_redir=disabled ;;
     --enable-vde) printf "%s" -Dvde=enabled ;;
     --disable-vde) printf "%s" -Dvde=disabled ;;
+    --enable-vmnet) printf "%s" -Dvmnet=enabled ;;
+    --disable-vmnet) printf "%s" -Dvmnet=disabled ;;
     --enable-vhost-user-blk-server) printf "%s" -Dvhost_user_blk_server=enabled ;;
     --disable-vhost-user-blk-server) printf "%s" -Dvhost_user_blk_server=disabled ;;
     --enable-virglrenderer) printf "%s" -Dvirglrenderer=enabled ;;
Signature · 1 line
2.23.0
#2 lore raw

PATCH v4 2/6 net/vmnet: add vmnet backends to qapi/net

In reply to Vladislav Yaroshchuk

Create separate netdevs for each vmnet operating mode:
- vmnet-host
- vmnet-shared
- vmnet-bridged

---
 net/clients.h       |  11 ++++
 net/meson.build     |   7 +++
 net/net.c           |  10 ++++
 net/vmnet-bridged.m |  25 +++++++++
 net/vmnet-common.m  |  20 ++++++++
 net/vmnet-host.c    |  24 +++++++++
 net/vmnet-shared.c  |  25 +++++++++
 net/vmnet_int.h     |  25 +++++++++
 qapi/net.json       | 122 +++++++++++++++++++++++++++++++++++++++++++-
 9 files changed, 267 insertions(+), 2 deletions(-)
 create mode 100644 net/vmnet-bridged.m
 create mode 100644 net/vmnet-common.m
 create mode 100644 net/vmnet-host.c
 create mode 100644 net/vmnet-shared.c
 create mode 100644 net/vmnet_int.h
net/clients.h +11 -0
index 92f9b59aed..c9157789f2 100644
@@ -63,4 +63,15 @@ int net_init_vhost_user(const Netdev *netdev, const char *name,
 
 int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
                         NetClientState *peer, Error **errp);
+#ifdef CONFIG_VMNET
+int net_init_vmnet_host(const Netdev *netdev, const char *name,
+                          NetClientState *peer, Error **errp);
+
+int net_init_vmnet_shared(const Netdev *netdev, const char *name,
+                          NetClientState *peer, Error **errp);
+
+int net_init_vmnet_bridged(const Netdev *netdev, const char *name,
+                          NetClientState *peer, Error **errp);
+#endif /* CONFIG_VMNET */
+
 #endif /* QEMU_NET_CLIENTS_H */
net/meson.build +7 -0
index 847bc2ac85..00a88c4951 100644
@@ -42,4 +42,11 @@ softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files(tap_posix))
 softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('tap-win32.c'))
 softmmu_ss.add(when: 'CONFIG_VHOST_NET_VDPA', if_true: files('vhost-vdpa.c'))
 
+vmnet_files = files(
+  'vmnet-common.m',
+  'vmnet-bridged.m',
+  'vmnet-host.c',
+  'vmnet-shared.c'
+)
+softmmu_ss.add(when: vmnet, if_true: vmnet_files)
 subdir('can')
net/net.c +10 -0
index f0d14dbfc1..1dbb64b935 100644
@@ -1021,6 +1021,11 @@ static int (* const net_client_init_fun[NET_CLIENT_DRIVER__MAX])(
 #ifdef CONFIG_L2TPV3
         [NET_CLIENT_DRIVER_L2TPV3]    = net_init_l2tpv3,
 #endif
+#ifdef CONFIG_VMNET
+        [NET_CLIENT_DRIVER_VMNET_HOST] = net_init_vmnet_host,
+        [NET_CLIENT_DRIVER_VMNET_SHARED] = net_init_vmnet_shared,
+        [NET_CLIENT_DRIVER_VMNET_BRIDGED] = net_init_vmnet_bridged,
+#endif /* CONFIG_VMNET */
 };
 
 
@@ -1106,6 +1111,11 @@ void show_netdevs(void)
 #endif
 #ifdef CONFIG_VHOST_VDPA
         "vhost-vdpa",
+#endif
+#ifdef CONFIG_VMNET
+        "vmnet-host",
+        "vmnet-shared",
+        "vmnet-bridged",
 #endif
     };
 
net/vmnet-bridged.m new file +25 -0
new file mode 100644
index 0000000000..4e42a90391
@@ -0,0 +1,25 @@
+/*
+ * vmnet-bridged.m
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#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 <vmnet/vmnet.h>
+
+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;
+}
net/vmnet-common.m new file +20 -0
new file mode 100644
index 0000000000..532d152840
@@ -0,0 +1,20 @@
+/*
+ * vmnet-common.m - network client wrapper for Apple vmnet.framework
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ * Copyright(c) 2021 Phillip Tennen <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#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 <vmnet/vmnet.h>
+
net/vmnet-host.c new file +24 -0
new file mode 100644
index 0000000000..4a5ef99dc7
@@ -0,0 +1,24 @@
+/*
+ * vmnet-host.c
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#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 <vmnet/vmnet.h>
+
+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;
+}
net/vmnet-shared.c new file +25 -0
new file mode 100644
index 0000000000..f8c4a4f3b8
@@ -0,0 +1,25 @@
+/*
+ * vmnet-shared.c
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#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 <vmnet/vmnet.h>
+
+int net_init_vmnet_shared(const Netdev *netdev, const char *name,
+                          NetClientState *peer, Error **errp)
+{
+  error_setg(errp, "vmnet-shared is not implemented yet");
+  return -1;
+}
net/vmnet_int.h new file +25 -0
new file mode 100644
index 0000000000..c5982259a4
@@ -0,0 +1,25 @@
+/*
+ * vmnet_int.h
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+#ifndef VMNET_INT_H
+#define VMNET_INT_H
+
+#include "qemu/osdep.h"
+#include "vmnet_int.h"
+#include "clients.h"
+
+#include <vmnet/vmnet.h>
+
+typedef struct VmnetCommonState {
+  NetClientState nc;
+
+} VmnetCommonState;
+
+
+#endif /* VMNET_INT_H */
qapi/net.json +120 -2

149 lines not on this page · raw message

Signature · 1 line
2.23.0
#3 lore raw

Re: [PATCH v4 2/6] net/vmnet: add vmnet backends to qapi/net

Quoted 6 lines · Vladislav Yaroshchuk

Create separate netdevs for each vmnet operating mode:
- vmnet-host
- vmnet-shared
- vmnet-bridged

[...]

Quoted 12 lines
qapi/net.json +4 -0
index 7fab2e7cd8..087cdf0546 100644
@@ -452,6 +452,112 @@
     '*vhostdev':     'str',
     '*queues':       'int' } }
 
+##
+# @NetdevVmnetHostOptions:
+#
+# vmnet (host mode) network backend.

qapi/net.json line 468

Quoted 10 lines
qapi/net.json +10 -0
+#
+# Allows the vmnet interface to communicate with other vmnet
+# interfaces that are in host mode and also with the native host.
+#
+# @dhcpstart: The starting IPv4 address to use for the interface.
+#             Must be in the private IP range (RFC 1918). Must be
+#             specified along with @dhcpend and @subnetmask.
+#             This address is used as the gateway address. The
+#             subsequent address up to and including dhcpend are
+#             placed in the DHCP pool.

In QMP, we separate words by dashes, like @dhcp-start. We may prefer not to here, for consistency with NetdevUserOptions, ...

qapi/net.json line 472

Quoted 4 lines
qapi/net.json +4 -0
+#
+# @dhcpend: The DHCP IPv4 range end address to use for the
+#           interface. Must be in the private IP range (RFC 1918).
+#           Must be specified along with @dhcpstart and @subnetmask.

... and here, to match @dhcpstart.

qapi/net.json line 475

Quoted 3 lines
qapi/net.json +3 -0
+#
+# @subnetmask: The IPv4 subnet mask to use on the interface. Must
+#              be specified along with @dhcpstart and @subnetmask.

@subnet-mask, please.

No support for IPv6?

qapi/net.json line 484

Quoted 9 lines
qapi/net.json +9 -0
+#
+# @isolated: Enable isolation for this interface. Interface isolation
+#            ensures that network communication between multiple
+#            vmnet interfaces instances is not possible.
+#
+# @net-uuid: The identifier (UUID) to uniquely identify the network.
+#            If provided, no DHCP service is provided on this network
+#            and the interface is added to an isolated network with
+#            the specified identifier.

Out of curiosity: identify to whom?

If I set @net-uuid, I get an isolated network with a UUID, and if I set "isolated": true, I get one without a UUID. When would I want the former, and when the latter?

What happens when I set "isolated": false together with @net-uuid?

When "no DCHCP service is provided", then @dhcpstart and @dhcpend become misnomers. Compare NetdevUserOptions: it uses @net to specify the address range, and dhcpstart to specify the DHCP range (@dhcpend is implied). Should we aim for consistency between the two?

qapi/net.json line 486

Quoted 2 lines
qapi/net.json +2 -0
+#
+# Since: 6.2

Missed 6.2, please adjust. More of the same below.

Quoted 11 lines
qapi/net.json +11 -0
+##
+{ 'struct': 'NetdevVmnetHostOptions',
+  'data': {
+    '*dhcpstart':   'str',
+    '*dhcpend':     'str',
+    '*subnetmask':  'str',
+    '*isolated':    'bool',
+    '*net-uuid':    'str'
+  },
+  'if': 'CONFIG_VMNET' }
+

qapi/net.json line 507

Quoted 10 lines
qapi/net.json +10 -0
+##
+# @NetdevVmnetSharedOptions:
+#
+# vmnet (shared mode) network backend.
+#
+# Allows traffic originating from the vmnet interface to reach the
+# Internet through a network address translator (NAT). The vmnet
+# interface can also communicate with the native host. By default,
+# the vmnet interface is able to communicate with other shared mode
+# interfaces. If a subnet range is specified, the vmnet interface can

Do you mean "subnet mask"?

Quoted 96 lines
qapi/net.json +67 -2
+# communicate with other shared mode interfaces on the same subnet.
+#
+# @dhcpstart: The starting IPv4 address to use for the interface.
+#             Must be in the private IP range (RFC 1918). Must be
+#             specified along with @dhcpend and @subnetmask.
+#             This address is used as the gateway address. The
+#             subsequent address up to and including dhcpend are
+#             placed in the DHCP pool.
+#
+# @dhcpend: The DHCP IPv4 range end address to use for the
+#           interface. Must be in the private IP range (RFC 1918).
+#           Must be specified along with @dhcpstart and @subnetmask.
+#
+# @subnetmask: The IPv4 subnet mask to use on the interface. Must
+#              be specified along with @dhcpstart and @subnetmask.
+#
+# @isolated: Enable isolation for this interface. Interface isolation
+#            ensures that network communication between multiple
+#            vmnet interfaces instances is not possible.
+#
+# Since: 6.2
+##
+{ 'struct': 'NetdevVmnetSharedOptions',
+  'data': {
+    '*dhcpstart':    'str',
+    '*dhcpend':      'str',
+    '*subnetmask':   'str',
+    '*isolated':     'bool'
+  },
+  'if': 'CONFIG_VMNET' }
+
+##
+# @NetdevVmnetBridgedOptions:
+#
+# vmnet (bridged mode) network backend.
+#
+# Bridges the vmnet interface with a physical network interface.
+#
+# @ifname: The name of the physical interface to be bridged.
+#
+# @isolated: Enable isolation for this interface. Interface isolation
+#            ensures that network communication between multiple
+#            vmnet interfaces instances is not possible.
+#
+# Since: 6.2
+##
+{ 'struct': 'NetdevVmnetBridgedOptions',
+  'data': {
+    'ifname':     'str',
+    '*isolated':  'str'
+  },
+  'if': 'CONFIG_VMNET' }
+
 ##
 # @NetClientDriver:
 #
@@ -460,10 +566,16 @@
 # Since: 2.7
 #
 #        @vhost-vdpa since 5.1
+#        @vmnet-host since 6.2
+#        @vmnet-shared since 6.2
+#        @vmnet-bridged since 6.2
 ##
 { 'enum': 'NetClientDriver',
   'data': [ 'none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'vde',
-            'bridge', 'hubport', 'netmap', 'vhost-user', 'vhost-vdpa' ] }
+            'bridge', 'hubport', 'netmap', 'vhost-user', 'vhost-vdpa',
+            { 'name': 'vmnet-host', 'if': 'CONFIG_VMNET' },
+            { 'name': 'vmnet-shared', 'if': 'CONFIG_VMNET' },
+            { 'name': 'vmnet-bridged', 'if': 'CONFIG_VMNET' }] }
 
 ##
 # @Netdev:
@@ -477,6 +589,9 @@
 # Since: 1.2
 #
 #        'l2tpv3' - since 2.1
+#        'vmnet-host' - since 6.2
+#        'vmnet-shared' - since 6.2
+#        'vmnet-bridged' - since 6.2
 ##
 { 'union': 'Netdev',
   'base': { 'id': 'str', 'type': 'NetClientDriver' },
@@ -492,7 +607,10 @@
     'hubport':  'NetdevHubPortOptions',
     'netmap':   'NetdevNetmapOptions',
     'vhost-user': 'NetdevVhostUserOptions',
-    'vhost-vdpa': 'NetdevVhostVDPAOptions' } }
+    'vhost-vdpa': 'NetdevVhostVDPAOptions',
+    'vmnet-host': 'NetdevVmnetHostOptions',
+    'vmnet-shared': 'NetdevVmnetSharedOptions',
+    'vmnet-bridged': 'NetdevVmnetBridgedOptions' } }
 
 ##
 # @RxState:
#4 lore raw

Re: [PATCH v4 2/6] net/vmnet: add vmnet backends to qapi/net

вт, 9 нояб. 2021 г. в 08:41, Markus Armbruster <[email protected]>:

Quoted 37 lines
Quoted 6 lines · Vladislav Yaroshchuk

Create separate netdevs for each vmnet operating mode:
- vmnet-host
- vmnet-shared
- vmnet-bridged

[...]

Quoted 12 lines
qapi/net.json +4 -0
index 7fab2e7cd8..087cdf0546 100644
@@ -452,6 +452,112 @@
     '*vhostdev':     'str',
     '*queues':       'int' } }
 
+##
+# @NetdevVmnetHostOptions:
+#
+# vmnet (host mode) network backend.

qapi/net.json line 468

Quoted 10 lines
qapi/net.json +10 -0
+#
+# Allows the vmnet interface to communicate with other vmnet
+# interfaces that are in host mode and also with the native host.
+#
+# @dhcpstart: The starting IPv4 address to use for the interface.
+#             Must be in the private IP range (RFC 1918). Must be
+#             specified along with @dhcpend and @subnetmask.
+#             This address is used as the gateway address. The
+#             subsequent address up to and including dhcpend are
+#             placed in the DHCP pool.

In QMP, we separate words by dashes, like @dhcp-start. We may prefer not to here, for consistency with NetdevUserOptions, ...

Quoted 8 lines

+#

qapi/net.json line 472

Quoted 3 lines
qapi/net.json +3 -0
+# @dhcpend: The DHCP IPv4 range end address to use for the
+#           interface. Must be in the private IP range (RFC 1918).
+#           Must be specified along with @dhcpstart and @subnetmask.

... and here, to match @dhcpstart.

Yes, I did not use dashed exactly because of this: to be consistent with

NetdevUserOptions.

Quoted 6 lines

+#

qapi/net.json line 473

Quoted 2 lines
qapi/net.json +2 -0
+# @subnetmask: The IPv4 subnet mask to use on the interface. Must
+#              be specified along with @dhcpstart and @subnetmask.

@subnet-mask, please.

So I think we can leave dhcpstart, dhcpend, but add a dash to subnet-mask.

Quoted 3 lines

No support for IPv6?

It's supported. vmnet-shared tested with link-local addresses. Also some configurable options exist, but only for 'shared' mode. I can try to add them in the next patch series version.

Quoted 12 lines

+#

qapi/net.json line 484

Quoted 8 lines
qapi/net.json +8 -0
+# @isolated: Enable isolation for this interface. Interface isolation
+#            ensures that network communication between multiple
+#            vmnet interfaces instances is not possible.
+#
+# @net-uuid: The identifier (UUID) to uniquely identify the network.
+#            If provided, no DHCP service is provided on this network
+#            and the interface is added to an isolated network with
+#            the specified identifier.

Out of curiosity: identify to whom?

Quoted 5 lines

If I set @net-uuid, I get an isolated network with a UUID, and if I set "isolated": true, I get one without a UUID. When would I want the former, and when the latter?

if I set "isolated": true, I get one without a UUID. is an incorrect statement.

vmnet.framework isolation features are designed a bit weirdly (just my opinion).
Most things happen on the macOS side, and we just can provide some configuration
options to vmnet.framework as the user provides options to QEMU.

Firstly, if you set @net-uuid, you're putting the interface into an isolated network.
You can set the same @net-uuid on multiple vmnet-host interfaces, also outside
QEMU, it can be any vmnet interface started in 'host' mode, ex. xhyve's netdev
if they support this. All of them can communicate with each other, but only inside
this net identified by the @net-uuid. They can't communicate with interfaces from
network with id != ${our set @net-uuid}.

"@isolated" is a more prohibitive mode. "Isolated" interface is not able to communicate
with anyone except the host.

What happens when I set "isolated": false together with @net-uuid?

Let's compare (vmnet-host mode):

0. When nothing is provided, DHCP is enabled and uses default (macOS-configured) settings.
Your interface can communicate with any other vmnet-host interface.

1. When provided @isolated=on only, DHCP is still enabled, but the interface can
communicate only with the host. All the attempts to create another
interface with
the same subnet will fail with VMNET_SHARING_SERVICE_BUSY. If we don't specify DHCP settings (start, end, mask), macOS adjusts them
automatically to
prevent collisions and the VMNET_SHARING_SERVICE_BUSY error.

2. When provided @net-uuid=uuid[,@isolated=off], the interface can communicate to any
other interface inside the 'uuid' network. Also with other VMs under
other hypervisors.
DHCP is disabled.

3. When provided @net-uuid=uuid,@isolated=on, the interface can communicate only with
the host. DHCP is disabled. All the attempts to create another
interface with
the @net-uuid will fail with VMNET_SHARING_SERVICE_BUSY.

When "no DCHCP service is provided", then @dhcpstart and @dhcpend become

Quoted 4 lines

misnomers. Compare NetdevUserOptions: it uses @net to specify the address range, and dhcpstart to specify the DHCP range (@dhcpend is implied). Should we aim for consistency between the two?

I think it is not our choice. All of these options are just mappings to vmnet interface
params:
https://developer.apple.com/documentation/vmnet/vmnet_constants
@subnet-mask -> vmnet_subnet_mask_key
@dhcpstart -> vmnet_start_address_key
@dhcpend -> vmnet_end_address_key
More detailed description is provided in the vmnet.h header of macOS SDK. There is a restriction that says: when the vmnet_subnet_mask_key (@subnet-mask)
is set you "must also specify vmnet_start_address_key and vmnet_end_address_key".
So, when "no DHCP service is provided" the@subnet-mask property also becomes
a misnomer.

I added a corresponding restriction: you cannot provide @net-uuid within any of DHCP
options, this causes hard failure with error_setg() (see vmnet-host.c).

Quoted 6 lines

+#

qapi/net.json line 482

Quoted 1 line
qapi/net.json +1 -0
+# Since: 6.2

Missed 6.2, please adjust. More of the same below.

The next one is 6.3, isn't it?

Quoted 15 lines

+##

Quoted 14 lines
qapi/net.json +14 -0
+{ 'struct': 'NetdevVmnetHostOptions',
+  'data': {
+    '*dhcpstart':   'str',
+    '*dhcpend':     'str',
+    '*subnetmask':  'str',
+    '*isolated':    'bool',
+    '*net-uuid':    'str'
+  },
+  'if': 'CONFIG_VMNET' }
+
+##
+# @NetdevVmnetSharedOptions:
+#
+# vmnet (shared mode) network backend.
Quoted 10 lines

qapi/net.json line 507

Quoted 6 lines
qapi/net.json +6 -0
+#
+# Allows traffic originating from the vmnet interface to reach the
+# Internet through a network address translator (NAT). The vmnet
+# interface can also communicate with the native host. By default,
+# the vmnet interface is able to communicate with other shared mode
+# interfaces. If a subnet range is specified, the vmnet interface can

Do you mean "subnet mask"?

This phrase was just copied from Apple's vmnet.h from SDK:

```
 * [...] VMNET_SHARED_MODE
 * Allows traffic originating from the vmnet interface to reach the
 * Internet through a network address translator (NAT). The vmnet interface
 * can also communicate with the native host. By default, the vmnet
interface
 * is able to communicate with other shared mode interfaces. If a subnet
range
 * is specified, the vmnet interface can communicate with other shared mode
 * interfaces on the same subnet.
```

But subnet mask sounds more suitable, so it's better to say:
"... If a subnet mask and DHCP range is specified, the vmnet interface can ..."

Quoted 24 lines

+# communicate with other shared mode interfaces on the same subnet.

Quoted 23 lines
qapi/net.json +23 -0
+#
+# @dhcpstart: The starting IPv4 address to use for the interface.
+#             Must be in the private IP range (RFC 1918). Must be
+#             specified along with @dhcpend and @subnetmask.
+#             This address is used as the gateway address. The
+#             subsequent address up to and including dhcpend are
+#             placed in the DHCP pool.
+#
+# @dhcpend: The DHCP IPv4 range end address to use for the
+#           interface. Must be in the private IP range (RFC 1918).
+#           Must be specified along with @dhcpstart and @subnetmask.
+#
+# @subnetmask: The IPv4 subnet mask to use on the interface. Must
+#              be specified along with @dhcpstart and @subnetmask.
+#
+# @isolated: Enable isolation for this interface. Interface isolation
+#            ensures that network communication between multiple
+#            vmnet interfaces instances is not possible.
+#
+# Since: 6.2
+##
+{ 'struct': 'NetdevVmnetSharedOptions',
+  'data': {
Quoted 8 lines
Quoted 6 lines
qapi/net.json +6 -0
+    '*dhcpstart':    'str',
+    '*dhcpend':      'str',
+    '*subnetmask':   'str',
+    '*isolated':     'bool'
+  },
+  'if': 'CONFIG_VMNET' }

[...]

As a conclusion, my TODOs for now:
* fix subnet range in documentation
* add dash to @subnet-mask
* change version: 6.2 -> 6.3
* provide IPv6 configuration properties for vmnet-shared (optional).

Best regards,
Vladislav Yaroshchuk

#5 lore raw

Re: [PATCH v4 2/6] net/vmnet: add vmnet backends to qapi/net

Quoted 8 lines · Vladislav Yaroshchuk
Quoted 7 lines

+#

Quoted 1 line

+# Since: 6.2

Missed 6.2, please adjust. More of the same below.

The next one is 6.3, isn't it?

7.0, actually, as it will be the first release in 2022.

Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org
#6 lore raw

Re: [PATCH v4 2/6] net/vmnet: add vmnet backends to qapi/net

чт, 11 нояб. 2021 г., 11:49 PM Eric Blake <[email protected]>:

Quoted 13 lines · Vladislav Yaroshchuk
Quoted 8 lines
Quoted 7 lines

+#

Quoted 1 line

+# Since: 6.2

Missed 6.2, please adjust. More of the same below.

The next one is 6.3, isn't it?

7.0, actually, as it will be the first release in 2022.

OK, thank you!

Quoted 6 lines

--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org

Signature · 3 lines
Best Regards,

Vladislav Yaroshchuk
#7 lore raw

Re: [PATCH v4 2/6] net/vmnet: add vmnet backends to qapi/net

In reply to Vladislav Yaroshchuk

I apologize for taking so long to respond. I spotted v5, but haven't reviewed it. Please read my response, then assess whether you need v6. If not, let me know, so I can have a look at v5.

Quoted 54 lines · Vladislav Yaroshchuk

--000000000000325dde05d084e6e4
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

=D0=B2=D1=82, 9 =D0=BD=D0=BE=D1=8F=D0=B1. 2021 =D0=B3. =D0=B2 08:41, Markus=
Armbruster <[email protected]>:

Quoted 47 lines
Quoted 6 lines · Vladislav Yaroshchuk

Create separate netdevs for each vmnet operating mode:
- vmnet-host
- vmnet-shared
- vmnet-bridged

[...]

Quoted 12 lines
qapi/net.json +4 -0
index 7fab2e7cd8..087cdf0546 100644
@@ -452,6 +452,112 @@
     '*vhostdev':     'str',
     '*queues':       'int' } }
 
+##
+# @NetdevVmnetHostOptions:
+#
+# vmnet (host mode) network backend.

qapi/net.json line 468

Quoted 10 lines
qapi/net.json +10 -0
+#
+# Allows the vmnet interface to communicate with other vmnet
+# interfaces that are in host mode and also with the native host.
+#
+# @dhcpstart: The starting IPv4 address to use for the interface.
+#             Must be in the private IP range (RFC 1918). Must be
+#             specified along with @dhcpend and @subnetmask.
+#             This address is used as the gateway address. The
+#             subsequent address up to and including dhcpend are
+#             placed in the DHCP pool.

In QMP, we separate words by dashes, like @dhcp-start. We may prefer not to here, for consistency with NetdevUserOptions, ...

+#

qapi/net.json line 472

Quoted 3 lines
qapi/net.json +3 -0
+# @dhcpend: The DHCP IPv4 range end address to use for the
+#           interface. Must be in the private IP range (RFC 1918).
+#           Must be specified along with @dhcpstart and @subnetmask.

... and here, to match @dhcpstart.

Yes, I did not use dashed exactly because of this: to be consistent with NetdevUserOptions.

+#

Quoted 8 lines
Quoted 5 lines

qapi/net.json line 473

Quoted 2 lines
qapi/net.json +2 -0
+# @subnetmask: The IPv4 subnet mask to use on the interface. Must
+#              be specified along with @dhcpstart and @subnetmask.

@subnet-mask, please.

So I think we can leave dhcpstart, dhcpend, but add a dash to subnet-mask.

Yes, please.

Quoted 6 lines
Quoted 3 lines

No support for IPv6?

It's supported. vmnet-shared tested with link-local addresses. Also some configurable options exist, but only for 'shared' mode. I can try to add them in the next patch series version.

Or a later patch.

Quoted 66 lines
Quoted 12 lines

+#

qapi/net.json line 484

Quoted 8 lines
qapi/net.json +8 -0
+# @isolated: Enable isolation for this interface. Interface isolation
+#            ensures that network communication between multiple
+#            vmnet interfaces instances is not possible.
+#
+# @net-uuid: The identifier (UUID) to uniquely identify the network.
+#            If provided, no DHCP service is provided on this network
+#            and the interface is added to an isolated network with
+#            the specified identifier.

Out of curiosity: identify to whom?

Quoted 5 lines

If I set @net-uuid, I get an isolated network with a UUID, and if I set "isolated": true, I get one without a UUID. When would I want the former, and when the latter?

if I set "isolated": true, I get one without a UUID. is an incorrect statement.

vmnet.framework isolation features are designed a bit weirdly (just my opinion).
Most things happen on the macOS side, and we just can provide some configuration
options to vmnet.framework as the user provides options to QEMU.

Firstly, if you set @net-uuid, you're putting the interface into an isolated network.
You can set the same @net-uuid on multiple vmnet-host interfaces, also outside
QEMU, it can be any vmnet interface started in 'host' mode, ex. xhyve's netdev
if they support this. All of them can communicate with each other, but only inside
this net identified by the @net-uuid. They can't communicate with interfaces from
network with id !=3D ${our set @net-uuid}.

"@isolated" is a more prohibitive mode. "Isolated" interface is not able to communicate
with anyone except the host.

What happens when I set "isolated": false together with @net-uuid?

Let's compare (vmnet-host mode):

0. When nothing is provided, DHCP is enabled and uses default (macOS-configured) settings.
Your interface can communicate with any other vmnet-host interface.

1. When provided @isolated=3Don only, DHCP is still enabled, but the interface can
communicate only with the host. All the attempts to create another
interface with
the same subnet will fail with VMNET_SHARING_SERVICE_BUSY. If we don't specify DHCP settings (start, end, mask), macOS adjusts them
automatically to
prevent collisions and the VMNET_SHARING_SERVICE_BUSY error.

2. When provided @net-uuid=3Duuid[,@isolated=3Doff], the interface can communicate to any
other interface inside the 'uuid' network. Also with other VMs under
other hypervisors.
DHCP is disabled.

Quoted 6 lines

3. When provided @net-uuid=3Duuid,@isolated=3Don, the interface can communi= cate
only with
the host. DHCP is disabled. All the attempts to create another
interface with
the @net-uuid will fail with VMNET_SHARING_SERVICE_BUSY.

The doc comments don't make this clear, I'm afraid. Care to improve them some?

Quoted 10 lines
Quoted 5 lines

When "no DCHCP service is provided", then @dhcpstart and @dhcpend become misnomers. Compare NetdevUserOptions: it uses @net to specify the address range, and dhcpstart to specify the DHCP range (@dhcpend is implied). Should we aim for consistency between the two?

I think it is not our choice. All of these options are just mappings to vmnet interface
params:
https://developer.apple.com/documentation/vmnet/vmnet_constants

I think it *is* our choice. We can choose to be internally consistent, i.e. with NetdevUserOptions, or consistent with the external interface we expose internally, i.e. with the vmnet interface. Tradeoff.

Quoted 3 lines

@subnet-mask -> vmnet_subnet_mask_key
@dhcpstart -> vmnet_start_address_key
@dhcpend -> vmnet_end_address_key

Note that the right hand side does not say "DHCP". I think the left hand side should not, either. Why not @start-address and @end-address?

Quoted 8 lines

More detailed description is provided in the vmnet.h header of macOS SDK. There is a restriction that says: when the vmnet_subnet_mask_key (@subnet-mask)
is set you "must also specify vmnet_start_address_key and vmnet_end_address_key".
So, when "no DHCP service is provided" the@subnet-mask property also becomes
a misnomer.

I don't think so. vmnet_end_address_key, vmnet_end_address_key, vmnet_subnet_mask_key all make sense regardless of DHCP service.

The gateway address is hardwired to the first address in the range. If DHCP is provided, it hands out addresses from the remainder of the range.

Quoted 5 lines

I added a corresponding restriction: you cannot provide @net-uuid within any of DHCP
options, this causes hard failure with error_setg() (see vmnet-host.c).

Quoted 7 lines
Quoted 6 lines

+#

qapi/net.json line 482

Quoted 1 line
qapi/net.json +1 -0
+# Since: 6.2

Missed 6.2, please adjust. More of the same below.

The next one is 6.3, isn't it?

7.0

Quoted 79 lines
Quoted 15 lines

+##

Quoted 14 lines
qapi/net.json +14 -0
+{ 'struct': 'NetdevVmnetHostOptions',
+  'data': {
+    '*dhcpstart':   'str',
+    '*dhcpend':     'str',
+    '*subnetmask':  'str',
+    '*isolated':    'bool',
+    '*net-uuid':    'str'
+  },
+  'if': 'CONFIG_VMNET' }
+
+##
+# @NetdevVmnetSharedOptions:
+#
+# vmnet (shared mode) network backend.
Quoted 10 lines

qapi/net.json line 507

Quoted 6 lines
qapi/net.json +6 -0
+#
+# Allows traffic originating from the vmnet interface to reach the
+# Internet through a network address translator (NAT). The vmnet
+# interface can also communicate with the native host. By default,
+# the vmnet interface is able to communicate with other shared mode
+# interfaces. If a subnet range is specified, the vmnet interface can

Do you mean "subnet mask"?

This phrase was just copied from Apple's vmnet.h from SDK:

```
 * [...] VMNET_SHARED_MODE
 * Allows traffic originating from the vmnet interface to reach the
 * Internet through a network address translator (NAT). The vmnet interface
 * can also communicate with the native host. By default, the vmnet
interface
 * is able to communicate with other shared mode interfaces. If a subnet
range
 * is specified, the vmnet interface can communicate with other shared mode
 * interfaces on the same subnet.
```

But subnet mask sounds more suitable, so it's better to say:
"... If a subnet mask and DHCP range is specified, the vmnet interface can ..."

Quoted 24 lines

+# communicate with other shared mode interfaces on the same subnet.

Quoted 23 lines
qapi/net.json +23 -0
+#
+# @dhcpstart: The starting IPv4 address to use for the interface.
+#             Must be in the private IP range (RFC 1918). Must be
+#             specified along with @dhcpend and @subnetmask.
+#             This address is used as the gateway address. The
+#             subsequent address up to and including dhcpend are
+#             placed in the DHCP pool.
+#
+# @dhcpend: The DHCP IPv4 range end address to use for the
+#           interface. Must be in the private IP range (RFC 1918).
+#           Must be specified along with @dhcpstart and @subnetmask.
+#
+# @subnetmask: The IPv4 subnet mask to use on the interface. Must
+#              be specified along with @dhcpstart and @subnetmask.
+#
+# @isolated: Enable isolation for this interface. Interface isolation
+#            ensures that network communication between multiple
+#            vmnet interfaces instances is not possible.
+#
+# Since: 6.2
+##
+{ 'struct': 'NetdevVmnetSharedOptions',
+  'data': {
Quoted 8 lines
Quoted 6 lines
qapi/net.json +6 -0
+    '*dhcpstart':    'str',
+    '*dhcpend':      'str',
+    '*subnetmask':   'str',
+    '*isolated':     'bool'
+  },
+  'if': 'CONFIG_VMNET' }

[...]

As a conclusion, my TODOs for now:
* fix subnet range in documentation
* add dash to @subnet-mask
* change version: 6.2 -> 6.3
* provide IPv6 configuration properties for vmnet-shared (optional).

#8 lore raw

Re: [PATCH v4 2/6] net/vmnet: add vmnet backends to qapi/net

пт, 19 нояб. 2021 г. в 17:22, Markus Armbruster <[email protected]>:

Quoted 5 lines

I apologize for taking so long to respond. I spotted v5, but haven't reviewed it. Please read my response, then assess whether you need v6. If not, let me know, so I can have a look at v5.

Not a problem, v5 has not so much difference to v4. I think we can discuss qapi here, after I'll submit v6 and then you can review it skipping v5.

Quoted 69 lines
Quoted 5 lines · Vladislav Yaroshchuk

--000000000000325dde05d084e6e4
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

=D0=B2=D1=82, 9 =D0=BD=D0=BE=D1=8F=D0=B1. 2021 =D0=B3. =D0=B2 08:41,

Markus=

Quoted 47 lines

Armbruster <[email protected]>:

Quoted 45 lines
Quoted 6 lines · Vladislav Yaroshchuk

Create separate netdevs for each vmnet operating mode:
- vmnet-host
- vmnet-shared
- vmnet-bridged

[...]

Quoted 12 lines
qapi/net.json +4 -0
index 7fab2e7cd8..087cdf0546 100644
@@ -452,6 +452,112 @@
     '*vhostdev':     'str',
     '*queues':       'int' } }
 
+##
+# @NetdevVmnetHostOptions:
+#
+# vmnet (host mode) network backend.

qapi/net.json line 468

Quoted 10 lines
qapi/net.json +10 -0
+#
+# Allows the vmnet interface to communicate with other vmnet
+# interfaces that are in host mode and also with the native host.
+#
+# @dhcpstart: The starting IPv4 address to use for the interface.
+#             Must be in the private IP range (RFC 1918). Must be
+#             specified along with @dhcpend and @subnetmask.
+#             This address is used as the gateway address. The
+#             subsequent address up to and including dhcpend are
+#             placed in the DHCP pool.

In QMP, we separate words by dashes, like @dhcp-start. We may prefer not to here, for consistency with NetdevUserOptions, ...

+#

qapi/net.json line 472

Quoted 3 lines
qapi/net.json +3 -0
+# @dhcpend: The DHCP IPv4 range end address to use for the
+#           interface. Must be in the private IP range (RFC 1918).
+#           Must be specified along with @dhcpstart and @subnetmask.

... and here, to match @dhcpstart.

Yes, I did not use dashed exactly because of this: to be consistent

with NetdevUserOptions.

Quoted 10 lines
Quoted 7 lines

+#

qapi/net.json line 473

Quoted 2 lines
qapi/net.json +2 -0
+# @subnetmask: The IPv4 subnet mask to use on the interface. Must
+#              be specified along with @dhcpstart and @subnetmask.

@subnet-mask, please.

So I think we can leave dhcpstart, dhcpend, but add a dash to subnet-mask.

Yes, please.

Quoted 10 lines
Quoted 6 lines

No support for IPv6?

Quoted 2 lines

It's supported. vmnet-shared tested with link-local addresses. Also some configurable options exist, but only for 'shared' mode. I can try to add them in the next patch series version.

Or a later patch.

'vmnet-shared' has NAT66 in addition to NAT44. It has configurable prefix for internal network, so I've added a new corresponding property in v5.

Quoted 71 lines
Quoted 26 lines

+#

Quoted 11 lines

qapi/net.json line 484

Quoted 8 lines
qapi/net.json +8 -0
+# @isolated: Enable isolation for this interface. Interface isolation
+#            ensures that network communication between multiple
+#            vmnet interfaces instances is not possible.
+#
+# @net-uuid: The identifier (UUID) to uniquely identify the network.
+#            If provided, no DHCP service is provided on this network
+#            and the interface is added to an isolated network with
+#            the specified identifier.

Out of curiosity: identify to whom?

Quoted 5 lines

If I set @net-uuid, I get an isolated network with a UUID, and if I set "isolated": true, I get one without a UUID. When would I want the former, and when the latter?

if I set "isolated": true, I get one without a UUID. is an incorrect statement.

vmnet.framework isolation features are designed a bit weirdly (just my opinion).
Most things happen on the macOS side, and we just can provide some configuration
options to vmnet.framework as the user provides options to QEMU.

Quoted 7 lines

Firstly, if you set @net-uuid, you're putting the interface into an isolated network.
You can set the same @net-uuid on multiple vmnet-host interfaces, also outside
QEMU, it can be any vmnet interface started in 'host' mode, ex. xhyve's netdev
if they support this. All of them can communicate with each other, but

only

Quoted 6 lines

inside
this net identified by the @net-uuid. They can't communicate with interfaces from
network with id !=3D ${our set @net-uuid}.

"@isolated" is a more prohibitive mode. "Isolated" interface is not able

to

Quoted 12 lines

communicate
with anyone except the host.

What happens when I set "isolated": false together with @net-uuid?

Let's compare (vmnet-host mode):

0. When nothing is provided, DHCP is enabled and uses default (macOS-configured) settings.
Your interface can communicate with any other vmnet-host interface.

Quoted 5 lines

1. When provided @isolated=3Don only, DHCP is still enabled, but the interface can
communicate only with the host. All the attempts to create another
interface with
the same subnet will fail with VMNET_SHARING_SERVICE_BUSY. If we

don't

Quoted 11 lines

specify DHCP settings (start, end, mask), macOS adjusts them
automatically to
prevent collisions and the VMNET_SHARING_SERVICE_BUSY error.

2. When provided @net-uuid=3Duuid[,@isolated=3Doff], the interface can communicate to any
other interface inside the 'uuid' network. Also with other VMs under
other hypervisors.
DHCP is disabled.

3. When provided @net-uuid=3Duuid,@isolated=3Don, the interface can

communi=

Quoted 10 lines
Quoted 5 lines

cate
only with
the host. DHCP is disabled. All the attempts to create another
interface with
the @net-uuid will fail with VMNET_SHARING_SERVICE_BUSY.

The doc comments don't make this clear, I'm afraid. Care to improve them some?

Ok, I'll add all that stuff to documentation.

Quoted 6 lines
Quoted 6 lines
Quoted 5 lines

When "no DCHCP service is provided", then @dhcpstart and @dhcpend become misnomers. Compare NetdevUserOptions: it uses @net to specify the address range, and dhcpstart to specify the DHCP range (@dhcpend is implied). Should we aim for consistency between the two?

Quoted 10 lines
Quoted 4 lines

I think it is not our choice. All of these options are just mappings to vmnet interface
params:
https://developer.apple.com/documentation/vmnet/vmnet_constants

I think it *is* our choice. We can choose to be internally consistent, i.e. with NetdevUserOptions, or consistent with the external interface we expose internally, i.e. with the vmnet interface. Tradeoff.

I think the second one is better, let's stay consistent with vmnet.

Quoted 8 lines

@subnet-mask -> vmnet_subnet_mask_key

Quoted 2 lines

@dhcpstart -> vmnet_start_address_key
@dhcpend -> vmnet_end_address_key

Note that the right hand side does not say "DHCP". I think the left hand side should not, either. Why not @start-address and @end-address?

I agree, these names sound much more suitable.

Quoted 10 lines
Quoted 1 line

More detailed description is provided in the vmnet.h header of macOS

SDK.

Quoted 7 lines

There is a restriction that says: when the vmnet_subnet_mask_key (@subnet-mask)
is set you "must also specify vmnet_start_address_key and vmnet_end_address_key".
So, when "no DHCP service is provided" the@subnet-mask property also becomes
a misnomer.

Quoted 8 lines

I don't think so. vmnet_end_address_key, vmnet_end_address_key, vmnet_subnet_mask_key all make sense regardless of DHCP service.

The gateway address is hardwired to the first address in the range. If DHCP is provided, it hands out addresses from the remainder of the range.

For some reason I thought that these params are DHCP-specific, while they are not. My fault, sorry. Will fix this too.

Quoted 51 lines
Quoted 5 lines

I added a corresponding restriction: you cannot provide @net-uuid within any of DHCP
options, this causes hard failure with error_setg() (see vmnet-host.c).

Quoted 7 lines
Quoted 6 lines

+#

qapi/net.json line 482

Quoted 1 line
qapi/net.json +1 -0
+# Since: 6.2

Missed 6.2, please adjust. More of the same below.

The next one is 6.3, isn't it?

7.0

Quoted 25 lines

+##

Quoted 14 lines
Quoted 14 lines
qapi/net.json +14 -0
+{ 'struct': 'NetdevVmnetHostOptions',
+  'data': {
+    '*dhcpstart':   'str',
+    '*dhcpend':     'str',
+    '*subnetmask':  'str',
+    '*isolated':    'bool',
+    '*net-uuid':    'str'
+  },
+  'if': 'CONFIG_VMNET' }
+
+##
+# @NetdevVmnetSharedOptions:
+#
+# vmnet (shared mode) network backend.
Quoted 10 lines

qapi/net.json line 507

Quoted 6 lines
qapi/net.json +6 -0
+#
+# Allows traffic originating from the vmnet interface to reach the
+# Internet through a network address translator (NAT). The vmnet
+# interface can also communicate with the native host. By default,
+# the vmnet interface is able to communicate with other shared mode
+# interfaces. If a subnet range is specified, the vmnet interface can

Do you mean "subnet mask"?

Quoted 5 lines

This phrase was just copied from Apple's vmnet.h from SDK:
```
* [...] VMNET_SHARED_MODE
* Allows traffic originating from the vmnet interface to reach the
* Internet through a network address translator (NAT). The vmnet

interface

Quoted 5 lines

* can also communicate with the native host. By default, the vmnet
interface
* is able to communicate with other shared mode interfaces. If a subnet
range
* is specified, the vmnet interface can communicate with other shared

Quoted 48 lines

mode

Quoted 4 lines

* interfaces on the same subnet.
```
But subnet mask sounds more suitable, so it's better to say:
"... If a subnet mask and DHCP range is specified, the vmnet interface

can

Quoted 40 lines

..."

Quoted 24 lines

+# communicate with other shared mode interfaces on the same subnet.

Quoted 23 lines
qapi/net.json +23 -0
+#
+# @dhcpstart: The starting IPv4 address to use for the interface.
+#             Must be in the private IP range (RFC 1918). Must be
+#             specified along with @dhcpend and @subnetmask.
+#             This address is used as the gateway address. The
+#             subsequent address up to and including dhcpend are
+#             placed in the DHCP pool.
+#
+# @dhcpend: The DHCP IPv4 range end address to use for the
+#           interface. Must be in the private IP range (RFC 1918).
+#           Must be specified along with @dhcpstart and @subnetmask.
+#
+# @subnetmask: The IPv4 subnet mask to use on the interface. Must
+#              be specified along with @dhcpstart and @subnetmask.
+#
+# @isolated: Enable isolation for this interface. Interface isolation
+#            ensures that network communication between multiple
+#            vmnet interfaces instances is not possible.
+#
+# Since: 6.2
+##
+{ 'struct': 'NetdevVmnetSharedOptions',
+  'data': {
Quoted 8 lines
Quoted 6 lines
qapi/net.json +6 -0
+    '*dhcpstart':    'str',
+    '*dhcpend':      'str',
+    '*subnetmask':   'str',
+    '*isolated':     'bool'
+  },
+  'if': 'CONFIG_VMNET' }

[...]

As a conclusion, my TODOs for now:
* fix subnet range in documentation
* add dash to @subnet-mask
* change version: 6.2 -> 6.3
* provide IPv6 configuration properties for vmnet-shared (optional).

Already done in v5:
* @subnetmask -> @subnet-mask
* nat66 prefix property added
* updated version 6.2 -> 7.0

Now in my TODO:
* improve documentation, especially for
isolation properties.
* change @dhcpstart, @dhcpend to
@start-address, @end-address.

Please confirm, and I'll submit v6 with all these fixes.

Thank you for the review!

Signature · 3 lines
Best Regards,

Vladislav Yaroshchuk
#9 lore raw

PATCH v4 3/6 net/vmnet: implement shared mode (vmnet-shared)

In reply to Vladislav Yaroshchuk
---
 net/vmnet-common.m | 305 +++++++++++++++++++++++++++++++++++++++++++++
 net/vmnet-shared.c |  69 +++++++++-
 net/vmnet_int.h    |  23 ++++
 3 files changed, 393 insertions(+), 4 deletions(-)
net/vmnet-common.m +305 -0
index 532d152840..b058e1b846 100644
@@ -10,6 +10,8 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/main-loop.h"
+#include "qemu/log.h"
 #include "qapi/qapi-types-net.h"
 #include "vmnet_int.h"
 #include "clients.h"
@@ -17,4 +19,307 @@
 #include "qapi/error.h"
 
 #include <vmnet/vmnet.h>
+#include <dispatch/dispatch.h>
 
+#ifdef DEBUG
+#define D(x) x
+#define D_LOG(...) qemu_log(__VA_ARGS__)
+#else
+#define D(x) do { } while (0)
+#define D_LOG(...) do { } while (0)
+#endif
+
+typedef struct vmpktdesc vmpktdesc_t;
+typedef struct iovec iovec_t;
+
+static void vmnet_set_send_enabled(VmnetCommonState *s, bool enable)
+{
+    s->send_enabled = enable;
+}
+
+
+static void vmnet_send_completed(NetClientState *nc, ssize_t len)
+{
+    VmnetCommonState *s = DO_UPCAST(VmnetCommonState, nc, nc);
+    vmnet_set_send_enabled(s, true);
+}
+
+
+static void vmnet_send(NetClientState *nc,
+                       interface_event_t event_id,
+                       xpc_object_t event)
+{
+    assert(event_id == VMNET_INTERFACE_PACKETS_AVAILABLE);
+
+    VmnetCommonState *s;
+    uint64_t packets_available;
+
+    struct iovec *iov;
+    struct vmpktdesc *packets;
+    int pkt_cnt;
+    int i;
+
+    vmnet_return_t if_status;
+    ssize_t size;
+
+    s = DO_UPCAST(VmnetCommonState, nc, nc);
+
+    packets_available = xpc_dictionary_get_uint64(
+        event,
+        vmnet_estimated_packets_available_key
+    );
+
+    pkt_cnt = (packets_available < VMNET_PACKETS_LIMIT) ?
+              packets_available :
+              VMNET_PACKETS_LIMIT;
+
+
+    iov = s->iov_buf;
+    packets = s->packets_buf;
+
+    for (i = 0; i < pkt_cnt; ++i) {
+        packets[i].vm_pkt_size = s->max_packet_size;
+        packets[i].vm_pkt_iovcnt = 1;
+        packets[i].vm_flags = 0;
+    }
+
+    if_status = vmnet_read(s->vmnet_if, packets, &pkt_cnt);
+    if (if_status != VMNET_SUCCESS) {
+        error_printf("vmnet: read failed: %s\n",
+                     vmnet_status_map_str(if_status));
+    }
+    qemu_mutex_lock_iothread();
+    for (i = 0; i < pkt_cnt; ++i) {
+        size = qemu_send_packet_async(nc,
+                                      iov[i].iov_base,
+                                      packets[i].vm_pkt_size,
+                                      vmnet_send_completed);
+        if (size == 0) {
+            vmnet_set_send_enabled(s, false);
+        } else if (size < 0) {
+            break;
+        }
+    }
+    qemu_mutex_unlock_iothread();
+
+}
+
+
+static void vmnet_register_event_callback(VmnetCommonState *s)
+{
+    dispatch_queue_t avail_pkt_q = dispatch_queue_create(
+        "org.qemu.vmnet.if_queue",
+        DISPATCH_QUEUE_SERIAL
+    );
+
+    vmnet_interface_set_event_callback(
+        s->vmnet_if,
+        VMNET_INTERFACE_PACKETS_AVAILABLE,
+        avail_pkt_q,
+        ^(interface_event_t event_id, xpc_object_t event) {
+          if (s->send_enabled) {
+              vmnet_send(&s->nc, event_id, event);
+          }
+        });
+}
+
+
+static void vmnet_bufs_init(VmnetCommonState *s)
+{
+    int i;
+    struct vmpktdesc *packets;
+    struct iovec *iov;
+
+    packets = s->packets_buf;
+    iov = s->iov_buf;
+
+    for (i = 0; i < VMNET_PACKETS_LIMIT; ++i) {
+        iov[i].iov_len = s->max_packet_size;
+        iov[i].iov_base = g_malloc0(iov[i].iov_len);
+        packets[i].vm_pkt_iov = iov + i;
+    }
+}
+
+
+const char *vmnet_status_map_str(vmnet_return_t status)
+{
+    switch (status) {
+    case VMNET_SUCCESS:
+        return "success";
+    case VMNET_FAILURE:
+        return "general failure";
+    case VMNET_MEM_FAILURE:
+        return "memory allocation failure";
+    case VMNET_INVALID_ARGUMENT:
+        return "invalid argument specified";
+    case VMNET_SETUP_INCOMPLETE:
+        return "interface setup is not complete";
+    case VMNET_INVALID_ACCESS:
+        return "invalid access, permission denied";
+    case VMNET_PACKET_TOO_BIG:
+        return "packet size is larger than MTU";
+    case VMNET_BUFFER_EXHAUSTED:
+        return "buffers exhausted in kernel";
+    case VMNET_TOO_MANY_PACKETS:
+        return "packet count exceeds limit";
+    case VMNET_SHARING_SERVICE_BUSY:
+        return "conflict, sharing service is in use";
+    default:
+        return "unknown vmnet error";
+    }
+}
+
+
+int vmnet_if_create(NetClientState *nc,
+                    xpc_object_t if_desc,
+                    Error **errp,
+                    void (*completion_callback)(xpc_object_t interface_param))
+{
+    VmnetCommonState *s;
+
+    dispatch_queue_t if_create_q;
+    dispatch_semaphore_t if_created_sem;
+
+    __block vmnet_return_t if_status;
+
+    if_create_q = dispatch_queue_create("org.qemu.vmnet.create",
+                                        DISPATCH_QUEUE_SERIAL);
+    if_created_sem = dispatch_semaphore_create(0);
+
+    xpc_dictionary_set_bool(
+        if_desc,
+        vmnet_allocate_mac_address_key,
+        false
+    );
+
+    D(D_LOG("vmnet.start.interface_desc:\n");
+    xpc_dictionary_apply(if_desc,
+                         ^bool(const char *k, xpc_object_t v) {
+                           char *desc = xpc_copy_description(v);
+                           D_LOG("  %s=%s\n", k, desc);
+                           free(desc);
+                           return true;
+                         }));
+
+    s = DO_UPCAST(VmnetCommonState, nc, nc);
+    s->vmnet_if = vmnet_start_interface(
+        if_desc,
+        if_create_q,
+        ^(vmnet_return_t status, xpc_object_t interface_param) {
+          if_status = status;
+          if (status != VMNET_SUCCESS || !interface_param) {
+              dispatch_semaphore_signal(if_created_sem);
+              return;
+          }
+
+          s->mtu = xpc_dictionary_get_uint64(
+              interface_param,
+              vmnet_mtu_key);
+          s->max_packet_size = xpc_dictionary_get_uint64(
+              interface_param,
+              vmnet_max_packet_size_key);
+          D(D_LOG("vmnet.start.interface_param:\n");
+          xpc_dictionary_apply(interface_param,
+                               ^bool(const char *k, xpc_object_t v) {
+                                 char *desc = xpc_copy_description(v);
+                                 D_LOG("  %s=%s\n", k, desc);
+                                 free(desc);
+                                 return true;
+                               }));
+          dispatch_semaphore_signal(if_created_sem);
+        });
+
+    if (s->vmnet_if == NULL) {
+        error_setg(errp, "unable to create interface with requested params");
+        return -1;
+    }
+
+    dispatch_semaphore_wait(if_created_sem, DISPATCH_TIME_FOREVER);
+    dispatch_release(if_create_q);
+
+    if (if_status != VMNET_SUCCESS) {
+        error_setg(errp,
+                   "cannot create vmnet interface: %s",
+                   vmnet_status_map_str(if_status));
+        return -1;
+    }
+
+    vmnet_register_event_callback(s);
+    vmnet_bufs_init(s);
+    vmnet_set_send_enabled(s, true);
+
+    return 0;
+}
+
+
+ssize_t vmnet_receive_common(NetClientState *nc,
+                             const uint8_t *buf,
+                             size_t size)
+{
+    VmnetCommonState *s;
+    vmpktdesc_t packet;
+    iovec_t iov;
+    int pkt_cnt;
+    vmnet_return_t if_status;
+
+    s = DO_UPCAST(VmnetCommonState, nc, nc);
+
+    if (size > s->max_packet_size) {
+        warn_report("vmnet: packet is too big, %zu > %llu\n",
+                    packet.vm_pkt_size,
+                    s->max_packet_size);
+        return -1;
+    }
+
+    iov.iov_base = (char *) buf;
+    iov.iov_len = size;
+
+    packet.vm_pkt_iovcnt = 1;
+    packet.vm_flags = 0;
+    packet.vm_pkt_size = size;
+    packet.vm_pkt_iov = &iov;
+
+    pkt_cnt = 1;
+    if_status = vmnet_write(s->vmnet_if, &packet, &pkt_cnt);
+
+    if (if_status != VMNET_SUCCESS) {
+        error_report("vmnet: write error: %s\n",
+                     vmnet_status_map_str(if_status));
+    }
+
+    if (if_status == VMNET_SUCCESS && pkt_cnt) {
+        return size;
+    }
+    return 0;
+}
+
+
+void vmnet_cleanup_common(NetClientState *nc)
+{
+    VmnetCommonState *s;
+    dispatch_queue_t if_destroy_q;
+
+    s = DO_UPCAST(VmnetCommonState, nc, nc);
+
+    qemu_purge_queued_packets(nc);
+    vmnet_set_send_enabled(s, false);
+
+    if (s->vmnet_if == NULL) {
+        return;
+    }
+
+    if_destroy_q = dispatch_queue_create(
+        "org.qemu.vmnet.destroy",
+        DISPATCH_QUEUE_SERIAL
+    );
+
+    vmnet_stop_interface(
+        s->vmnet_if,
+        if_destroy_q,
+        ^(vmnet_return_t status) {
+        });
+
+    for (int i = 0; i < VMNET_PACKETS_LIMIT; ++i) {
+        g_free(s->iov_buf[i].iov_base);
+    }
+}
net/vmnet-shared.c +65 -4

81 lines not on this page · raw message

net/vmnet_int.h +23 -0
index c5982259a4..3979fe4678 100644
@@ -16,10 +16,33 @@
 
 #include <vmnet/vmnet.h>
 
+#define VMNET_PACKETS_LIMIT 50
+
 typedef struct VmnetCommonState {
   NetClientState nc;
+  interface_ref vmnet_if;
+
+  bool send_enabled;
+
+  uint64_t mtu;
+  uint64_t max_packet_size;
+
+  struct vmpktdesc packets_buf[VMNET_PACKETS_LIMIT];
+  struct iovec iov_buf[VMNET_PACKETS_LIMIT];
 
 } VmnetCommonState;
 
+const char *vmnet_status_map_str(vmnet_return_t status);
+
+int vmnet_if_create(NetClientState *nc,
+                    xpc_object_t if_desc,
+                    Error **errp,
+                    void (*completion_callback)(xpc_object_t interface_param));
+
+ssize_t vmnet_receive_common(NetClientState *nc,
+                             const uint8_t *buf,
+                             size_t size);
+
+void vmnet_cleanup_common(NetClientState *nc);
 
 #endif /* VMNET_INT_H */
Signature · 1 line
2.23.0
#10 lore raw

PATCH v4 4/6 net/vmnet: implement host mode (vmnet-host)

In reply to Vladislav Yaroshchuk
---
 net/vmnet-host.c | 99 +++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 93 insertions(+), 6 deletions(-)
net/vmnet-host.c +93 -6
index 4a5ef99dc7..725675d0eb 100644
@@ -9,16 +9,103 @@
  */
 
 #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_dhcpstart ||
+        options->has_dhcpend ||
+        options->has_subnetmask) {
+
+        if (options->has_dhcpstart &&
+            options->has_dhcpend &&
+            options->has_subnetmask) {
+
+            if (options->has_net_uuid) {
+                error_setg(errp,
+                           "DHCP disabled for this interface "
+                           "because 'net-uuid' is provided");
+            }
+
+            xpc_dictionary_set_string(if_desc,
+                                      vmnet_start_address_key,
+                                      options->dhcpstart);
+            xpc_dictionary_set_string(if_desc,
+                                      vmnet_end_address_key,
+                                      options->dhcpend);
+            xpc_dictionary_set_string(if_desc,
+                                      vmnet_subnet_mask_key,
+                                      options->subnetmask);
+        } else {
+            error_setg(
+                errp,
+                "'dhcpstart', 'dhcpend', 'subnetmask' "
+                "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);
 }
Signature · 1 line
2.23.0
#11 lore raw

PATCH v4 5/6 net/vmnet: implement bridged mode (vmnet-bridged)

In reply to Vladislav Yaroshchuk
---
 net/vmnet-bridged.m | 98 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 92 insertions(+), 6 deletions(-)
net/vmnet-bridged.m +92 -6
index 4e42a90391..3c9da9dc8b 100644
@@ -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
Signature · 1 line
2.23.0
#12 lore raw

PATCH v4 6/6 net/vmnet: update qemu-options.hx

In reply to Vladislav Yaroshchuk
---
 qemu-options.hx | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
qemu-options.hx +23 -0
index f051536b63..443cb9a64b 100644
@@ -2677,6 +2677,23 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,
 #ifdef __linux__
     "-netdev vhost-vdpa,id=str,vhostdev=/path/to/dev\n"
     "                configure a vhost-vdpa network,Establish a vhost-vdpa netdev\n"
+#endif
+#ifdef CONFIG_VMNET
+    "-netdev vmnet-host,id=str[,isolated=on|off][,net-uuid=uuid]\n"
+    "         [,dhcpstart=addr,dhcpend=addr,subnetmask=mask]\n"
+    "                configure a vmnet network backend in host mode with ID 'str',\n"
+    "                isolate this interface from others with 'isolated',\n"
+    "                configure its DHCP server and choose a subnet mask\n"
+    "                or specify network UUID 'uuid' to disable DHCP and interact with\n"
+    "                vmnet-host interfaces within this isolated network\n"
+    "-netdev vmnet-shared,id=str[,isolated=on|off][,dhcpstart=addr,dhcpend=addr,subnetmask=mask]\n"
+    "                configure a vmnet network backend in shared mode with ID 'str',\n"
+    "                configure its DHCP server and choose a subnet mask,\n"
+    "                isolate this interface from others with 'isolated'\n"
+    "-netdev vmnet-bridged,id=str,ifname=name[,isolated=on|off]\n"
+    "                configure a vmnet network backend in bridged mode with ID 'str',\n"
+    "                use 'ifname=name' to select a physical network interface to be bridged,\n"
+    "                isolate this interface from others with 'isolated'\n"
 #endif
     "-netdev hubport,id=str,hubid=n[,netdev=nd]\n"
     "                configure a hub port on the hub with ID 'n'\n", QEMU_ARCH_ALL)
@@ -2696,6 +2713,9 @@ DEF("nic", HAS_ARG, QEMU_OPTION_nic,
 #endif
 #ifdef CONFIG_POSIX
     "vhost-user|"
+#endif
+#ifdef CONFIG_VMNET
+    "vmnet-host|vmnet-shared|vmnet-bridged|"
 #endif
     "socket][,option][,...][mac=macaddr]\n"
     "                initialize an on-board / default host NIC (using MAC address\n"
@@ -2718,6 +2738,9 @@ DEF("net", HAS_ARG, QEMU_OPTION_net,
 #endif
 #ifdef CONFIG_NETMAP
     "netmap|"
+#endif
+#ifdef CONFIG_VMNET
+    "vmnet-host|vmnet-shared|vmnet-bridged|"
 #endif
     "socket][,option][,option][,...]\n"
     "                old way to initialize a host network interface\n"
Signature · 1 line
2.23.0