View | Details | Raw Unified | Return to bug 202864
Collapse All | Expand All

(-)files/patch-configure (-6 / +6 lines)
Lines 9-17 Link Here
9 
 datadir="\${prefix}/share"
 9 
 datadir="\${prefix}/share"
10 
 qemu_docdir="\${prefix}/share/doc/qemu"
 10 
 qemu_docdir="\${prefix}/share/doc/qemu"
11 
 bindir="\${prefix}/bin"
 11 
 bindir="\${prefix}/bin"
12 
@@ -2062,7 +2062,7 @@ if test "$gtk" != "no"; then
 12 
@@ -2102,7 +2102,7 @@ if test "$gtk" != "no"; then
13 
         if $pkg_config --exists "$gtkx11package >= $gtkversion"; then
 13 
             gtk_cflags="$gtk_cflags $x11_cflags"
14 
             gtk_libs="$gtk_libs -lX11"
 14 
             gtk_libs="$gtk_libs $x11_libs"
15 
         fi
 15 
         fi
16 
-        libs_softmmu="$gtk_libs $libs_softmmu"
 16 
-        libs_softmmu="$gtk_libs $libs_softmmu"
17 
+        libs_softmmu="$gtk_libs -lintl $libs_softmmu"
 17 
+        libs_softmmu="$gtk_libs -lintl $libs_softmmu"
Lines 18-24 Link Here
18 
         gtk="yes"
 18 
         gtk="yes"
19 
     elif test "$gtk" = "yes"; then
 19 
     elif test "$gtk" = "yes"; then
20 
         feature_not_found "gtk" "Install gtk2 or gtk3 devel"
 20 
         feature_not_found "gtk" "Install gtk2 or gtk3 devel"
21 
@@ -3500,15 +3500,18 @@ if compile_prog "" "" ; then
 21 
@@ -3643,15 +3643,18 @@ if compile_prog "" "" ; then
22 
 fi
 22 
 fi
23
23
24 
 # Check if tools are available to build documentation.
 24 
 # Check if tools are available to build documentation.
Lines 45-51 Link Here
45 
 fi
 45 
 fi
46
46
47 
 # Search for bswap_32 function
 47 
 # Search for bswap_32 function
48 
@@ -3650,6 +3653,17 @@ fi
 48 
@@ -3793,6 +3796,17 @@ fi
49
49
50 
 # check for libusb
 50 
 # check for libusb
51 
 if test "$libusb" != "no" ; then
 51 
 if test "$libusb" != "no" ; then
Lines 63-69 Link Here
63 
     if $pkg_config --atleast-version=1.0.13 libusb-1.0; then
 63 
     if $pkg_config --atleast-version=1.0.13 libusb-1.0; then
64 
         libusb="yes"
 64 
         libusb="yes"
65 
         libusb_cflags=$($pkg_config --cflags libusb-1.0)
 65 
         libusb_cflags=$($pkg_config --cflags libusb-1.0)
66 
@@ -3662,6 +3676,7 @@ if test "$libusb" != "no" ; then
 66 
@@ -3805,6 +3819,7 @@ if test "$libusb" != "no" ; then
67 
         fi
 67 
         fi
68 
         libusb="no"
 68 
         libusb="no"
69 
     fi
 69 
     fi
(-)files/pcap-patch (-10 / +10 lines)
Lines 1-9 Link Here
1 
--- configure.orig
 1 
--- configure.orig
2 
+++ configure
 2 
+++ configure
3 
@@ -335,6 +335,9 @@ libssh2=""
 3 
@@ -338,6 +338,9 @@ libssh2=""
4 
 vhdx=""
 4 
 vhdx=""
5 
 quorum=""
6 
 numa=""
 5 
 numa=""
6 
 tcmalloc="no"
7 
+pcap="no"
 7 
+pcap="no"
8 
+pcap_create="no"
 8 
+pcap_create="no"
9 
+bpf="no"
 9 
+bpf="no"
Lines 10-18 Link Here
10
10
11 
 # parse CC options first
 11 
 # parse CC options first
12 
 for opt do
 12 
 for opt do
13 
@@ -888,6 +891,10 @@ for opt do
 13 
@@ -896,6 +899,10 @@ for opt do
14 
   ;;
 14 
   ;;
15 
   --enable-vnc-ws) vnc_ws="yes"
 15 
   --enable-vnc-png) vnc_png="yes"
16 
   ;;
 16 
   ;;
17 
+  --enable-pcap) pcap="yes"
 17 
+  --enable-pcap) pcap="yes"
18 
+  ;;
 18 
+  ;;
Lines 21-27 Link Here
21 
   --disable-slirp) slirp="no"
 21 
   --disable-slirp) slirp="no"
22 
   ;;
 22 
   ;;
23 
   --disable-uuid) uuid="no"
 23 
   --disable-uuid) uuid="no"
24 
@@ -2216,6 +2223,51 @@ EOF
 24 
@@ -2354,6 +2361,51 @@ EOF
25 
 fi
 25 
 fi
26
26
27 
 ##########################################
 27 
 ##########################################
Lines 71-79 Link Here
71 
+
 71 
+
72 
+##########################################
 72 
+##########################################
73 
 # VNC TLS/WS detection
 73 
 # VNC TLS/WS detection
74 
 if test "$vnc" = "yes" -a \( "$vnc_tls" != "no" -o "$vnc_ws" != "no" \) ; then
 74 
 if test "$vnc" = "yes" -a "$vnc_tls" != "no" ; then
75 
   cat > $TMPC <<EOF
 75 
   cat > $TMPC <<EOF
76 
@@ -4286,6 +4338,7 @@ echo "Audio drivers     $audio_drv_list"
 76 
@@ -4515,6 +4567,7 @@ echo "Audio drivers     $audio_drv_list"
77 
 echo "Block whitelist (rw) $block_drv_rw_whitelist"
 77 
 echo "Block whitelist (rw) $block_drv_rw_whitelist"
78 
 echo "Block whitelist (ro) $block_drv_ro_whitelist"
 78 
 echo "Block whitelist (ro) $block_drv_ro_whitelist"
79 
 echo "VirtFS support    $virtfs"
 79 
 echo "VirtFS support    $virtfs"
Lines 81-87 Link Here
81 
 echo "VNC support       $vnc"
 81 
 echo "VNC support       $vnc"
82 
 if test "$vnc" = "yes" ; then
 82 
 if test "$vnc" = "yes" ; then
83 
     echo "VNC TLS support   $vnc_tls"
 83 
     echo "VNC TLS support   $vnc_tls"
84 
@@ -4447,6 +4500,15 @@ fi
 84 
@@ -4692,6 +4745,15 @@ fi
85 
 if test "$profiler" = "yes" ; then
 85 
 if test "$profiler" = "yes" ; then
86 
   echo "CONFIG_PROFILER=y" >> $config_host_mak
 86 
   echo "CONFIG_PROFILER=y" >> $config_host_mak
87 
 fi
 87 
 fi
Lines 101-107 Link Here
101 
@@ -49,6 +49,12 @@ int net_init_bridge(const NetClientOptio
 101 
@@ -49,6 +49,12 @@ int net_init_bridge(const NetClientOptio
102
102
103 
 int net_init_l2tpv3(const NetClientOptions *opts, const char *name,
 103 
 int net_init_l2tpv3(const NetClientOptions *opts, const char *name,
104 
                     NetClientState *peer);
 104 
                     NetClientState *peer, Error **errp);
105 
+
 105 
+
106 
+#ifdef CONFIG_PCAP
 106 
+#ifdef CONFIG_PCAP
107 
+int net_init_pcap(const NetClientOptions *opts, const char *name,
 107 
+int net_init_pcap(const NetClientOptions *opts, const char *name,
Lines 110-116 Link Here
110 
+
 110 
+
111 
 #ifdef CONFIG_VDE
 111 
 #ifdef CONFIG_VDE
112 
 int net_init_vde(const NetClientOptions *opts, const char *name,
 112 
 int net_init_vde(const NetClientOptions *opts, const char *name,
113 
                  NetClientState *peer);
 113 
                  NetClientState *peer, Error **errp);
114 
Index: net/net.c
 114 
Index: net/net.c
115 
@@ -40,6 +40,11 @@
 115 
@@ -40,6 +40,11 @@
116 
 #include "qapi/opts-visitor.h"
 116 
 #include "qapi/opts-visitor.h"

Return to bug 202864