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/patch-Makefile16
-rw-r--r--emulators/qemu-devel/files/patch-configure36
-rw-r--r--emulators/qemu-devel/files/patch-cpu-exec.c13
-rw-r--r--emulators/qemu-devel/files/pcap-patch16
-rw-r--r--emulators/qemu-devel/files/prepatch-configure10
5 files changed, 44 insertions, 47 deletions
diff --git a/emulators/qemu-devel/files/patch-Makefile b/emulators/qemu-devel/files/patch-Makefile
index 87a365001ffc..3eba14264cf3 100644
--- a/emulators/qemu-devel/files/patch-Makefile
+++ b/emulators/qemu-devel/files/patch-Makefile
@@ -1,28 +1,28 @@
Index: qemu/Makefile
-@@ -53,7 +53,11 @@ LIBS+=-lz $(LIBS_TOOLS)
+@@ -65,7 +65,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/qmp-commands.txt
+ DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 qmp-commands.txt
+endif
ifdef CONFIG_VIRTFS
DOCS+=fsdev/virtfs-proxy-helper.1
endif
-@@ -311,8 +315,10 @@ endif
+@@ -304,8 +308,10 @@ endif
install-doc: $(DOCS)
$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"
+ifndef NOPORTDOCS
$(INSTALL_DATA) qemu-doc.html qemu-tech.html "$(DESTDIR)$(qemu_docdir)"
- $(INSTALL_DATA) QMP/qmp-commands.txt "$(DESTDIR)$(qemu_docdir)"
+ $(INSTALL_DATA) qmp-commands.txt "$(DESTDIR)$(qemu_docdir)"
+endif
ifdef CONFIG_POSIX
$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
- $(INSTALL_DATA) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
-@@ -331,7 +337,10 @@ install-confdir:
+ $(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1"
+@@ -334,7 +340,10 @@ install-confdir:
$(INSTALL_DIR) "$(DESTDIR)$(qemu_confdir)"
install-sysconfig: install-datadir install-confdir
@@ -32,5 +32,5 @@ Index: qemu/Makefile
+ $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(qemu_confdir)"; \
+ fi
- install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig install-datadir
- $(INSTALL_DIR) "$(DESTDIR)$(bindir)"
+ install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \
+ install-datadir install-localstatedir
diff --git a/emulators/qemu-devel/files/patch-configure b/emulators/qemu-devel/files/patch-configure
index 45c561b4be4a..49b7e000a62d 100644
--- a/emulators/qemu-devel/files/patch-configure
+++ b/emulators/qemu-devel/files/patch-configure
@@ -1,7 +1,7 @@
--- a/configure
+++ a/configure
-@@ -154,7 +154,7 @@ bigendian="no"
- mingw32="no"
+@@ -192,7 +192,7 @@ gcov="no"
+ gcov_tool="gcov"
EXESUF=""
prefix="/usr/local"
-mandir="\${prefix}/share/man"
@@ -9,16 +9,16 @@
datadir="\${prefix}/share"
qemu_docdir="\${prefix}/share/doc/qemu"
bindir="\${prefix}/bin"
-@@ -1756,7 +1756,7 @@ if test "$gtk" != "no"; then
- gtk_libs=`$pkg_config --libs $gtkpackage 2>/dev/null`
- vte_cflags=`$pkg_config --cflags $vtepackage 2>/dev/null`
- vte_libs=`$pkg_config --libs $vtepackage 2>/dev/null`
+@@ -1749,7 +1749,7 @@ if test "$gtk" != "no"; then
+ gtk_libs=`$pkg_config --libs $gtkpackage`
+ vte_cflags=`$pkg_config --cflags $vtepackage`
+ vte_libs=`$pkg_config --libs $vtepackage`
- libs_softmmu="$gtk_libs $vte_libs $libs_softmmu"
+ libs_softmmu="$gtk_libs -lintl $vte_libs $libs_softmmu"
gtk="yes"
- else
- if test "$gtk" = "yes" ; then
-@@ -2511,15 +2511,18 @@ if compile_prog "" "" ; then
+ fi
+ fi
+@@ -2956,15 +2956,18 @@ if compile_prog "" "" ; then
fi
# Check if tools are available to build documentation.
@@ -45,33 +45,33 @@
fi
# Search for bswap_32 function
-@@ -3134,18 +3134,29 @@ fi
+@@ -3121,17 +3124,30 @@ fi
# check for libusb
if test "$libusb" != "no" ; then
-- if $pkg_config --atleast-version=1.0.13 libusb-1.0 >/dev/null 2>&1 ; then
+- if $pkg_config --atleast-version=1.0.13 libusb-1.0; then
- libusb="yes"
-- usb="libusb"
-- libusb_cflags=$($pkg_config --cflags libusb-1.0 2>/dev/null)
-- libusb_libs=$($pkg_config --libs libusb-1.0 2>/dev/null)
+- libusb_cflags=$($pkg_config --cflags libusb-1.0)
+- libusb_libs=$($pkg_config --libs libusb-1.0)
- QEMU_CFLAGS="$QEMU_CFLAGS $libusb_cflags"
+ cat > $TMPC << EOF
+#include <libusb.h>
+
+int main(void) { return libusb_get_port_path(NULL, NULL, NULL, 0); }
+EOF
-+ if compile_prog "-Werror" "-lusb" ; then
++ if compile_prog "-Werror" "-lusb -pthread" ; then
++ libusb="yes"
+ libusb_cflags=""
+ libusb_libs=-lusb
libs_softmmu="$libs_softmmu $libusb_libs"
else
- if test "$libusb" = "yes"; then
- feature_not_found "libusb"
-+ if $pkg_config --atleast-version=1.0.13 libusb-1.0 >/dev/null 2>&1 ; then
++ if $pkg_config --atleast-version=1.0.13 libusb-1.0; then
+ libusb="yes"
+ usb="libusb"
-+ libusb_cflags=$($pkg_config --cflags libusb-1.0 2>/dev/null)
-+ libusb_libs=$($pkg_config --libs libusb-1.0 2>/dev/null)
++ libusb_cflags=$($pkg_config --cflags libusb-1.0)
++ libusb_libs=$($pkg_config --libs libusb-1.0)
+ QEMU_CFLAGS="$QEMU_CFLAGS $libusb_cflags"
+ libs_softmmu="$libs_softmmu $libusb_libs"
+ else
diff --git a/emulators/qemu-devel/files/patch-cpu-exec.c b/emulators/qemu-devel/files/patch-cpu-exec.c
deleted file mode 100644
index 57229ab351db..000000000000
--- a/emulators/qemu-devel/files/patch-cpu-exec.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/cpu-exec.c
-+++ b/cpu-exec.c
-@@ -681,6 +681,10 @@ int cpu_exec(CPUArchState *env)
- * local variables as longjmp is marked 'noreturn'. */
- cpu = current_cpu;
- env = cpu->env_ptr;
-+#if !(defined(CONFIG_USER_ONLY) && \
-+ (defined(TARGET_M68K) || defined(TARGET_PPC) || defined(TARGET_S390X)))
-+ cc = CPU_GET_CLASS(cpu);
-+#endif
- }
- } /* for(;;) */
-
diff --git a/emulators/qemu-devel/files/pcap-patch b/emulators/qemu-devel/files/pcap-patch
index 1428b20345c3..1688360e8c6c 100644
--- a/emulators/qemu-devel/files/pcap-patch
+++ b/emulators/qemu-devel/files/pcap-patch
@@ -1,16 +1,16 @@
--- configure.orig
+++ configure
-@@ -241,6 +241,9 @@ gtk=""
- gtkabi="2.0"
+@@ -261,6 +261,9 @@ gtkabi="2.0"
tpm="no"
libssh2=""
+ vhdx=""
+pcap="no"
+pcap_create="no"
+bpf="no"
# parse CC options first
for opt do
-@@ -748,6 +751,10 @@ for opt do
+@@ -787,6 +790,10 @@ for opt do
;;
--enable-vnc-ws) vnc_ws="yes"
;;
@@ -21,7 +21,7 @@
--disable-slirp) slirp="no"
;;
--disable-uuid) uuid="no"
-@@ -1843,6 +1850,51 @@ EOF
+@@ -1884,6 +1891,51 @@ EOF
fi
##########################################
@@ -73,15 +73,15 @@
# VNC TLS/WS detection
if test "$vnc" = "yes" -a \( "$vnc_tls" != "no" -o "$vnc_ws" != "no" \) ; then
cat > $TMPC <<EOF
-@@ -3549,6 +3601,7 @@ echo "Audio drivers $audio_drv_list"
- echo "Block whitelist $block_drv_whitelist"
- echo "Mixer emulation $mixemu"
+@@ -3747,6 +3799,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 "VNC support $vnc"
if test "$vnc" = "yes" ; then
echo "VNC TLS support $vnc_tls"
-@@ -3701,6 +3754,15 @@ fi
+@@ -3897,6 +3950,15 @@ fi
if test "$profiler" = "yes" ; then
echo "CONFIG_PROFILER=y" >> $config_host_mak
fi
diff --git a/emulators/qemu-devel/files/prepatch-configure b/emulators/qemu-devel/files/prepatch-configure
new file mode 100644
index 000000000000..1b4708fc382f
--- /dev/null
+++ b/emulators/qemu-devel/files/prepatch-configure
@@ -0,0 +1,10 @@
+--- a/configure
++++ b/configure
+@@ -491,6 +491,7 @@ FreeBSD)
+ audio_possible_drivers="oss sdl esd pa"
+ # needed for kinfo_getvmmap(3) in libutil.h
+ LIBS="-lutil $LIBS"
++ netmap="" # enable netmap autodetect
+ ;;
+ DragonFly)
+ bsd="yes"
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-12 10:21:54 +0000