Attachment 160664 Details for Bug 202864 – emulators/qemu-devel partially regen two patches

[patch] emulators/qemu-devel partially regen two patches

qemu-devel-2.4.0.patch (text/plain), 3.67 KB, created by Jason Unovitch on 2015-09-03 02:24:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Unovitch

Created: 2015-09-03 02:24:40 UTC

Size: 3.67 KB

patch

obsolete

>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 395929)
>+++ files/patch-configure	(working copy)
>@@ -9,9 +9,9 @@
>  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"
>+@@ -2102,7 +2102,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"
>@@ -18,7 +18,7 @@
>          gtk="yes"
>      elif test "$gtk" = "yes"; then
>          feature_not_found "gtk" "Install gtk2 or gtk3 devel"
>-@@ -3500,15 +3500,18 @@ if compile_prog "" "" ; then
>+@@ -3643,15 +3643,18 @@ if compile_prog "" "" ; then
>  fi
>  
>  # Check if tools are available to build documentation.
>@@ -45,7 +45,7 @@
>  fi
>  
>  # Search for bswap_32 function
>-@@ -3650,6 +3653,17 @@ fi
>+@@ -3793,6 +3796,17 @@ fi
>  
>  # check for libusb
>  if test "$libusb" != "no" ; then
>@@ -63,7 +63,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
>+@@ -3805,6 +3819,7 @@ if test "$libusb" != "no" ; then
>          fi
>          libusb="no"
>      fi
>Index: files/pcap-patch
>===================================================================
>--- files/pcap-patch	(revision 395929)
>+++ files/pcap-patch	(working copy)
>@@ -1,9 +1,9 @@
> --- configure.orig
> +++ configure
>-@@ -335,6 +335,9 @@ libssh2=""
>+@@ -338,6 +338,9 @@ libssh2=""
>  vhdx=""
>- quorum=""
>  numa=""
>+ tcmalloc="no"
> +pcap="no"
> +pcap_create="no"
> +bpf="no"
>@@ -10,9 +10,9 @@
>  
>  # parse CC options first
>  for opt do
>-@@ -888,6 +891,10 @@ for opt do
>+@@ -896,6 +899,10 @@ for opt do
>    ;;
>-   --enable-vnc-ws) vnc_ws="yes"
>+   --enable-vnc-png) vnc_png="yes"
>    ;;
> +  --enable-pcap) pcap="yes"
> +  ;;
>@@ -21,7 +21,7 @@
>    --disable-slirp) slirp="no"
>    ;;
>    --disable-uuid) uuid="no"
>-@@ -2216,6 +2223,51 @@ EOF
>+@@ -2354,6 +2361,51 @@ EOF
>  fi
>  
>  ##########################################
>@@ -71,9 +71,9 @@
> +
> +##########################################
>  # VNC TLS/WS detection
>- if test "$vnc" = "yes" -a $ "$vnc_tls" != "no" -o "$vnc_ws" != "no" $ ; then
>+ if test "$vnc" = "yes" -a "$vnc_tls" != "no" ; then
>    cat > $TMPC <<EOF
>-@@ -4286,6 +4338,7 @@ echo "Audio drivers     $audio_drv_list"
>+@@ -4515,6 +4567,7 @@ echo "Audio drivers     $audio_drv_list"
>  echo "Block whitelist (rw) $block_drv_rw_whitelist"
>  echo "Block whitelist (ro) $block_drv_ro_whitelist"
>  echo "VirtFS support    $virtfs"
>@@ -81,7 +81,7 @@
>  echo "VNC support       $vnc"
>  if test "$vnc" = "yes" ; then
>      echo "VNC TLS support   $vnc_tls"
>-@@ -4447,6 +4500,15 @@ fi
>+@@ -4692,6 +4745,15 @@ fi
>  if test "$profiler" = "yes" ; then
>    echo "CONFIG_PROFILER=y" >> $config_host_mak
>  fi
>@@ -101,7 +101,7 @@
> @@ -49,6 +49,12 @@ int net_init_bridge(const NetClientOptio
>  
>  int net_init_l2tpv3(const NetClientOptions *opts, const char *name,
>-                     NetClientState *peer);
>+                     NetClientState *peer, Error **errp);
> +
> +#ifdef CONFIG_PCAP
> +int net_init_pcap(const NetClientOptions *opts, const char *name,
>@@ -110,7 +110,7 @@
> +
>  #ifdef CONFIG_VDE
>  int net_init_vde(const NetClientOptions *opts, const char *name,
>-                  NetClientState *peer);
>+                  NetClientState *peer, Error **errp);
> Index: net/net.c
> @@ -40,6 +40,11 @@
>  #include "qapi/opts-visitor.h"

Actions: View | Diff

Attachments on bug 202864: 160664