Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at 2022-10-01 17:42:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qemu (Old) and /work/SRC/openSUSE:Factory/.qemu.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu" Sat Oct 1 17:42:36 2022 rev:236 rq:1006838 version:7.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2022-09-16 13:32:33.109309609 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new.2275/qemu.changes 2022-10-01 17:42:44.745625291 +0200 @@ -1,0 +2,119 @@ +Wed Sep 28 16:35:10 UTC 2022 - Dario Faggioli <dfaggi...@suse.com> + +- Runs of the test-suite seem much more stable now, in this version + of QEMU. (bsc#1203610) We are also fine re-enabling running them + in parallel. + +------------------------------------------------------------------- +Wed Sep 28 11:48:14 UTC 2022 - Dario Faggioli <dfaggi...@suse.com> + +- Switch QEMU Linux user to emulate the same CPU as the one of the + host by default. This is a bit conrtoversial and tricky, when + thinking about system emulation/virtualization. But for linux-user, + it should be just fine. (bsc#1203684) +* Patches added: + linux-user-use-max-as-default-CPU-model-.patch + +------------------------------------------------------------------- +Tue Sep 27 16:16:17 UTC 2022 - Dario Faggioli <dfaggi...@suse.com> + +- Be less verbose when packaging documentation. In fact, with just + a couple of (minor) re-arrangements, we can get rid of having to + list all the files all the time +- Package /etc/qemu/bridge.conf as '%config(noreplace). Next step + will probably be to move it to /usr/etc/qemu (bsc#1201944) + +------------------------------------------------------------------- +Wed Sep 21 07:08:48 UTC 2022 - Dario Faggioli <dfaggi...@suse.com> + +- Switch to %autosetup for all products (this required some changes + in update_git.sh) +- Run check-qtest sequentially, as it's more reliable, when in OBS +- Build with libbpf, fdt and capstone support +- Drop the patch adding our support document, and deal with that + in the spec file directly +* Patches dropped: + doc-add-our-support-doc-to-the-main-proj.patch + +------------------------------------------------------------------- +Tue Sep 20 07:14:16 UTC 2022 - Dario Faggioli <dfaggi...@suse.com> + +- Updated to latest upstream version 7.1 + * https://wiki.qemu.org/ChangeLog/7.1 + Be sure to also check the following pages: + * https://qemu-project.gitlab.io/qemu/about/removed-features.html + * https://qemu-project.gitlab.io/qemu/about/deprecated.html + Some notable changes: + * [x86] Support for architectural LBRs on KVM virtual machines + * [x86] The libopcode-based disassembler has been removed. Use + Capstone instead + * [LoongArch] Add initial support for the LoongArch64 architecture. + * [ARM] The emulated SMMUv3 now advertises support for SMMUv3.2-BBML2 + * [ARM] The xlnx-zynqmp SoC model now implements the 4 TTC timers + * [ARM] The versal machine now models the Cortex-R5s in the Real-Time + Processing Unit (RPU) subsystem + * [ARM] The virt board now supports emulation of the GICv4.0 + * [ARM] New emulated CPU types: Cortex-A76, Neoverse-N1 + * [HPPA] Fix serial port pass-through from host to guest + * [HPPA] Lots of general code improvements and tidy-ups + * [RISC-V] RISC-V + * [RISC-V] Add support for privileged spec version 1.12.0 + * [RISC-V] Use privileged spec version 1.12.0 for virt machine by default + * [RISC-V] Allow software access to MIP SEIP + * [RISC-V] Add initial support for the Sdtrig extension + * [RISC-V] Optimisations and improvements for the vector extension + * [VFIO] Experimental support for exposing emulated PCI devices over the + new vfio-user protocol (a vfio-user client is not yet available + in QEMU, though) + * [QMP] The on-cbw-error option for copy-before-write filter, to specify + behavior on CBW (copy before write) operation failure. + * [QMP] The cbw-timeout option for copy-before-write filter, to specify + timeout for CBW operation. + * [QMP] New commands query-stats and query-stats-schema to retrieve + statistics from various QEMU subsystems (right now only from + KVM). + * [QMP] The PanicAction can now be configured to report an exit-failure + (useful for automated testing) + * [Networking] QEMU can be compiled with the system slirp library even + when using CFI. This requires libslirp 4.7. + * [Migration] Support for zero-copy-send on Linux, which reduces CPU + usage on the source host. Note that locked memory is needed + to support this +* Patches added: + Revert-tests-qtest-enable-more-vhost-use.patch + meson-remove-pkgversion-from-CONFIG_STAM.patch +* Patches dropped: + AIO-Reduce-number-of-threads-for-32bit-h.patch + Makefile-Don-t-check-pc-bios-as-pre-requ.patch + Revert-8dcb404bff6d9147765d7dd3e9c849337.patch + Revert-qht-constify-qht_statistics_init.patch + XXX-dont-dump-core-on-sigabort.patch + acpi_piix4-Fix-migration-from-SLE11-SP2.patch + configure-only-populate-roms-if-softmmu.patch + configure-remove-pkgversion-from-CONFIG_.patch + coroutine-ucontext-use-QEMU_DEFINE_STATI.patch + coroutine-use-QEMU_DEFINE_STATIC_CO_TLS.patch + coroutine-win32-use-QEMU_DEFINE_STATIC_C.patch + hostmem-default-the-amount-of-prealloc-t.patch + hw-usb-hcd-ehci-fix-writeback-order.patch + i8254-Fix-migration-from-SLE11-SP2.patch + intc-exynos4210_gic-replace-snprintf-wit.patch + modules-generates-per-target-modinfo.patch + modules-introduces-module_kconfig-direct.patch + pc-bios-s390-ccw-net-avoid-warning-about.patch + pci-fix-overflow-in-snprintf-string-form.patch + qemu-cvs-gettimeofday.patch + qemu-cvs-ioctl_debug.patch + qemu-cvs-ioctl_nodirection.patch + qht-Revert-some-constification-in-qht.c.patch + qom-handle-case-of-chardev-spice-module-.patch + scsi-lsi53c895a-fix-use-after-free-in-ls.patch + scsi-lsi53c895a-really-fix-use-after-fre.patch + softmmu-Always-initialize-xlat-in-addres.patch + sphinx-change-default-language-to-en.patch + test-add-mapping-from-arch-of-i686-to-qe.patch + tests-Fix-block-tests-to-be-compatible-w.patch + tests-qtest-Move-the-fuzz-tests-to-x86-o.patch + usb-Help-compiler-out-to-avoid-a-warning.patch + +------------------------------------------------------------------- Old: ---- AIO-Reduce-number-of-threads-for-32bit-h.patch Makefile-Don-t-check-pc-bios-as-pre-requ.patch Revert-8dcb404bff6d9147765d7dd3e9c849337.patch Revert-qht-constify-qht_statistics_init.patch XXX-dont-dump-core-on-sigabort.patch acpi_piix4-Fix-migration-from-SLE11-SP2.patch configure-only-populate-roms-if-softmmu.patch configure-remove-pkgversion-from-CONFIG_.patch coroutine-ucontext-use-QEMU_DEFINE_STATI.patch coroutine-use-QEMU_DEFINE_STATIC_CO_TLS.patch coroutine-win32-use-QEMU_DEFINE_STATIC_C.patch doc-add-our-support-doc-to-the-main-proj.patch hostmem-default-the-amount-of-prealloc-t.patch hw-usb-hcd-ehci-fix-writeback-order.patch i8254-Fix-migration-from-SLE11-SP2.patch intc-exynos4210_gic-replace-snprintf-wit.patch modules-generates-per-target-modinfo.patch modules-introduces-module_kconfig-direct.patch pc-bios-s390-ccw-net-avoid-warning-about.patch pci-fix-overflow-in-snprintf-string-form.patch qemu-7.0.0.tar.xz qemu-7.0.0.tar.xz.sig qemu-cvs-gettimeofday.patch qemu-cvs-ioctl_debug.patch qemu-cvs-ioctl_nodirection.patch qht-Revert-some-constification-in-qht.c.patch qom-handle-case-of-chardev-spice-module-.patch scsi-lsi53c895a-fix-use-after-free-in-ls.patch scsi-lsi53c895a-really-fix-use-after-fre.patch softmmu-Always-initialize-xlat-in-addres.patch sphinx-change-default-language-to-en.patch test-add-mapping-from-arch-of-i686-to-qe.patch tests-Fix-block-tests-to-be-compatible-w.patch tests-qtest-Move-the-fuzz-tests-to-x86-o.patch usb-Help-compiler-out-to-avoid-a-warning.patch New: ---- Revert-tests-qtest-enable-more-vhost-use.patch linux-user-use-max-as-default-CPU-model-.patch meson-remove-pkgversion-from-CONFIG_STAM.patch qemu-7.1.0.tar.xz qemu-7.1.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu.spec ++++++ ++++ 853 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/qemu/qemu.spec ++++ and /work/SRC/openSUSE:Factory/.qemu.new.2275/qemu.spec ++++++ Disable-some-tests-that-have-problems-in.patch ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:47.149629676 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:47.153629684 +0200 @@ -18,12 +18,12 @@ 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build -index e860b0edf275cd68cd24516cb1ca..ef1af9b109c1591e3bfda2cb4a56 100644 +index be4b30dea248d75f477cc402ce8d..06a2015232fd920170a9f503be52 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build -@@ -35,6 +35,10 @@ qtests_pci = \ - (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) + \ - (config_all_devices.has_key('CONFIG_IVSHMEM_DEVICE') ? ['ivshmem-test'] : []) +@@ -39,6 +39,10 @@ qtests_pci = \ + qtests_cxl = \ + (config_all_devices.has_key('CONFIG_CXL') ? ['cxl-test'] : []) +# display-vga-test currently fails in OBS, for ppc64 +qtests_pci_novga = \ @@ -32,7 +32,7 @@ qtests_i386 = \ (slirp.found() ? ['pxe-test', 'test-netfilter'] : []) + \ (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) + \ -@@ -171,7 +175,7 @@ qtests_ppc64 = \ +@@ -167,7 +171,7 @@ qtests_ppc64 = \ (slirp.found() ? ['pxe-test'] : []) + \ (config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] : []) + \ (config_all_devices.has_key('CONFIG_USB_XHCI_NEC') ? ['usb-hcd-xhci-test'] : []) + \ ++++++ Make-char-muxer-more-robust-wrt-small-FI.patch ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:47.173629720 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:47.177629727 +0200 @@ -94,10 +94,10 @@ #include "qemu/cutils.h" #include "monitor/monitor.h" diff --git a/chardev/chardev-internal.h b/chardev/chardev-internal.h -index aba0240759ebf938cf391d89edb8..fb3957b771f9e24547619fd45669 100644 +index 4e03af31476cb88cbe699dfafb23..ae5738ae4e3bd90ae703740a68da 100644 --- a/chardev/chardev-internal.h +++ b/chardev/chardev-internal.h -@@ -36,6 +36,9 @@ struct MuxChardev { +@@ -37,6 +37,9 @@ struct MuxChardev { Chardev parent; CharBackend *backends[MAX_MUX]; CharBackend chr; ++++++ Make-installed-scripts-explicitly-python.patch ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:47.193629757 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:47.197629764 +0200 @@ -23,7 +23,7 @@ # Migration Stream Analyzer # diff --git a/scripts/vmstate-static-checker.py b/scripts/vmstate-static-checker.py -index 539ead62b498202fc40b42bff05f..0b7d30eef392cd659dbd722d8bdc 100755 +index b36938836026facea26c0e475579..cf08875c4a51dfe17902e802e76b 100755 --- a/scripts/vmstate-static-checker.py +++ b/scripts/vmstate-static-checker.py @@ -1,4 +1,4 @@ ++++++ PPC-KVM-Disable-mmu-notifier-check.patch ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:47.217629800 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:47.221629808 +0200 @@ -14,10 +14,10 @@ 1 file changed, 2 insertions(+) diff --git a/softmmu/physmem.c b/softmmu/physmem.c -index 4e1b27a20eccca027515aee6f78f..02aa7205a4992a678414111f625c 100644 +index dc3c3e5f2e7071eb21e77f3d95c2..b89279889e13b9d1bc37440a67a8 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c -@@ -2066,11 +2066,13 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, +@@ -2077,11 +2077,13 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, return NULL; } ++++++ Raise-soft-address-space-limit-to-hard-l.patch ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:47.253629866 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:47.257629873 +0200 @@ -16,10 +16,10 @@ 1 file changed, 12 insertions(+) diff --git a/softmmu/vl.c b/softmmu/vl.c -index 6f646531a0aeb6ff2dd3fc8a5cd8..f0f2f190a4a84af95ccaac353bb1 100644 +index 706bd7cff793dff6433c93dc6601..738736c50d90e7144743dfe0f61c 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c -@@ -41,6 +41,7 @@ +@@ -42,6 +42,7 @@ #include "sysemu/reset.h" #include "sysemu/runstate.h" #include "sysemu/runstate-action.h" @@ -27,7 +27,7 @@ #include "sysemu/seccomp.h" #include "sysemu/tcg.h" #include "sysemu/xen.h" -@@ -2778,6 +2779,17 @@ void qemu_init(int argc, char **argv, char **envp) +@@ -2613,6 +2614,17 @@ void qemu_init(int argc, char **argv, char **envp) MachineClass *machine_class; bool userconfig = true; FILE *vmstate_dump_file = NULL; ++++++ Revert-roms-efirom-tests-uefi-test-tools.patch ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:47.277629910 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:47.281629917 +0200 @@ -9,13 +9,14 @@ Signed-off-by: Bruce Rogers <brog...@suse.com> [DF: Rebased on top of 6.2.0] +Signed-off-by: Dario Faggioli <dfaggi...@suse.com> --- roms/Makefile | 2 -- tests/uefi-test-tools/Makefile | 1 - 2 files changed, 3 deletions(-) diff --git a/roms/Makefile b/roms/Makefile -index 3d53bd528666b594ab3d6b631450..c7c6e973db59572e8b8bee74e969 100644 +index 0e652aff895fe0680cf35e43b299..fd2c5824787e1c983f6e66170a60 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -151,8 +151,6 @@ build-efi-roms: build-pxe-roms ++++++ Revert-tests-qtest-enable-more-vhost-use.patch ++++++ From: Dario Faggioli <dfaggi...@suse.com> Date: Tue, 24 May 2022 20:52:17 +0200 Subject: Revert "tests/qtest: enable more vhost-user tests by default" Git-commit: 0000000000000000000000000000000000000000 Revert commit "tests/qtest: enable more vhost-user tests by default" (8dcb404bff6d9), as it causes prooblem when building with GCC 12 and LTO enabled. This should be considered temporary, until the actual reason why the code of the tests that are added in that commit breaks. It has been reported upstream, and will be (hopefully) solved there: https://lore.kernel.org/qemu-devel/1d3bbff9e92e7c8a24db9e140dcf3f428c2df103.ca...@suse.com/ Signed-off-by: Dario Faggioli <dfaggi...@suse.com> --- tests/qtest/vhost-user-test.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c index 8bf390be207cd2c016662c78f4a4..a4f7cc4359fac1bc6f556ef28810 100644 --- a/tests/qtest/vhost-user-test.c +++ b/tests/qtest/vhost-user-test.c @@ -996,17 +996,20 @@ static void register_vhost_user_test(void) "virtio-net", test_migrate, &opts); - opts.before = vhost_user_test_setup_reconnect; - qos_add_test("vhost-user/reconnect", "virtio-net", - test_reconnect, &opts); + /* keeps failing on build-system since Aug 15 2017 */ + if (getenv("QTEST_VHOST_USER_FIXME")) { + opts.before = vhost_user_test_setup_reconnect; + qos_add_test("vhost-user/reconnect", "virtio-net", + test_reconnect, &opts); - opts.before = vhost_user_test_setup_connect_fail; - qos_add_test("vhost-user/connect-fail", "virtio-net", - test_vhost_user_started, &opts); + opts.before = vhost_user_test_setup_connect_fail; + qos_add_test("vhost-user/connect-fail", "virtio-net", + test_vhost_user_started, &opts); - opts.before = vhost_user_test_setup_flags_mismatch; - qos_add_test("vhost-user/flags-mismatch", "virtio-net", - test_vhost_user_started, &opts); + opts.before = vhost_user_test_setup_flags_mismatch; + qos_add_test("vhost-user/flags-mismatch", "virtio-net", + test_vhost_user_started, &opts); + } opts.before = vhost_user_test_setup_multiqueue; opts.edge.extra_device_opts = "mq=on"; ++++++ bundles.tar.xz ++++++ Binary files old/621da7789083b80d6f1ff1c0fb499334007b4f51.bundle and new/621da7789083b80d6f1ff1c0fb499334007b4f51.bundle differ Binary files old/823a3f11fb8f04c3c3cc0f95f968fef1bfc6534f.bundle and new/823a3f11fb8f04c3c3cc0f95f968fef1bfc6534f.bundle differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/repo new/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/repo --- old/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/repo 1970-01-01 01:00:00.000000000 +0100 +++ new/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/repo 2022-08-30 19:51:11.000000000 +0200 @@ -0,0 +1 @@ +https://github.com/google/brotli Binary files old/roms/skiboot/24a7eb35966d93455520bc2debdd7954314b638b.bundle and new/roms/skiboot/24a7eb35966d93455520bc2debdd7954314b638b.bundle differ Binary files old/roms/skiboot/820d43c0a7751e75a8830561f35535dfffd522bd.bundle and new/roms/skiboot/820d43c0a7751e75a8830561f35535dfffd522bd.bundle differ ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:47.429630187 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:47.433630194 +0200 @@ -18,12 +18,13 @@ # The following specifies the upstream tag or commit upon which our patchqueue # gets rebased. The special value LATEST may be used to "automatically" track # the upstream development tree in the master branch -GIT_UPSTREAM_COMMIT_ISH=v7.0.0 +#GIT_UPSTREAM_COMMIT_ISH=v7.0.0 +GIT_UPSTREAM_COMMIT_ISH=v7.1.0 # WARNING: If transitioning from using LATEST to not, MANUALLY re-set the # tarball present. If transitioning TO LATEST, make sure that # NEXT_RELEASE_IS_MAJOR is set correctly # This is used to choose the version number when LATEST processing is active -NEXT_RELEASE_IS_MAJOR=0 +NEXT_RELEASE_IS_MAJOR=1 # Unfortunately, SeaBIOS doesn't always follow an "always increasing" version # model, so there may be times we should overide the automated version setting. @@ -41,7 +42,8 @@ # Path to be used for temporary files, directories, repositories, etc. # Default is /dev/shm. An alternative could be /tmp (e.g., when building # in containers, or whatever). -TMPDIR=/dev/shm +#TMPDIR=/dev/shm +TMPDIR=/tmp # This array tracks all git submodule paths within the superproject (1st entry) PATCH_PATH_MAP=( ++++++ increase-x86_64-physical-bits-to-42.patch ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:47.457630238 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:47.461630245 +0200 @@ -59,7 +59,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/tcg/helper-tcg.h b/target/i386/tcg/helper-tcg.h -index 0a4401e917f9a0b40fb95bf947fd..ef916d40e8c9497853b265a1e7b4 100644 +index 34167e2e29cacee8dfb05e943fac..8ded299c8f4bf91ba2bea6b88211 100644 --- a/target/i386/tcg/helper-tcg.h +++ b/target/i386/tcg/helper-tcg.h @@ -26,7 +26,7 @@ ++++++ linux-user-Fake-proc-cpuinfo.patch ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:47.497630311 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:47.501630318 +0200 @@ -16,20 +16,32 @@ Signed-off-by: Alexander Graf <ag...@suse.de> [AF: Rebased for v1.6 and v1.7] Signed-off-by: Andreas F??rber <afaer...@suse.de> +[DF: Restructured it a bit, to make ARM look like other arch-es] +Signed-off-by: Dario Faggioli <dfaggi...@suse.com> --- - linux-user/syscall.c | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) + linux-user/syscall.c | 26 ++++++++++++++++++++++++-- + 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index c9adb65a2293e9735341a217a68d..8de1bb8d48eeb867a1047d986299 100644 +index f4091212027c254a19dc871a675d..b746511fe5ba1c03cf44a14ed811 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -8099,6 +8099,27 @@ static int open_self_stat(void *cpu_env, int fd) - return 0; +@@ -8157,7 +8157,8 @@ static int is_proc_myself(const char *filename, const char *entry) } + #if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN || \ +- defined(TARGET_SPARC) || defined(TARGET_M68K) || defined(TARGET_HPPA) ++ defined(TARGET_SPARC) || defined(TARGET_M68K) || \ ++ defined(TARGET_HPPA) || defined(TARGET_ARM) + static int is_proc(const char *filename, const char *entry) + { + return strcmp(filename, entry) == 0; +@@ -8229,6 +8230,27 @@ static int open_cpuinfo(CPUArchState *cpu_env, int fd) + } + #endif + +#if defined(TARGET_ARM) -+static int open_cpuinfo(void *cpu_env, int fd) ++static int open_cpuinfo(CPUArchState *cpu_env, int fd) +{ + dprintf(fd, +"Processor : ARMv7 Processor rev 5 (v7l)\n" @@ -44,22 +56,21 @@ +"Hardware : Genesi Efika MX (Smarttop)\n" +"Revision : 51030\n" +"Serial : 0000000000000000\n"); -+ + return 0; +} +#endif + - static int open_self_auxv(void *cpu_env, int fd) ++ + #if defined(TARGET_M68K) + static int open_hardware(CPUArchState *cpu_env, int fd) { - CPUState *cpu = env_cpu((CPUArchState *)cpu_env); -@@ -8253,6 +8274,9 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags, - #if defined(TARGET_SPARC) || defined(TARGET_HPPA) +@@ -8253,7 +8275,7 @@ static int do_openat(CPUArchState *cpu_env, int dirfd, const char *pathname, int + #if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN + { "/proc/net/route", open_net_route, is_proc }, + #endif +-#if defined(TARGET_SPARC) || defined(TARGET_HPPA) ++#if defined(TARGET_SPARC) || defined(TARGET_HPPA) || defined(TARGET_ARM) { "/proc/cpuinfo", open_cpuinfo, is_proc }, #endif -+#if defined(TARGET_ARM) -+ { "cpuinfo", open_cpuinfo, is_proc_myself }, -+#endif #if defined(TARGET_M68K) - { "/proc/hardware", open_hardware, is_proc }, - #endif ++++++ linux-user-add-binfmt-wrapper-for-argv-0.patch ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:47.513630340 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:47.517630347 +0200 @@ -82,10 +82,10 @@ + return execve(new_argv[0], new_argv, envp); +} diff --git a/meson.build b/meson.build -index 861de93c4f58f294f9d353c9674e..05740dd14228fb700ecf6b793cfc 100644 +index 20fddbd707c91c1baee604202fb1..ce227b6c25e3c71f16416f0a8f25 100644 --- a/meson.build +++ b/meson.build -@@ -3336,6 +3336,11 @@ endforeach +@@ -3585,6 +3585,11 @@ endforeach # Other build targets ++++++ linux-user-lseek-explicitly-cast-non-set.patch ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:47.537630384 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:47.537630384 +0200 @@ -15,10 +15,10 @@ 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 5096b1258f6d631b80fb6cca6011..ae26ad25466aca617d272e4c7474 100644 +index de782620fe3c9169a58e442a6f05..9d92e56e3996dc2174a4af9d0491 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -8929,8 +8929,13 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_ulong arg1, +@@ -8936,8 +8936,13 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_ulong arg1, return ret; #endif #ifdef TARGET_NR_lseek ++++++ linux-user-use-max-as-default-CPU-model-.patch ++++++ From: Dario Faggioli <dfaggi...@suse.com> Date: Wed, 28 Sep 2022 13:13:08 +0200 Subject: linux-user: use "max" as default CPU model, to deal with x86_64-v2 binaries Git-commit: 0000000000000000000000000000000000000000 References: bsc#1203684 The old "qemu64" model cannot run binaries compiled for, e.g., x86_64-v2. This could be a problem because a couple of major distribution are switching to that as their baseline. In fact, errors like this one can be observed (if 'ls' is such a binary): x86_64-linux-user/qemu-x86_64 /usr/bin/ls qemu: uncaught target signal 4 (Illegal instruction) - core dumped Instead, using "max" as the CPU model, everything (of course) works: export QEMU_CPU=max x86_64-linux-user/qemu-x86_64 /usr/bin/ls This has been and is being discussed in several places, e.g.: https://lore.kernel.org/qemu-devel/20210607135843.196595-1-berra...@redhat.com/ https://bugzilla.redhat.com/show_bug.cgi?id=2079915 https://bugzilla.redhat.com/show_bug.cgi?id=2080133 http:s//github.com/containers/podman/issues/14314 However, these are all about system-emulation/virtualization, which is indeed quite tricky. In fact, what would be a good alternative default CPU model to pick, in that case? At the same time, however, it's also less problematic. In fact, people using QEMU for that purpose are likely in one of the following two situations already: 1) they're starting QEMU manually, with a long and complex command line, for whatever specific reason. In that case, adding '-cpu host' (or whatever) to such long and complex command line, isn't a big deal; 2) they're using QEMU via libvirt, which has its own fancy and convenient ways of determining the best CPU model, and the default "qemu64" one is pretty much never being used. The case of Linux user emulation, however, it's a bit more tricky, as it's less convenient to actually pass any parameter to QEMU at all, in this scenario, so having to add one might be complicated. The same goes for having to define the QEMU_CPU environment variable. When doing Linux userspace emulation, though, a lot of the downsides of just using '-cpu host' as the default are non-issue (e.g., we do not need to think about migration!). Therefore, while the topic remain complex and unsolved for system emulation, for Linux user, let's just switch and be happy. Signed-off-by: Dario Faggioli <dfaggi...@suse.com> --- linux-user/x86_64/target_elf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/x86_64/target_elf.h b/linux-user/x86_64/target_elf.h index 7b76a90de8805a84b4983f3b2bb9..3f628f8d66197faae698cbec4e24 100644 --- a/linux-user/x86_64/target_elf.h +++ b/linux-user/x86_64/target_elf.h @@ -9,6 +9,6 @@ #define X86_64_TARGET_ELF_H static inline const char *cpu_get_model(uint32_t eflags) { - return "qemu64"; + return "max"; } #endif ++++++ linux-user-use-target_ulong.patch ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:47.573630449 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:47.581630464 +0200 @@ -20,11 +20,11 @@ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 8de1bb8d48eeb867a1047d986299..5096b1258f6d631b80fb6cca6011 100644 +index b746511fe5ba1c03cf44a14ed811..de782620fe3c9169a58e442a6f05 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -6406,8 +6406,8 @@ static abi_long do_prctl_inval1(CPUArchState *env, abi_long arg2) - #define do_prctl_set_unalign do_prctl_inval1 +@@ -6405,8 +6405,8 @@ static abi_long do_prctl_inval1(CPUArchState *env, abi_long arg2) + #define do_prctl_sme_set_vl do_prctl_inval1 #endif -static abi_long do_prctl(CPUArchState *env, abi_long option, abi_long arg2, @@ -34,30 +34,30 @@ { abi_long ret; -@@ -8574,10 +8574,10 @@ _syscall2(int, pivot_root, const char *, new_root, const char *, put_old) +@@ -8581,10 +8581,10 @@ _syscall2(int, pivot_root, const char *, new_root, const char *, put_old) * of syscall results, can be performed. * All errnos that do_syscall() returns must be -TARGET_<errcode>. */ --static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, +-static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, - abi_long arg2, abi_long arg3, abi_long arg4, - abi_long arg5, abi_long arg6, abi_long arg7, - abi_long arg8) -+static abi_long do_syscall1(void *cpu_env, int num, abi_ulong arg1, ++static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_ulong arg1, + abi_ulong arg2, abi_ulong arg3, abi_ulong arg4, + abi_ulong arg5, abi_ulong arg6, abi_ulong arg7, + abi_ulong arg8) { CPUState *cpu = env_cpu(cpu_env); abi_long ret; -@@ -13201,10 +13201,10 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, +@@ -13203,10 +13203,10 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, return ret; } --abi_long do_syscall(void *cpu_env, int num, abi_long arg1, +-abi_long do_syscall(CPUArchState *cpu_env, int num, abi_long arg1, - abi_long arg2, abi_long arg3, abi_long arg4, - abi_long arg5, abi_long arg6, abi_long arg7, - abi_long arg8) -+abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1, ++abi_long do_syscall(CPUArchState *cpu_env, int num, abi_ulong arg1, + abi_ulong arg2, abi_ulong arg3, abi_ulong arg4, + abi_ulong arg5, abi_ulong arg6, abi_ulong arg7, + abi_ulong arg8) @@ -65,22 +65,22 @@ CPUState *cpu = env_cpu(cpu_env); abi_long ret; diff --git a/linux-user/user-internals.h b/linux-user/user-internals.h -index ee152ccfaa8fdfa33b1e6d36b8ab..7117d8b2c583a16311ef82a0eb60 100644 +index 0280e76addda504ea9745a17324b..1026e09da8caecf3e74159ea319e 100644 --- a/linux-user/user-internals.h +++ b/linux-user/user-internals.h @@ -59,10 +59,10 @@ int info_is_fdpic(struct image_info *info); void target_set_brk(abi_ulong new_brk); void syscall_init(void); --abi_long do_syscall(void *cpu_env, int num, abi_long arg1, +-abi_long do_syscall(CPUArchState *cpu_env, int num, abi_long arg1, - abi_long arg2, abi_long arg3, abi_long arg4, - abi_long arg5, abi_long arg6, abi_long arg7, - abi_long arg8); -+abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1, ++abi_long do_syscall(CPUArchState *cpu_env, int num, abi_ulong arg1, + abi_ulong arg2, abi_ulong arg3, abi_ulong arg4, + abi_ulong arg5, abi_ulong arg6, abi_ulong arg7, + abi_ulong arg8); extern __thread CPUState *thread_cpu; - void QEMU_NORETURN cpu_loop(CPUArchState *env); - const char *target_strerror(int err); + G_NORETURN void cpu_loop(CPUArchState *env); + abi_long get_errno(abi_long ret); ++++++ meson-remove-pkgversion-from-CONFIG_STAM.patch ++++++ From: Dario Faggioli <dfaggi...@suse.com> Date: Tue, 20 Sep 2022 09:10:59 +0200 Subject: meson: remove $pkgversion from CONFIG_STAMP input to broaden compatibility Git-commit: 0000000000000000000000000000000000000000 As part of the effort to close the gap with Leap I think we are fine removing the $pkgversion component to creating a unique CONFIG_STAMP. This stamp is only used in creating a unique symbol used in ensuring the dynamically loaded modules correspond correctly to the loading qemu. The default inputs to producing this unique symbol are somewhat reasonable as a generic mechanism, but specific packaging and maintenance practices might require the default to be modified for best use. This is an example of that. Signed-off-by: Bruce Rogers <brog...@suse.com> Signed-off-by: Dario Faggioli <dfaggi...@suse.com> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index ce227b6c25e3c71f16416f0a8f25..09145d35aa3e684e92da7895ac67 100644 --- a/meson.build +++ b/meson.build @@ -1736,7 +1736,7 @@ config_host_data.set_quoted('CONFIG_SYSCONFDIR', get_option('prefix') / get_opti if config_host.has_key('CONFIG_MODULES') config_host_data.set('CONFIG_STAMP', run_command( meson.current_source_dir() / 'scripts/qemu-stamp.py', - meson.project_version(), get_option('pkgversion'), '--', + meson.project_version(), '--', meson.current_source_dir() / 'configure', capture: true, check: true).stdout().strip()) endif ++++++ qemu-7.0.0.tar.xz -> qemu-7.1.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/qemu/qemu-7.0.0.tar.xz /work/SRC/openSUSE:Factory/.qemu.new.2275/qemu-7.1.0.tar.xz differ: char 26, line 1 ++++++ qemu-binfmt-conf-Modify-default-path.patch ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:47.665630617 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:47.669630625 +0200 @@ -13,10 +13,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh -index 9cb723f44355c55d21eeeb2c1b7b..02eedc7c92d788637385ef3eba19 100755 +index 6ef9f118d9ffe39cfadcdf54168e..4115eaa121aabc17a417f5ef4955 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh -@@ -334,7 +334,7 @@ BINFMT_SET=qemu_register_interpreter +@@ -341,7 +341,7 @@ BINFMT_SET=qemu_register_interpreter SYSTEMDDIR="/etc/binfmt.d" DEBIANDIR="/usr/share/binfmts" ++++++ qemu.spec.in ++++++ ++++ 650 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/qemu/qemu.spec.in ++++ and /work/SRC/openSUSE:Factory/.qemu.new.2275/qemu.spec.in ++++++ roms-Makefile-add-cross-file-to-qboot-me.patch ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:47.789630844 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:47.789630844 +0200 @@ -2,26 +2,25 @@ Date: Mon, 23 Nov 2020 07:13:23 -0700 Subject: roms/Makefile: add --cross-file to qboot meson setup for aarch64 -Include-If: %ifarch aarch64 - -We conditionally add a --cross-file reference so that we can do -cross compilation of qboot from an aarch64 build. +We add a --cross-file reference so that we can do cross compilation +of qboot from an aarch64 build. Signed-off-by: Bruce Rogers <brog...@suse.com> +Signed-off-by: Dario Faggioli <dfaggi...@suse.com> --- roms/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roms/Makefile b/roms/Makefile -index c7c6e973db59572e8b8bee74e969..6f979016c273246ce91432ee0ace 100644 +index 3d53bd528666b594ab3d6b631450..0e652aff895fe0680cf35e43b299 100644 --- a/roms/Makefile +++ b/roms/Makefile -@@ -197,7 +197,7 @@ MESON = meson +@@ -199,7 +199,7 @@ MESON = meson NINJA = ninja qboot: mkdir -p qboot/build - $(MESON) setup $(if $(wildcard qboot/build/meson-private),--wipe,) qboot qboot/build -+ $(MESON) setup --cross-file qboot/cross.ini $(if $(wildcard qboot/build/meson-private),--wipe,) qboot qboot/build ++ $(MESON) setup $(if $(x86_64_cross_prefix),--cross-file qboot/cross.ini,) $(if $(wildcard qboot/build/meson-private),--wipe,) qboot qboot/build $(NINJA) -C qboot/build cp qboot/build/bios.bin ../pc-bios/qboot.rom ++++++ scsi-generic-check-for-additional-SG_IO-.patch ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:47.813630887 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:47.817630895 +0200 @@ -20,10 +20,10 @@ 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c -index 343b51c2c0ab5dc7fb792aeb6458..513b10bed0f4279dc4077a31c66f 100644 +index aa3ae417ac726e9decf7e678e25f..8eb65f5f81bd4e998966571a3741 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c -@@ -391,7 +391,10 @@ static void scsi_write_complete(void * opaque, int ret) +@@ -397,7 +397,10 @@ static void scsi_write_complete(void * opaque, int ret) aio_context_acquire(blk_get_aio_context(s->conf.blk)); ++++++ scsi-generic-replace-logical-block-count.patch ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:47.829630917 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:47.833630924 +0200 @@ -78,10 +78,10 @@ 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c -index 0306ccc7b1e4827a67aaed926f93..343b51c2c0ab5dc7fb792aeb6458 100644 +index 3d35d307e1a2dcb1390b7c319b85..aa3ae417ac726e9decf7e678e25f 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c -@@ -315,11 +315,17 @@ static void scsi_read_complete(void * opaque, int ret) +@@ -322,11 +322,17 @@ static void scsi_read_complete(void * opaque, int ret) if (r->req.cmd.buf[0] == READ_CAPACITY_10 && (ldl_be_p(&r->buf[0]) != 0xffffffffU || s->max_lba == 0)) { s->blocksize = ldl_be_p(&r->buf[4]); @@ -99,6 +99,6 @@ + s->max_lba = bs->total_sectors - 1; + stq_be_p(&r->buf[0], s->max_lba); } - blk_set_guest_block_size(s->conf.blk, s->blocksize); + /* ++++++ tests-change-error-message-in-test-162.patch ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:47.925631092 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:47.929631099 +0200 @@ -2,6 +2,8 @@ Date: Mon, 11 Mar 2019 22:02:37 -0600 Subject: tests: change error message in test 162 +Git-commit: 0000000000000000000000000000000000000000 + Since we have a quite restricted execution environment, as far as networking is concerned, we need to change the error message we expect in test 162. There is actually no routing set up so the error we get is ++++++ tests-qemu-iotests-Triple-timeout-of-i-o.patch ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:47.937631114 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:47.941631121 +0200 @@ -3,6 +3,8 @@ Subject: tests/qemu-iotests: Triple timeout of i/o tests due to obs environment +Git-commit: 0000000000000000000000000000000000000000 + Executing tests in obs is very fickle, since you aren't guaranteed reliable cpu time. Triple the timeout for each test to help ensure we don't fail a test because the stars align against us. ++++++ update_git.sh ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:47.957631150 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:47.961631157 +0200 @@ -17,6 +17,7 @@ clean_up_temp_dirs() { echo "Cleaning temporary files before exit" +exit rm -rf $GIT_DIR rm -rf $CMP_DIR rm -rf $BUN_DIR @@ -470,7 +471,7 @@ PATCHES_BY_SUBMODULE_PATH[$INDEX]=$ACCUMULATED_PATCHES break; fi - if [[ "$line" =~ ^Patch[0-9]*:[\ ]*(.*)$ ]]; then + if [[ "$line" =~ ^#?Patch[0-9]*:[\ ]*(.*)$ ]]; then PATCH="${BASH_REMATCH[1]}" #echo "Patch is $PATCH" ACCUMULATED_PATCHES="$ACCUMULATED_PATCHES $PATCH" @@ -680,9 +681,22 @@ for package in $PKG; do while IFS= read -r line; do if [ "$line" = "PATCH_FILES" ]; then + SPNUM=1000 + SP_PATCHES=$(mktemp /tmp/sp-patches-XXXX) # Here (and other places below) we try to get ONLY the numbered patches, but it's possible some ACTUAL patch name actually starts with multiple digits, but EXTREMELY unlikely # TODO: do this better! for i in [0-9][0-9][0-9][0-9]*-*.patch; do + COMMENT="" + if grep "^Include-If: " $i &> /dev/null ; then + COMMENT="#" + if [[ "$NUMBERED_PATCHES" = "0" ]]; then + PATCH_NUMBER=${i%%-*} + echo -e "Source$SPNUM: ${i:${#PATCH_NUMBER}+1:40+1+5}" >> $SP_PATCHES + else + echo -e "Source$SPNUM: $i" >> $SP_PATCHES + fi + SPNUM=$((SPNUM+1)) + fi NUM=${i%%-*} DIV=$((10#$NUM/$PATCH_RANGE)) REM=$((10#$NUM%$PATCH_RANGE)) @@ -696,19 +710,23 @@ if [[ "$FIVE_DIGIT_POTENTIAL" != "0" ]]; then if [[ "$NUMBERED_PATCHES" = "0" ]]; then PATCH_NUMBER=${i%%-*} - echo -e "Patch$NUM: ${i:${#PATCH_NUMBER}+1:40+1+5}" + echo -e "${COMMENT}Patch$NUM: ${i:${#PATCH_NUMBER}+1:40+1+5}" else - echo -e "Patch$NUM: $i" + echo -e "${COMMENT}Patch$NUM: $i" fi else if [[ "$NUMBERED_PATCHES" = "0" ]]; then PATCH_NUMBER=${i%%-*} - echo -e "Patch$NUM: ${i:${#PATCH_NUMBER}+1:40+1+5}" + echo -e "${COMMENT}Patch$NUM: ${i:${#PATCH_NUMBER}+1:40+1+5}" else - echo -e "Patch$NUM: $i" + echo -e "${COMMENT}Patch$NUM: $i" fi fi done + + echo + echo "# Patches that will be applied directly across the spec file" + cat $SP_PATCHES elif [ "$line" = "PATCH_EXEC" ]; then unset PREV_S for i in [0-9][0-9][0-9][0-9]*-*.patch; do ++++++ xen-add-block-resize-support-for-xen-dis.patch ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:47.973631179 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:47.977631187 +0200 @@ -15,10 +15,10 @@ 1 file changed, 3 insertions(+) diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c -index 07b3be7b9b9f6093642363f13187..b0fe7583f9de18bfe75109e3f194 100644 +index 4c7f17c253e97bd747347aca3063..46168753f3dcc0d1795d5f567145 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c -@@ -271,6 +271,9 @@ static void xen_block_realize(XenDevice *xendev, Error **errp) +@@ -270,6 +270,9 @@ static void xen_block_realize(XenDevice *xendev, Error **errp) xen_block_set_size(blockdev); ++++++ xen-ignore-live-parameter-from-xen-save-.patch ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:47.989631208 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:47.993631216 +0200 @@ -27,10 +27,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/savevm.c b/migration/savevm.c -index 02ed94c180661c99970aebfe16a0..52251cf0afd48f919ad705544bf2 100644 +index 48e85c052c2c0197405803b9ef83..58eea0775eaa78d5d0250cdcbcaf 100644 --- a/migration/savevm.c +++ b/migration/savevm.c -@@ -2966,7 +2966,7 @@ void qmp_xen_save_devices_state(const char *filename, bool has_live, bool live, +@@ -2950,7 +2950,7 @@ void qmp_xen_save_devices_state(const char *filename, bool has_live, bool live, * So call bdrv_inactivate_all (release locks) here to let the other * side of the migration take control of the images. */ ++++++ xen_disk-Add-suse-specific-flush-disable.patch ++++++ --- /var/tmp/diff_new_pack.gKjH2H/_old 2022-10-01 17:42:48.009631245 +0200 +++ /var/tmp/diff_new_pack.gKjH2H/_new 2022-10-01 17:42:48.013631252 +0200 @@ -18,10 +18,10 @@ 1 file changed, 12 insertions(+) diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c -index 674953f1adeeaec6a81d9857144e..07b3be7b9b9f6093642363f13187 100644 +index 345b284d70181727f17a64d51bf2..4c7f17c253e97bd747347aca3063 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c -@@ -723,6 +723,8 @@ static XenBlockDrive *xen_block_drive_create(const char *id, +@@ -722,6 +722,8 @@ static XenBlockDrive *xen_block_drive_create(const char *id, const char *mode = qdict_get_try_str(opts, "mode"); const char *direct_io_safe = qdict_get_try_str(opts, "direct-io-safe"); const char *discard_enable = qdict_get_try_str(opts, "discard-enable"); @@ -30,7 +30,7 @@ char *driver = NULL; char *filename = NULL; XenBlockDrive *drive = NULL; -@@ -803,6 +805,16 @@ static XenBlockDrive *xen_block_drive_create(const char *id, +@@ -802,6 +804,16 @@ static XenBlockDrive *xen_block_drive_create(const char *id, } }
