Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at 2021-12-23 17:53:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qemu (Old) and /work/SRC/openSUSE:Factory/.qemu.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu" Thu Dec 23 17:53:34 2021 rev:217 rq:942113 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2021-12-16 21:19:38.094528606 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new.2520/qemu.changes 2021-12-23 17:53:44.799719012 +0100 @@ -1,0 +2,95 @@ +Wed Dec 22 08:51:15 UTC 2021 - Dario Faggioli <dfaggi...@suse.com> + +- Fix testsuite failures by not using modules when building tests + (and some other, also testsuite related, spec file problems) + +------------------------------------------------------------------- +Tue Dec 21 04:18:07 UTC 2021 - Lin Ma <l...@suse.com> + +- [JIRA] (SLE-20965) Make QEMU guests more failsafe when resizing + SCSI passthrough disks + * Patches added: + scsi-generic-replace-logical-block-count.patch + +------------------------------------------------------------------- +Thu Dec 16 21:54:06 UTC 2021 - Li Zhang <li.zh...@suse.com> + +- Add an audio-oss sub-package + +------------------------------------------------------------------- +Thu Dec 16 21:44:17 UTC 2021 - Dario Faggioli <dfaggi...@suse.com> + +- Add some new (mostly documentation) files in the package + +------------------------------------------------------------------- +Thu Dec 16 18:14:26 UTC 2021 - Li Zhang <li.zh...@suse.com> + +- Remove option --audio-drv-list because audio is detected by + meson automatically in latest version. + +------------------------------------------------------------------- +Thu Dec 16 17:59:41 UTC 2021 - Li Zhang <li.zh...@suse.com> + +- Remove options --disable-jemalloc and --disable-tcmalloc + which are changed in v6.2.0. + +------------------------------------------------------------------- +Thu Dec 16 16:32:27 UTC 2021 - Dario Faggioli <dfaggi...@suse.com> + +- Update to v 6.2.0. For full release notese, see: + * https://wiki.qemu.org/ChangeLog/6.2. + 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: + * virtio-mem: guest memory dumps are now fully supported, along + with pre-copy/post-copy migration and background guest snapshots + * QMP: support for nw DEVICE_UNPLUG_GUEST_ERROR to detect + guest-reported hotplug failures + * TCG: improvements to TCG plugin argument syntax, and multi-core + support for cache plugin + * 68k: improved support for Apple???s NuBus, including ability to + load declaration ROMs, and slot IRQ support + * ARM: macOS hosts with Apple Silicon CPUs now support ???hvf??? + accelerator for AArch64 guests + * ARM: emulation support for Fujitsu A64FX processor model + * ARM: emulation support for kudo-mbc machine type + * ARM: M-profile MVE extension is now supported for Cortex-M55 + * ARM: ???virt??? machine now supports an emulated ITS (Interrupt + Translation Service) and supports more than 123 CPUs in + emulation mode + * ARM: xlnx-zcu102 and xlnx-versal-virt machines now support + BBRAM and eFUSE devices + * PowerPC: improved POWER10 support for the ???powernv??? machine type + * PowerPC: initial support for POWER10 DD2.0 CPU model + * PowerPC: support for FORM2 PAPR NUMA descriptions for ???pseries??? machine type + * RISC-V: support for Zb[abcs] instruction set extensions + * RISC-V: support for vhost-user and numa mem options across all boards + * RISC-V: SiFive PWM support + * x86: support for new Snowridge-v4 CPU model + * x86: guest support for Intel SGX + * x86: AMD SEV guests now support measurement of kernel binary when doing + direct kernel boot (not using a bootloader) +* Patches dropped: + 9pfs-fix-crash-in-v9fs_walk.patch + block-introduce-max_hw_iov-for-use-in-sc.patch + hmp-Unbreak-change-vnc.patch + hw-acpi-ich9-Add-compat-prop-to-keep-HPC.patch + hw-i386-acpi-build-Deny-control-on-PCIe-.patch + i386-cpu-Remove-AVX_VNNI-feature-from-Co.patch + net-vmxnet3-validate-configuration-value.patch + pcie-rename-native-hotplug-to-x-native-h.patch + plugins-do-not-limit-exported-symbols-if.patch + plugins-execlog-removed-unintended-s-at-.patch + qemu-nbd-Change-default-cache-mode-to-wr.patch + qemu-sockets-fix-unix-socket-path-copy-a.patch + target-arm-Don-t-skip-M-profile-reset-en.patch + target-i386-add-missing-bits-to-CR4_RESE.patch + tcg-arm-Fix-tcg_out_vec_op-function-sign.patch + uas-add-stream-number-sanity-checks.patch + vhost-vsock-fix-migration-issue-when-seq.patch + virtio-balloon-don-t-start-free-page-hin.patch + virtio-mem-pci-Fix-memory-leak-when-crea.patch + virtio-net-fix-use-after-unmap-free-for-.patch + +------------------------------------------------------------------- Old: ---- 9pfs-fix-crash-in-v9fs_walk.patch block-introduce-max_hw_iov-for-use-in-sc.patch hmp-Unbreak-change-vnc.patch hw-acpi-ich9-Add-compat-prop-to-keep-HPC.patch hw-i386-acpi-build-Deny-control-on-PCIe-.patch i386-cpu-Remove-AVX_VNNI-feature-from-Co.patch net-vmxnet3-validate-configuration-value.patch pcie-rename-native-hotplug-to-x-native-h.patch plugins-do-not-limit-exported-symbols-if.patch plugins-execlog-removed-unintended-s-at-.patch qemu-6.1.0.tar.xz qemu-6.1.0.tar.xz.sig qemu-nbd-Change-default-cache-mode-to-wr.patch qemu-sockets-fix-unix-socket-path-copy-a.patch target-arm-Don-t-skip-M-profile-reset-en.patch target-i386-add-missing-bits-to-CR4_RESE.patch tcg-arm-Fix-tcg_out_vec_op-function-sign.patch uas-add-stream-number-sanity-checks.patch vhost-vsock-fix-migration-issue-when-seq.patch virtio-balloon-don-t-start-free-page-hin.patch virtio-mem-pci-Fix-memory-leak-when-crea.patch virtio-net-fix-use-after-unmap-free-for-.patch New: ---- qemu-6.2.0.tar.xz qemu-6.2.0.tar.xz.sig scsi-generic-replace-logical-block-count.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.275720547 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.283720552 +0100 @@ -93,9 +93,9 @@ %bcond_with system_membarrier -%define qemuver 6.1.0 -%define srcver 6.1.0 -%define sbver 1.14.0_0_g155821a +%define qemuver 6.2.0 +%define srcver 6.2.0 +%define sbver 1.15.0_0_g2dd4b9b %define srcname qemu Name: qemu%{name_suffix} URL: https://www.qemu.org/ @@ -132,74 +132,55 @@ # This patch queue is auto-generated - see README.PACKAGING for process # Patches applied in base project: -Patch00000: net-vmxnet3-validate-configuration-value.patch -Patch00001: XXX-dont-dump-core-on-sigabort.patch -Patch00002: qemu-binfmt-conf-Modify-default-path.patch -Patch00003: qemu-cvs-gettimeofday.patch -Patch00004: qemu-cvs-ioctl_debug.patch -Patch00005: qemu-cvs-ioctl_nodirection.patch -Patch00006: linux-user-add-binfmt-wrapper-for-argv-0.patch -Patch00007: PPC-KVM-Disable-mmu-notifier-check.patch -Patch00008: linux-user-binfmt-support-host-binaries.patch -Patch00009: linux-user-Fake-proc-cpuinfo.patch -Patch00010: linux-user-use-target_ulong.patch -Patch00011: Make-char-muxer-more-robust-wrt-small-FI.patch -Patch00012: linux-user-lseek-explicitly-cast-non-set.patch -Patch00013: AIO-Reduce-number-of-threads-for-32bit-h.patch -Patch00014: xen_disk-Add-suse-specific-flush-disable.patch -Patch00015: qemu-bridge-helper-reduce-security-profi.patch -Patch00016: qemu-binfmt-conf-use-qemu-ARCH-binfmt.patch -Patch00017: roms-Makefile-pass-a-packaging-timestamp.patch -Patch00018: Raise-soft-address-space-limit-to-hard-l.patch -Patch00019: increase-x86_64-physical-bits-to-42.patch -Patch00020: i8254-Fix-migration-from-SLE11-SP2.patch -Patch00021: acpi_piix4-Fix-migration-from-SLE11-SP2.patch -Patch00022: Make-installed-scripts-explicitly-python.patch -Patch00023: hw-smbios-handle-both-file-formats-regar.patch -Patch00024: xen-add-block-resize-support-for-xen-dis.patch -Patch00025: tests-qemu-iotests-Triple-timeout-of-i-o.patch -Patch00026: tests-Fix-block-tests-to-be-compatible-w.patch -Patch00027: xen-ignore-live-parameter-from-xen-save-.patch -Patch00028: tests-change-error-message-in-test-162.patch -Patch00029: hw-intc-exynos4210_gic-provide-more-room.patch -Patch00030: configure-only-populate-roms-if-softmmu.patch -Patch00031: pc-bios-s390-ccw-net-avoid-warning-about.patch -Patch00032: roms-change-cross-compiler-naming-to-be-.patch -Patch00033: test-add-mapping-from-arch-of-i686-to-qe.patch -Patch00034: configure-remove-pkgversion-from-CONFIG_.patch -Patch00035: Revert-qht-constify-qht_statistics_init.patch -Patch00036: qht-Revert-some-constification-in-qht.c.patch -Patch00037: meson-install-ivshmem-client-and-ivshmem.patch -Patch00038: Revert-roms-efirom-tests-uefi-test-tools.patch -Patch00039: Makefile-Don-t-check-pc-bios-as-pre-requ.patch -Patch00040: roms-Makefile-add-cross-file-to-qboot-me.patch -Patch00041: usb-Help-compiler-out-to-avoid-a-warning.patch -Patch00042: qom-handle-case-of-chardev-spice-module-.patch -Patch00043: doc-add-our-support-doc-to-the-main-proj.patch -Patch00044: Revert-qemu-img-Improve-error-for-rebase.patch -Patch00045: Revert-qemu-img-Require-F-with-b-backing.patch -Patch00046: tcg-arm-Fix-tcg_out_vec_op-function-sign.patch -Patch00047: i386-cpu-Remove-AVX_VNNI-feature-from-Co.patch -Patch00048: plugins-execlog-removed-unintended-s-at-.patch -Patch00049: plugins-do-not-limit-exported-symbols-if.patch -Patch00050: 9pfs-fix-crash-in-v9fs_walk.patch -Patch00051: virtio-balloon-don-t-start-free-page-hin.patch -Patch00052: qemu-sockets-fix-unix-socket-path-copy-a.patch -Patch00053: target-i386-add-missing-bits-to-CR4_RESE.patch -Patch00054: qemu-binfmt-conf.sh-should-use-F-as-shor.patch -Patch00055: modules-quick-fix-a-fundamental-error-in.patch -Patch00056: virtio-net-fix-use-after-unmap-free-for-.patch -Patch00057: target-arm-Don-t-skip-M-profile-reset-en.patch -Patch00058: hmp-Unbreak-change-vnc.patch -Patch00059: qemu-nbd-Change-default-cache-mode-to-wr.patch -Patch00060: virtio-mem-pci-Fix-memory-leak-when-crea.patch -Patch00061: vhost-vsock-fix-migration-issue-when-seq.patch -Patch00062: block-introduce-max_hw_iov-for-use-in-sc.patch -Patch00063: uas-add-stream-number-sanity-checks.patch -Patch00064: qemu-binfmt-conf.sh-allow-overriding-SUS.patch -Patch00065: pcie-rename-native-hotplug-to-x-native-h.patch -Patch00066: hw-acpi-ich9-Add-compat-prop-to-keep-HPC.patch -Patch00067: hw-i386-acpi-build-Deny-control-on-PCIe-.patch +Patch00000: XXX-dont-dump-core-on-sigabort.patch +Patch00001: qemu-binfmt-conf-Modify-default-path.patch +Patch00002: qemu-cvs-gettimeofday.patch +Patch00003: qemu-cvs-ioctl_debug.patch +Patch00004: qemu-cvs-ioctl_nodirection.patch +Patch00005: linux-user-add-binfmt-wrapper-for-argv-0.patch +Patch00006: PPC-KVM-Disable-mmu-notifier-check.patch +Patch00007: linux-user-binfmt-support-host-binaries.patch +Patch00008: linux-user-Fake-proc-cpuinfo.patch +Patch00009: linux-user-use-target_ulong.patch +Patch00010: Make-char-muxer-more-robust-wrt-small-FI.patch +Patch00011: linux-user-lseek-explicitly-cast-non-set.patch +Patch00012: AIO-Reduce-number-of-threads-for-32bit-h.patch +Patch00013: xen_disk-Add-suse-specific-flush-disable.patch +Patch00014: qemu-bridge-helper-reduce-security-profi.patch +Patch00015: qemu-binfmt-conf-use-qemu-ARCH-binfmt.patch +Patch00016: roms-Makefile-pass-a-packaging-timestamp.patch +Patch00017: Raise-soft-address-space-limit-to-hard-l.patch +Patch00018: increase-x86_64-physical-bits-to-42.patch +Patch00019: i8254-Fix-migration-from-SLE11-SP2.patch +Patch00020: acpi_piix4-Fix-migration-from-SLE11-SP2.patch +Patch00021: Make-installed-scripts-explicitly-python.patch +Patch00022: hw-smbios-handle-both-file-formats-regar.patch +Patch00023: xen-add-block-resize-support-for-xen-dis.patch +Patch00024: tests-qemu-iotests-Triple-timeout-of-i-o.patch +Patch00025: tests-Fix-block-tests-to-be-compatible-w.patch +Patch00026: xen-ignore-live-parameter-from-xen-save-.patch +Patch00027: tests-change-error-message-in-test-162.patch +Patch00028: hw-intc-exynos4210_gic-provide-more-room.patch +Patch00029: configure-only-populate-roms-if-softmmu.patch +Patch00030: pc-bios-s390-ccw-net-avoid-warning-about.patch +Patch00031: roms-change-cross-compiler-naming-to-be-.patch +Patch00032: test-add-mapping-from-arch-of-i686-to-qe.patch +Patch00033: configure-remove-pkgversion-from-CONFIG_.patch +Patch00034: Revert-qht-constify-qht_statistics_init.patch +Patch00035: qht-Revert-some-constification-in-qht.c.patch +Patch00036: meson-install-ivshmem-client-and-ivshmem.patch +Patch00037: Revert-roms-efirom-tests-uefi-test-tools.patch +Patch00038: Makefile-Don-t-check-pc-bios-as-pre-requ.patch +Patch00039: roms-Makefile-add-cross-file-to-qboot-me.patch +Patch00040: usb-Help-compiler-out-to-avoid-a-warning.patch +Patch00041: qom-handle-case-of-chardev-spice-module-.patch +Patch00042: doc-add-our-support-doc-to-the-main-proj.patch +Patch00043: Revert-qemu-img-Improve-error-for-rebase.patch +Patch00044: Revert-qemu-img-Require-F-with-b-backing.patch +Patch00045: qemu-binfmt-conf.sh-should-use-F-as-shor.patch +Patch00046: modules-quick-fix-a-fundamental-error-in.patch +Patch00047: qemu-binfmt-conf.sh-allow-overriding-SUS.patch +Patch00048: scsi-generic-replace-logical-block-count.patch # Patches applied in roms/seabios/: Patch01000: seabios-use-python2-explicitly-as-needed.patch Patch01001: seabios-switch-to-python3-as-needed.patch @@ -594,6 +575,16 @@ %description audio-spice This package contains a module for Spice based audio support for QEMU. +%package audio-oss +Summary: OSS based audio support for QEMU +Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 +%{qemu_module_conflicts} + +%description audio-oss +This package contains a module for OSS based audio support for QEMU. + %package block-curl Summary: cURL block support for QEMU Group: System/Emulators/PC @@ -1030,6 +1021,7 @@ BuildRequires: qemu-arm = %{qemuver} BuildRequires: qemu-audio-alsa = %{qemuver} BuildRequires: qemu-audio-jack = %{qemuver} +BuildRequires: qemu-audio-oss = %{qemuver} BuildRequires: qemu-audio-pa = %{qemuver} BuildRequires: qemu-audio-spice = %{qemuver} BuildRequires: qemu-block-curl = %{qemuver} @@ -1121,41 +1113,22 @@ %patch00036 -p1 %patch00037 -p1 %patch00038 -p1 -%patch00039 -p1 %ifarch aarch64 -%patch00040 -p1 +%patch00039 -p1 %endif %ifarch %arm %ix86 ppc -%patch00041 -p1 +%patch00040 -p1 %endif -%patch00042 -p1 +%patch00041 -p1 %if %{legacy_qemu_kvm} -%patch00043 -p1 +%patch00042 -p1 %endif +%patch00043 -p1 %patch00044 -p1 %patch00045 -p1 %patch00046 -p1 %patch00047 -p1 %patch00048 -p1 -%patch00049 -p1 -%patch00050 -p1 -%patch00051 -p1 -%patch00052 -p1 -%patch00053 -p1 -%patch00054 -p1 -%patch00055 -p1 -%patch00056 -p1 -%patch00057 -p1 -%patch00058 -p1 -%patch00059 -p1 -%patch00060 -p1 -%patch00061 -p1 -%patch00062 -p1 -%patch00063 -p1 -%patch00064 -p1 -%patch00065 -p1 -%patch00066 -p1 -%patch00067 -p1 %patch01000 -p1 %patch01001 -p1 %patch01002 -p1 @@ -1190,7 +1163,7 @@ %define s390x_default_firmware {s390-ccw.img s390-netboot.img} %define s390x_extra_firmware {%nil} %define x86_default_firmware {linuxboot.bin linuxboot_dma.bin multiboot.bin \ -kvmvapic.bin pvh.bin} +multiboot_dma.bin kvmvapic.bin pvh.bin} %define x86_extra_firmware {bios.bin bios-256k.bin bios-microvm.bin qboot.rom \ pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom pxe-pcnet.rom pxe-rtl8139.rom \ pxe-virtio.rom sgabios.bin vgabios-ati.bin vgabios-bochs-display.bin \ @@ -1305,6 +1278,10 @@ %endif %if "%flavor" != "testsuite" --disable-qom-cast-debug \ + --enable-modules \ + --disable-module-upgrades \ +%else + --disable-modules \ %endif --with-git-submodules=ignore \ %if "%{name}" != "qemu-linux-user" @@ -1312,12 +1289,9 @@ --with-default-devices \ --enable-system --disable-linux-user \ --enable-tools --enable-guest-agent \ - --enable-modules \ - --disable-module-upgrades \ --enable-slirp=system \ --enable-pie \ --enable-docs \ - --audio-drv-list="pa alsa jack" \ --enable-attr \ --disable-auth-pam \ --enable-bochs \ @@ -1340,7 +1314,6 @@ --disable-hax \ --disable-hvf \ --enable-iconv \ - --disable-jemalloc \ %if %{kvm_available} --enable-kvm \ %else @@ -1404,7 +1377,6 @@ --enable-smartcard \ --enable-snappy \ --enable-spice \ - --disable-tcmalloc \ --enable-tpm \ --enable-usb-redir \ --enable-vde \ @@ -1447,7 +1419,6 @@ --disable-modules \ --disable-pie \ --disable-docs \ - --audio-drv-list="" \ --disable-blobs \ --disable-bochs \ --disable-capstone \ @@ -1619,7 +1590,7 @@ # ------------------------------------------------------------------------ %if "%{name}" == "qemu-testsuite" -# TODO: Some of these are actually overwritten during the following make's +# XXX: What's the point of all this, if we need to rebuild everything anyway?!? ln -s %_bindir/qemu-img qemu-img ln -s %_bindir/qemu-ga qemu-ga ln -s %_bindir/qemu-io qemu-io @@ -1638,8 +1609,8 @@ ln -s %_datadir/qemu/$i pc-bios/$i done -for conf in %{_builddir}/%buildsubdir/default-configs/targets/*-softmmu.mak; do - arch=`echo "$conf" | sed -e 's|%{_builddir}/%buildsubdir/default-configs/targets/\(.*\)-softmmu.mak|\1|g'` +for conf in %{_builddir}/%buildsubdir/configs/targets/*-softmmu.mak; do + arch=`echo "$conf" | sed -e 's|%{_builddir}/%buildsubdir/configs/targets/\(.*\)-softmmu.mak|\1|g'` if $(unlink $arch-softmmu/qemu-system-$arch); then ln -s %_bindir/qemu-system-$arch $arch-softmmu/qemu-system-$arch fi @@ -1969,6 +1940,9 @@ %dir %_docdir/%name/tools %dir %_docdir/%name/user %_docdir/%name/.buildinfo +%if %{legacy_qemu_kvm} +%_docdir/%name/supported.html +%endif %_docdir/%name/about/build-platforms.html %_docdir/%name/about/deprecated.html %_docdir/%name/about/index.html @@ -1990,55 +1964,62 @@ %_docdir/%name/devel/kconfig.html %_docdir/%name/devel/loads-stores.html %_docdir/%name/devel/memory.html +%_docdir/%name/devel/migration.html %_docdir/%name/devel/modules.html %_docdir/%name/devel/multi-process.html -%_docdir/%name/devel/migration.html %_docdir/%name/devel/multi-thread-tcg.html %_docdir/%name/devel/qapi-code-gen.html -%_docdir/%name/devel/qom.html %_docdir/%name/devel/qgraph.html +%_docdir/%name/devel/qom.html %_docdir/%name/devel/qtest.html %_docdir/%name/devel/reset.html %_docdir/%name/devel/s390-dasd-ipl.html %_docdir/%name/devel/secure-coding-practices.html %_docdir/%name/devel/stable-process.html %_docdir/%name/devel/style.html +%_docdir/%name/devel/submitting-a-patch.html +%_docdir/%name/devel/submitting-a-patch.html +%_docdir/%name/devel/submitting-a-pull-request.html +%_docdir/%name/devel/submitting-a-pull-request.html %_docdir/%name/devel/tcg-icount.html %_docdir/%name/devel/tcg-plugins.html %_docdir/%name/devel/tcg.html %_docdir/%name/devel/testing.html %_docdir/%name/devel/tracing.html +%_docdir/%name/devel/trivial-patches.html +%_docdir/%name/devel/trivial-patches.html %_docdir/%name/devel/ui.html %_docdir/%name/devel/vfio-migration.html -%_docdir/%name/devel/writing-qmp-commands.html +%_docdir/%name/devel/writing-monitor-commands.html %_docdir/%name/genindex.html %_docdir/%name/index.html %_docdir/%name/interop/barrier.html %_docdir/%name/interop/bitmaps.html -%_docdir/%name/interop/dbus.html %_docdir/%name/interop/dbus-vmstate.html +%_docdir/%name/interop/dbus.html %_docdir/%name/interop/index.html %_docdir/%name/interop/live-block-operations.html %_docdir/%name/interop/pr-helper.html %_docdir/%name/interop/qemu-ga-ref.html %_docdir/%name/interop/qemu-qmp-ref.html %_docdir/%name/interop/qemu-storage-daemon-qmp-ref.html -%_docdir/%name/interop/vhost-user.html %_docdir/%name/interop/vhost-user-gpu.html +%_docdir/%name/interop/vhost-user.html %_docdir/%name/interop/vhost-vdpa.html %_docdir/%name/objects.inv %_docdir/%name/search.html %_docdir/%name/searchindex.js +%_docdir/%name/specs/acpi_cpu_hotplug.html %_docdir/%name/specs/acpi_hest_ghes.html %_docdir/%name/specs/acpi_hw_reduced_hotplug.html +%_docdir/%name/specs/acpi_mem_hotplug.html +%_docdir/%name/specs/acpi_nvdimm.html +%_docdir/%name/specs/acpi_pci_hotplug.html %_docdir/%name/specs/index.html %_docdir/%name/specs/ppc-spapr-numa.html %_docdir/%name/specs/ppc-spapr-xive.html %_docdir/%name/specs/ppc-xive.html %_docdir/%name/specs/tpm.html -%if %{legacy_qemu_kvm} -%_docdir/%name/supported.html -%endif %_docdir/%name/system/arm/aspeed.html %_docdir/%name/system/arm/collie.html %_docdir/%name/system/arm/cpu-features.html @@ -2065,13 +2046,14 @@ %_docdir/%name/system/arm/sabrelite.html %_docdir/%name/system/arm/sbsa.html %_docdir/%name/system/arm/stellaris.html +%_docdir/%name/system/arm/stm32.html %_docdir/%name/system/arm/sx1.html %_docdir/%name/system/arm/versatile.html %_docdir/%name/system/arm/vexpress.html %_docdir/%name/system/arm/virt.html %_docdir/%name/system/arm/xlnx-versal-virt.html %_docdir/%name/system/arm/xscale.html -%_docdir/%name/system/arm/stm32.html +%_docdir/%name/system/authz.html %_docdir/%name/system/barrier.html %_docdir/%name/system/bootindex.html %_docdir/%name/system/cpu-hotplug.html @@ -2080,13 +2062,17 @@ %_docdir/%name/system/devices/net.html %_docdir/%name/system/devices/nvme.html %_docdir/%name/system/devices/usb.html +%_docdir/%name/system/devices/vhost-user-rng.html %_docdir/%name/system/devices/vhost-user.html %_docdir/%name/system/devices/virtio-pmem.html %_docdir/%name/system/gdb.html %_docdir/%name/system/generic-loader.html %_docdir/%name/system/guest-loader.html +%_docdir/%name/system/i386/cpu.html +%_docdir/%name/system/i386/kvm-pv.html %_docdir/%name/system/i386/microvm.html %_docdir/%name/system/i386/pc.html +%_docdir/%name/system/i386/sgx.html %_docdir/%name/system/images.html %_docdir/%name/system/index.html %_docdir/%name/system/invocation.html @@ -2108,8 +2094,8 @@ %_docdir/%name/system/qemu-manpage.html %_docdir/%name/system/quickstart.html %_docdir/%name/system/riscv/microchip-icicle-kit.html -%_docdir/%name/system/riscv/sifive_u.html %_docdir/%name/system/riscv/shakti-c.html +%_docdir/%name/system/riscv/sifive_u.html %_docdir/%name/system/riscv/virt.html %_docdir/%name/system/s390x/3270.html %_docdir/%name/system/s390x/bootdevices.html @@ -2117,7 +2103,6 @@ %_docdir/%name/system/s390x/protvirt.html %_docdir/%name/system/s390x/vfio-ap.html %_docdir/%name/system/s390x/vfio-ccw.html -%_docdir/%name/system/authz.html %_docdir/%name/system/secrets.html %_docdir/%name/system/security.html %_docdir/%name/system/target-arm.html @@ -2129,8 +2114,8 @@ %_docdir/%name/system/target-riscv.html %_docdir/%name/system/target-rx.html %_docdir/%name/system/target-s390x.html -%_docdir/%name/system/target-sparc64.html %_docdir/%name/system/target-sparc.html +%_docdir/%name/system/target-sparc64.html %_docdir/%name/system/target-xtensa.html %_docdir/%name/system/targets.html %_docdir/%name/system/tls.html @@ -2140,8 +2125,8 @@ %_docdir/%name/tools/qemu-img.html %_docdir/%name/tools/qemu-nbd.html %_docdir/%name/tools/qemu-pr-helper.html -%_docdir/%name/tools/qemu-trace-stap.html %_docdir/%name/tools/qemu-storage-daemon.html +%_docdir/%name/tools/qemu-trace-stap.html %_docdir/%name/tools/virtfs-proxy-helper.html %_docdir/%name/tools/virtiofsd.html %_docdir/%name/user/index.html @@ -2174,6 +2159,7 @@ %_datadir/%name/linuxboot.bin %_datadir/%name/linuxboot_dma.bin %_datadir/%name/multiboot.bin +%_datadir/%name/multiboot_dma.bin %_datadir/%name/pvh.bin %dir %_docdir/qemu-x86 %_docdir/qemu-x86/supported.txt @@ -2278,6 +2264,11 @@ %dir %_libdir/%name %_libdir/%name/audio-spice.so +%files audio-oss +%defattr(-, root, root) +%dir %_libdir/%name +%_libdir/%name/audio-oss.so + %files block-curl %defattr(-, root, root) %dir %_libdir/%name ++++++ Make-char-muxer-more-robust-wrt-small-FI.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.367720604 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.371720606 +0100 @@ -41,7 +41,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" diff --git a/chardev/char-mux.c b/chardev/char-mux.c -index 5baf4190108366803a1a0fa26fb7..2aa164c2ecac8f8a843cec9fa1e1 100644 +index ee2d47b20d9bd0d2ceb132343bf3..5a7c66e7466cefdc96cb95e26b84 100644 --- a/chardev/char-mux.c +++ b/chardev/char-mux.c @@ -22,6 +22,7 @@ @@ -52,7 +52,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" -@@ -197,6 +198,17 @@ static void mux_chr_accept_input(Chardev *chr) +@@ -198,6 +199,17 @@ static void mux_chr_accept_input(Chardev *chr) be->chr_read(be->opaque, &d->buffer[m][d->cons[m]++ & MUX_BUFFER_MASK], 1); } @@ -70,7 +70,7 @@ } static int mux_chr_can_read(void *opaque) -@@ -331,6 +343,10 @@ static void qemu_chr_open_mux(Chardev *chr, +@@ -332,6 +344,10 @@ static void qemu_chr_open_mux(Chardev *chr, } d->focus = -1; @@ -82,7 +82,7 @@ * set of muxes */ diff --git a/chardev/char.c b/chardev/char.c -index 4595a8d430bf99537367b8d26379..d9d918f905a584f8cf97fb6ee1de 100644 +index 0169d8dde4b533c9cf851831b03c..3b1495c0a4fd6b9e81f6703eeb49 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -22,6 +22,7 @@ ++++++ Make-installed-scripts-explicitly-python.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.379720611 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.383720614 +0100 @@ -13,7 +13,7 @@ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/analyze-migration.py b/scripts/analyze-migration.py -index d7177b212c86e826303bd93e74cb..502ae14111aa328e549b70ac66e7 100755 +index b82a1b0c58c4490ffd0c7d083a44..26f9fb1382108787cc1b56546873 100755 --- a/scripts/analyze-migration.py +++ b/scripts/analyze-migration.py @@ -1,4 +1,4 @@ ++++++ Makefile-Don-t-check-pc-bios-as-pre-requ.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.391720619 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.391720619 +0100 @@ -6,20 +6,22 @@ course it is when we are building the qemu packages. Signed-off-by: Bruce Rogers <brog...@suse.com> +[DF: Rebased on top of 6.2.0] +Signed-off-by: Dario Faggioli <dfaggi...@suse.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 401c623a65f84e07ffdf5dc263bf..d8d75dd42e5e066b9f03dc235130 100644 +index 74c5b46d38b501f9dd25f447ed08..87ae3ba6efe74e6c48d2a6db970f 100644 --- a/Makefile +++ b/Makefile @@ -87,7 +87,7 @@ x := $(shell rm -rf meson-private meson-info meson-logs) endif # 1. ensure config-host.mak is up-to-date --config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios $(SRC_PATH)/VERSION -+config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/VERSION +-config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/scripts/meson-buildoptions.sh $(SRC_PATH)/pc-bios $(SRC_PATH)/VERSION ++config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/scripts/meson-buildoptions.sh $(SRC_PATH)/VERSION @echo config-host.mak is out-of-date, running configure @if test -f meson-private/coredata.dat; then \ ./config.status --skip-meson; \ ++++++ PPC-KVM-Disable-mmu-notifier-check.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.403720626 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.403720626 +0100 @@ -14,10 +14,10 @@ 1 file changed, 2 insertions(+) diff --git a/softmmu/physmem.c b/softmmu/physmem.c -index 2e18947598eec3dfb6abe91be933..655fb3afb6e23c42868d241d6760 100644 +index 3524c04c2a162b717c3975cc15da..f69d6b00467f8b53614171fa17a9 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c -@@ -2059,11 +2059,13 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, +@@ -2064,11 +2064,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.BrEXYP/_old 2021-12-23 17:53:47.427720641 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.427720641 +0100 @@ -16,7 +16,7 @@ 1 file changed, 12 insertions(+) diff --git a/softmmu/vl.c b/softmmu/vl.c -index 5ca11e74694e6b4b6ae83cb320d0..4ccc503f58b7d7aff2b6cf4c8e55 100644 +index 620a1f1367e2b033bfec541619d3..527e1d91859b19351d397ef64930 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -40,6 +40,7 @@ @@ -27,7 +27,7 @@ #include "sysemu/seccomp.h" #include "sysemu/tcg.h" #include "sysemu/xen.h" -@@ -2729,6 +2730,17 @@ void qemu_init(int argc, char **argv, char **envp) +@@ -2772,6 +2773,17 @@ void qemu_init(int argc, char **argv, char **envp) MachineClass *machine_class; bool userconfig = true; FILE *vmstate_dump_file = NULL; ++++++ Revert-qemu-img-Improve-error-for-rebase.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.439720649 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.439720649 +0100 @@ -12,10 +12,10 @@ 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/qemu-img.c b/qemu-img.c -index 908fd0cce5b4fc90a4798ea4a1c4..3ebd09245290878c24c8f1412146 100644 +index f036a1d428db21205ded31bd3035..6570fc67dd37a708cbe379331930 100644 --- a/qemu-img.c +++ b/qemu-img.c -@@ -3810,9 +3810,6 @@ static int img_rebase(int argc, char **argv) +@@ -3822,9 +3822,6 @@ static int img_rebase(int argc, char **argv) if (ret == -ENOSPC) { error_report("Could not change the backing file to '%s': No " "space left in the file header", out_baseimg); ++++++ Revert-qemu-img-Require-F-with-b-backing.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.455720658 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.459720661 +0100 @@ -8,7 +8,7 @@ Signed-off-by: Jose R Ziviani <jose.zivi...@suse.com> --- block.c | 37 +++++++++++++++++++++++---------- - docs/about/deprecated.rst | 20 ++++++++++++++++++ + docs/about/deprecated.rst | 23 ++++++++++++++++++++ docs/about/removed-features.rst | 19 ----------------- qemu-img.c | 6 ++---- tests/qemu-iotests/040 | 4 ++-- @@ -17,13 +17,13 @@ tests/qemu-iotests/114.out | 11 ++++++---- tests/qemu-iotests/301 | 4 +++- tests/qemu-iotests/301.out | 16 ++++++++++++-- - 10 files changed, 85 insertions(+), 56 deletions(-) + 10 files changed, 88 insertions(+), 56 deletions(-) diff --git a/block.c b/block.c -index e97ce0b1c83eb68db8abccfe9086..06f5ff49ee79ab5d423008ecc20e 100644 +index 0ac5b163d2aa19368ff54f2bc04a..a4dda8c7b6e1c76e7e5c8712475b 100644 --- a/block.c +++ b/block.c -@@ -5119,7 +5119,7 @@ int coroutine_fn bdrv_co_check(BlockDriverState *bs, +@@ -5337,7 +5337,7 @@ int coroutine_fn bdrv_co_check(BlockDriverState *bs, * -ENOTSUP - format driver doesn't support changing the backing file */ int bdrv_change_backing_file(BlockDriverState *bs, const char *backing_file, @@ -32,7 +32,7 @@ { BlockDriver *drv = bs->drv; int ret; -@@ -5133,8 +5133,10 @@ int bdrv_change_backing_file(BlockDriverState *bs, const char *backing_file, +@@ -5351,8 +5351,10 @@ int bdrv_change_backing_file(BlockDriverState *bs, const char *backing_file, return -EINVAL; } @@ -45,7 +45,7 @@ } if (drv->bdrv_change_backing_file != NULL) { -@@ -6647,11 +6649,24 @@ void bdrv_img_create(const char *filename, const char *fmt, +@@ -6873,11 +6875,24 @@ void bdrv_img_create(const char *filename, const char *fmt, goto out; } else { if (!backing_fmt) { @@ -75,7 +75,7 @@ } if (size == -1) { /* Opened BS, have no size */ -@@ -6668,9 +6683,9 @@ void bdrv_img_create(const char *filename, const char *fmt, +@@ -6894,9 +6909,9 @@ void bdrv_img_create(const char *filename, const char *fmt, } /* (backing_file && !(flags & BDRV_O_NO_BACKING)) */ } else if (backing_file && !backing_fmt) { @@ -89,13 +89,16 @@ if (size == -1) { diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst -index 6d438f1c8d41e19c4fc976d1c7da..638f1000cbd19a72aa456104446f 100644 +index ff7488cb63b93830f75093030add..a5de09adbe9fd84b897101b31999 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst -@@ -300,6 +300,26 @@ this CPU is also deprecated. - Related binaries - ---------------- +@@ -401,6 +401,29 @@ The ``I7200`` guest CPU relies on the nanoMIPS ISA, which is deprecated + (the ISA has never been upstreamed to a compiler toolchain). Therefore + this CPU is also deprecated. ++Related binaries ++---------------- ++ +qemu-img backing file without format (since 5.1) +'''''''''''''''''''''''''''''''''''''''''''''''' + @@ -120,15 +123,15 @@ ----------------------- diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst -index cbfa1a8e31a69200c2bb97ddffb1..afadc8f7e0fc4e2377ee85d6166c 100644 +index d42c3341dee4462adb8496691575..15b34368f99fc649595507c742a1 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst -@@ -678,25 +678,6 @@ backing chain should be performed with ``qemu-img rebase -u`` either +@@ -670,25 +670,6 @@ backing chain should be performed with ``qemu-img rebase -u`` either before or after the remaining changes being performed by amend, as appropriate. --qemu-img backing file without format (removed in 6.1) --''''''''''''''''''''''''''''''''''''''''''''''''''''' +-``qemu-img`` backing file without format (removed in 6.1) +-''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -The use of ``qemu-img create``, ``qemu-img rebase``, or ``qemu-img -convert`` to create or modify an image that depends on a backing file @@ -150,10 +153,10 @@ ------------- diff --git a/qemu-img.c b/qemu-img.c -index 3ebd09245290878c24c8f1412146..4da817857f3efccc2bd83297500b 100644 +index 6570fc67dd37a708cbe379331930..0239bdd6d09d635acee68ac28c36 100644 --- a/qemu-img.c +++ b/qemu-img.c -@@ -2549,10 +2549,8 @@ static int img_convert(int argc, char **argv) +@@ -2553,10 +2553,8 @@ static int img_convert(int argc, char **argv) if (out_baseimg_param) { if (!qemu_opt_get(opts, BLOCK_OPT_BACKING_FMT)) { @@ -167,10 +170,10 @@ } diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040 -index f3677de9dfde326ad85515ec8bfa..ba7cb34ce8cf95df6fa63f9eb8f0 100755 +index 6af5ab9e764cc5a061712a622a81..26ebe0b02f75a13c05ec5d938f53 100755 --- a/tests/qemu-iotests/040 +++ b/tests/qemu-iotests/040 -@@ -920,8 +920,8 @@ class TestCommitWithOverriddenBacking(iotests.QMPTestCase): +@@ -915,8 +915,8 @@ class TestCommitWithOverriddenBacking(iotests.QMPTestCase): def setUp(self): qemu_img('create', '-f', iotests.imgfmt, self.img_base_a, '1M') qemu_img('create', '-f', iotests.imgfmt, self.img_base_b, '1M') ++++++ Revert-roms-efirom-tests-uefi-test-tools.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.471720668 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.471720668 +0100 @@ -8,20 +8,22 @@ No need. In our build system submodules are checked out. Signed-off-by: Bruce Rogers <brog...@suse.com> +[DF: Rebased on top of 6.2.0] --- - roms/Makefile | 1 - + roms/Makefile | 2 -- tests/uefi-test-tools/Makefile | 1 - - 2 files changed, 2 deletions(-) + 2 files changed, 3 deletions(-) diff --git a/roms/Makefile b/roms/Makefile -index 38b71afb0757bd717154afd6a92d..6ea8edd9fcf6bb0cdc1f1602f241 100644 +index 66d06f5831303c3d41e943290389..6ea8edd9fcf6bb0cdc1f1602f241 100644 --- a/roms/Makefile +++ b/roms/Makefile -@@ -151,7 +151,6 @@ build-efi-roms: build-pxe-roms +@@ -151,8 +151,6 @@ build-efi-roms: build-pxe-roms # efirom # edk2-basetools: -- cd edk2/BaseTools && git submodule update --init --force +- cd edk2/BaseTools && git submodule update --init --force \ +- Source/C/BrotliCompress/brotli $(MAKE) -C edk2/BaseTools \ PYTHON_COMMAND=$${EDK2_PYTHON_COMMAND:-python3} \ EXTRA_OPTFLAGS='$(EDK2_BASETOOLS_OPTFLAGS)' \ ++++++ XXX-dont-dump-core-on-sigabort.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.483720676 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.483720676 +0100 @@ -8,10 +8,10 @@ 1 file changed, 6 insertions(+) diff --git a/linux-user/signal.c b/linux-user/signal.c -index a8faea6f090964b46199239ed1d3..4db55900a44ade173c02aedc3618 100644 +index 6d5e5b698cc827416b4fdf78aac3..41ec78926582729c91f486f1fb15 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c -@@ -677,6 +677,10 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig) +@@ -734,6 +734,10 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig) trace_user_force_sig(env, target_sig, host_sig); gdb_signalled(env, target_sig); @@ -22,7 +22,7 @@ /* dump core if supported by target binary format */ if (core_dump_signal(target_sig) && (ts->bprm->core_dump != NULL)) { stop_all_tasks(); -@@ -694,6 +698,8 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig) +@@ -751,6 +755,8 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig) target_sig, strsignal(host_sig), "core dumped" ); } ++++++ acpi_piix4-Fix-migration-from-SLE11-SP2.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.515720695 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.515720695 +0100 @@ -16,7 +16,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c -index 48f7a1edbcbc06461ecb23699a87..d32441fadf7bfc6fbb930addd697 100644 +index f0b5fac44a14279ac3c66834bfb1..42c1a7a816cbdb22b16876dc6f8c 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -278,7 +278,7 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id) ++++++ build-be-explicit-about-mx86-used-note-n.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.535720707 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.539720711 +0100 @@ -15,7 +15,7 @@ 1 file changed, 1 insertion(+) diff --git a/roms/seabios/Makefile b/roms/seabios/Makefile -index 74a01853f26458d94d4a4e056b7b..16627562900bbca4b68c6f1df220 100644 +index 5ced69cd8be94d36c8aaa887ce73..e0c51a4e455e9796437b7f59dd17 100644 --- a/roms/seabios/Makefile +++ b/roms/seabios/Makefile @@ -73,6 +73,7 @@ COMMONCFLAGS += $(call cc-option,$(CC),-fstack-check=no,) ++++++ bundles.tar.xz ++++++ Binary files old/44f28df24767cf9dca1ddc9b23157737c4cbb645.bundle and new/44f28df24767cf9dca1ddc9b23157737c4cbb645.bundle differ Binary files old/f9baca549e44791be0dd98de15add3d8452a8af0.bundle and new/f9baca549e44791be0dd98de15add3d8452a8af0.bundle differ Binary files old/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.bundle and new/roms/edk2/BaseTools/Source/C/BrotliCompress/brotli/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.bundle differ Binary files old/roms/seabios/155821a1990b6de78dde5f98fa5ab90e802021e0.bundle and new/roms/seabios/155821a1990b6de78dde5f98fa5ab90e802021e0.bundle differ Binary files old/roms/seabios/2dd4b9b3f84019668719344b40dba79d681be41c.bundle and new/roms/seabios/2dd4b9b3f84019668719344b40dba79d681be41c.bundle differ ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.607720753 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.611720755 +0100 @@ -18,12 +18,12 @@ # 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=v6.1.0 +GIT_UPSTREAM_COMMIT_ISH=v6.2.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. ++++++ configure-only-populate-roms-if-softmmu.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.623720763 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.623720763 +0100 @@ -12,10 +12,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 9a79a004d7cf1952cf3f4178e099..2a3073da6bd818cc2391c1d8f515 100755 +index 48c21775f3a90c91631d90bd6e3e..e53fc9b91a69870e354ba2f27475 100755 --- a/configure +++ b/configure -@@ -4413,7 +4413,7 @@ fi +@@ -3373,7 +3373,7 @@ fi # Only build s390-ccw bios if we're on s390x and the compiler has -march=z900 # or -march=z10 (which is the lowest architecture level that Clang supports) ++++++ configure-remove-pkgversion-from-CONFIG_.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.631720767 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.635720769 +0100 @@ -18,10 +18,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 2a3073da6bd818cc2391c1d8f515..26368a637f85c0667fa627f7cbd6 100755 +index e53fc9b91a69870e354ba2f27475..5312dc66dd293857ef916f3dde44 100755 --- a/configure +++ b/configure -@@ -4587,7 +4587,7 @@ echo "TARGET_DIRS=$target_list" >> $config_host_mak +@@ -3509,7 +3509,7 @@ echo "TARGET_DIRS=$target_list" >> $config_host_mak if test "$modules" = "yes"; then # $shacmd can generate a hash started with digit, which the compiler doesn't # like as an symbol. So prefix it with an underscore ++++++ doc-add-our-support-doc-to-the-main-proj.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.643720775 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.647720777 +0100 @@ -10,10 +10,10 @@ 1 file changed, 1 insertion(+) diff --git a/docs/index.rst b/docs/index.rst -index 5f7eaaa632c4e1e4569bd9996801..17e560e0cb8d46f71ba4f13803c0 100644 +index 0b9ee9901d952c37cf3f9aefeffc..0669fc4cca6d0298cfab566857ba 100644 --- a/docs/index.rst +++ b/docs/index.rst -@@ -10,6 +10,7 @@ Welcome to QEMU's documentation! +@@ -11,6 +11,7 @@ Welcome to QEMU's documentation! :maxdepth: 2 :caption: Contents: ++++++ enable-cross-compilation-on-ARM.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.655720782 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.659720785 +0100 @@ -8,7 +8,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roms/seabios/Makefile b/roms/seabios/Makefile -index edb83b7a1c77f7bb75c371330b2c..74a01853f26458d94d4a4e056b7b 100644 +index 408983026669e531dcb84230dd23..5ced69cd8be94d36c8aaa887ce73 100644 --- a/roms/seabios/Makefile +++ b/roms/seabios/Makefile @@ -13,7 +13,7 @@ export CONFIG_SHELL := sh ++++++ increase-x86_64-physical-bits-to-42.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.675720794 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.679720797 +0100 @@ -18,7 +18,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 2510cc244e91c91adfaffbb69674..b1903b2d86ac067ebe90212b25e0 100644 +index 0a4401e917f9a0b40fb95bf947fd..ef916d40e8c9497853b265a1e7b4 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.BrEXYP/_old 2021-12-23 17:53:47.707720815 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.711720817 +0100 @@ -21,10 +21,10 @@ 1 file changed, 24 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 7771dede6384e061b9ad10a2b0c2..3e206c14c12d48a2ee7d242f6f13 100644 +index 0a1d99cb44d168d561de4c42e132..d4f3295b9d1837126f35d8357e80 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -7860,6 +7860,27 @@ static int open_self_stat(void *cpu_env, int fd) +@@ -7871,6 +7871,27 @@ static int open_self_stat(void *cpu_env, int fd) return 0; } @@ -52,7 +52,7 @@ static int open_self_auxv(void *cpu_env, int fd) { CPUState *cpu = env_cpu((CPUArchState *)cpu_env); -@@ -8014,6 +8035,9 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags, +@@ -8025,6 +8046,9 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags, #if defined(TARGET_SPARC) || defined(TARGET_HPPA) { "/proc/cpuinfo", open_cpuinfo, is_proc }, #endif ++++++ linux-user-add-binfmt-wrapper-for-argv-0.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.719720822 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.723720825 +0100 @@ -82,10 +82,10 @@ + return execve(new_argv[0], new_argv, envp); +} diff --git a/meson.build b/meson.build -index b3e7ec0e92da8d333d0c49bbe4aa..72aa5562bb69b828e4ca8f65fb3b 100644 +index 96de1a6ef948542aa93bd0324200..612da7167f5c4aafcf77a0e1ce55 100644 --- a/meson.build +++ b/meson.build -@@ -2717,6 +2717,11 @@ endforeach +@@ -3043,6 +3043,11 @@ endforeach # Other build targets ++++++ linux-user-lseek-explicitly-cast-non-set.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.735720831 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.735720831 +0100 @@ -15,10 +15,10 @@ 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 54dcd38709918dd5f8aa8013ee17..4effe3b234aa7da037638b8a268e 100644 +index 381066e788eb36c1d6ca5b872353..7fe3a69c7cd860d7c1a8ea88a48d 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -8537,8 +8537,13 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_ulong arg1, +@@ -8701,8 +8701,13 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_ulong arg1, return ret; #endif #ifdef TARGET_NR_lseek ++++++ linux-user-use-target_ulong.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.747720839 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.751720842 +0100 @@ -10,35 +10,18 @@ Pass syscall arguments as ulong always. Signed-off-by: Alexander Graf <ag...@suse.de> +[JRZ: changes from linux-user/qemu.h wass moved to linux-user/user-internals.h] +Signed-off-by: Jose R Ziviani <jzivi...@suse.de> --- - linux-user/qemu.h | 8 ++++---- - linux-user/syscall.c | 18 +++++++++--------- + linux-user/syscall.c | 18 +++++++++--------- + linux-user/user-internals.h | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) -diff --git a/linux-user/qemu.h b/linux-user/qemu.h -index 3b0b6b75fe8f1c5a5a5eb56ff99d..6a1d9b2d90da099bb2faaebbd265 100644 ---- a/linux-user/qemu.h -+++ b/linux-user/qemu.h -@@ -231,10 +231,10 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src, - void target_set_brk(abi_ulong new_brk); - abi_long do_brk(abi_ulong new_brk); - void syscall_init(void); --abi_long do_syscall(void *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_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 cpu_loop(CPUArchState *env); - const char *target_strerror(int err); diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 3e206c14c12d48a2ee7d242f6f13..54dcd38709918dd5f8aa8013ee17 100644 +index d4f3295b9d1837126f35d8357e80..381066e788eb36c1d6ca5b872353 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -8182,10 +8182,10 @@ _syscall2(int, pivot_root, const char *, new_root, const char *, put_old) +@@ -8346,10 +8346,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>. */ @@ -53,7 +36,7 @@ { CPUState *cpu = env_cpu(cpu_env); abi_long ret; -@@ -10794,7 +10794,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, +@@ -10807,7 +10807,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, */ ret = -TARGET_EINVAL; if (cpu_isar_feature(aa64_sve, env_archcpu(cpu_env)) @@ -62,7 +45,7 @@ CPUARMState *env = cpu_env; ARMCPU *cpu = env_archcpu(env); uint32_t vq, old_vq; -@@ -13163,10 +13163,10 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, +@@ -13176,10 +13176,10 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, return ret; } @@ -77,4 +60,23 @@ { CPUState *cpu = env_cpu(cpu_env); abi_long ret; +diff --git a/linux-user/user-internals.h b/linux-user/user-internals.h +index 661612a088b5c4e37f8f9fbcb6af..db24553432003b2faa3957d63c3d 100644 +--- a/linux-user/user-internals.h ++++ b/linux-user/user-internals.h +@@ -60,10 +60,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 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_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 cpu_loop(CPUArchState *env); + const char *target_strerror(int err); ++++++ modules-quick-fix-a-fundamental-error-in.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.763720849 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.763720849 +0100 @@ -24,7 +24,7 @@ 2 files changed, 34 insertions(+) diff --git a/include/qemu/module.h b/include/qemu/module.h -index 3deac0078b9d4d62d0549427b7ec..49d46532000e8c7211d43f7b705c 100644 +index 5fcc323b2a79d5adfdf27fa19bf7..ed051a6c0e7df56015e25936e641 100644 --- a/include/qemu/module.h +++ b/include/qemu/module.h @@ -73,6 +73,7 @@ bool module_load_one(const char *prefix, const char *lib_name, bool mayfail); ++++++ qemu-6.1.0.tar.xz -> qemu-6.2.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/qemu/qemu-6.1.0.tar.xz /work/SRC/openSUSE:Factory/.qemu.new.2520/qemu-6.2.0.tar.xz differ: char 26, line 1 ++++++ qemu-cvs-gettimeofday.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.815720881 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.819720884 +0100 @@ -11,10 +11,10 @@ 1 file changed, 3 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index ccd3892b2df7ab1261d6c736afef..4a66b6b0072fbeba0629bf93be29 100644 +index f1cfcc81048695222abc0a0f546d..5da0c1e2be709e7fcbbe34235813 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -9363,6 +9363,9 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, +@@ -9527,6 +9527,9 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, { struct timeval tv; struct timezone tz; ++++++ qemu-cvs-ioctl_debug.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.827720889 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.827720889 +0100 @@ -13,10 +13,10 @@ 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 4a66b6b0072fbeba0629bf93be29..6c1daf5addf0c8b746a7aafddbf7 100644 +index 5da0c1e2be709e7fcbbe34235813..ad8e36a3e6e37a5cec02dd867776 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -5688,8 +5688,21 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) +@@ -5699,8 +5699,21 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) ie = ioctl_entries; for(;;) { if (ie->target_cmd == 0) { ++++++ qemu-cvs-ioctl_nodirection.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.839720897 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.839720897 +0100 @@ -16,10 +16,10 @@ 1 file changed, 8 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 6c1daf5addf0c8b746a7aafddbf7..7771dede6384e061b9ad10a2b0c2 100644 +index ad8e36a3e6e37a5cec02dd867776..0a1d99cb44d168d561de4c42e132 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -5733,6 +5733,13 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) +@@ -5744,6 +5744,13 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) arg_type++; target_size = thunk_type_size(arg_type, 0); switch(ie->access) { @@ -33,7 +33,7 @@ case IOC_R: ret = get_errno(safe_ioctl(fd, ie->host_cmd, buf_temp)); if (!is_error(ret)) { -@@ -5751,6 +5758,7 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) +@@ -5762,6 +5769,7 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) unlock_user(argptr, arg, 0); ret = get_errno(safe_ioctl(fd, ie->host_cmd, buf_temp)); break; ++++++ qemu.spec.in ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.903720936 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.907720939 +0100 @@ -506,6 +506,16 @@ %description audio-spice This package contains a module for Spice based audio support for QEMU. +%package audio-oss +Summary: OSS based audio support for QEMU +Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 +%{qemu_module_conflicts} + +%description audio-oss +This package contains a module for OSS based audio support for QEMU. + %package block-curl Summary: cURL block support for QEMU Group: System/Emulators/PC @@ -940,6 +950,7 @@ %else BuildRequires: bc BuildRequires: qemu-arm = %{qemuver} +BuildRequires: qemu-audio-oss = %{qemuver} BuildRequires: qemu-audio-alsa = %{qemuver} BuildRequires: qemu-audio-pa = %{qemuver} BuildRequires: qemu-audio-jack = %{qemuver} @@ -1015,7 +1026,7 @@ %define s390x_default_firmware {s390-ccw.img s390-netboot.img} %define s390x_extra_firmware {%nil} %define x86_default_firmware {linuxboot.bin linuxboot_dma.bin multiboot.bin \ -kvmvapic.bin pvh.bin} +multiboot_dma.bin kvmvapic.bin pvh.bin} %define x86_extra_firmware {bios.bin bios-256k.bin bios-microvm.bin qboot.rom \ pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom pxe-pcnet.rom pxe-rtl8139.rom \ pxe-virtio.rom sgabios.bin vgabios-ati.bin vgabios-bochs-display.bin \ @@ -1130,6 +1141,10 @@ %endif %if "%flavor" != "testsuite" --disable-qom-cast-debug \ + --enable-modules \ + --disable-module-upgrades \ +%else + --disable-modules \ %endif --with-git-submodules=ignore \ %if "%{name}" != "qemu-linux-user" @@ -1137,12 +1152,9 @@ --with-default-devices \ --enable-system --disable-linux-user \ --enable-tools --enable-guest-agent \ - --enable-modules \ - --disable-module-upgrades \ --enable-slirp=system \ --enable-pie \ --enable-docs \ - --audio-drv-list="pa alsa jack" \ --enable-attr \ --disable-auth-pam \ --enable-bochs \ @@ -1165,7 +1177,6 @@ --disable-hax \ --disable-hvf \ --enable-iconv \ - --disable-jemalloc \ %if %{kvm_available} --enable-kvm \ %else @@ -1229,7 +1240,6 @@ --enable-smartcard \ --enable-snappy \ --enable-spice \ - --disable-tcmalloc \ --enable-tpm \ --enable-usb-redir \ --enable-vde \ @@ -1272,7 +1282,6 @@ --disable-modules \ --disable-pie \ --disable-docs \ - --audio-drv-list="" \ --disable-blobs \ --disable-bochs \ --disable-capstone \ @@ -1444,7 +1453,7 @@ # ------------------------------------------------------------------------ %if "%{name}" == "qemu-testsuite" -# TODO: Some of these are actually overwritten during the following make's +# XXX: What's the point of all this, if we need to rebuild everything anyway?!? ln -s %_bindir/qemu-img qemu-img ln -s %_bindir/qemu-ga qemu-ga ln -s %_bindir/qemu-io qemu-io @@ -1463,8 +1472,8 @@ ln -s %_datadir/qemu/$i pc-bios/$i done -for conf in %{_builddir}/%buildsubdir/default-configs/targets/*-softmmu.mak; do - arch=`echo "$conf" | sed -e 's|%{_builddir}/%buildsubdir/default-configs/targets/\(.*\)-softmmu.mak|\1|g'` +for conf in %{_builddir}/%buildsubdir/configs/targets/*-softmmu.mak; do + arch=`echo "$conf" | sed -e 's|%{_builddir}/%buildsubdir/configs/targets/\(.*\)-softmmu.mak|\1|g'` if $(unlink $arch-softmmu/qemu-system-$arch); then ln -s %_bindir/qemu-system-$arch $arch-softmmu/qemu-system-$arch fi @@ -1794,6 +1803,9 @@ %dir %_docdir/%name/tools %dir %_docdir/%name/user %_docdir/%name/.buildinfo +%if %{legacy_qemu_kvm} +%_docdir/%name/supported.html +%endif %_docdir/%name/about/build-platforms.html %_docdir/%name/about/deprecated.html %_docdir/%name/about/index.html @@ -1815,55 +1827,62 @@ %_docdir/%name/devel/kconfig.html %_docdir/%name/devel/loads-stores.html %_docdir/%name/devel/memory.html +%_docdir/%name/devel/migration.html %_docdir/%name/devel/modules.html %_docdir/%name/devel/multi-process.html -%_docdir/%name/devel/migration.html %_docdir/%name/devel/multi-thread-tcg.html %_docdir/%name/devel/qapi-code-gen.html -%_docdir/%name/devel/qom.html %_docdir/%name/devel/qgraph.html +%_docdir/%name/devel/qom.html %_docdir/%name/devel/qtest.html %_docdir/%name/devel/reset.html %_docdir/%name/devel/s390-dasd-ipl.html %_docdir/%name/devel/secure-coding-practices.html %_docdir/%name/devel/stable-process.html %_docdir/%name/devel/style.html +%_docdir/%name/devel/submitting-a-patch.html +%_docdir/%name/devel/submitting-a-patch.html +%_docdir/%name/devel/submitting-a-pull-request.html +%_docdir/%name/devel/submitting-a-pull-request.html %_docdir/%name/devel/tcg-icount.html %_docdir/%name/devel/tcg-plugins.html %_docdir/%name/devel/tcg.html %_docdir/%name/devel/testing.html %_docdir/%name/devel/tracing.html +%_docdir/%name/devel/trivial-patches.html +%_docdir/%name/devel/trivial-patches.html %_docdir/%name/devel/ui.html %_docdir/%name/devel/vfio-migration.html -%_docdir/%name/devel/writing-qmp-commands.html +%_docdir/%name/devel/writing-monitor-commands.html %_docdir/%name/genindex.html %_docdir/%name/index.html %_docdir/%name/interop/barrier.html %_docdir/%name/interop/bitmaps.html -%_docdir/%name/interop/dbus.html %_docdir/%name/interop/dbus-vmstate.html +%_docdir/%name/interop/dbus.html %_docdir/%name/interop/index.html %_docdir/%name/interop/live-block-operations.html %_docdir/%name/interop/pr-helper.html %_docdir/%name/interop/qemu-ga-ref.html %_docdir/%name/interop/qemu-qmp-ref.html %_docdir/%name/interop/qemu-storage-daemon-qmp-ref.html -%_docdir/%name/interop/vhost-user.html %_docdir/%name/interop/vhost-user-gpu.html +%_docdir/%name/interop/vhost-user.html %_docdir/%name/interop/vhost-vdpa.html %_docdir/%name/objects.inv %_docdir/%name/search.html %_docdir/%name/searchindex.js +%_docdir/%name/specs/acpi_cpu_hotplug.html %_docdir/%name/specs/acpi_hest_ghes.html %_docdir/%name/specs/acpi_hw_reduced_hotplug.html +%_docdir/%name/specs/acpi_mem_hotplug.html +%_docdir/%name/specs/acpi_nvdimm.html +%_docdir/%name/specs/acpi_pci_hotplug.html %_docdir/%name/specs/index.html %_docdir/%name/specs/ppc-spapr-numa.html %_docdir/%name/specs/ppc-spapr-xive.html %_docdir/%name/specs/ppc-xive.html %_docdir/%name/specs/tpm.html -%if %{legacy_qemu_kvm} -%_docdir/%name/supported.html -%endif %_docdir/%name/system/arm/aspeed.html %_docdir/%name/system/arm/collie.html %_docdir/%name/system/arm/cpu-features.html @@ -1890,13 +1909,14 @@ %_docdir/%name/system/arm/sabrelite.html %_docdir/%name/system/arm/sbsa.html %_docdir/%name/system/arm/stellaris.html +%_docdir/%name/system/arm/stm32.html %_docdir/%name/system/arm/sx1.html %_docdir/%name/system/arm/versatile.html %_docdir/%name/system/arm/vexpress.html %_docdir/%name/system/arm/virt.html %_docdir/%name/system/arm/xlnx-versal-virt.html %_docdir/%name/system/arm/xscale.html -%_docdir/%name/system/arm/stm32.html +%_docdir/%name/system/authz.html %_docdir/%name/system/barrier.html %_docdir/%name/system/bootindex.html %_docdir/%name/system/cpu-hotplug.html @@ -1905,13 +1925,17 @@ %_docdir/%name/system/devices/net.html %_docdir/%name/system/devices/nvme.html %_docdir/%name/system/devices/usb.html +%_docdir/%name/system/devices/vhost-user-rng.html %_docdir/%name/system/devices/vhost-user.html %_docdir/%name/system/devices/virtio-pmem.html %_docdir/%name/system/gdb.html %_docdir/%name/system/generic-loader.html %_docdir/%name/system/guest-loader.html +%_docdir/%name/system/i386/cpu.html +%_docdir/%name/system/i386/kvm-pv.html %_docdir/%name/system/i386/microvm.html %_docdir/%name/system/i386/pc.html +%_docdir/%name/system/i386/sgx.html %_docdir/%name/system/images.html %_docdir/%name/system/index.html %_docdir/%name/system/invocation.html @@ -1933,8 +1957,8 @@ %_docdir/%name/system/qemu-manpage.html %_docdir/%name/system/quickstart.html %_docdir/%name/system/riscv/microchip-icicle-kit.html -%_docdir/%name/system/riscv/sifive_u.html %_docdir/%name/system/riscv/shakti-c.html +%_docdir/%name/system/riscv/sifive_u.html %_docdir/%name/system/riscv/virt.html %_docdir/%name/system/s390x/3270.html %_docdir/%name/system/s390x/bootdevices.html @@ -1942,7 +1966,6 @@ %_docdir/%name/system/s390x/protvirt.html %_docdir/%name/system/s390x/vfio-ap.html %_docdir/%name/system/s390x/vfio-ccw.html -%_docdir/%name/system/authz.html %_docdir/%name/system/secrets.html %_docdir/%name/system/security.html %_docdir/%name/system/target-arm.html @@ -1954,8 +1977,8 @@ %_docdir/%name/system/target-riscv.html %_docdir/%name/system/target-rx.html %_docdir/%name/system/target-s390x.html -%_docdir/%name/system/target-sparc64.html %_docdir/%name/system/target-sparc.html +%_docdir/%name/system/target-sparc64.html %_docdir/%name/system/target-xtensa.html %_docdir/%name/system/targets.html %_docdir/%name/system/tls.html @@ -1965,8 +1988,8 @@ %_docdir/%name/tools/qemu-img.html %_docdir/%name/tools/qemu-nbd.html %_docdir/%name/tools/qemu-pr-helper.html -%_docdir/%name/tools/qemu-trace-stap.html %_docdir/%name/tools/qemu-storage-daemon.html +%_docdir/%name/tools/qemu-trace-stap.html %_docdir/%name/tools/virtfs-proxy-helper.html %_docdir/%name/tools/virtiofsd.html %_docdir/%name/user/index.html @@ -1999,6 +2022,7 @@ %_datadir/%name/linuxboot.bin %_datadir/%name/linuxboot_dma.bin %_datadir/%name/multiboot.bin +%_datadir/%name/multiboot_dma.bin %_datadir/%name/pvh.bin %dir %_docdir/qemu-x86 %_docdir/qemu-x86/supported.txt @@ -2103,6 +2127,11 @@ %dir %_libdir/%name %_libdir/%name/audio-spice.so +%files audio-oss +%defattr(-, root, root) +%dir %_libdir/%name +%_libdir/%name/audio-oss.so + %files block-curl %defattr(-, root, root) %dir %_libdir/%name ++++++ qom-handle-case-of-chardev-spice-module-.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.923720949 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.923720949 +0100 @@ -14,7 +14,7 @@ 1 file changed, 6 insertions(+) diff --git a/qom/object.c b/qom/object.c -index e86cb05b84da941a177093811726..18edd2c91ab7d9a790c887fd730e 100644 +index 4f0677cca9e494a3eb20d9dabd0c..63ed3d67b61f7c5c67a3ee25e201 100644 --- a/qom/object.c +++ b/qom/object.c @@ -237,6 +237,12 @@ static bool type_is_ancestor(TypeImpl *type, TypeImpl *target_type) ++++++ roms-Makefile-pass-a-packaging-timestamp.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.939720959 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.943720961 +0100 @@ -20,7 +20,7 @@ 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/roms/Makefile b/roms/Makefile -index eeb5970348cd6d28fa4165d25562..38b71afb0757bd717154afd6a92d 100644 +index b967b53bb76ee8a94fc9b37e4460..66d06f5831303c3d41e943290389 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -52,6 +52,12 @@ SEABIOS_EXTRAVERSION="-prebuilt.qemu.org" @@ -59,7 +59,7 @@ CROSS_COMPILE=$(x86_64_cross_prefix) \ $(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets)) -@@ -150,7 +158,9 @@ edk2-basetools: +@@ -151,7 +159,9 @@ edk2-basetools: EXTRA_LDFLAGS='$(EDK2_BASETOOLS_LDFLAGS)' slof: ++++++ scsi-generic-replace-logical-block-count.patch ++++++ From: Lin Ma <l...@suse.com> Date: Sat, 20 Nov 2021 18:05:57 +0800 Subject: scsi-generic: replace logical block count of response of READ CAPACITY MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Git-commit: 0000000000000000000000000000000000000000 References: [SUSE-JIRA] (SLE-20965) While using SCSI passthrough, Following scenario makes qemu doesn't realized the capacity change of remote scsi target: 1. online resize the scsi target. 2. issue 'rescan-scsi-bus.sh -s ...' in host. 3. issue 'rescan-scsi-bus.sh -s ...' in vm. In above scenario I used to experienced errors while accessing the additional disk space in vm. I think the reasonable operations should be: 1. online resize the scsi target. 2. issue 'rescan-scsi-bus.sh -s ...' in host. 3. issue 'block_resize' via qmp to notify qemu. 4. issue 'rescan-scsi-bus.sh -s ...' in vm. The errors disappear once I notify qemu by block_resize via qmp. So this patch replaces the number of logical blocks of READ CAPACITY response from scsi target by qemu's bs->total_sectors. If the user in vm wants to access the additional disk space, The administrator of host must notify qemu once resizeing the scsi target. Bonus is that domblkinfo of libvirt can reflect the consistent capacity information between host and vm in case of missing block_resize in qemu. E.g: ... <disk type='block' device='lun'> <driver name='qemu' type='raw'/> <source dev='/dev/sdc' index='1'/> <backingStore/> <target dev='sda' bus='scsi'/> <alias name='scsi0-0-0-0'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> ... Before: 1. online resize the scsi target. 2. host:~ # rescan-scsi-bus.sh -s /dev/sdc 3. guest:~ # rescan-scsi-bus.sh -s /dev/sda 4 host:~ # virsh domblkinfo --domain $DOMAIN --human --device sda Capacity: 4.000 GiB Allocation: 0.000 B Physical: 8.000 GiB 5. guest:~ # lsblk /dev/sda NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINT sda 8:0 0 8G 0 disk ??????sda1 8:1 0 2G 0 part After: 1. online resize the scsi target. 2. host:~ # rescan-scsi-bus.sh -s /dev/sdc 3. guest:~ # rescan-scsi-bus.sh -s /dev/sda 4 host:~ # virsh domblkinfo --domain $DOMAIN --human --device sda Capacity: 4.000 GiB Allocation: 0.000 B Physical: 8.000 GiB 5. guest:~ # lsblk /dev/sda NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINT sda 8:0 0 4G 0 disk ??????sda1 8:1 0 2G 0 part Signed-off-by: Lin Ma <l...@suse.com> --- hw/scsi/scsi-generic.c | 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 --- 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) 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]); - s->max_lba = ldl_be_p(&r->buf[0]) & 0xffffffffULL; + BlockBackend *blk = s->conf.blk; + BlockDriverState *bs = blk_bs(blk); + s->max_lba = bs->total_sectors - 1; + stl_be_p(&r->buf[0], s->max_lba); } else if (r->req.cmd.buf[0] == SERVICE_ACTION_IN_16 && (r->req.cmd.buf[1] & 31) == SAI_READ_CAPACITY_16) { s->blocksize = ldl_be_p(&r->buf[8]); - s->max_lba = ldq_be_p(&r->buf[0]); + BlockBackend *blk = s->conf.blk; + BlockDriverState *bs = blk_bs(blk); + 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); ++++++ seabios-switch-to-python3-as-needed.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.963720973 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.967720976 +0100 @@ -17,7 +17,7 @@ 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/roms/seabios/Makefile b/roms/seabios/Makefile -index 87a6ac92e69f23c1ce799d16512a..edb83b7a1c77f7bb75c371330b2c 100644 +index 418a0e3649443ee89e8fdad436f5..408983026669e531dcb84230dd23 100644 --- a/roms/seabios/Makefile +++ b/roms/seabios/Makefile @@ -22,7 +22,7 @@ LD=$(CROSS_PREFIX)ld @@ -59,7 +59,7 @@ # # This file may be distributed under the terms of the GNU GPLv3 license. diff --git a/roms/seabios/scripts/layoutrom.py b/roms/seabios/scripts/layoutrom.py -index 6616721d1b584892074491b292ba..c6d003273990ae66ca62bc36fe07 100755 +index abebf0211fa9627cec31cce76b8d..34b3e68f556af124346755e87c58 100755 --- a/roms/seabios/scripts/layoutrom.py +++ b/roms/seabios/scripts/layoutrom.py @@ -81,8 +81,8 @@ def fitSections(sections, fillsections): @@ -125,7 +125,7 @@ sys.exit(1) return 1 -@@ -691,7 +691,7 @@ def main(): +@@ -695,7 +695,7 @@ def main(): li = doLayout(sections, config, genreloc) # Exported symbols ++++++ seabios-use-python2-explicitly-as-needed.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:47.979720983 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:47.979720983 +0100 @@ -14,7 +14,7 @@ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roms/seabios/Makefile b/roms/seabios/Makefile -index 3d8943ef5f25afb9c41db84ad2a0..87a6ac92e69f23c1ce799d16512a 100644 +index c108f87de7683667d1a0cad6b9e5..418a0e3649443ee89e8fdad436f5 100644 --- a/roms/seabios/Makefile +++ b/roms/seabios/Makefile @@ -22,7 +22,7 @@ LD=$(CROSS_PREFIX)ld ++++++ tests-qemu-iotests-Triple-timeout-of-i-o.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:48.055721030 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:48.059721033 +0100 @@ -8,21 +8,23 @@ we don't fail a test because the stars align against us. Signed-off-by: Bruce Rogers <brog...@suse.com> +[DF: Small tweaks necessary for rebasing on top of 6.2.0] +Signed-off-by: Dario Faggioli <dfaggi...@suse.com> --- tests/qemu-iotests/common.qemu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/common.qemu b/tests/qemu-iotests/common.qemu -index 0fc52d20d74020a4c4a0d697aaa2..622495201eed12a5fe4734581f84 100644 +index 0f1fecc68edfb07633589b0f3c75..b23c4798aa112efee49cf5c9469e 100644 --- a/tests/qemu-iotests/common.qemu +++ b/tests/qemu-iotests/common.qemu @@ -85,7 +85,7 @@ _timed_wait_for() timeout=yes QEMU_STATUS[$h]=0 -- while IFS= read -t ${QEMU_COMM_TIMEOUT} resp <&${QEMU_OUT[$h]} -+ while IFS= read -t $((${QEMU_COMM_TIMEOUT}*3)) resp <&${QEMU_OUT[$h]} - do - if [ -n "$capture_events" ]; then - capture=0 +- read_timeout="-t ${QEMU_COMM_TIMEOUT}" ++ read_timeout="-t $((${QEMU_COMM_TIMEOUT}*3))" + if [ -n "${GDB_OPTIONS}" ]; then + read_timeout= + fi ++++++ xen-ignore-live-parameter-from-xen-save-.patch ++++++ --- /var/tmp/diff_new_pack.BrEXYP/_old 2021-12-23 17:53:48.079721045 +0100 +++ /var/tmp/diff_new_pack.BrEXYP/_new 2021-12-23 17:53:48.079721045 +0100 @@ -27,10 +27,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/savevm.c b/migration/savevm.c -index 7b7b64bd13e737618319759cdffb..375ca95caeef4a3ba0d5704ccbcc 100644 +index d59e976d50e7c81c20bbf5b930d1..7f7cedddb36dcc536fc242349882 100644 --- a/migration/savevm.c +++ b/migration/savevm.c -@@ -2941,7 +2941,7 @@ void qmp_xen_save_devices_state(const char *filename, bool has_live, bool live, +@@ -2942,7 +2942,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. */
