Add 'vmnet' customizable option and 'vmnet.framework' probe into
configure;
Create source files for network client driver, update meson.build;
Add 'vmnet' into qapi::net::NetClientDriver options list.
Signed-off-by: Vladislav Yaroshchuk <yaroshchuk2...@gmail.com>
---
configure | 31 +++++++++++++++++++++++++++++++
meson.build | 5 +++++
net/clients.h | 4 ++++
net/meson.build | 1 +
net/net.c | 6 ++++++
net/vmnet.c | 22 ++++++++++++++++++++++
qapi/net.json | 3 ++-
7 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 net/vmnet.c
diff --git a/configure b/configure
index 8dcb9965b2..cdc171988b 100755
--- a/configure
+++ b/configure
@@ -307,6 +307,7 @@ mpath="auto"
vnc="enabled"
sparse="auto"
vde="$default_feature"
+vmnet="auto"
vnc_sasl="auto"
vnc_jpeg="auto"
vnc_png="auto"
@@ -1059,6 +1060,10 @@ for opt do
;;
--enable-vde) vde="yes"
;;
+ --disable-vmnet) vmnet="no"
+ ;;
+ --enable-vmnet) vmnet="yes"
+ ;;
--disable-netmap) netmap="no"
;;
--enable-netmap) netmap="yes"
@@ -1871,6 +1876,7 @@ disabled with --disable-FEATURE, default is enabled if
available
rdma Enable RDMA-based migration
pvrdma Enable PVRDMA support
vde support for vde network
+ vmnet vmnet.framework support (macOS)
netmap support for netmap network
linux-aio Linux AIO support
linux-io-uring Linux io_uring support
@@ -3157,6 +3163,28 @@ EOF
fi
fi
+##########################################
+# vmnet.framework probe
+if test "$vmnet" != "no" ; then
+ vmnet_flags="-framework vmnet"
+ cat > $TMPC << EOF
+#include <vmnet/vmnet.h>
+int main(void)
+{
+ (void) vmnet_allocate_mac_address_key;
+ return 0;
+}
+EOF
+ if compile_prog "" "$vmnet_flags" ; then
+ vmnet=yes
+ else
+ if test "$vmnet" = "yes" ; then
+ feature_not_found "vmnet" "'vmnet.framework' in unsupported in this
build"
+ fi
+ vmnet=no
+ fi
+fi
+
##########################################
# netmap support probe
# Apart from looking for netmap headers, we make sure that the host API version
@@ -5559,6 +5587,9 @@ if test "$vde" = "yes" ; then
echo "CONFIG_VDE=y" >> $config_host_mak
echo "VDE_LIBS=$vde_libs" >> $config_host_mak
fi
+if test "$vmnet" = "yes" ; then
+ echo "CONFIG_VMNET=y" >> $config_host_mak
+fi
if test "$netmap" = "yes" ; then
echo "CONFIG_NETMAP=y" >> $config_host_mak
fi
diff --git a/meson.build b/meson.build
index a2311eda6e..df254522af 100644
--- a/meson.build
+++ b/meson.build
@@ -173,6 +173,7 @@ iokit = []
emulator_link_args = []
nvmm =not_found
hvf = not_found
+vmnet = not_found
if targetos == 'windows'
socket = cc.find_library('ws2_32')
winmm = cc.find_library('winmm')
@@ -184,6 +185,9 @@ if targetos == 'windows'
elif targetos == 'darwin'
coref = dependency('appleframeworks', modules: 'CoreFoundation')
iokit = dependency('appleframeworks', modules: 'IOKit')
+ if config_host.has_key('CONFIG_VMNET')
+ vmnet = dependency('appleframeworks', modules: 'vmnet')
+ endif
elif targetos == 'sunos'
socket = [cc.find_library('socket'),
cc.find_library('nsl'),
@@ -2522,6 +2526,7 @@ summary_info += {'vhost-user support':
config_host.has_key('CONFIG_VHOST_USER')}
summary_info += {'vhost-user-blk server support': have_vhost_user_blk_server}
summary_info += {'vhost-user-fs support':
config_host.has_key('CONFIG_VHOST_USER_FS')}
summary_info += {'vhost-vdpa support':
config_host.has_key('CONFIG_VHOST_VDPA')}
+summary_info += {'vmnet support': vmnet.found()}
summary_info += {'build guest agent':
config_host.has_key('CONFIG_GUEST_AGENT')}
summary(summary_info, bool_yn: true, section: 'Configurable features')
diff --git a/net/clients.h b/net/clients.h
index 92f9b59aed..ac19843aab 100644
--- a/net/clients.h
+++ b/net/clients.h
@@ -63,4 +63,8 @@ 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(const Netdev *netdev, const char *name,
+ NetClientState *peer, Error **errp);
+#endif
#endif /* QEMU_NET_CLIENTS_H */
diff --git a/net/meson.build b/net/meson.build
index 1076b0a7ab..196cf321a2 100644
--- a/net/meson.build
+++ b/net/meson.build
@@ -38,4 +38,5 @@ 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'))
+softmmu_ss.add(when: ['CONFIG_VMNET', vmnet], if_true: files('vmnet.c'))
subdir('can')
diff --git a/net/net.c b/net/net.c
index 76bbb7c31b..645c52ef6e 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1001,6 +1001,9 @@ 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] = net_init_vmnet,
+#endif
};
@@ -1086,6 +1089,9 @@ void show_netdevs(void)
#endif
#ifdef CONFIG_VHOST_VDPA
"vhost-vdpa",
+#endif
+#ifdef CONFIG_VMNET
+ "vmnet",
#endif
};
diff --git a/net/vmnet.c b/net/vmnet.c
new file mode 100644
index 0000000000..f8b64e2a27
--- /dev/null
+++ b/net/vmnet.c
@@ -0,0 +1,22 @@
+/*
+ * vmnet.c - network client wrapper for Apple vmnet.framework
+ *
+ * Copyright(c) 2021 Vladislav Yaroshchuk <yaroshchuk2...@gmail.com>
+ *
+ * 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 "clients.h"
+#include "qemu/error-report.h"
+#include "qapi/error.h"
+
+#include <vmnet/vmnet.h>
+
+int net_init_vmnet(const Netdev *netdev, const char *name,
+ NetClientState *peer, Error **errp) {
+ error_setg(errp, "vmnet is not implemented yet");
+ return -1;
+}
diff --git a/qapi/net.json b/qapi/net.json
index 7fab2e7cd8..c5de234e2c 100644
--- a/qapi/net.json
+++ b/qapi/net.json
@@ -460,10 +460,11 @@
# Since: 2.7
#
# @vhost-vdpa since 5.1
+# @vmnet since 6.1
##
{ 'enum': 'NetClientDriver',
'data': [ 'none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'vde',
- 'bridge', 'hubport', 'netmap', 'vhost-user', 'vhost-vdpa' ] }
+ 'bridge', 'hubport', 'netmap', 'vhost-user', 'vhost-vdpa', 'vmnet'
] }
##
# @Netdev:
--
2.23.0
