summaryrefslogtreecommitdiff
path: root/emulators/qemu-devel/files
diff options
context:
space:
mode:
Diffstat (limited to 'emulators/qemu-devel/files')
-rw-r--r--emulators/qemu-devel/files/cdrom-dma-patch10
-rw-r--r--emulators/qemu-devel/files/hw_e1000_c.patch11
-rw-r--r--emulators/qemu-devel/files/patch-Makefile10
-rw-r--r--emulators/qemu-devel/files/patch-configure32
-rw-r--r--emulators/qemu-devel/files/patch-disas_libvixl_a64_disasm-a64.cc (renamed from emulators/qemu-devel/files/patch-disas-libvixl-a64-disasm-a64.cc)7
-rw-r--r--emulators/qemu-devel/files/patch-include_net_net.h (renamed from emulators/qemu-devel/files/patch-qemu-include-net-net.h)9
-rw-r--r--emulators/qemu-devel/files/patch-include_qemu-common.h (renamed from emulators/qemu-devel/files/patch-include-qemu-common.h)8
-rw-r--r--emulators/qemu-devel/files/patch-net_tap-bsd.c (renamed from emulators/qemu-devel/files/patch-net-tap-bsd.c)4
-rw-r--r--emulators/qemu-devel/files/patch-qemu-char.c (renamed from emulators/qemu-devel/files/patch-vl.c-serial)6
-rw-r--r--emulators/qemu-devel/files/patch-qemu-doc.texi5
-rw-r--r--emulators/qemu-devel/files/patch-slirp_slirp__config.h (renamed from emulators/qemu-devel/files/patch-qemu-slirp-slirp_config.h)19
-rw-r--r--emulators/qemu-devel/files/patch-ui_x__keymap.c (renamed from emulators/qemu-devel/files/patch-x_keymap.c)11
-rw-r--r--emulators/qemu-devel/files/pcap-patch147
13 files changed, 153 insertions, 126 deletions
diff --git a/emulators/qemu-devel/files/cdrom-dma-patch b/emulators/qemu-devel/files/cdrom-dma-patch
deleted file mode 100644
index 4eea657e3bae..000000000000
--- a/emulators/qemu-devel/files/cdrom-dma-patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: hw/ide/internal.h
-@@ -27,7 +27,7 @@
- //#define DEBUG_IDE
- //#define DEBUG_IDE_ATAPI
- //#define DEBUG_AIO
--#define USE_DMA_CDROM
-+// #define USE_DMA_CDROM
-
- /* Bits of HD_STATUS */
- #define ERR_STAT 0x01
diff --git a/emulators/qemu-devel/files/hw_e1000_c.patch b/emulators/qemu-devel/files/hw_e1000_c.patch
deleted file mode 100644
index 8cd6ded303d3..000000000000
--- a/emulators/qemu-devel/files/hw_e1000_c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qemu-0.14.1/hw/net/e1000.c.orig
-+++ qemu-0.14.1/hw/net/e1000.c
-@@ -573,7 +573,7 @@
- if (rctl & E1000_RCTL_UPE) // promiscuous
- return 1;
-
-- if ((buf[0] & 1) && (rctl & E1000_RCTL_MPE)) // promiscuous mcast
-+ if (buf[0] & 1) // promiscuous mcast
- return 1;
-
- if ((rctl & E1000_RCTL_BAM) && !memcmp(buf, bcast, sizeof bcast))
diff --git a/emulators/qemu-devel/files/patch-Makefile b/emulators/qemu-devel/files/patch-Makefile
index f46724e62435..eaa1dd056f8e 100644
--- a/emulators/qemu-devel/files/patch-Makefile
+++ b/emulators/qemu-devel/files/patch-Makefile
@@ -1,18 +1,18 @@
---- Makefile.orig
+--- Makefile.orig 2015-12-16 20:32:52 UTC
+++ Makefile
-@@ -83,7 +83,11 @@ LIBS+=-lz $(LIBS_TOOLS)
+@@ -90,7 +90,11 @@ LIBS+=-lz $(LIBS_TOOLS)
HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
ifdef BUILD_DOCS
+ifdef NOPORTDOCS
+DOCS=qemu.1 qemu-img.1 qemu-nbd.8
+else
- DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 qmp-commands.txt
+ DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
+endif
+ DOCS+=qmp-commands.txt
ifdef CONFIG_LINUX
DOCS+=kvm_stat.1
- endif
-@@ -362,8 +366,10 @@ endif
+@@ -407,8 +411,10 @@ endif
install-doc: $(DOCS)
$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"
diff --git a/emulators/qemu-devel/files/patch-configure b/emulators/qemu-devel/files/patch-configure
index 7a0be6132bbb..bd8305a19a7e 100644
--- a/emulators/qemu-devel/files/patch-configure
+++ b/emulators/qemu-devel/files/patch-configure
@@ -1,6 +1,6 @@
---- a/configure
-+++ a/configure
-@@ -273,7 +273,7 @@ DSOSUF=".so"
+--- configure.orig 2015-12-16 20:50:32 UTC
++++ configure
+@@ -276,7 +276,7 @@ DSOSUF=".so"
LDFLAGS_SHARED="-shared"
modules="no"
prefix="/usr/local"
@@ -9,43 +9,31 @@
datadir="\${prefix}/share"
qemu_docdir="\${prefix}/share/doc/qemu"
bindir="\${prefix}/bin"
-@@ -2062,7 +2062,7 @@ if test "$gtk" != "no"; then
- if $pkg_config --exists "$gtkx11package >= $gtkversion"; then
- gtk_libs="$gtk_libs -lX11"
+@@ -2241,7 +2241,7 @@ if test "$gtk" != "no"; then
+ gtk_cflags="$gtk_cflags $x11_cflags"
+ gtk_libs="$gtk_libs $x11_libs"
fi
- libs_softmmu="$gtk_libs $libs_softmmu"
+ libs_softmmu="$gtk_libs -lintl $libs_softmmu"
gtk="yes"
elif test "$gtk" = "yes"; then
feature_not_found "gtk" "Install gtk2 or gtk3 devel"
-@@ -3500,15 +3500,18 @@ if compile_prog "" "" ; then
- fi
+@@ -3864,14 +3864,7 @@ fi
# Check if tools are available to build documentation.
-+#if test "$docs" != "no" ; then
-+# if has makeinfo && has pod2man; then
-+# docs=yes
-+# else
-+# if test "$docs" = "yes" ; then
-+# feature_not_found "docs" "Install texinfo and Perl/perl-podlators"
-+# fi
-+# docs=no
-+# fi
-+#fi
if test "$docs" != "no" ; then
- if has makeinfo && has pod2man; then
-- docs=yes
+ docs=yes
- else
- if test "$docs" = "yes" ; then
- feature_not_found "docs" "Install texinfo and Perl/perl-podlators"
- fi
- docs=no
- fi
-+ docs=yes
fi
# Search for bswap_32 function
-@@ -3650,6 +3653,17 @@ fi
+@@ -3999,6 +3992,17 @@ fi
# check for libusb
if test "$libusb" != "no" ; then
@@ -63,7 +51,7 @@
if $pkg_config --atleast-version=1.0.13 libusb-1.0; then
libusb="yes"
libusb_cflags=$($pkg_config --cflags libusb-1.0)
-@@ -3662,6 +3676,7 @@ if test "$libusb" != "no" ; then
+@@ -4011,6 +4015,7 @@ if test "$libusb" != "no" ; then
fi
libusb="no"
fi
diff --git a/emulators/qemu-devel/files/patch-disas-libvixl-a64-disasm-a64.cc b/emulators/qemu-devel/files/patch-disas_libvixl_a64_disasm-a64.cc
index 3cfe79312f65..3544f6d34501 100644
--- a/emulators/qemu-devel/files/patch-disas-libvixl-a64-disasm-a64.cc
+++ b/emulators/qemu-devel/files/patch-disas_libvixl_a64_disasm-a64.cc
@@ -1,11 +1,10 @@
---- a/disas/libvixl/a64/disasm-a64.cc
-+++ b/disas/libvixl/a64/disasm-a64.cc
-@@ -1337,7 +1337,8 @@ void Disassembler::AppendPCRelativeOffse
+--- disas/libvixl/a64/disasm-a64.cc.orig 2015-11-03 20:01:31 UTC
++++ disas/libvixl/a64/disasm-a64.cc
+@@ -1362,7 +1362,7 @@ void Disassembler::AppendPCRelativeOffse
int64_t offset) {
USE(instr);
char sign = (offset < 0) ? '-' : '+';
- AppendToOutput("#%c0x%" PRIx64, sign, std::abs(offset));
-+ // AppendToOutput("#%c0x%" PRIx64, sign, std::abs(offset));
+ AppendToOutput("#%c0x%" PRIx64, sign, offset < 0 ? -offset : offset);
}
diff --git a/emulators/qemu-devel/files/patch-qemu-include-net-net.h b/emulators/qemu-devel/files/patch-include_net_net.h
index 401f91246ee1..95d3b5e33654 100644
--- a/emulators/qemu-devel/files/patch-qemu-include-net-net.h
+++ b/emulators/qemu-devel/files/patch-include_net_net.h
@@ -1,7 +1,8 @@
-Index: qemu/include/net/net.h
-@@ -174,8 +174,8 @@ void net_host_device_remove(Monitor *mon
- int do_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret_data);
- int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data);
+--- include/net/net.h.orig 2015-11-03 20:01:34 UTC
++++ include/net/net.h
+@@ -202,8 +202,8 @@ void qmp_netdev_add(QDict *qdict, QObjec
+ int net_hub_id_for_client(NetClientState *nc, int *id);
+ NetClientState *net_hub_port_find(int hub_id);
-#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
-#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
diff --git a/emulators/qemu-devel/files/patch-include-qemu-common.h b/emulators/qemu-devel/files/patch-include_qemu-common.h
index b4e30fed5815..035105bf95d3 100644
--- a/emulators/qemu-devel/files/patch-include-qemu-common.h
+++ b/emulators/qemu-devel/files/patch-include_qemu-common.h
@@ -1,7 +1,7 @@
---- a/include/qemu-common.h
-+++ b/include/qemu-common.h
-@@ -445,7 +445,9 @@ void qemu_hexdump(const char *buf, FILE
- #define ALL_EQ(v1, v2) vec_all_eq(v1, v2)
+--- include/qemu-common.h.orig 2015-11-03 20:01:34 UTC
++++ include/qemu-common.h
+@@ -469,7 +469,9 @@ void qemu_hexdump(const char *buf, FILE
+ #define VEC_OR(v1, v2) ((v1) | (v2))
/* altivec.h may redefine the bool macro as vector type.
* Reset it to POSIX semantics. */
+#ifndef __cplusplus
diff --git a/emulators/qemu-devel/files/patch-net-tap-bsd.c b/emulators/qemu-devel/files/patch-net_tap-bsd.c
index 83239d4d560a..8e027eda9e61 100644
--- a/emulators/qemu-devel/files/patch-net-tap-bsd.c
+++ b/emulators/qemu-devel/files/patch-net_tap-bsd.c
@@ -1,5 +1,5 @@
---- a/net/tap-bsd.c
-+++ b/net/tap-bsd.c
+--- net/tap-bsd.c.orig 2015-11-03 20:01:34 UTC
++++ net/tap-bsd.c
@@ -29,6 +29,7 @@
#if defined(__NetBSD__) || defined(__FreeBSD__)
diff --git a/emulators/qemu-devel/files/patch-vl.c-serial b/emulators/qemu-devel/files/patch-qemu-char.c
index 0918cd7a724f..40a9b529f3b9 100644
--- a/emulators/qemu-devel/files/patch-vl.c-serial
+++ b/emulators/qemu-devel/files/patch-qemu-char.c
@@ -1,5 +1,6 @@
-Index: qemu/qemu-char.c
-@@ -1606,10 +1606,13 @@
+--- qemu-char.c.orig 2015-12-16 00:54:18 UTC
++++ qemu-char.c
+@@ -1507,10 +1507,14 @@ static void tty_serial_init(int fd, int
cfsetospeed(&tty, spd);
tty.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP
@@ -12,6 +13,7 @@ Index: qemu/qemu-char.c
+#ifdef __FreeBSD__
+ cfmakeraw(&tty);
+#endif
++
switch(data_bits) {
default:
case 8:
diff --git a/emulators/qemu-devel/files/patch-qemu-doc.texi b/emulators/qemu-devel/files/patch-qemu-doc.texi
index 1a7d9ef2ca51..4bcda8581c01 100644
--- a/emulators/qemu-devel/files/patch-qemu-doc.texi
+++ b/emulators/qemu-devel/files/patch-qemu-doc.texi
@@ -1,5 +1,6 @@
-Index: qemu/qemu-doc.texi
-@@ -985,7 +985,8 @@
+--- qemu-doc.texi.orig 2015-11-03 20:01:35 UTC
++++ qemu-doc.texi
+@@ -355,7 +355,8 @@ Send Ctrl-a
@c man begin SEEALSO
The HTML documentation of QEMU for more precise information and Linux
diff --git a/emulators/qemu-devel/files/patch-qemu-slirp-slirp_config.h b/emulators/qemu-devel/files/patch-slirp_slirp__config.h
index 57cc889e3119..4aa0dd7c10cf 100644
--- a/emulators/qemu-devel/files/patch-qemu-slirp-slirp_config.h
+++ b/emulators/qemu-devel/files/patch-slirp_slirp__config.h
@@ -1,6 +1,7 @@
-Index: qemu/slirp/slirp_config.h
-@@ -86,7 +86,7 @@
- #undef BAD_SPRINTF
+--- slirp/slirp_config.h.orig 2015-11-03 20:01:35 UTC
++++ slirp/slirp_config.h
+@@ -83,7 +83,7 @@
+ //#undef HOST_WORDS_BIGENDIAN
/* Define if you have readv */
-#undef HAVE_READV
@@ -8,17 +9,17 @@ Index: qemu/slirp/slirp_config.h
/* Define if iovec needs to be declared */
#undef DECLARE_IOVEC
-@@ -95,7 +95,7 @@
- #undef DECLARE_SPRINTF
+@@ -92,7 +92,7 @@
+ #endif
/* Define if you have a POSIX.1 sys/wait.h */
-#undef HAVE_SYS_WAIT_H
+#define HAVE_SYS_WAIT_H
/* Define if you have sys/select.h */
- #define HAVE_SYS_SELECT_H
-@@ -107,7 +107,7 @@
- #define HAVE_ARPA_INET_H
+ #undef HAVE_SYS_SELECT_H
+@@ -110,7 +110,7 @@
+ #endif
/* Define if you have sys/signal.h */
-#undef HAVE_SYS_SIGNAL_H
@@ -26,7 +27,7 @@ Index: qemu/slirp/slirp_config.h
/* Define if you have sys/stropts.h */
#undef HAVE_SYS_STROPTS_H
-@@ -180,7 +180,7 @@
+@@ -179,7 +179,7 @@
#undef HAVE_GRANTPT
/* Define if you have fchmod */
diff --git a/emulators/qemu-devel/files/patch-x_keymap.c b/emulators/qemu-devel/files/patch-ui_x__keymap.c
index 449c4585d4a2..7bb859dfd381 100644
--- a/emulators/qemu-devel/files/patch-x_keymap.c
+++ b/emulators/qemu-devel/files/patch-ui_x__keymap.c
@@ -1,14 +1,15 @@
-Index: qemu/ui/x_keymap.c
-@@ -41,9 +41,9 @@
+--- ui/x_keymap.c.orig 2015-12-16 00:59:05 UTC
++++ ui/x_keymap.c
+@@ -43,9 +43,9 @@ static const uint8_t x_keycode_to_pc_key
0xb5, /* 112 Divide */
0xb8, /* 113 Alt-R */
0xc6, /* 114 Break */
- 0x0, /* 115 */
- 0x0, /* 116 */
- 0x0, /* 117 */
-+ 0xdb, /* 115 left windows key */
-+ 0xdc, /* 116 right windows key */
-+ 0xdd, /* 117 right menu key */
++ 0xdb, /* 115 left windows key */
++ 0xdc, /* 116 right windows key */
++ 0xdd, /* 117 right menu key */
0x0, /* 118 */
0x0, /* 119 */
0x0, /* 120 */
diff --git a/emulators/qemu-devel/files/pcap-patch b/emulators/qemu-devel/files/pcap-patch
index d31c1c9eda17..0c798e5b1ca5 100644
--- a/emulators/qemu-devel/files/pcap-patch
+++ b/emulators/qemu-devel/files/pcap-patch
@@ -1,16 +1,27 @@
---- configure.orig 2015-08-11 19:11:05 UTC
-+++ configure
-@@ -338,6 +338,9 @@ libssh2=""
+configure
+--- configure 2015-12-17 04:04:48.000000000 +0600
++++ configure 2015-12-25 01:32:09.000000000 +0600
+@@ -342,6 +342,10 @@
+ tpm="yes"
+ libssh2=""
vhdx=""
- numa=""
- tcmalloc="no"
++quorum="no"
+pcap="no"
+pcap_create="no"
+bpf="no"
-
- # parse CC options first
- for opt do
-@@ -896,6 +899,10 @@ for opt do
+ numa=""
+ tcmalloc="no"
+ jemalloc="no"
+@@ -602,7 +606,7 @@
+ audio_drv_list="oss"
+ audio_possible_drivers="oss sdl pa"
+ # needed for kinfo_getvmmap(3) in libutil.h
+- LIBS="-lutil $LIBS"
++ LIBS="-lprocstat -lkvm -lelf -lutil $LIBS"
+ netmap="" # enable netmap autodetect
+ HOST_VARIANT_DIR="freebsd"
+ ;;
+@@ -905,6 +909,10 @@
;;
--enable-vnc-png) vnc_png="yes"
;;
@@ -21,10 +32,26 @@
--disable-slirp) slirp="no"
;;
--disable-uuid) uuid="no"
-@@ -2354,6 +2361,51 @@ EOF
- fi
+@@ -2427,6 +2435,14 @@
+
##########################################
++# getifaddrs (for tests/test-io-channel-socket )
++
++have_ifaddrs_h=yes
++if ! check_include "ifaddrs.h" ; then
++ have_ifaddrs_h=no
++fi
++
++##########################################
+ # VTE probe
+
+ if test "$vte" != "no"; then
+@@ -2569,6 +2585,50 @@
+ fi
+ fi
+
++##########################################
+# pcap probe
+
+if test "$pcap" = "yes" -a "$pcap" != "no"; then
@@ -68,20 +95,31 @@
+ fi
+ libs_softmmu="$libpcap $libs_softmmu"
+fi # test "$pcap"
-+
-+##########################################
- # VNC TLS/WS detection
- if test "$vnc" = "yes" -a "$vnc_tls" != "no" ; then
- cat > $TMPC <<EOF
-@@ -4515,6 +4567,7 @@ echo "Audio drivers $audio_drv_list"
+
+ ##########################################
+ # VNC SASL detection
+@@ -4758,7 +4833,11 @@
+ echo "GNUTLS support $gnutls"
+ echo "GNUTLS hash $gnutls_hash"
+ echo "libgcrypt $gcrypt"
+-echo "nettle $nettle ${nettle+($nettle_version)}"
++if test "$nettle" = "yes"; then
++ echo "nettle $nettle ($nettle_version)"
++else
++ echo "nettle $nettle"
++fi
+ echo "libtasn1 $tasn1"
+ echo "VTE support $vte"
+ echo "curses support $curses"
+@@ -4769,6 +4848,7 @@
echo "Block whitelist (rw) $block_drv_rw_whitelist"
echo "Block whitelist (ro) $block_drv_ro_whitelist"
echo "VirtFS support $virtfs"
+echo "pcap support $pcap"
echo "VNC support $vnc"
if test "$vnc" = "yes" ; then
- echo "VNC TLS support $vnc_tls"
-@@ -4692,6 +4745,15 @@ fi
+ echo "VNC SASL support $vnc_sasl"
+@@ -4947,6 +5027,15 @@
if test "$profiler" = "yes" ; then
echo "CONFIG_PROFILER=y" >> $config_host_mak
fi
@@ -97,24 +135,35 @@
if test "$slirp" = "yes" ; then
echo "CONFIG_SLIRP=y" >> $config_host_mak
echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
---- net/clients.h.orig 2015-08-11 19:11:09 UTC
-+++ net/clients.h
-@@ -49,6 +49,12 @@ int net_init_bridge(const NetClientOptio
-
- int net_init_l2tpv3(const NetClientOptions *opts, const char *name,
+@@ -5137,6 +5226,9 @@
+ if test "$tasn1" = "yes" ; then
+ echo "CONFIG_TASN1=y" >> $config_host_mak
+ fi
++if test "$have_ifaddrs_h" = "yes" ; then
++ echo "HAVE_IFADDRS_H=y" >> $config_host_mak
++fi
+ if test "$vte" = "yes" ; then
+ echo "CONFIG_VTE=y" >> $config_host_mak
+ echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak
+diff -ruN net/clients.h net/clients.h
+--- net/clients.h 2015-12-17 04:04:50.000000000 +0600
++++ net/clients.h 2015-12-25 01:32:09.000000000 +0600
+@@ -47,6 +47,11 @@
+ int net_init_bridge(const NetClientOptions *opts, const char *name,
NetClientState *peer, Error **errp);
-+
+
+#ifdef CONFIG_PCAP
+int net_init_pcap(const NetClientOptions *opts, const char *name,
-+ NetClientState *peer);
++ NetClientState *peer, Error **errp);
+#endif
+
+ int net_init_l2tpv3(const NetClientOptions *opts, const char *name,
+ NetClientState *peer, Error **errp);
#ifdef CONFIG_VDE
- int net_init_vde(const NetClientOptions *opts, const char *name,
- NetClientState *peer, Error **errp);
---- net/hub.c.orig 2015-08-11 19:11:09 UTC
-+++ net/hub.c
-@@ -322,6 +322,7 @@ void net_hub_check_clients(void)
+diff -ruN net/hub.c net/hub.c
+--- net/hub.c 2015-12-17 04:04:50.000000000 +0600
++++ net/hub.c 2015-12-25 01:32:09.000000000 +0600
+@@ -322,6 +322,7 @@
case NET_CLIENT_OPTIONS_KIND_SOCKET:
case NET_CLIENT_OPTIONS_KIND_VDE:
case NET_CLIENT_OPTIONS_KIND_VHOST_USER:
@@ -122,11 +171,12 @@
has_host_dev = 1;
break;
default:
---- net/net.c.orig 2015-08-11 19:11:09 UTC
-+++ net/net.c
-@@ -45,6 +45,11 @@
- #include "qapi/dealloc-visitor.h"
+diff -ruN net/net.c net/net.c
+--- net/net.c 2015-12-17 04:04:50.000000000 +0600
++++ net/net.c 2015-12-25 01:32:09.000000000 +0600
+@@ -46,6 +46,11 @@
#include "sysemu/sysemu.h"
+ #include "net/filter.h"
+#include <sys/ioctl.h>
+#ifdef __FreeBSD__
@@ -136,7 +186,7 @@
/* Net bridge is currently not supported for W32. */
#if !defined(_WIN32)
# define CONFIG_NET_BRIDGE
-@@ -880,6 +885,221 @@ static int net_init_nic(const NetClientO
+@@ -942,8 +947,224 @@
return idx;
}
@@ -211,9 +261,10 @@
+ * ... -net pcap,ifname="..."
+ */
+
-+int net_init_pcap(const NetClientOptions *opts, const char *name, NetClientState *peer)
++int net_init_pcap(const NetClientOptions *opts,
++ const char *name, NetClientState *peer, Error **errp)
+{
-+ const NetdevPcapOptions *pcap_opts = opts->pcap;
++ const NetdevPcapOptions *pcap_opts = opts->u.pcap;
+ NetClientState *nc;
+ struct PCAPState *s;
+ const char *ifname;
@@ -356,9 +407,12 @@
+
+#endif
- static int (* const net_client_init_fun[NET_CLIENT_OPTIONS_KIND_MAX])(
+-static int (* const net_client_init_fun[NET_CLIENT_OPTIONS_KIND_MAX])(
++static int (* const net_client_init_fun[NET_CLIENT_OPTIONS_KIND_MAX])(
const NetClientOptions *opts,
-@@ -901,6 +1121,9 @@ static int (* const net_client_init_fun[
+ const char *name,
+ NetClientState *peer, Error **errp) = {
+@@ -963,6 +1184,9 @@
#ifdef CONFIG_NET_BRIDGE
[NET_CLIENT_OPTIONS_KIND_BRIDGE] = net_init_bridge,
#endif
@@ -368,9 +422,10 @@
[NET_CLIENT_OPTIONS_KIND_HUBPORT] = net_init_hubport,
#ifdef CONFIG_VHOST_NET_USED
[NET_CLIENT_OPTIONS_KIND_VHOST_USER] = net_init_vhost_user,
---- qapi-schema.json.orig 2015-08-11 19:11:09 UTC
-+++ qapi-schema.json
-@@ -2423,6 +2423,10 @@
+diff -ruN qapi-schema.json qapi-schema.json
+--- qapi-schema.json 2015-12-17 04:04:50.000000000 +0600
++++ qapi-schema.json 2015-12-25 01:32:09.000000000 +0600
+@@ -2538,6 +2538,10 @@
'*br': 'str',
'*helper': 'str' } }
@@ -381,11 +436,11 @@
##
# @NetdevHubPortOptions
#
-@@ -2490,6 +2494,7 @@
+@@ -2608,6 +2612,7 @@
+ 'nic': 'NetLegacyNicOptions',
'user': 'NetdevUserOptions',
'tap': 'NetdevTapOptions',
- 'l2tpv3': 'NetdevL2TPv3Options',
+ 'pcap': 'NetdevPcapOptions',
+ 'l2tpv3': 'NetdevL2TPv3Options',
'socket': 'NetdevSocketOptions',
'vde': 'NetdevVdeOptions',
- 'dump': 'NetdevDumpOptions',
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-23 20:41:10 +0000