diff options
Diffstat (limited to 'emulators/qemu2/files/patch-configure')
| -rw-r--r-- | emulators/qemu2/files/patch-configure | 264 |
1 files changed, 0 insertions, 264 deletions
diff --git a/emulators/qemu2/files/patch-configure b/emulators/qemu2/files/patch-configure deleted file mode 100644 index f3c700048265..000000000000 --- a/emulators/qemu2/files/patch-configure +++ /dev/null @@ -1,264 +0,0 @@ ---- configure.orig 2019-04-14 20:18:21 UTC -+++ configure -@@ -353,6 +353,7 @@ hax="no" - hvf="no" - whpx="no" - rdma="" -+pvrdma="" - gprof="no" - debug_tcg="no" - debug="no" -@@ -369,7 +370,7 @@ DSOSUF=".so" - LDFLAGS_SHARED="-shared" - modules="no" - prefix="/usr/local" --mandir="\${prefix}/share/man" -+mandir="\${prefix}/man" - datadir="\${prefix}/share" - firmwarepath="\${prefix}/share/qemu-firmware" - qemu_docdir="\${prefix}/share/doc/qemu" -@@ -449,6 +450,9 @@ numa="" - tcmalloc="no" - jemalloc="no" - replication="yes" -+pcap="no" -+pcap_create="no" -+bpf="no" - vxhs="" - libxml2="" - -@@ -1032,6 +1036,10 @@ for opt do - ;; - --enable-vnc-png) vnc_png="yes" - ;; -+ --enable-pcap) pcap="yes" -+ ;; -+ --disable-pcap) pcap="no" -+ ;; - --disable-slirp) slirp="no" - ;; - --disable-vde) vde="no" -@@ -1308,6 +1316,10 @@ for opt do - ;; - --disable-rdma) rdma="no" - ;; -+ --enable-pvrdma) pvrdma="yes" -+ ;; -+ --disable-pvrdma) pvrdma="no" -+ ;; - --with-gtkabi=*) gtkabi="$optarg" - ;; - --disable-vte) vte="no" -@@ -1593,7 +1605,8 @@ disabled with --disable-FEATURE, default is enabled if - hax HAX acceleration support - hvf Hypervisor.framework acceleration support - whpx Windows Hypervisor Platform acceleration support -- rdma Enable RDMA-based migration and PVRDMA support -+ rdma Enable RDMA-based migration -+ pvrdma Enable PVRDMA support - vde support for vde network - netmap support for netmap network - linux-aio Linux AIO support -@@ -2791,7 +2804,49 @@ else - tasn1=no - fi - -+########################################## -+# PVRDMA detection - -+cat > $TMPC <<EOF && -+#include <sys/mman.h> -+ -+int -+main(void) -+{ -+ char buf = 0; -+ void *addr = &buf; -+ addr = mremap(addr, 0, 1, MREMAP_MAYMOVE | MREMAP_FIXED); -+ -+ return 0; -+} -+EOF -+ -+if test "$rdma" = "yes" ; then -+ case "$pvrdma" in -+ "") -+ if compile_prog "" ""; then -+ pvrdma="yes" -+ else -+ pvrdma="no" -+ fi -+ ;; -+ "yes") -+ if ! compile_prog "" ""; then -+ error_exit "PVRDMA is not supported since mremap is not implemented" -+ fi -+ pvrdma="yes" -+ ;; -+ "no") -+ pvrdma="no" -+ ;; -+ esac -+else -+ if test "$pvrdma" = "yes" ; then -+ error_exit "PVRDMA requires rdma suppport" -+ fi -+ pvrdma="no" -+fi -+ - ########################################## - # getifaddrs (for tests/test-io-channel-socket ) - -@@ -2801,6 +2856,14 @@ if ! check_include "ifaddrs.h" ; then - fi - - ########################################## -+# 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 -@@ -2971,7 +3034,51 @@ EOF - fi - fi - -+########################################## -+# pcap probe - -+if test "$pcap" = "yes" -a "$pcap" != "no"; then -+ cat > $TMPC << EOF -+#include <pcap.h> -+int main(void) { return (pcap_lib_version() == (char *)0 ? 1 : 0); } -+EOF -+ if test "$mingw32" = "no" ; then -+ libpcap=-lpcap -+ else -+ libpcap=-lwpcap -+ fi -+ if compile_prog "" "$libpcap" ; then -+ : -+ else -+ echo -+ echo "Error: Could not find pcap" -+ echo "Make sure to have the pcap libs and headers installed." -+ echo -+ exit 1 -+ fi -+ cat > $TMPC << EOF -+#include <pcap.h> -+int main(void) -+{ -+ char errbuf[PCAP_ERRBUF_SIZE]; -+ return (pcap_create("foo", errbuf) == (pcap_t *)0 ? 1 : 0); -+} -+EOF -+ if compile_prog "" "$libpcap" ; then -+ pcap_create="yes" -+ fi -+ cat > $TMPC << EOF -+#define PCAP_DONT_INCLUDE_PCAP_BPF_H -+#include <pcap.h> -+#include <net/bpf.h> -+int main(void) { return (BPF_MAJOR_VERSION); } -+EOF -+ if compile_prog ; then -+ bpf="yes" -+ fi -+ libs_softmmu="$libpcap $libs_softmmu" -+fi # test "$pcap" -+ - ########################################## - # VNC SASL detection - if test "$vnc" = "yes" -a "$vnc_sasl" != "no" ; then -@@ -3388,7 +3495,7 @@ for i in $glib_modules; do - glib_libs=$($pkg_config --libs $i) - QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS" - LIBS="$glib_libs $LIBS" -- libs_qga="$glib_libs $libs_qga" -+ libs_qga="$glib_libs -lintl $libs_qga" - else - error_exit "glib-$glib_req_ver $i is required to compile QEMU" - fi -@@ -4333,14 +4440,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 - - # Search for bswap_32 function -@@ -4465,7 +4565,7 @@ fi - - # check for libusb - if test "$libusb" != "no" ; then -- if $pkg_config --atleast-version=1.0.13 libusb-1.0; then -+ if $pkg_config libusb-1.0; then - libusb="yes" - libusb_cflags=$($pkg_config --cflags libusb-1.0) - libusb_libs=$($pkg_config --libs libusb-1.0) -@@ -5785,6 +5885,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" -+echo "pcap support $pcap" - echo "Multipath support $mpath" - echo "VNC support $vnc" - if test "$vnc" = "yes" ; then -@@ -5820,6 +5921,7 @@ if test "$tcg" = "yes" ; then - fi - echo "malloc trim support $malloc_trim" - echo "RDMA support $rdma" -+echo "PVRDMA support $pvrdma" - echo "fdt support $fdt" - echo "membarrier $membarrier" - echo "preadv support $preadv" -@@ -6012,6 +6114,15 @@ fi - if test "$profiler" = "yes" ; then - echo "CONFIG_PROFILER=y" >> $config_host_mak - fi -+if test "$pcap" = "yes" ; then -+ echo "CONFIG_PCAP=y" >> $config_host_mak -+ if test "$pcap_create" = "yes" ; then -+ echo "CONFIG_PCAP_CREATE=y" >> $config_host_mak -+ fi -+ if test "$bpf" = "yes" ; then -+ echo "CONFIG_BPF=y" >> $config_host_mak -+ fi -+fi - if test "$slirp" = "yes" ; then - echo "CONFIG_SLIRP=y" >> $config_host_mak - echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak -@@ -6250,6 +6361,9 @@ fi - if test "$have_fsxattr" = "yes" ; then - echo "HAVE_FSXATTR=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 -@@ -6566,6 +6680,10 @@ echo "CONFIG_TRACE_FILE=$trace_file" >> $config_host_m - if test "$rdma" = "yes" ; then - echo "CONFIG_RDMA=y" >> $config_host_mak - echo "RDMA_LIBS=$rdma_libs" >> $config_host_mak -+fi -+ -+if test "$pvrdma" = "yes" ; then -+ echo "CONFIG_PVRDMA=y" >> $config_host_mak - fi - - if test "$have_rtnetlink" = "yes" ; then |