Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at 2017-09-07 22:09:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qemu (Old) and /work/SRC/openSUSE:Factory/.qemu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu" Thu Sep 7 22:09:38 2017 rev:127 rq:520233 version:2.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qemu/qemu-linux-user.changes 2017-08-29 11:39:56.907272246 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/qemu-linux-user.changes 2017-09-07 22:09:49.127688236 +0200 @@ -1,0 +2,90 @@ +Thu Aug 31 18:48:32 UTC 2017 - brog...@suse.com + +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.10 +* Patches added: + 0034-slirp-fix-clearing-ifq_so-from-pend.patch + 0035-s390-ccw-Fix-alignment-for-CCW1.patch + +------------------------------------------------------------------- +Wed Aug 30 19:52:36 UTC 2017 - brog...@suse.com + +- Update to v2.10.0: See http://wiki.qemu.org/ChangeLog/2.10 +- Dropped miscellaneous patches deemed unused and not worth carrying +* Patches renamed: + 0006-qemu-cvs-gettimeofday.patch -> 0003-qemu-cvs-gettimeofday.patch + 0007-qemu-cvs-ioctl_debug.patch -> 0004-qemu-cvs-ioctl_debug.patch + 0008-qemu-cvs-ioctl_nodirection.patch -> 0005-qemu-cvs-ioctl_nodirection.patch + 0009-linux-user-add-binfmt-wrapper-for-a.patch -> 0006-linux-user-add-binfmt-wrapper-for-a.patch + 0010-PPC-KVM-Disable-mmu-notifier-check.patch -> 0007-PPC-KVM-Disable-mmu-notifier-check.patch + 0011-linux-user-fix-segfault-deadlock.patch -> 0008-linux-user-fix-segfault-deadlock.patch + 0012-linux-user-binfmt-support-host-bina.patch -> 0009-linux-user-binfmt-support-host-bina.patch + 0013-linux-user-Fake-proc-cpuinfo.patch -> 0010-linux-user-Fake-proc-cpuinfo.patch + 0014-linux-user-XXX-disable-fiemap.patch -> 0011-linux-user-XXX-disable-fiemap.patch + 0017-linux-user-use-target_ulong.patch -> 0012-linux-user-use-target_ulong.patch + 0021-console-add-question-mark-escape-op.patch -> 0013-console-add-question-mark-escape-op.patch + 0022-Make-char-muxer-more-robust-wrt-sma.patch -> 0014-Make-char-muxer-more-robust-wrt-sma.patch + 0023-linux-user-lseek-explicitly-cast-no.patch -> 0015-linux-user-lseek-explicitly-cast-no.patch + 0025-AIO-Reduce-number-of-threads-for-32.patch -> 0016-AIO-Reduce-number-of-threads-for-32.patch + 0027-xen_disk-Add-suse-specific-flush-di.patch -> 0017-xen_disk-Add-suse-specific-flush-di.patch + 0028-qemu-bridge-helper-reduce-security-.patch -> 0018-qemu-bridge-helper-reduce-security-.patch + 0029-qemu-binfmt-conf-use-qemu-ARCH-binf.patch -> 0019-qemu-binfmt-conf-use-qemu-ARCH-binf.patch + 0030-configure-Fix-detection-of-seccomp-.patch -> 0020-configure-Fix-detection-of-seccomp-.patch + 0031-linux-user-properly-test-for-infini.patch -> 0021-linux-user-properly-test-for-infini.patch + 0033-roms-Makefile-pass-a-packaging-time.patch -> 0022-roms-Makefile-pass-a-packaging-time.patch + 0034-Raise-soft-address-space-limit-to-h.patch -> 0023-Raise-soft-address-space-limit-to-h.patch + 0035-increase-x86_64-physical-bits-to-42.patch -> 0024-increase-x86_64-physical-bits-to-42.patch + 0036-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch -> 0025-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch + 0037-i8254-Fix-migration-from-SLE11-SP2.patch -> 0026-i8254-Fix-migration-from-SLE11-SP2.patch + 0038-acpi_piix4-Fix-migration-from-SLE11.patch -> 0027-acpi_piix4-Fix-migration-from-SLE11.patch + 0039-Fix-tigervnc-long-press-issue.patch -> 0028-Fix-tigervnc-long-press-issue.patch + 0041-string-input-visitor-Fix-uint64-par.patch -> 0029-string-input-visitor-Fix-uint64-par.patch + 0042-test-string-input-visitor-Add-int-t.patch -> 0030-test-string-input-visitor-Add-int-t.patch + 0043-test-string-input-visitor-Add-uint6.patch -> 0031-test-string-input-visitor-Add-uint6.patch + 0044-tests-Add-QOM-property-unit-tests.patch -> 0032-tests-Add-QOM-property-unit-tests.patch + 0045-tests-Add-scsi-disk-test.patch -> 0033-tests-Add-scsi-disk-test.patch +* Patches dropped (upstream unless otherwise noted): + 0003-qemu-cvs-alsa_bitfield.patch (deemed not needed) + 0004-qemu-cvs-alsa_ioctl.patch (deemed not needed) + 0005-qemu-cvs-alsa_mmap.patch (deemed not needed) + 0015-slirp-nooutgoing.patch (bsc#1055125) + 0016-vnc-password-file-and-incoming-conn.patch (bsc#1055127) + 0018-block-Add-support-for-DictZip-enabl.patch (bsc#1046783) + 0019-block-Add-tar-container-format.patch (bsc#1046783) + 0020-Legacy-Patch-kvm-qemu-preXX-dictzip.patch (bsc#1046783) + 0024-configure-Enable-PIE-for-ppc-and-pp.patch (obsolete) + 0026-dictzip-Fix-on-big-endian-systems.patch (bsc#1046783) + 0032-linux-user-remove-all-traces-of-qem.patch + 0040-fix-xen-hvm-direct-kernel-boot.patch (bsc#970791) + 0046-RFC-update-Linux-headers-from-irqs-.patch + 0047-ARM-KVM-Enable-in-kernel-timers-wit.patch + 0048-input-Add-trace-event-for-empty-key.patch + 0049-ACPI-don-t-call-acpi_pcihp_device_p.patch + 0050-i386-Allow-cpuid-bit-override.patch (was for testing only) + 0051-input-limit-kbd-queue-depth.patch + 0052-audio-release-capture-buffers.patch + 0053-scsi-avoid-an-off-by-one-error-in-m.patch + 0054-vmw_pvscsi-check-message-ring-page-.patch + 0055-9pfs-local-forbid-client-access-to-.patch + 0056-jazz_led-fix-bad-snprintf.patch + 0057-slirp-smb-Replace-constant-strings-.patch + 0058-altera_timer-fix-incorrect-memset.patch + 0059-Hacks-for-building-on-gcc-7-Fedora-.patch + 0060-9pfs-local-fix-unlink-of-alien-file.patch + 0061-megasas-do-not-read-DCMD-opcode-mor.patch + 0062-megasas-always-store-SCSIRequest-in.patch + 0063-nbd-Fully-initialize-client-in-case.patch + 0064-9pfs-local-remove-use-correct-path-.patch + 0065-hid-Reset-kbd-modifiers-on-reset.patch + 0066-input-Decrement-queue-count-on-kbd-.patch + 0067-xhci-only-update-dequeue-ptr-on-com.patch + 0068-vnc-Set-default-kbd-delay-to-10ms.patch + 0069-qemu-nbd-Ignore-SIGPIPE.patch + 0070-usb-redir-fix-stack-overflow-in-usb.patch + 0072-slirp-check-len-against-dhcp-option.patch + 0071-exec-use-qemu_ram_ptr_length-to-acc.patch + 0073-xen-mapcache-store-dma-information-.patch + 0074-exec-Add-lock-parameter-to-qemu_ram.patch + 0075-Replace-struct-ucontext-with-uconte.patch +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.10 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/qemu/qemu-testsuite.changes 2017-08-29 11:39:57.355209311 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/qemu-testsuite.changes 2017-09-07 22:09:49.307662869 +0200 @@ -1,0 +2,114 @@ +Thu Aug 31 18:48:22 UTC 2017 - brog...@suse.com + +- Update BuildRequires packages libibverbs-devel and librdmacm-devel + to the more correct rdma-core-devel +- Enable seccomp for s390x, aarch64, and ppc64le +- Fix OOB issue (use after free) in slirp network stack (CVE-2017-13711 + bsc#1056291) + 0034-slirp-fix-clearing-ifq_so-from-pend.patch +- Fix a misalignment in the s390 ccw firmware (bsc#1056680) + 0035-s390-ccw-Fix-alignment-for-CCW1.patch +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.10 + +------------------------------------------------------------------- +Thu Aug 31 18:34:27 UTC 2017 - jfeh...@suse.com + +- Add a supportconfig plugin + qemu-supportconfig + FATE#323661 + +------------------------------------------------------------------- +Wed Aug 30 19:52:26 UTC 2017 - brog...@suse.com + +- Update to v2.10.0: See http://wiki.qemu.org/ChangeLog/2.10 +- Dropped internal only patches used to support SUSE Studio + Testdrive as well as other miscellaneous patches deemed unused + and not worth carrying (bsc#1046783, bsc#1055125, bsc#1055127) +- Update SLE support statements in anticipation of SLE15 +- disable SAN boot capability from virtio pxe rom used in v1.4 and + older pc machine types due to rom size requirements. Hopefully + a better solution can be found which doesn't impact functionality +* Patches added: + ipxe-stub-out-the-SAN-req-s-in-int13.patch +* Patches renamed: + 0006-qemu-cvs-gettimeofday.patch -> 0003-qemu-cvs-gettimeofday.patch + 0007-qemu-cvs-ioctl_debug.patch -> 0004-qemu-cvs-ioctl_debug.patch + 0008-qemu-cvs-ioctl_nodirection.patch -> 0005-qemu-cvs-ioctl_nodirection.patch + 0009-linux-user-add-binfmt-wrapper-for-a.patch -> 0006-linux-user-add-binfmt-wrapper-for-a.patch + 0010-PPC-KVM-Disable-mmu-notifier-check.patch -> 0007-PPC-KVM-Disable-mmu-notifier-check.patch + 0011-linux-user-fix-segfault-deadlock.patch -> 0008-linux-user-fix-segfault-deadlock.patch + 0012-linux-user-binfmt-support-host-bina.patch -> 0009-linux-user-binfmt-support-host-bina.patch + 0013-linux-user-Fake-proc-cpuinfo.patch -> 0010-linux-user-Fake-proc-cpuinfo.patch + 0014-linux-user-XXX-disable-fiemap.patch -> 0011-linux-user-XXX-disable-fiemap.patch + 0017-linux-user-use-target_ulong.patch -> 0012-linux-user-use-target_ulong.patch + 0021-console-add-question-mark-escape-op.patch -> 0013-console-add-question-mark-escape-op.patch + 0022-Make-char-muxer-more-robust-wrt-sma.patch -> 0014-Make-char-muxer-more-robust-wrt-sma.patch + 0023-linux-user-lseek-explicitly-cast-no.patch -> 0015-linux-user-lseek-explicitly-cast-no.patch + 0025-AIO-Reduce-number-of-threads-for-32.patch -> 0016-AIO-Reduce-number-of-threads-for-32.patch + 0027-xen_disk-Add-suse-specific-flush-di.patch -> 0017-xen_disk-Add-suse-specific-flush-di.patch + 0028-qemu-bridge-helper-reduce-security-.patch -> 0018-qemu-bridge-helper-reduce-security-.patch + 0029-qemu-binfmt-conf-use-qemu-ARCH-binf.patch -> 0019-qemu-binfmt-conf-use-qemu-ARCH-binf.patch + 0030-configure-Fix-detection-of-seccomp-.patch -> 0020-configure-Fix-detection-of-seccomp-.patch + 0031-linux-user-properly-test-for-infini.patch -> 0020-linux-user-properly-test-for-infini.patch + 0033-roms-Makefile-pass-a-packaging-time.patch -> 0022-roms-Makefile-pass-a-packaging-time.patch + 0034-Raise-soft-address-space-limit-to-h.patch -> 0023-Raise-soft-address-space-limit-to-h.patch + 0035-increase-x86_64-physical-bits-to-42.patch -> 0024-increase-x86_64-physical-bits-to-42.patch + 0036-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch -> 0025-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch + 0037-i8254-Fix-migration-from-SLE11-SP2.patch -> 0026-i8254-Fix-migration-from-SLE11-SP2.patch + 0038-acpi_piix4-Fix-migration-from-SLE11.patch -> 0027-acpi_piix4-Fix-migration-from-SLE11.patch + 0039-Fix-tigervnc-long-press-issue.patch -> 0028-Fix-tigervnc-long-press-issue.patch + 0041-string-input-visitor-Fix-uint64-par.patch -> 0029-string-input-visitor-Fix-uint64-par.patch + 0042-test-string-input-visitor-Add-int-t.patch -> 0030-test-string-input-visitor-Add-int-t.patch + 0043-test-string-input-visitor-Add-uint6.patch -> 0031-test-string-input-visitor-Add-uint6.patch + 0044-tests-Add-QOM-property-unit-tests.patch -> 0032-tests-Add-QOM-property-unit-tests.patch + 0045-tests-Add-scsi-disk-test.patch -> 0033-tests-Add-scsi-disk-test.patch +* Patches dropped (upstream unless otherwise noted): + 0003-qemu-cvs-alsa_bitfield.patch (deemed not needed) + 0004-qemu-cvs-alsa_ioctl.patch (deemed not needed) + 0005-qemu-cvs-alsa_mmap.patch (deemed not needed) + 0015-slirp-nooutgoing.patch (bsc#1055125) + 0016-vnc-password-file-and-incoming-conn.patch (bsc#1055127) + 0018-block-Add-support-for-DictZip-enabl.patch (bsc#1046783) + 0019-block-Add-tar-container-format.patch (bsc#1046783) + 0020-Legacy-Patch-kvm-qemu-preXX-dictzip.patch (bsc#1046783) + 0024-configure-Enable-PIE-for-ppc-and-pp.patch (obsolete) + 0026-dictzip-Fix-on-big-endian-systems.patch (bsc#1046783) + 0032-linux-user-remove-all-traces-of-qem.patch + 0040-fix-xen-hvm-direct-kernel-boot.patch (bsc#970791) + 0046-RFC-update-Linux-headers-from-irqs-.patch + 0047-ARM-KVM-Enable-in-kernel-timers-wit.patch + 0048-input-Add-trace-event-for-empty-key.patch + 0049-ACPI-don-t-call-acpi_pcihp_device_p.patch + 0050-i386-Allow-cpuid-bit-override.patch (was for testing only) + 0051-input-limit-kbd-queue-depth.patch + 0052-audio-release-capture-buffers.patch + 0053-scsi-avoid-an-off-by-one-error-in-m.patch + 0054-vmw_pvscsi-check-message-ring-page-.patch + 0055-9pfs-local-forbid-client-access-to-.patch + 0056-jazz_led-fix-bad-snprintf.patch + 0057-slirp-smb-Replace-constant-strings-.patch + 0058-altera_timer-fix-incorrect-memset.patch + 0059-Hacks-for-building-on-gcc-7-Fedora-.patch + 0060-9pfs-local-fix-unlink-of-alien-file.patch + 0061-megasas-do-not-read-DCMD-opcode-mor.patch + 0062-megasas-always-store-SCSIRequest-in.patch + 0063-nbd-Fully-initialize-client-in-case.patch + 0064-9pfs-local-remove-use-correct-path-.patch + 0065-hid-Reset-kbd-modifiers-on-reset.patch + 0066-input-Decrement-queue-count-on-kbd-.patch + 0067-xhci-only-update-dequeue-ptr-on-com.patch + 0068-vnc-Set-default-kbd-delay-to-10ms.patch + 0069-qemu-nbd-Ignore-SIGPIPE.patch + 0070-usb-redir-fix-stack-overflow-in-usb.patch + 0072-slirp-check-len-against-dhcp-option.patch + 0071-exec-use-qemu_ram_ptr_length-to-acc.patch + 0073-xen-mapcache-store-dma-information-.patch + 0074-exec-Add-lock-parameter-to-qemu_ram.patch + 0075-Replace-struct-ucontext-with-uconte.patch + ipxe-build-Avoid-implicit-fallthrough-warnings-on-GCC-7.patch + ipxe-iscsi-Always-send-FirstBurstLength-parameter.patch + ipxe-ath-Add-missing-break-statements.patch + ipxe-mucurses-Fix-erroneous-__nonnull-attribute.patch +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.10 + +------------------------------------------------------------------- qemu.changes: same change Old: ---- 0003-qemu-cvs-alsa_bitfield.patch 0004-qemu-cvs-alsa_ioctl.patch 0005-qemu-cvs-alsa_mmap.patch 0006-qemu-cvs-gettimeofday.patch 0007-qemu-cvs-ioctl_debug.patch 0008-qemu-cvs-ioctl_nodirection.patch 0009-linux-user-add-binfmt-wrapper-for-a.patch 0010-PPC-KVM-Disable-mmu-notifier-check.patch 0011-linux-user-fix-segfault-deadlock.patch 0012-linux-user-binfmt-support-host-bina.patch 0013-linux-user-Fake-proc-cpuinfo.patch 0014-linux-user-XXX-disable-fiemap.patch 0015-slirp-nooutgoing.patch 0016-vnc-password-file-and-incoming-conn.patch 0017-linux-user-use-target_ulong.patch 0018-block-Add-support-for-DictZip-enabl.patch 0019-block-Add-tar-container-format.patch 0020-Legacy-Patch-kvm-qemu-preXX-dictzip.patch 0021-console-add-question-mark-escape-op.patch 0022-Make-char-muxer-more-robust-wrt-sma.patch 0023-linux-user-lseek-explicitly-cast-no.patch 0024-configure-Enable-PIE-for-ppc-and-pp.patch 0025-AIO-Reduce-number-of-threads-for-32.patch 0026-dictzip-Fix-on-big-endian-systems.patch 0027-xen_disk-Add-suse-specific-flush-di.patch 0028-qemu-bridge-helper-reduce-security-.patch 0029-qemu-binfmt-conf-use-qemu-ARCH-binf.patch 0030-configure-Fix-detection-of-seccomp-.patch 0031-linux-user-properly-test-for-infini.patch 0032-linux-user-remove-all-traces-of-qem.patch 0033-roms-Makefile-pass-a-packaging-time.patch 0034-Raise-soft-address-space-limit-to-h.patch 0035-increase-x86_64-physical-bits-to-42.patch 0036-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch 0037-i8254-Fix-migration-from-SLE11-SP2.patch 0038-acpi_piix4-Fix-migration-from-SLE11.patch 0039-Fix-tigervnc-long-press-issue.patch 0040-fix-xen-hvm-direct-kernel-boot.patch 0041-string-input-visitor-Fix-uint64-par.patch 0042-test-string-input-visitor-Add-int-t.patch 0043-test-string-input-visitor-Add-uint6.patch 0044-tests-Add-QOM-property-unit-tests.patch 0045-tests-Add-scsi-disk-test.patch 0046-RFC-update-Linux-headers-from-irqs-.patch 0047-ARM-KVM-Enable-in-kernel-timers-wit.patch 0048-input-Add-trace-event-for-empty-key.patch 0049-ACPI-don-t-call-acpi_pcihp_device_p.patch 0050-i386-Allow-cpuid-bit-override.patch 0051-input-limit-kbd-queue-depth.patch 0052-audio-release-capture-buffers.patch 0053-scsi-avoid-an-off-by-one-error-in-m.patch 0054-vmw_pvscsi-check-message-ring-page-.patch 0055-9pfs-local-forbid-client-access-to-.patch 0056-jazz_led-fix-bad-snprintf.patch 0057-slirp-smb-Replace-constant-strings-.patch 0058-altera_timer-fix-incorrect-memset.patch 0059-Hacks-for-building-on-gcc-7-Fedora-.patch 0060-9pfs-local-fix-unlink-of-alien-file.patch 0061-megasas-do-not-read-DCMD-opcode-mor.patch 0062-megasas-always-store-SCSIRequest-in.patch 0063-nbd-Fully-initialize-client-in-case.patch 0064-9pfs-local-remove-use-correct-path-.patch 0065-hid-Reset-kbd-modifiers-on-reset.patch 0066-input-Decrement-queue-count-on-kbd-.patch 0067-xhci-only-update-dequeue-ptr-on-com.patch 0068-vnc-Set-default-kbd-delay-to-10ms.patch 0069-qemu-nbd-Ignore-SIGPIPE.patch 0070-usb-redir-fix-stack-overflow-in-usb.patch 0071-exec-use-qemu_ram_ptr_length-to-acc.patch 0072-slirp-check-len-against-dhcp-option.patch 0073-xen-mapcache-store-dma-information-.patch 0074-exec-Add-lock-parameter-to-qemu_ram.patch 0075-Replace-struct-ucontext-with-uconte.patch ipxe-ath-Add-missing-break-statements.patch ipxe-build-Avoid-implicit-fallthrough-warnings-on-GCC-7.patch ipxe-iscsi-Always-send-FirstBurstLength-parameter.patch ipxe-mucurses-Fix-erroneous-__nonnull-attribute.patch qemu-2.9.0.tar.xz qemu-2.9.0.tar.xz.sig New: ---- 0003-qemu-cvs-gettimeofday.patch 0004-qemu-cvs-ioctl_debug.patch 0005-qemu-cvs-ioctl_nodirection.patch 0006-linux-user-add-binfmt-wrapper-for-a.patch 0007-PPC-KVM-Disable-mmu-notifier-check.patch 0008-linux-user-fix-segfault-deadlock.patch 0009-linux-user-binfmt-support-host-bina.patch 0010-linux-user-Fake-proc-cpuinfo.patch 0011-linux-user-XXX-disable-fiemap.patch 0012-linux-user-use-target_ulong.patch 0013-console-add-question-mark-escape-op.patch 0014-Make-char-muxer-more-robust-wrt-sma.patch 0015-linux-user-lseek-explicitly-cast-no.patch 0016-AIO-Reduce-number-of-threads-for-32.patch 0017-xen_disk-Add-suse-specific-flush-di.patch 0018-qemu-bridge-helper-reduce-security-.patch 0019-qemu-binfmt-conf-use-qemu-ARCH-binf.patch 0020-configure-Fix-detection-of-seccomp-.patch 0021-linux-user-properly-test-for-infini.patch 0022-roms-Makefile-pass-a-packaging-time.patch 0023-Raise-soft-address-space-limit-to-h.patch 0024-increase-x86_64-physical-bits-to-42.patch 0025-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch 0026-i8254-Fix-migration-from-SLE11-SP2.patch 0027-acpi_piix4-Fix-migration-from-SLE11.patch 0028-Fix-tigervnc-long-press-issue.patch 0029-string-input-visitor-Fix-uint64-par.patch 0030-test-string-input-visitor-Add-int-t.patch 0031-test-string-input-visitor-Add-uint6.patch 0032-tests-Add-QOM-property-unit-tests.patch 0033-tests-Add-scsi-disk-test.patch 0034-slirp-fix-clearing-ifq_so-from-pend.patch 0035-s390-ccw-Fix-alignment-for-CCW1.patch ipxe-stub-out-the-SAN-req-s-in-int13.patch qemu-2.10.0.tar.xz qemu-2.10.0.tar.xz.sig qemu-supportconfig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu-linux-user.spec ++++++ --- /var/tmp/diff_new_pack.ga9cmO/_old 2017-09-07 22:09:52.211253610 +0200 +++ /var/tmp/diff_new_pack.ga9cmO/_new 2017-09-07 22:09:52.211253610 +0200 @@ -21,86 +21,46 @@ Summary: Universal CPU emulator License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT Group: System/Emulators/PC -Version: 2.9.0 +Version: 2.10.0 Release: 0 -Source: qemu-2.9.0.tar.xz +Source: qemu-2.10.0.tar.xz # Upstream First -- http://wiki.qemu-project.org/Contribute/SubmitAPatch # This patch queue is auto-generated from https://github.com/openSUSE/qemu Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patch Patch0002: 0002-qemu-binfmt-conf-Modify-default-pat.patch -Patch0003: 0003-qemu-cvs-alsa_bitfield.patch -Patch0004: 0004-qemu-cvs-alsa_ioctl.patch -Patch0005: 0005-qemu-cvs-alsa_mmap.patch -Patch0006: 0006-qemu-cvs-gettimeofday.patch -Patch0007: 0007-qemu-cvs-ioctl_debug.patch -Patch0008: 0008-qemu-cvs-ioctl_nodirection.patch -Patch0009: 0009-linux-user-add-binfmt-wrapper-for-a.patch -Patch0010: 0010-PPC-KVM-Disable-mmu-notifier-check.patch -Patch0011: 0011-linux-user-fix-segfault-deadlock.patch -Patch0012: 0012-linux-user-binfmt-support-host-bina.patch -Patch0013: 0013-linux-user-Fake-proc-cpuinfo.patch -Patch0014: 0014-linux-user-XXX-disable-fiemap.patch -Patch0015: 0015-slirp-nooutgoing.patch -Patch0016: 0016-vnc-password-file-and-incoming-conn.patch -Patch0017: 0017-linux-user-use-target_ulong.patch -Patch0018: 0018-block-Add-support-for-DictZip-enabl.patch -Patch0019: 0019-block-Add-tar-container-format.patch -Patch0020: 0020-Legacy-Patch-kvm-qemu-preXX-dictzip.patch -Patch0021: 0021-console-add-question-mark-escape-op.patch -Patch0022: 0022-Make-char-muxer-more-robust-wrt-sma.patch -Patch0023: 0023-linux-user-lseek-explicitly-cast-no.patch -Patch0024: 0024-configure-Enable-PIE-for-ppc-and-pp.patch -Patch0025: 0025-AIO-Reduce-number-of-threads-for-32.patch -Patch0026: 0026-dictzip-Fix-on-big-endian-systems.patch -Patch0027: 0027-xen_disk-Add-suse-specific-flush-di.patch -Patch0028: 0028-qemu-bridge-helper-reduce-security-.patch -Patch0029: 0029-qemu-binfmt-conf-use-qemu-ARCH-binf.patch -Patch0030: 0030-configure-Fix-detection-of-seccomp-.patch -Patch0031: 0031-linux-user-properly-test-for-infini.patch -Patch0032: 0032-linux-user-remove-all-traces-of-qem.patch -Patch0033: 0033-roms-Makefile-pass-a-packaging-time.patch -Patch0034: 0034-Raise-soft-address-space-limit-to-h.patch -Patch0035: 0035-increase-x86_64-physical-bits-to-42.patch -Patch0036: 0036-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch -Patch0037: 0037-i8254-Fix-migration-from-SLE11-SP2.patch -Patch0038: 0038-acpi_piix4-Fix-migration-from-SLE11.patch -Patch0039: 0039-Fix-tigervnc-long-press-issue.patch -Patch0040: 0040-fix-xen-hvm-direct-kernel-boot.patch -Patch0041: 0041-string-input-visitor-Fix-uint64-par.patch -Patch0042: 0042-test-string-input-visitor-Add-int-t.patch -Patch0043: 0043-test-string-input-visitor-Add-uint6.patch -Patch0044: 0044-tests-Add-QOM-property-unit-tests.patch -Patch0045: 0045-tests-Add-scsi-disk-test.patch -Patch0046: 0046-RFC-update-Linux-headers-from-irqs-.patch -Patch0047: 0047-ARM-KVM-Enable-in-kernel-timers-wit.patch -Patch0048: 0048-input-Add-trace-event-for-empty-key.patch -Patch0049: 0049-ACPI-don-t-call-acpi_pcihp_device_p.patch -Patch0050: 0050-i386-Allow-cpuid-bit-override.patch -Patch0051: 0051-input-limit-kbd-queue-depth.patch -Patch0052: 0052-audio-release-capture-buffers.patch -Patch0053: 0053-scsi-avoid-an-off-by-one-error-in-m.patch -Patch0054: 0054-vmw_pvscsi-check-message-ring-page-.patch -Patch0055: 0055-9pfs-local-forbid-client-access-to-.patch -Patch0056: 0056-jazz_led-fix-bad-snprintf.patch -Patch0057: 0057-slirp-smb-Replace-constant-strings-.patch -Patch0058: 0058-altera_timer-fix-incorrect-memset.patch -Patch0059: 0059-Hacks-for-building-on-gcc-7-Fedora-.patch -Patch0060: 0060-9pfs-local-fix-unlink-of-alien-file.patch -Patch0061: 0061-megasas-do-not-read-DCMD-opcode-mor.patch -Patch0062: 0062-megasas-always-store-SCSIRequest-in.patch -Patch0063: 0063-nbd-Fully-initialize-client-in-case.patch -Patch0064: 0064-9pfs-local-remove-use-correct-path-.patch -Patch0065: 0065-hid-Reset-kbd-modifiers-on-reset.patch -Patch0066: 0066-input-Decrement-queue-count-on-kbd-.patch -Patch0067: 0067-xhci-only-update-dequeue-ptr-on-com.patch -Patch0068: 0068-vnc-Set-default-kbd-delay-to-10ms.patch -Patch0069: 0069-qemu-nbd-Ignore-SIGPIPE.patch -Patch0070: 0070-usb-redir-fix-stack-overflow-in-usb.patch -Patch0071: 0071-exec-use-qemu_ram_ptr_length-to-acc.patch -Patch0072: 0072-slirp-check-len-against-dhcp-option.patch -Patch0073: 0073-xen-mapcache-store-dma-information-.patch -Patch0074: 0074-exec-Add-lock-parameter-to-qemu_ram.patch -Patch0075: 0075-Replace-struct-ucontext-with-uconte.patch +Patch0003: 0003-qemu-cvs-gettimeofday.patch +Patch0004: 0004-qemu-cvs-ioctl_debug.patch +Patch0005: 0005-qemu-cvs-ioctl_nodirection.patch +Patch0006: 0006-linux-user-add-binfmt-wrapper-for-a.patch +Patch0007: 0007-PPC-KVM-Disable-mmu-notifier-check.patch +Patch0008: 0008-linux-user-fix-segfault-deadlock.patch +Patch0009: 0009-linux-user-binfmt-support-host-bina.patch +Patch0010: 0010-linux-user-Fake-proc-cpuinfo.patch +Patch0011: 0011-linux-user-XXX-disable-fiemap.patch +Patch0012: 0012-linux-user-use-target_ulong.patch +Patch0013: 0013-console-add-question-mark-escape-op.patch +Patch0014: 0014-Make-char-muxer-more-robust-wrt-sma.patch +Patch0015: 0015-linux-user-lseek-explicitly-cast-no.patch +Patch0016: 0016-AIO-Reduce-number-of-threads-for-32.patch +Patch0017: 0017-xen_disk-Add-suse-specific-flush-di.patch +Patch0018: 0018-qemu-bridge-helper-reduce-security-.patch +Patch0019: 0019-qemu-binfmt-conf-use-qemu-ARCH-binf.patch +Patch0020: 0020-configure-Fix-detection-of-seccomp-.patch +Patch0021: 0021-linux-user-properly-test-for-infini.patch +Patch0022: 0022-roms-Makefile-pass-a-packaging-time.patch +Patch0023: 0023-Raise-soft-address-space-limit-to-h.patch +Patch0024: 0024-increase-x86_64-physical-bits-to-42.patch +Patch0025: 0025-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch +Patch0026: 0026-i8254-Fix-migration-from-SLE11-SP2.patch +Patch0027: 0027-acpi_piix4-Fix-migration-from-SLE11.patch +Patch0028: 0028-Fix-tigervnc-long-press-issue.patch +Patch0029: 0029-string-input-visitor-Fix-uint64-par.patch +Patch0030: 0030-test-string-input-visitor-Add-int-t.patch +Patch0031: 0031-test-string-input-visitor-Add-uint6.patch +Patch0032: 0032-tests-Add-QOM-property-unit-tests.patch +Patch0033: 0033-tests-Add-scsi-disk-test.patch +Patch0034: 0034-slirp-fix-clearing-ifq_so-from-pend.patch +Patch0035: 0035-s390-ccw-Fix-alignment-for-CCW1.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. Source400: update_git.sh @@ -153,7 +113,7 @@ run cross-architecture builds. %prep -%setup -q -n qemu-2.9.0 +%setup -q -n qemu-2.10.0 %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 @@ -189,46 +149,6 @@ %patch0033 -p1 %patch0034 -p1 %patch0035 -p1 -%patch0036 -p1 -%patch0037 -p1 -%patch0038 -p1 -%patch0039 -p1 -%patch0040 -p1 -%patch0041 -p1 -%patch0042 -p1 -%patch0043 -p1 -%patch0044 -p1 -%patch0045 -p1 -%patch0046 -p1 -%patch0047 -p1 -%patch0048 -p1 -%patch0049 -p1 -%patch0050 -p1 -%patch0051 -p1 -%patch0052 -p1 -%patch0053 -p1 -%patch0054 -p1 -%patch0055 -p1 -%patch0056 -p1 -%patch0057 -p1 -%patch0058 -p1 -%patch0059 -p1 -%patch0060 -p1 -%patch0061 -p1 -%patch0062 -p1 -%patch0063 -p1 -%patch0064 -p1 -%patch0065 -p1 -%patch0066 -p1 -%patch0067 -p1 -%patch0068 -p1 -%patch0069 -p1 -%patch0070 -p1 -%patch0071 -p1 -%patch0072 -p1 -%patch0073 -p1 -%patch0074 -p1 -%patch0075 -p1 %build ./configure \ ++++++ qemu-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.ga9cmO/_old 2017-09-07 22:09:52.247248537 +0200 +++ /var/tmp/diff_new_pack.ga9cmO/_new 2017-09-07 22:09:52.251247973 +0200 @@ -22,6 +22,7 @@ %define build_slof_from_source 0 %define kvm_available 0 %define legacy_qemu_kvm 0 +%define force_fit_virtio_pxe_rom 1 %ifarch %ix86 x86_64 # choice of building all from source or using provided binary x86 blobs @@ -86,7 +87,7 @@ %define with_seccomp 1 %endif -%ifarch %ix86 x86_64 +%ifarch %ix86 x86_64 s390x aarch64 ppc64le %define with_seccomp 1 %endif @@ -109,10 +110,10 @@ Summary: Universal CPU emulator License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT Group: System/Emulators/PC -Version: 2.9.0 +Version: 2.10.0 Release: 0 -Source: http://wiki.qemu.org/download/qemu-2.9.0.tar.xz -Source99: http://wiki.qemu.org/download/qemu-2.9.0.tar.xz.sig +Source: http://wiki.qemu.org/download/qemu-2.10.0.tar.xz +Source99: http://wiki.qemu.org/download/qemu-2.10.0.tar.xz.sig Source1: 80-kvm.rules Source2: qemu-ifup Source3: kvm_stat @@ -128,83 +129,44 @@ Source13: supported.s390.txt Source14: supported.arm.txt Source15: supported.ppc.txt +Source16: qemu-supportconfig # Upstream First -- http://wiki.qemu-project.org/Contribute/SubmitAPatch # This patch queue is auto-generated from https://github.com/openSUSE/qemu Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patch Patch0002: 0002-qemu-binfmt-conf-Modify-default-pat.patch -Patch0003: 0003-qemu-cvs-alsa_bitfield.patch -Patch0004: 0004-qemu-cvs-alsa_ioctl.patch -Patch0005: 0005-qemu-cvs-alsa_mmap.patch -Patch0006: 0006-qemu-cvs-gettimeofday.patch -Patch0007: 0007-qemu-cvs-ioctl_debug.patch -Patch0008: 0008-qemu-cvs-ioctl_nodirection.patch -Patch0009: 0009-linux-user-add-binfmt-wrapper-for-a.patch -Patch0010: 0010-PPC-KVM-Disable-mmu-notifier-check.patch -Patch0011: 0011-linux-user-fix-segfault-deadlock.patch -Patch0012: 0012-linux-user-binfmt-support-host-bina.patch -Patch0013: 0013-linux-user-Fake-proc-cpuinfo.patch -Patch0014: 0014-linux-user-XXX-disable-fiemap.patch -Patch0015: 0015-slirp-nooutgoing.patch -Patch0016: 0016-vnc-password-file-and-incoming-conn.patch -Patch0017: 0017-linux-user-use-target_ulong.patch -Patch0018: 0018-block-Add-support-for-DictZip-enabl.patch -Patch0019: 0019-block-Add-tar-container-format.patch -Patch0020: 0020-Legacy-Patch-kvm-qemu-preXX-dictzip.patch -Patch0021: 0021-console-add-question-mark-escape-op.patch -Patch0022: 0022-Make-char-muxer-more-robust-wrt-sma.patch -Patch0023: 0023-linux-user-lseek-explicitly-cast-no.patch -Patch0024: 0024-configure-Enable-PIE-for-ppc-and-pp.patch -Patch0025: 0025-AIO-Reduce-number-of-threads-for-32.patch -Patch0026: 0026-dictzip-Fix-on-big-endian-systems.patch -Patch0027: 0027-xen_disk-Add-suse-specific-flush-di.patch -Patch0028: 0028-qemu-bridge-helper-reduce-security-.patch -Patch0029: 0029-qemu-binfmt-conf-use-qemu-ARCH-binf.patch -Patch0030: 0030-configure-Fix-detection-of-seccomp-.patch -Patch0031: 0031-linux-user-properly-test-for-infini.patch -Patch0032: 0032-linux-user-remove-all-traces-of-qem.patch -Patch0033: 0033-roms-Makefile-pass-a-packaging-time.patch -Patch0034: 0034-Raise-soft-address-space-limit-to-h.patch -Patch0035: 0035-increase-x86_64-physical-bits-to-42.patch -Patch0036: 0036-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch -Patch0037: 0037-i8254-Fix-migration-from-SLE11-SP2.patch -Patch0038: 0038-acpi_piix4-Fix-migration-from-SLE11.patch -Patch0039: 0039-Fix-tigervnc-long-press-issue.patch -Patch0040: 0040-fix-xen-hvm-direct-kernel-boot.patch -Patch0041: 0041-string-input-visitor-Fix-uint64-par.patch -Patch0042: 0042-test-string-input-visitor-Add-int-t.patch -Patch0043: 0043-test-string-input-visitor-Add-uint6.patch -Patch0044: 0044-tests-Add-QOM-property-unit-tests.patch -Patch0045: 0045-tests-Add-scsi-disk-test.patch -Patch0046: 0046-RFC-update-Linux-headers-from-irqs-.patch -Patch0047: 0047-ARM-KVM-Enable-in-kernel-timers-wit.patch -Patch0048: 0048-input-Add-trace-event-for-empty-key.patch -Patch0049: 0049-ACPI-don-t-call-acpi_pcihp_device_p.patch -Patch0050: 0050-i386-Allow-cpuid-bit-override.patch -Patch0051: 0051-input-limit-kbd-queue-depth.patch -Patch0052: 0052-audio-release-capture-buffers.patch -Patch0053: 0053-scsi-avoid-an-off-by-one-error-in-m.patch -Patch0054: 0054-vmw_pvscsi-check-message-ring-page-.patch -Patch0055: 0055-9pfs-local-forbid-client-access-to-.patch -Patch0056: 0056-jazz_led-fix-bad-snprintf.patch -Patch0057: 0057-slirp-smb-Replace-constant-strings-.patch -Patch0058: 0058-altera_timer-fix-incorrect-memset.patch -Patch0059: 0059-Hacks-for-building-on-gcc-7-Fedora-.patch -Patch0060: 0060-9pfs-local-fix-unlink-of-alien-file.patch -Patch0061: 0061-megasas-do-not-read-DCMD-opcode-mor.patch -Patch0062: 0062-megasas-always-store-SCSIRequest-in.patch -Patch0063: 0063-nbd-Fully-initialize-client-in-case.patch -Patch0064: 0064-9pfs-local-remove-use-correct-path-.patch -Patch0065: 0065-hid-Reset-kbd-modifiers-on-reset.patch -Patch0066: 0066-input-Decrement-queue-count-on-kbd-.patch -Patch0067: 0067-xhci-only-update-dequeue-ptr-on-com.patch -Patch0068: 0068-vnc-Set-default-kbd-delay-to-10ms.patch -Patch0069: 0069-qemu-nbd-Ignore-SIGPIPE.patch -Patch0070: 0070-usb-redir-fix-stack-overflow-in-usb.patch -Patch0071: 0071-exec-use-qemu_ram_ptr_length-to-acc.patch -Patch0072: 0072-slirp-check-len-against-dhcp-option.patch -Patch0073: 0073-xen-mapcache-store-dma-information-.patch -Patch0074: 0074-exec-Add-lock-parameter-to-qemu_ram.patch -Patch0075: 0075-Replace-struct-ucontext-with-uconte.patch +Patch0003: 0003-qemu-cvs-gettimeofday.patch +Patch0004: 0004-qemu-cvs-ioctl_debug.patch +Patch0005: 0005-qemu-cvs-ioctl_nodirection.patch +Patch0006: 0006-linux-user-add-binfmt-wrapper-for-a.patch +Patch0007: 0007-PPC-KVM-Disable-mmu-notifier-check.patch +Patch0008: 0008-linux-user-fix-segfault-deadlock.patch +Patch0009: 0009-linux-user-binfmt-support-host-bina.patch +Patch0010: 0010-linux-user-Fake-proc-cpuinfo.patch +Patch0011: 0011-linux-user-XXX-disable-fiemap.patch +Patch0012: 0012-linux-user-use-target_ulong.patch +Patch0013: 0013-console-add-question-mark-escape-op.patch +Patch0014: 0014-Make-char-muxer-more-robust-wrt-sma.patch +Patch0015: 0015-linux-user-lseek-explicitly-cast-no.patch +Patch0016: 0016-AIO-Reduce-number-of-threads-for-32.patch +Patch0017: 0017-xen_disk-Add-suse-specific-flush-di.patch +Patch0018: 0018-qemu-bridge-helper-reduce-security-.patch +Patch0019: 0019-qemu-binfmt-conf-use-qemu-ARCH-binf.patch +Patch0020: 0020-configure-Fix-detection-of-seccomp-.patch +Patch0021: 0021-linux-user-properly-test-for-infini.patch +Patch0022: 0022-roms-Makefile-pass-a-packaging-time.patch +Patch0023: 0023-Raise-soft-address-space-limit-to-h.patch +Patch0024: 0024-increase-x86_64-physical-bits-to-42.patch +Patch0025: 0025-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch +Patch0026: 0026-i8254-Fix-migration-from-SLE11-SP2.patch +Patch0027: 0027-acpi_piix4-Fix-migration-from-SLE11.patch +Patch0028: 0028-Fix-tigervnc-long-press-issue.patch +Patch0029: 0029-string-input-visitor-Fix-uint64-par.patch +Patch0030: 0030-test-string-input-visitor-Add-int-t.patch +Patch0031: 0031-test-string-input-visitor-Add-uint6.patch +Patch0032: 0032-tests-Add-QOM-property-unit-tests.patch +Patch0033: 0033-tests-Add-scsi-disk-test.patch +Patch0034: 0034-slirp-fix-clearing-ifq_so-from-pend.patch +Patch0035: 0035-s390-ccw-Fix-alignment-for-CCW1.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. @@ -214,10 +176,6 @@ # PATCH-FIX-OPENSUSE ipxe-stable-buildid.patch brog...@suse.com -- reproducible builds Patch1100: ipxe-stable-buildid.patch Patch1101: ipxe-use-gcc6-for-more-compact-code.patch -Patch1102: ipxe-build-Avoid-implicit-fallthrough-warnings-on-GCC-7.patch -Patch1103: ipxe-iscsi-Always-send-FirstBurstLength-parameter.patch -Patch1104: ipxe-ath-Add-missing-break-statements.patch -Patch1105: ipxe-mucurses-Fix-erroneous-__nonnull-attribute.patch # sgabios # PATCH-FIX-OPENSUSE sgabios-stable-buildid.patch brog...@suse.com -- reproducible builds @@ -227,6 +185,7 @@ # this is to make lint happy Source300: qemu-rpmlintrc +Source301: ipxe-stub-out-the-SAN-req-s-in-int13.patch Source302: bridge.conf Source400: update_git.sh ExcludeArch: s390 @@ -290,9 +249,6 @@ BuildRequires: libgbm-devel BuildRequires: libgcrypt-devel BuildRequires: libgnutls-devel -%if 0%{?suse_version} >= 1315 -BuildRequires: libibverbs-devel -%endif %if 0%{?with_rbd} %if 0%{?is_opensuse} || 0%{?sle_version} > 120100 BuildRequires: librbd-devel @@ -326,9 +282,6 @@ BuildRequires: libpixman-1-0-devel BuildRequires: libpng-devel BuildRequires: libpulse-devel -%if 0%{?suse_version} >= 1315 -BuildRequires: librdmacm-devel -%endif %if 0%{?with_seccomp} BuildRequires: libseccomp-devel %endif @@ -358,6 +311,9 @@ BuildRequires: pkgconfig BuildRequires: pwdutils BuildRequires: python +%if 0%{?suse_version} >= 1315 +BuildRequires: rdma-core-devel +%endif %if 0%{?suse_version} >= 1310 BuildRequires: snappy-devel %endif @@ -859,7 +815,7 @@ %endif # !qemu-testsuite %prep -%setup -q -n qemu-2.9.0 +%setup -q -n qemu-2.10.0 %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 @@ -895,56 +851,12 @@ %patch0033 -p1 %patch0034 -p1 %patch0035 -p1 -%patch0036 -p1 -%patch0037 -p1 -%patch0038 -p1 -%patch0039 -p1 -%patch0040 -p1 -%patch0041 -p1 -%patch0042 -p1 -%patch0043 -p1 -%patch0044 -p1 -%patch0045 -p1 -%patch0046 -p1 -%patch0047 -p1 -%patch0048 -p1 -%patch0049 -p1 -%patch0050 -p1 -%patch0051 -p1 -%patch0052 -p1 -%patch0053 -p1 -%patch0054 -p1 -%patch0055 -p1 -%patch0056 -p1 -%patch0057 -p1 -%patch0058 -p1 -%patch0059 -p1 -%patch0060 -p1 -%patch0061 -p1 -%patch0062 -p1 -%patch0063 -p1 -%patch0064 -p1 -%patch0065 -p1 -%patch0066 -p1 -%patch0067 -p1 -%patch0068 -p1 -%patch0069 -p1 -%patch0070 -p1 -%patch0071 -p1 -%patch0072 -p1 -%patch0073 -p1 -%patch0074 -p1 -%patch0075 -p1 pushd roms/ipxe %patch1100 -p1 %if 0%{?suse_version} <= 1320 %patch1101 -p1 %endif -%patch1102 -p1 -%patch1103 -p1 -%patch1104 -p1 -%patch1105 -p1 popd pushd roms/sgabios @@ -1166,6 +1078,14 @@ make %{?_smp_mflags} -C roms efirom %endif make -C roms sgabios + +%if %{force_fit_virtio_pxe_rom} +pushd roms/ipxe +patch -p1 < %{SOURCE301} +popd +make %{?_smp_mflags} -C roms pxerom_variants=virtio pxerom_targets=1af41000 NO_WERROR=1 pxerom +%endif + # enforce pxe rom sizes for migration compatability from SLE 11 SP3 forward # the following need to be > 64K %define supported_nics_large {e1000 rtl8139} @@ -1283,6 +1203,9 @@ install -D -m 0644 %{SOURCE14} %{buildroot}%{_docdir}/qemu-arm/supported.txt install -D -m 0644 %{SOURCE15} %{buildroot}%{_docdir}/qemu-ppc/supported.txt %endif +# install supportconfig plugin +mkdir -p %{buildroot}%{_libexecdir}/supportconfig/plugins +install -D -m 0755 %{SOURCE16} %{buildroot}%{_libexecdir}/supportconfig/plugins/qemu %if %{legacy_qemu_kvm} cat > %{buildroot}%{_bindir}/qemu-kvm << 'EOF' #!/bin/sh @@ -1445,6 +1368,9 @@ %_datadir/%name/qemu_logo_no_text.svg %dir %_sysconfdir/%name %_datadir/%name/qemu-ifup +%dir %_libexecdir/supportconfig +%dir %_libexecdir/supportconfig/plugins +%_libexecdir/supportconfig/plugins/qemu %if %{kvm_available} %if 0%{?suse_version} <= 1320 %_bindir/kvm_stat @@ -1489,6 +1415,8 @@ %_datadir/%name/bamboo.dtb %_datadir/%name/petalogix-ml605.dtb %_datadir/%name/skiboot.lid +%_datadir/%name/qemu_vga.ndrv +%_datadir/%name/s390-netboot.img %if 0%{?is_opensuse} == 0 %dir %_docdir/qemu-ppc %_docdir/qemu-ppc/supported.txt ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.ga9cmO/_old 2017-09-07 22:09:52.283243463 +0200 +++ /var/tmp/diff_new_pack.ga9cmO/_new 2017-09-07 22:09:52.287242899 +0200 @@ -22,6 +22,7 @@ %define build_slof_from_source 0 %define kvm_available 0 %define legacy_qemu_kvm 0 +%define force_fit_virtio_pxe_rom 1 %ifarch %ix86 x86_64 # choice of building all from source or using provided binary x86 blobs @@ -86,7 +87,7 @@ %define with_seccomp 1 %endif -%ifarch %ix86 x86_64 +%ifarch %ix86 x86_64 s390x aarch64 ppc64le %define with_seccomp 1 %endif @@ -109,10 +110,10 @@ Summary: Universal CPU emulator License: BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT Group: System/Emulators/PC -Version: 2.9.0 +Version: 2.10.0 Release: 0 -Source: http://wiki.qemu.org/download/qemu-2.9.0.tar.xz -Source99: http://wiki.qemu.org/download/qemu-2.9.0.tar.xz.sig +Source: http://wiki.qemu.org/download/qemu-2.10.0.tar.xz +Source99: http://wiki.qemu.org/download/qemu-2.10.0.tar.xz.sig Source1: 80-kvm.rules Source2: qemu-ifup Source3: kvm_stat @@ -128,83 +129,44 @@ Source13: supported.s390.txt Source14: supported.arm.txt Source15: supported.ppc.txt +Source16: qemu-supportconfig # Upstream First -- http://wiki.qemu-project.org/Contribute/SubmitAPatch # This patch queue is auto-generated from https://github.com/openSUSE/qemu Patch0001: 0001-XXX-dont-dump-core-on-sigabort.patch Patch0002: 0002-qemu-binfmt-conf-Modify-default-pat.patch -Patch0003: 0003-qemu-cvs-alsa_bitfield.patch -Patch0004: 0004-qemu-cvs-alsa_ioctl.patch -Patch0005: 0005-qemu-cvs-alsa_mmap.patch -Patch0006: 0006-qemu-cvs-gettimeofday.patch -Patch0007: 0007-qemu-cvs-ioctl_debug.patch -Patch0008: 0008-qemu-cvs-ioctl_nodirection.patch -Patch0009: 0009-linux-user-add-binfmt-wrapper-for-a.patch -Patch0010: 0010-PPC-KVM-Disable-mmu-notifier-check.patch -Patch0011: 0011-linux-user-fix-segfault-deadlock.patch -Patch0012: 0012-linux-user-binfmt-support-host-bina.patch -Patch0013: 0013-linux-user-Fake-proc-cpuinfo.patch -Patch0014: 0014-linux-user-XXX-disable-fiemap.patch -Patch0015: 0015-slirp-nooutgoing.patch -Patch0016: 0016-vnc-password-file-and-incoming-conn.patch -Patch0017: 0017-linux-user-use-target_ulong.patch -Patch0018: 0018-block-Add-support-for-DictZip-enabl.patch -Patch0019: 0019-block-Add-tar-container-format.patch -Patch0020: 0020-Legacy-Patch-kvm-qemu-preXX-dictzip.patch -Patch0021: 0021-console-add-question-mark-escape-op.patch -Patch0022: 0022-Make-char-muxer-more-robust-wrt-sma.patch -Patch0023: 0023-linux-user-lseek-explicitly-cast-no.patch -Patch0024: 0024-configure-Enable-PIE-for-ppc-and-pp.patch -Patch0025: 0025-AIO-Reduce-number-of-threads-for-32.patch -Patch0026: 0026-dictzip-Fix-on-big-endian-systems.patch -Patch0027: 0027-xen_disk-Add-suse-specific-flush-di.patch -Patch0028: 0028-qemu-bridge-helper-reduce-security-.patch -Patch0029: 0029-qemu-binfmt-conf-use-qemu-ARCH-binf.patch -Patch0030: 0030-configure-Fix-detection-of-seccomp-.patch -Patch0031: 0031-linux-user-properly-test-for-infini.patch -Patch0032: 0032-linux-user-remove-all-traces-of-qem.patch -Patch0033: 0033-roms-Makefile-pass-a-packaging-time.patch -Patch0034: 0034-Raise-soft-address-space-limit-to-h.patch -Patch0035: 0035-increase-x86_64-physical-bits-to-42.patch -Patch0036: 0036-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch -Patch0037: 0037-i8254-Fix-migration-from-SLE11-SP2.patch -Patch0038: 0038-acpi_piix4-Fix-migration-from-SLE11.patch -Patch0039: 0039-Fix-tigervnc-long-press-issue.patch -Patch0040: 0040-fix-xen-hvm-direct-kernel-boot.patch -Patch0041: 0041-string-input-visitor-Fix-uint64-par.patch -Patch0042: 0042-test-string-input-visitor-Add-int-t.patch -Patch0043: 0043-test-string-input-visitor-Add-uint6.patch -Patch0044: 0044-tests-Add-QOM-property-unit-tests.patch -Patch0045: 0045-tests-Add-scsi-disk-test.patch -Patch0046: 0046-RFC-update-Linux-headers-from-irqs-.patch -Patch0047: 0047-ARM-KVM-Enable-in-kernel-timers-wit.patch -Patch0048: 0048-input-Add-trace-event-for-empty-key.patch -Patch0049: 0049-ACPI-don-t-call-acpi_pcihp_device_p.patch -Patch0050: 0050-i386-Allow-cpuid-bit-override.patch -Patch0051: 0051-input-limit-kbd-queue-depth.patch -Patch0052: 0052-audio-release-capture-buffers.patch -Patch0053: 0053-scsi-avoid-an-off-by-one-error-in-m.patch -Patch0054: 0054-vmw_pvscsi-check-message-ring-page-.patch -Patch0055: 0055-9pfs-local-forbid-client-access-to-.patch -Patch0056: 0056-jazz_led-fix-bad-snprintf.patch -Patch0057: 0057-slirp-smb-Replace-constant-strings-.patch -Patch0058: 0058-altera_timer-fix-incorrect-memset.patch -Patch0059: 0059-Hacks-for-building-on-gcc-7-Fedora-.patch -Patch0060: 0060-9pfs-local-fix-unlink-of-alien-file.patch -Patch0061: 0061-megasas-do-not-read-DCMD-opcode-mor.patch -Patch0062: 0062-megasas-always-store-SCSIRequest-in.patch -Patch0063: 0063-nbd-Fully-initialize-client-in-case.patch -Patch0064: 0064-9pfs-local-remove-use-correct-path-.patch -Patch0065: 0065-hid-Reset-kbd-modifiers-on-reset.patch -Patch0066: 0066-input-Decrement-queue-count-on-kbd-.patch -Patch0067: 0067-xhci-only-update-dequeue-ptr-on-com.patch -Patch0068: 0068-vnc-Set-default-kbd-delay-to-10ms.patch -Patch0069: 0069-qemu-nbd-Ignore-SIGPIPE.patch -Patch0070: 0070-usb-redir-fix-stack-overflow-in-usb.patch -Patch0071: 0071-exec-use-qemu_ram_ptr_length-to-acc.patch -Patch0072: 0072-slirp-check-len-against-dhcp-option.patch -Patch0073: 0073-xen-mapcache-store-dma-information-.patch -Patch0074: 0074-exec-Add-lock-parameter-to-qemu_ram.patch -Patch0075: 0075-Replace-struct-ucontext-with-uconte.patch +Patch0003: 0003-qemu-cvs-gettimeofday.patch +Patch0004: 0004-qemu-cvs-ioctl_debug.patch +Patch0005: 0005-qemu-cvs-ioctl_nodirection.patch +Patch0006: 0006-linux-user-add-binfmt-wrapper-for-a.patch +Patch0007: 0007-PPC-KVM-Disable-mmu-notifier-check.patch +Patch0008: 0008-linux-user-fix-segfault-deadlock.patch +Patch0009: 0009-linux-user-binfmt-support-host-bina.patch +Patch0010: 0010-linux-user-Fake-proc-cpuinfo.patch +Patch0011: 0011-linux-user-XXX-disable-fiemap.patch +Patch0012: 0012-linux-user-use-target_ulong.patch +Patch0013: 0013-console-add-question-mark-escape-op.patch +Patch0014: 0014-Make-char-muxer-more-robust-wrt-sma.patch +Patch0015: 0015-linux-user-lseek-explicitly-cast-no.patch +Patch0016: 0016-AIO-Reduce-number-of-threads-for-32.patch +Patch0017: 0017-xen_disk-Add-suse-specific-flush-di.patch +Patch0018: 0018-qemu-bridge-helper-reduce-security-.patch +Patch0019: 0019-qemu-binfmt-conf-use-qemu-ARCH-binf.patch +Patch0020: 0020-configure-Fix-detection-of-seccomp-.patch +Patch0021: 0021-linux-user-properly-test-for-infini.patch +Patch0022: 0022-roms-Makefile-pass-a-packaging-time.patch +Patch0023: 0023-Raise-soft-address-space-limit-to-h.patch +Patch0024: 0024-increase-x86_64-physical-bits-to-42.patch +Patch0025: 0025-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch +Patch0026: 0026-i8254-Fix-migration-from-SLE11-SP2.patch +Patch0027: 0027-acpi_piix4-Fix-migration-from-SLE11.patch +Patch0028: 0028-Fix-tigervnc-long-press-issue.patch +Patch0029: 0029-string-input-visitor-Fix-uint64-par.patch +Patch0030: 0030-test-string-input-visitor-Add-int-t.patch +Patch0031: 0031-test-string-input-visitor-Add-uint6.patch +Patch0032: 0032-tests-Add-QOM-property-unit-tests.patch +Patch0033: 0033-tests-Add-scsi-disk-test.patch +Patch0034: 0034-slirp-fix-clearing-ifq_so-from-pend.patch +Patch0035: 0035-s390-ccw-Fix-alignment-for-CCW1.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. @@ -214,10 +176,6 @@ # PATCH-FIX-OPENSUSE ipxe-stable-buildid.patch brog...@suse.com -- reproducible builds Patch1100: ipxe-stable-buildid.patch Patch1101: ipxe-use-gcc6-for-more-compact-code.patch -Patch1102: ipxe-build-Avoid-implicit-fallthrough-warnings-on-GCC-7.patch -Patch1103: ipxe-iscsi-Always-send-FirstBurstLength-parameter.patch -Patch1104: ipxe-ath-Add-missing-break-statements.patch -Patch1105: ipxe-mucurses-Fix-erroneous-__nonnull-attribute.patch # sgabios # PATCH-FIX-OPENSUSE sgabios-stable-buildid.patch brog...@suse.com -- reproducible builds @@ -227,6 +185,7 @@ # this is to make lint happy Source300: qemu-rpmlintrc +Source301: ipxe-stub-out-the-SAN-req-s-in-int13.patch Source302: bridge.conf Source400: update_git.sh ExcludeArch: s390 @@ -290,9 +249,6 @@ BuildRequires: libgbm-devel BuildRequires: libgcrypt-devel BuildRequires: libgnutls-devel -%if 0%{?suse_version} >= 1315 -BuildRequires: libibverbs-devel -%endif %if 0%{?with_rbd} %if 0%{?is_opensuse} || 0%{?sle_version} > 120100 BuildRequires: librbd-devel @@ -326,9 +282,6 @@ BuildRequires: libpixman-1-0-devel BuildRequires: libpng-devel BuildRequires: libpulse-devel -%if 0%{?suse_version} >= 1315 -BuildRequires: librdmacm-devel -%endif %if 0%{?with_seccomp} BuildRequires: libseccomp-devel %endif @@ -358,6 +311,9 @@ BuildRequires: pkgconfig BuildRequires: pwdutils BuildRequires: python +%if 0%{?suse_version} >= 1315 +BuildRequires: rdma-core-devel +%endif %if 0%{?suse_version} >= 1310 BuildRequires: snappy-devel %endif @@ -859,7 +815,7 @@ %endif # !qemu-testsuite %prep -%setup -q -n qemu-2.9.0 +%setup -q -n qemu-2.10.0 %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 @@ -895,56 +851,12 @@ %patch0033 -p1 %patch0034 -p1 %patch0035 -p1 -%patch0036 -p1 -%patch0037 -p1 -%patch0038 -p1 -%patch0039 -p1 -%patch0040 -p1 -%patch0041 -p1 -%patch0042 -p1 -%patch0043 -p1 -%patch0044 -p1 -%patch0045 -p1 -%patch0046 -p1 -%patch0047 -p1 -%patch0048 -p1 -%patch0049 -p1 -%patch0050 -p1 -%patch0051 -p1 -%patch0052 -p1 -%patch0053 -p1 -%patch0054 -p1 -%patch0055 -p1 -%patch0056 -p1 -%patch0057 -p1 -%patch0058 -p1 -%patch0059 -p1 -%patch0060 -p1 -%patch0061 -p1 -%patch0062 -p1 -%patch0063 -p1 -%patch0064 -p1 -%patch0065 -p1 -%patch0066 -p1 -%patch0067 -p1 -%patch0068 -p1 -%patch0069 -p1 -%patch0070 -p1 -%patch0071 -p1 -%patch0072 -p1 -%patch0073 -p1 -%patch0074 -p1 -%patch0075 -p1 pushd roms/ipxe %patch1100 -p1 %if 0%{?suse_version} <= 1320 %patch1101 -p1 %endif -%patch1102 -p1 -%patch1103 -p1 -%patch1104 -p1 -%patch1105 -p1 popd pushd roms/sgabios @@ -1166,6 +1078,14 @@ make %{?_smp_mflags} -C roms efirom %endif make -C roms sgabios + +%if %{force_fit_virtio_pxe_rom} +pushd roms/ipxe +patch -p1 < %{SOURCE301} +popd +make %{?_smp_mflags} -C roms pxerom_variants=virtio pxerom_targets=1af41000 NO_WERROR=1 pxerom +%endif + # enforce pxe rom sizes for migration compatability from SLE 11 SP3 forward # the following need to be > 64K %define supported_nics_large {e1000 rtl8139} @@ -1283,6 +1203,9 @@ install -D -m 0644 %{SOURCE14} %{buildroot}%{_docdir}/qemu-arm/supported.txt install -D -m 0644 %{SOURCE15} %{buildroot}%{_docdir}/qemu-ppc/supported.txt %endif +# install supportconfig plugin +mkdir -p %{buildroot}%{_libexecdir}/supportconfig/plugins +install -D -m 0755 %{SOURCE16} %{buildroot}%{_libexecdir}/supportconfig/plugins/qemu %if %{legacy_qemu_kvm} cat > %{buildroot}%{_bindir}/qemu-kvm << 'EOF' #!/bin/sh @@ -1445,6 +1368,9 @@ %_datadir/%name/qemu_logo_no_text.svg %dir %_sysconfdir/%name %_datadir/%name/qemu-ifup +%dir %_libexecdir/supportconfig +%dir %_libexecdir/supportconfig/plugins +%_libexecdir/supportconfig/plugins/qemu %if %{kvm_available} %if 0%{?suse_version} <= 1320 %_bindir/kvm_stat @@ -1489,6 +1415,8 @@ %_datadir/%name/bamboo.dtb %_datadir/%name/petalogix-ml605.dtb %_datadir/%name/skiboot.lid +%_datadir/%name/qemu_vga.ndrv +%_datadir/%name/s390-netboot.img %if 0%{?is_opensuse} == 0 %dir %_docdir/qemu-ppc %_docdir/qemu-ppc/supported.txt ++++++ 0001-XXX-dont-dump-core-on-sigabort.patch ++++++ --- /var/tmp/diff_new_pack.ga9cmO/_old 2017-09-07 22:09:52.311239517 +0200 +++ /var/tmp/diff_new_pack.ga9cmO/_new 2017-09-07 22:09:52.315238954 +0200 @@ -1,4 +1,4 @@ -From c033f8e4e487f2b1a09c86351f33c116464509af Mon Sep 17 00:00:00 2001 +From 5e63842369b27b4db6bc20d1d2652f7ce0ed0c29 Mon Sep 17 00:00:00 2001 From: Alexander Graf <ag...@suse.de> Date: Mon, 21 Nov 2011 23:50:36 +0100 Subject: [PATCH] XXX dont dump core on sigabort @@ -8,7 +8,7 @@ 1 file changed, 6 insertions(+) diff --git a/linux-user/signal.c b/linux-user/signal.c -index a67db04e1a..a11728f6e0 100644 +index cc0c3fcee9..47f1a89860 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -560,6 +560,10 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig) ++++++ 0002-qemu-binfmt-conf-Modify-default-pat.patch ++++++ --- /var/tmp/diff_new_pack.ga9cmO/_old 2017-09-07 22:09:52.323237826 +0200 +++ /var/tmp/diff_new_pack.ga9cmO/_new 2017-09-07 22:09:52.327237262 +0200 @@ -1,4 +1,4 @@ -From 70b4b47993dbbae58b80e504f4bc373e75a4acfb Mon Sep 17 00:00:00 2001 +From a4246a201cfc32b55f59afafb42ba81758f2dd66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaer...@suse.de> Date: Wed, 10 Aug 2016 19:00:24 +0200 Subject: [PATCH] qemu-binfmt-conf: Modify default path @@ -14,7 +14,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh -index 0f1aa63872..9fcd95a435 100755 +index 8afc3eb5bb..5c3ba942ec 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -264,7 +264,7 @@ BINFMT_SET=qemu_register_interpreter ++++++ 0006-qemu-cvs-gettimeofday.patch -> 0003-qemu-cvs-gettimeofday.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0006-qemu-cvs-gettimeofday.patch 2017-06-04 01:49:56.140064724 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0003-qemu-cvs-gettimeofday.patch 2017-09-07 22:09:40.192947585 +0200 @@ -1,4 +1,4 @@ -From cc91b17c96a16f1fccdbe4f7ab534816b4ff5e77 Mon Sep 17 00:00:00 2001 +From b05b060316ffa77e26dc32215b3cfd49286b0c2f Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <u...@suse.de> Date: Tue, 14 Apr 2009 16:25:41 +0200 Subject: [PATCH] qemu-cvs-gettimeofday @@ -9,10 +9,10 @@ 1 file changed, 2 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index cec8428589..03c3576dab 100644 +index 9b6364a266..ec6ee23f96 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -8914,6 +8914,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, +@@ -8950,6 +8950,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, case TARGET_NR_gettimeofday: { struct timeval tv; ++++++ 0007-qemu-cvs-ioctl_debug.patch -> 0004-qemu-cvs-ioctl_debug.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0007-qemu-cvs-ioctl_debug.patch 2017-06-04 01:49:56.176059639 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0004-qemu-cvs-ioctl_debug.patch 2017-09-07 22:09:40.600890086 +0200 @@ -1,4 +1,4 @@ -From a047a2ecf689e8f70d09ad3804b1c1fe8bca4406 Mon Sep 17 00:00:00 2001 +From b92757bdfdd6bec948283cec7183ab3a2cdfa2d9 Mon Sep 17 00:00:00 2001 From: Alexander Graf <ag...@suse.de> Date: Tue, 14 Apr 2009 16:26:33 +0200 Subject: [PATCH] qemu-cvs-ioctl_debug @@ -12,10 +12,10 @@ 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 03c3576dab..891ee1c6ea 100644 +index ec6ee23f96..cf290dbf4b 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -5611,7 +5611,12 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) +@@ -5615,7 +5615,12 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) ie = ioctl_entries; for(;;) { if (ie->target_cmd == 0) { ++++++ 0008-qemu-cvs-ioctl_nodirection.patch -> 0005-qemu-cvs-ioctl_nodirection.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0008-qemu-cvs-ioctl_nodirection.patch 2017-06-04 01:49:56.212054553 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0005-qemu-cvs-ioctl_nodirection.patch 2017-09-07 22:09:41.276794817 +0200 @@ -1,4 +1,4 @@ -From 82f268e91d5582f5bf7c327abe2ba6c4ff527f7b Mon Sep 17 00:00:00 2001 +From 1e894eafd90d078886d31e50774d8f3b5732f087 Mon Sep 17 00:00:00 2001 From: Alexander Graf <ag...@suse.de> Date: Tue, 14 Apr 2009 16:27:36 +0200 Subject: [PATCH] qemu-cvs-ioctl_nodirection @@ -15,10 +15,10 @@ 1 file changed, 6 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 891ee1c6ea..2f82a7d1a6 100644 +index cf290dbf4b..1802aec4cb 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -5648,6 +5648,11 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) +@@ -5652,6 +5652,11 @@ 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) { @@ -30,7 +30,7 @@ case IOC_R: ret = get_errno(safe_ioctl(fd, ie->host_cmd, buf_temp)); if (!is_error(ret)) { -@@ -5666,6 +5671,7 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) +@@ -5670,6 +5675,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; ++++++ 0009-linux-user-add-binfmt-wrapper-for-a.patch -> 0006-linux-user-add-binfmt-wrapper-for-a.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0009-linux-user-add-binfmt-wrapper-for-a.patch 2017-06-04 01:49:56.252048902 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0006-linux-user-add-binfmt-wrapper-for-a.patch 2017-09-07 22:09:41.296791998 +0200 @@ -1,4 +1,4 @@ -From c1f6c6bbb68c9ceb462cb3f8f4a2abd719f67bd5 Mon Sep 17 00:00:00 2001 +From 05252b67f56cf792580ff32cd8f577f747bf588e Mon Sep 17 00:00:00 2001 From: Alexander Graf <ag...@suse.de> Date: Fri, 30 Sep 2011 19:40:36 +0200 Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling @@ -37,7 +37,7 @@ create mode 100644 linux-user/binfmt.c diff --git a/Makefile.target b/Makefile.target -index 7df2b8c149..85ae084545 100644 +index 7f42c45db8..b5a3574059 100644 --- a/Makefile.target +++ b/Makefile.target @@ -36,6 +36,10 @@ endif @@ -60,7 +60,7 @@ endif #CONFIG_LINUX_USER ######################################################### -@@ -169,7 +175,11 @@ endif # CONFIG_SOFTMMU +@@ -162,7 +168,11 @@ endif # CONFIG_SOFTMMU # Workaround for http://gcc.gnu.org/PR55489, see configure. %/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS) @@ -72,7 +72,7 @@ all-obj-y := $(obj-y) target-obj-y := -@@ -211,6 +221,9 @@ ifdef CONFIG_DARWIN +@@ -203,6 +213,9 @@ ifdef CONFIG_DARWIN $(call quiet-command,SetFile -a C $@,"SETFILE","$(TARGET_DIR)$@") endif ++++++ 0010-PPC-KVM-Disable-mmu-notifier-check.patch -> 0007-PPC-KVM-Disable-mmu-notifier-check.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0010-PPC-KVM-Disable-mmu-notifier-check.patch 2017-06-04 01:49:56.288043816 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0007-PPC-KVM-Disable-mmu-notifier-check.patch 2017-09-07 22:09:41.312789743 +0200 @@ -1,4 +1,4 @@ -From 5af3522f9a43395d9445806b150c0b9f5a7d107e Mon Sep 17 00:00:00 2001 +From e1e2752d5d87ad1b341e1205938c627ca0d7f82c Mon Sep 17 00:00:00 2001 From: Alexander Graf <ag...@suse.de> Date: Fri, 6 Jan 2012 01:05:55 +0100 Subject: [PATCH] PPC: KVM: Disable mmu notifier check @@ -13,12 +13,12 @@ 1 file changed, 2 insertions(+) diff --git a/exec.c b/exec.c -index c97ef4a8da..b47b3f9096 100644 +index d20c34ca83..b54fbb02c8 100644 --- a/exec.c +++ b/exec.c -@@ -1362,11 +1362,13 @@ static void *file_ram_alloc(RAMBlock *block, - int fd = -1; - int64_t file_size; +@@ -1950,11 +1950,13 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, + return NULL; + } +#ifndef TARGET_PPC if (kvm_enabled() && !kvm_has_sync_mmu()) { @@ -28,5 +28,5 @@ } +#endif - for (;;) { - fd = open(path, O_RDWR); + if (phys_mem_alloc != qemu_anon_ram_alloc) { + /* ++++++ 0011-linux-user-fix-segfault-deadlock.patch -> 0008-linux-user-fix-segfault-deadlock.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0011-linux-user-fix-segfault-deadlock.patch 2017-06-04 01:49:56.332037601 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0008-linux-user-fix-segfault-deadlock.patch 2017-09-07 22:09:41.324788053 +0200 @@ -1,4 +1,4 @@ -From ebdfb6b8345badf51e6da5f56abcb069de29ebfe Mon Sep 17 00:00:00 2001 +From d37e6a8cf4aafca05c62d45a9e0f6c7a2315bd90 Mon Sep 17 00:00:00 2001 From: Alexander Graf <ag...@suse.de> Date: Fri, 13 Jan 2012 17:05:41 +0100 Subject: [PATCH] linux-user: fix segfault deadlock @@ -26,7 +26,7 @@ 1 file changed, 4 insertions(+) diff --git a/user-exec.c b/user-exec.c -index a8f95fa1e1..c262653604 100644 +index 2a975eaf69..6225c4e1a8 100644 --- a/user-exec.c +++ b/user-exec.c @@ -78,6 +78,10 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address, ++++++ 0012-linux-user-binfmt-support-host-bina.patch -> 0009-linux-user-binfmt-support-host-bina.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0012-linux-user-binfmt-support-host-bina.patch 2017-06-04 01:49:56.368032515 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0009-linux-user-binfmt-support-host-bina.patch 2017-09-07 22:09:41.340785798 +0200 @@ -1,4 +1,4 @@ -From 8a8e7f00c3028d2f07a8afd4dabf20b634654637 Mon Sep 17 00:00:00 2001 +From 36b9976bddad38fa0aa991655482c0c087c2e704 Mon Sep 17 00:00:00 2001 From: Alexander Graf <ag...@suse.de> Date: Thu, 2 Feb 2012 18:02:33 +0100 Subject: [PATCH] linux-user: binfmt: support host binaries ++++++ 0013-linux-user-Fake-proc-cpuinfo.patch -> 0010-linux-user-Fake-proc-cpuinfo.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0013-linux-user-Fake-proc-cpuinfo.patch 2017-06-04 01:49:56.400027994 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0010-linux-user-Fake-proc-cpuinfo.patch 2017-09-07 22:09:41.352784106 +0200 @@ -1,4 +1,4 @@ -From fd25a10cf311c732589a131c107b0dd61a845ecf Mon Sep 17 00:00:00 2001 +From 8993e5938b5c14148c8fe4898946731c61707ecd Mon Sep 17 00:00:00 2001 From: Alexander Graf <ag...@suse.de> Date: Mon, 23 Jul 2012 10:24:14 +0200 Subject: [PATCH] linux-user: Fake /proc/cpuinfo @@ -22,10 +22,10 @@ 1 file changed, 20 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 2f82a7d1a6..37b49bd406 100644 +index 1802aec4cb..cf22c5b96a 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -7503,6 +7503,25 @@ static int open_self_stat(void *cpu_env, int fd) +@@ -7472,6 +7472,25 @@ static int open_self_stat(void *cpu_env, int fd) return 0; } @@ -51,7 +51,7 @@ static int open_self_auxv(void *cpu_env, int fd) { CPUState *cpu = ENV_GET_CPU((CPUArchState *)cpu_env); -@@ -7617,6 +7636,7 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags, +@@ -7586,6 +7605,7 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags, #if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN) { "/proc/net/route", open_net_route, is_proc }, #endif ++++++ 0014-linux-user-XXX-disable-fiemap.patch -> 0011-linux-user-XXX-disable-fiemap.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0014-linux-user-XXX-disable-fiemap.patch 2017-06-04 01:49:56.432023473 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0011-linux-user-XXX-disable-fiemap.patch 2017-09-07 22:09:41.364782416 +0200 @@ -1,4 +1,4 @@ -From be8989734d0f8f83659186495cca577e3844a310 Mon Sep 17 00:00:00 2001 +From 6c7351296bd1d8b500f33c7ef7832d3d12a76bb4 Mon Sep 17 00:00:00 2001 From: Alexander Graf <ag...@suse.de> Date: Tue, 21 Aug 2012 14:20:40 +0200 Subject: [PATCH] linux-user: XXX disable fiemap @@ -9,10 +9,10 @@ 1 file changed, 5 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 37b49bd406..983475a0b9 100644 +index cf22c5b96a..99e9ee82ed 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -5076,6 +5076,11 @@ static abi_long do_ioctl_fs_ioc_fiemap(const IOCTLEntry *ie, uint8_t *buf_temp, +@@ -5080,6 +5080,11 @@ static abi_long do_ioctl_fs_ioc_fiemap(const IOCTLEntry *ie, uint8_t *buf_temp, uint32_t outbufsz; int free_fm = 0; ++++++ 0017-linux-user-use-target_ulong.patch -> 0012-linux-user-use-target_ulong.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0017-linux-user-use-target_ulong.patch 2017-06-04 01:49:56.532009347 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0012-linux-user-use-target_ulong.patch 2017-09-07 22:09:41.380780160 +0200 @@ -1,4 +1,4 @@ -From 86cc99ea8d1648c0e2388cde261e8349d7f235b8 Mon Sep 17 00:00:00 2001 +From ca891b6c05280246f827a2692d216efa763a3eff Mon Sep 17 00:00:00 2001 From: Alexander Graf <ag...@suse.de> Date: Tue, 9 Oct 2012 09:06:49 +0200 Subject: [PATCH] linux-user: use target_ulong @@ -36,10 +36,10 @@ extern THREAD CPUState *thread_cpu; void cpu_loop(CPUArchState *env); diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 983475a0b9..1472d72f27 100644 +index 99e9ee82ed..a2bb65922b 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -7710,10 +7710,10 @@ static target_timer_t get_timer_id(abi_long arg) +@@ -7728,10 +7728,10 @@ static TargetFdTrans target_inotify_trans = { /* do_syscall() should always have a single exit point at the end so that actions, such as logging of syscall results, can be performed. All errnos that do_syscall() returns must be -TARGET_<errcode>. */ ++++++ 0021-console-add-question-mark-escape-op.patch -> 0013-console-add-question-mark-escape-op.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0021-console-add-question-mark-escape-op.patch 2017-06-04 01:49:56.731981093 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0013-console-add-question-mark-escape-op.patch 2017-09-07 22:09:41.396777906 +0200 @@ -1,4 +1,4 @@ -From 0e5cce67ba0aafd9cf0bc3c31a3b24706bee26f4 Mon Sep 17 00:00:00 2001 +From 8f591fd391262fbf76373136fc5a1629635b4de4 Mon Sep 17 00:00:00 2001 From: Alexander Graf <ag...@suse.de> Date: Mon, 6 Jun 2011 06:53:52 +0200 Subject: [PATCH] console: add question-mark escape operator @@ -16,7 +16,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/console.c b/ui/console.c -index 419b098c11..9688457480 100644 +index d2d3534c49..c28e19c375 100644 --- a/ui/console.c +++ b/ui/console.c @@ -880,7 +880,7 @@ static void console_putchar(QemuConsole *s, int ch) ++++++ 0022-Make-char-muxer-more-robust-wrt-sma.patch -> 0014-Make-char-muxer-more-robust-wrt-sma.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0022-Make-char-muxer-more-robust-wrt-sma.patch 2017-06-04 01:49:56.763976572 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0014-Make-char-muxer-more-robust-wrt-sma.patch 2017-09-07 22:09:41.412775651 +0200 @@ -1,4 +1,4 @@ -From dafee8907bcaa3ee580ebef4f76e7d62c14cd5c3 Mon Sep 17 00:00:00 2001 +From 6d94b304169f112118fb6dd78c5cd2617e4613f6 Mon Sep 17 00:00:00 2001 From: Alexander Graf <ag...@suse.de> Date: Thu, 1 Apr 2010 17:36:23 +0200 Subject: [PATCH] Make char muxer more robust wrt small FIFOs @@ -20,15 +20,37 @@ [AF: Rebased for v2.7.0-rc2] --- - chardev/char-mux.c | 13 +++++++++++++ - chardev/char-mux.h | 3 +++ - 2 files changed, 16 insertions(+) - + chardev/char-fe.c | 1 + + chardev/char-mux.c | 14 ++++++++++++++ + chardev/char.c | 1 + + include/chardev/char-mux.h | 3 +++ + 4 files changed, 19 insertions(+) + +diff --git a/chardev/char-fe.c b/chardev/char-fe.c +index f3af6ae584..9683926048 100644 +--- a/chardev/char-fe.c ++++ b/chardev/char-fe.c +@@ -21,6 +21,7 @@ + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ ++#define HW_POISON_H // avoid poison since we patch against rules it "enforces" + #include "qemu/osdep.h" + #include "qemu/error-report.h" + #include "qapi/error.h" diff --git a/chardev/char-mux.c b/chardev/char-mux.c -index 5547a36a0a..7b80dc8ad7 100644 +index 4cda5e7458..a6dc05c624 100644 --- a/chardev/char-mux.c +++ b/chardev/char-mux.c -@@ -179,6 +179,15 @@ static void mux_chr_accept_input(Chardev *chr) +@@ -21,6 +21,7 @@ + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ ++#define HW_POISON_H // avoid poison since we patch against rules it "enforces" + #include "qemu/osdep.h" + #include "qapi/error.h" + #include "qemu-common.h" +@@ -179,6 +180,15 @@ static void mux_chr_accept_input(Chardev *chr) be->chr_read(be->opaque, &d->buffer[m][d->cons[m]++ & MUX_BUFFER_MASK], 1); } @@ -44,7 +66,7 @@ } static int mux_chr_can_read(void *opaque) -@@ -308,6 +317,10 @@ static void qemu_chr_open_mux(Chardev *chr, +@@ -314,6 +324,10 @@ static void qemu_chr_open_mux(Chardev *chr, } d->focus = -1; @@ -55,11 +77,23 @@ /* only default to opened state if we've realized the initial * set of muxes */ -diff --git a/chardev/char-mux.h b/chardev/char-mux.h -index 9a2fffce91..d5f419c8a9 100644 ---- a/chardev/char-mux.h -+++ b/chardev/char-mux.h -@@ -35,6 +35,9 @@ typedef struct MuxChardev { +diff --git a/chardev/char.c b/chardev/char.c +index 5d283b90d3..d74fd7aeb9 100644 +--- a/chardev/char.c ++++ b/chardev/char.c +@@ -21,6 +21,7 @@ + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ ++#define HW_POISON_H // avoid poison since we patch against rules it "enforces" + #include "qemu/osdep.h" + #include "qemu/cutils.h" + #include "monitor/monitor.h" +diff --git a/include/chardev/char-mux.h b/include/chardev/char-mux.h +index 8928977897..ee9bfe7205 100644 +--- a/include/chardev/char-mux.h ++++ b/include/chardev/char-mux.h +@@ -36,6 +36,9 @@ typedef struct MuxChardev { Chardev parent; CharBackend *backends[MAX_MUX]; CharBackend chr; ++++++ 0023-linux-user-lseek-explicitly-cast-no.patch -> 0015-linux-user-lseek-explicitly-cast-no.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0023-linux-user-lseek-explicitly-cast-no.patch 2017-06-04 01:49:56.795972052 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0015-linux-user-lseek-explicitly-cast-no.patch 2017-09-07 22:09:41.432772832 +0200 @@ -1,4 +1,4 @@ -From 53b09a6f91e505d68429e5e67002fcd476d5e4ee Mon Sep 17 00:00:00 2001 +From 94bf05dfa58cb57d03bb02e9937c029df3497022 Mon Sep 17 00:00:00 2001 From: Alexander Graf <ag...@suse.de> Date: Thu, 13 Dec 2012 14:29:22 +0100 Subject: [PATCH] linux-user: lseek: explicitly cast non-set offsets to signed @@ -16,10 +16,10 @@ 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 1472d72f27..71d4f06bdb 100644 +index a2bb65922b..8b75b1f588 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -8076,9 +8076,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1, +@@ -8107,9 +8107,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1, case TARGET_NR_oldstat: goto unimplemented; #endif ++++++ 0025-AIO-Reduce-number-of-threads-for-32.patch -> 0016-AIO-Reduce-number-of-threads-for-32.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0025-AIO-Reduce-number-of-threads-for-32.patch 2017-06-04 01:49:56.875960750 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0016-AIO-Reduce-number-of-threads-for-32.patch 2017-09-07 22:09:41.468767758 +0200 @@ -1,4 +1,4 @@ -From 5d3ffee948660539ebe7dc51595986d18ae3701b Mon Sep 17 00:00:00 2001 +From 2ca6f0f0129374584098e60809afaaa43c609666 Mon Sep 17 00:00:00 2001 From: Alexander Graf <ag...@suse.de> Date: Wed, 14 Jan 2015 01:32:11 +0100 Subject: [PATCH] AIO: Reduce number of threads for 32bit hosts ++++++ 0027-xen_disk-Add-suse-specific-flush-di.patch -> 0017-xen_disk-Add-suse-specific-flush-di.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0027-xen_disk-Add-suse-specific-flush-di.patch 2017-06-04 01:49:56.955949449 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0017-xen_disk-Add-suse-specific-flush-di.patch 2017-09-07 22:09:41.484765503 +0200 @@ -1,4 +1,4 @@ -From e583a3cabe6667f8446d6ba35bd1f730d3ac991f Mon Sep 17 00:00:00 2001 +From c6660c98496ab59522e3ebaa1f1339beff864ca5 Mon Sep 17 00:00:00 2001 From: Bruce Rogers <brog...@suse.com> Date: Wed, 9 Mar 2016 15:18:11 -0700 Subject: [PATCH] xen_disk: Add suse specific flush disable handling and map to @@ -17,18 +17,18 @@ 1 file changed, 15 insertions(+) diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c -index 456a2d5694..94e755d3e8 100644 +index d42ed7070d..0dc524903e 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c -@@ -111,6 +111,7 @@ struct XenBlkDev { - int requests_inflight; +@@ -113,6 +113,7 @@ struct XenBlkDev { int requests_finished; + unsigned int max_requests; + gboolean cache_unsafe; /* Persistent grants extension */ gboolean feature_discard; gboolean feature_persistent; -@@ -960,6 +961,16 @@ static void blk_parse_discard(struct XenBlkDev *blkdev) +@@ -947,6 +948,16 @@ static void blk_parse_discard(struct XenBlkDev *blkdev) } } @@ -45,15 +45,15 @@ static int blk_init(struct XenDevice *xendev) { struct XenBlkDev *blkdev = container_of(xendev, struct XenBlkDev, xendev); -@@ -1031,6 +1042,7 @@ static int blk_init(struct XenDevice *xendev) - xenstore_write_be_int(&blkdev->xendev, "info", info); +@@ -1028,6 +1039,7 @@ static int blk_init(struct XenDevice *xendev) + MAX_RING_PAGE_ORDER); blk_parse_discard(blkdev); + blk_parse_cache_unsafe(blkdev); g_free(directiosafe); return 0; -@@ -1073,6 +1085,9 @@ static int blk_connect(struct XenDevice *xendev) +@@ -1083,6 +1095,9 @@ static int blk_connect(struct XenDevice *xendev) qflags |= BDRV_O_UNMAP; } ++++++ 0028-qemu-bridge-helper-reduce-security-.patch -> 0018-qemu-bridge-helper-reduce-security-.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0028-qemu-bridge-helper-reduce-security-.patch 2017-06-04 01:49:56.995943798 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0018-qemu-bridge-helper-reduce-security-.patch 2017-09-07 22:09:41.500763248 +0200 @@ -1,4 +1,4 @@ -From 2818c2f6840a0169068d390e5756a79ad1f2fb08 Mon Sep 17 00:00:00 2001 +From 87f1e67999ab7ddbbb9b2a4a04e82ceb7cdcbdf1 Mon Sep 17 00:00:00 2001 From: Bruce Rogers <brog...@suse.com> Date: Tue, 2 Aug 2016 11:36:02 -0600 Subject: [PATCH] qemu-bridge-helper: reduce security profile ++++++ 0029-qemu-binfmt-conf-use-qemu-ARCH-binf.patch -> 0019-qemu-binfmt-conf-use-qemu-ARCH-binf.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0029-qemu-binfmt-conf-use-qemu-ARCH-binf.patch 2017-06-04 01:49:57.167919499 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0019-qemu-binfmt-conf-use-qemu-ARCH-binf.patch 2017-09-07 22:09:41.528759303 +0200 @@ -1,4 +1,4 @@ -From 108e17b16aa8372c04ec13ddeb566794ae336cf5 Mon Sep 17 00:00:00 2001 +From 9fd37e866278fac910e0321aeea4c950f26cb224 Mon Sep 17 00:00:00 2001 From: Andreas Schwab <sch...@suse.de> Date: Fri, 12 Aug 2016 18:20:49 +0200 Subject: [PATCH] qemu-binfmt-conf: use qemu-ARCH-binfmt @@ -13,7 +13,7 @@ 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh -index 9fcd95a435..f14a6ef37b 100755 +index 5c3ba942ec..bb29213fa5 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -206,7 +206,7 @@ qemu_check_systemd() { ++++++ 0030-configure-Fix-detection-of-seccomp-.patch -> 0020-configure-Fix-detection-of-seccomp-.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0030-configure-Fix-detection-of-seccomp-.patch 2017-06-04 01:49:57.255907068 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0020-configure-Fix-detection-of-seccomp-.patch 2017-09-07 22:09:41.548756484 +0200 @@ -1,4 +1,4 @@ -From eebe76eeffb2166f2ce71bd3445498e989235aa2 Mon Sep 17 00:00:00 2001 +From 07887c4bbde2e00ded180e90395c61dfe10fbbf1 Mon Sep 17 00:00:00 2001 From: markkp <mp...@suse.com> Date: Thu, 11 Aug 2016 16:28:39 -0400 Subject: [PATCH] configure: Fix detection of seccomp on s390x @@ -13,10 +13,10 @@ 1 file changed, 3 insertions(+) diff --git a/configure b/configure -index 3308560f78..cb7589a8e7 100755 +index dd73cce62f..f2b265681e 100755 --- a/configure +++ b/configure -@@ -1961,6 +1961,9 @@ if test "$seccomp" != "no" ; then +@@ -2040,6 +2040,9 @@ if test "$seccomp" != "no" ; then ppc|ppc64) libseccomp_minver="2.3.0" ;; ++++++ 0031-linux-user-properly-test-for-infini.patch -> 0021-linux-user-properly-test-for-infini.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0031-linux-user-properly-test-for-infini.patch 2017-06-04 01:49:57.583860732 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0021-linux-user-properly-test-for-infini.patch 2017-09-07 22:09:41.564754229 +0200 @@ -1,4 +1,4 @@ -From 158de49a5e5ae6f0e90f3e3f381acf769e063988 Mon Sep 17 00:00:00 2001 +From 846384277e21e0b4d7bf815a3a26c5fc7d34e288 Mon Sep 17 00:00:00 2001 From: Andreas Schwab <sch...@linux-m68k.org> Date: Thu, 8 Sep 2016 11:21:05 +0200 Subject: [PATCH] linux-user: properly test for infinite timeout in poll (#8) @@ -16,10 +16,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 71d4f06bdb..78f0ea4c58 100644 +index 8b75b1f588..25b0a2ce69 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -10204,7 +10204,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1, +@@ -10240,7 +10240,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_ulong arg1, { struct timespec ts, *pts; ++++++ 0033-roms-Makefile-pass-a-packaging-time.patch -> 0022-roms-Makefile-pass-a-packaging-time.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0033-roms-Makefile-pass-a-packaging-time.patch 2017-06-04 01:49:59.095647133 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0022-roms-Makefile-pass-a-packaging-time.patch 2017-09-07 22:09:41.580751974 +0200 @@ -1,4 +1,4 @@ -From efc73d004696dada76a417cb2797593493e94f66 Mon Sep 17 00:00:00 2001 +From f8462e79c79efa3de96835939d08aed29a5c5213 Mon Sep 17 00:00:00 2001 From: Bruce Rogers <brog...@suse.com> Date: Sat, 19 Nov 2016 08:06:30 -0700 Subject: [PATCH] roms/Makefile: pass a packaging timestamp to subpackages with ++++++ 0034-Raise-soft-address-space-limit-to-h.patch -> 0023-Raise-soft-address-space-limit-to-h.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0034-Raise-soft-address-space-limit-to-h.patch 2017-06-04 01:49:59.207631311 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0023-Raise-soft-address-space-limit-to-h.patch 2017-09-07 22:09:41.600749156 +0200 @@ -1,4 +1,4 @@ -From 0b4661283cb4ea49967dd1a9b1f977a4fbc9e804 Mon Sep 17 00:00:00 2001 +From b839546b8729e0ed6415ddc16799ba6cca8e9e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaer...@suse.de> Date: Sun, 15 Jan 2012 19:53:49 +0100 Subject: [PATCH] Raise soft address space limit to hard limit @@ -17,7 +17,7 @@ 1 file changed, 12 insertions(+) diff --git a/vl.c b/vl.c -index e0f2ec86a9..caad3f93b3 100644 +index 8e247cc2a2..9bfbc25c6b 100644 --- a/vl.c +++ b/vl.c @@ -26,6 +26,7 @@ @@ -28,7 +28,7 @@ #ifdef CONFIG_SECCOMP #include "sysemu/seccomp.h" -@@ -2984,6 +2985,7 @@ int main(int argc, char **argv, char **envp) +@@ -3035,6 +3036,7 @@ int main(int argc, char **argv, char **envp) } BlockdevOptions_queue; QSIMPLEQ_HEAD(, BlockdevOptions_queue) bdo_queue = QSIMPLEQ_HEAD_INITIALIZER(bdo_queue); @@ -36,7 +36,7 @@ module_call_init(MODULE_INIT_TRACE); -@@ -2991,6 +2993,16 @@ int main(int argc, char **argv, char **envp) +@@ -3042,6 +3044,16 @@ int main(int argc, char **argv, char **envp) qemu_init_cpu_loop(); qemu_mutex_lock_iothread(); ++++++ 0035-increase-x86_64-physical-bits-to-42.patch -> 0024-increase-x86_64-physical-bits-to-42.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0035-increase-x86_64-physical-bits-to-42.patch 2017-06-04 01:49:59.263623400 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0024-increase-x86_64-physical-bits-to-42.patch 2017-09-07 22:09:41.624745773 +0200 @@ -1,4 +1,4 @@ -From 28085d5db9376007294f5189c559d3182a2a98f4 Mon Sep 17 00:00:00 2001 +From 5c70d36188f9864e847475cc0369ce87e8b8f779 Mon Sep 17 00:00:00 2001 From: Bruce Rogers <brog...@suse.com> Date: Fri, 17 May 2013 16:49:58 -0600 Subject: [PATCH] increase x86_64 physical bits to 42 @@ -19,10 +19,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h -index c4602ca80d..81c02c5a3b 100644 +index 051867399b..fdbaf372a9 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h -@@ -1488,7 +1488,7 @@ uint64_t cpu_get_tsc(CPUX86State *env); +@@ -1500,7 +1500,7 @@ uint64_t cpu_get_tsc(CPUX86State *env); /* XXX: This value should match the one returned by CPUID * and in exec.c */ # if defined(TARGET_X86_64) ++++++ 0036-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch -> 0025-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0036-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch 2017-06-04 01:49:59.367608708 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0025-vga-Raise-VRAM-to-16-MiB-for-pc-0.1.patch 2017-09-07 22:09:41.644742955 +0200 @@ -1,4 +1,4 @@ -From dec5ed741c369aed84b47752e43ad0eace76b75b Mon Sep 17 00:00:00 2001 +From 5b7e140d6d806dda842e9731337fb179dfab3bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaer...@suse.de> Date: Wed, 12 Jun 2013 19:26:37 +0200 Subject: [PATCH] vga: Raise VRAM to 16 MiB for pc-0.15 and below @@ -25,10 +25,10 @@ 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c -index 9f102aa388..1c09005293 100644 +index 46dfd2c954..e4ac76c905 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c -@@ -779,7 +779,32 @@ DEFINE_I440FX_MACHINE(v1_0, "pc-1.0", pc_compat_1_2, +@@ -789,7 +789,32 @@ DEFINE_I440FX_MACHINE(v1_0, "pc-1.0", pc_compat_1_2, #define PC_COMPAT_0_15 \ ++++++ 0037-i8254-Fix-migration-from-SLE11-SP2.patch -> 0026-i8254-Fix-migration-from-SLE11-SP2.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0037-i8254-Fix-migration-from-SLE11-SP2.patch 2017-06-04 01:49:59.395604753 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0026-i8254-Fix-migration-from-SLE11-SP2.patch 2017-09-07 22:09:41.684737318 +0200 @@ -1,4 +1,4 @@ -From 5013ff917f276a6d9edc2ca0ab93fed93a7ac653 Mon Sep 17 00:00:00 2001 +From f56bc071c0ad6ba30b6f2c6c224916c0c2fc5fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaer...@suse.de> Date: Wed, 31 Jul 2013 17:05:29 +0200 Subject: [PATCH] i8254: Fix migration from SLE11 SP2 @@ -17,7 +17,7 @@ 1 file changed, 7 insertions(+) diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c -index e18299a482..bc676c4664 100644 +index 976d5200f1..f1d9b3cbe9 100644 --- a/hw/timer/i8254_common.c +++ b/hw/timer/i8254_common.c @@ -258,6 +258,12 @@ static int pit_dispatch_post_load(void *opaque, int version_id) ++++++ 0038-acpi_piix4-Fix-migration-from-SLE11.patch -> 0027-acpi_piix4-Fix-migration-from-SLE11.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0038-acpi_piix4-Fix-migration-from-SLE11.patch 2017-06-04 01:49:59.423600797 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0027-acpi_piix4-Fix-migration-from-SLE11.patch 2017-09-07 22:09:41.700735063 +0200 @@ -1,4 +1,4 @@ -From e681140d293caba3f27ccadfd872473725021aa2 Mon Sep 17 00:00:00 2001 +From 926544e46fbfebc5a09d1eac59c3b748a9242acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaer...@suse.de> Date: Wed, 31 Jul 2013 17:32:35 +0200 Subject: [PATCH] acpi_piix4: Fix migration from SLE11 SP2 @@ -17,7 +17,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c -index a553a7e110..c34f761175 100644 +index f276967365..85557a7fab 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -311,7 +311,7 @@ static const VMStateDescription vmstate_cpuhp_state = { ++++++ 0039-Fix-tigervnc-long-press-issue.patch -> 0028-Fix-tigervnc-long-press-issue.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0039-Fix-tigervnc-long-press-issue.patch 2017-06-04 01:49:59.451596841 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0028-Fix-tigervnc-long-press-issue.patch 2017-09-07 22:09:41.716732808 +0200 @@ -1,4 +1,4 @@ -From 76e9783f2f222d9650e620082cf1741002d9fd88 Mon Sep 17 00:00:00 2001 +From 1a77800ad89b4d90155b82181557690a91d9349f Mon Sep 17 00:00:00 2001 From: Chunyan Liu <cy...@suse.com> Date: Thu, 3 Mar 2016 16:48:17 +0800 Subject: [PATCH] Fix tigervnc long press issue @@ -24,10 +24,10 @@ 1 file changed, 19 insertions(+) diff --git a/ui/vnc.c b/ui/vnc.c -index 486d2759e4..51d6f2353f 100644 +index 651cbb8606..eb3d7d0e54 100644 --- a/ui/vnc.c +++ b/ui/vnc.c -@@ -1668,6 +1668,25 @@ static void do_key_event(VncState *vs, int down, int keycode, int sym) +@@ -1657,6 +1657,25 @@ static void do_key_event(VncState *vs, int down, int keycode, int sym) if (down) vs->modifiers_state[keycode] ^= 1; break; ++++++ 0041-string-input-visitor-Fix-uint64-par.patch -> 0029-string-input-visitor-Fix-uint64-par.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0041-string-input-visitor-Fix-uint64-par.patch 2017-06-04 01:49:59.503589495 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0029-string-input-visitor-Fix-uint64-par.patch 2017-09-07 22:09:41.736729989 +0200 @@ -1,4 +1,4 @@ -From b6acefe54f39380e601ea553b8d2109c92427143 Mon Sep 17 00:00:00 2001 +From 3e0bafa61adbdeb3d2fd0800ed6d89fcf3a478f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaer...@suse.de> Date: Thu, 24 Sep 2015 19:21:11 +0200 Subject: [PATCH] string-input-visitor: Fix uint64 parsing @@ -22,7 +22,7 @@ 1 file changed, 50 insertions(+), 13 deletions(-) diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c -index c089491c24..fedbda7895 100644 +index 67a0a4a58b..1c73e5aeae 100644 --- a/qapi/string-input-visitor.c +++ b/qapi/string-input-visitor.c @@ -43,7 +43,8 @@ static void free_range(void *range, void *dummy) ++++++ 0042-test-string-input-visitor-Add-int-t.patch -> 0030-test-string-input-visitor-Add-int-t.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0042-test-string-input-visitor-Add-int-t.patch 2017-08-24 18:22:07.601258990 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0030-test-string-input-visitor-Add-int-t.patch 2017-09-07 22:09:41.768725480 +0200 @@ -1,4 +1,4 @@ -From 610feec09278e8f2112c77c32d9c2e6633859730 Mon Sep 17 00:00:00 2001 +From a7e094ddefb5e7eea6376840e501b928b6c4c668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaer...@suse.de> Date: Thu, 24 Sep 2015 19:23:50 +0200 Subject: [PATCH] test-string-input-visitor: Add int test case ++++++ 0043-test-string-input-visitor-Add-uint6.patch -> 0031-test-string-input-visitor-Add-uint6.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0043-test-string-input-visitor-Add-uint6.patch 2017-06-04 01:49:59.563581020 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0031-test-string-input-visitor-Add-uint6.patch 2017-09-07 22:09:42.888567638 +0200 @@ -1,4 +1,4 @@ -From c22b22f0d807e8dc81c94dfbea4d95864bd79586 Mon Sep 17 00:00:00 2001 +From c90474a98dc87e92c66c382110fd3942b4fc399d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaer...@suse.de> Date: Thu, 24 Sep 2015 19:24:23 +0200 Subject: [PATCH] test-string-input-visitor: Add uint64 test ++++++ 0044-tests-Add-QOM-property-unit-tests.patch -> 0032-tests-Add-QOM-property-unit-tests.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0044-tests-Add-QOM-property-unit-tests.patch 2017-06-04 01:49:59.603575369 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0032-tests-Add-QOM-property-unit-tests.patch 2017-09-07 22:09:43.692454330 +0200 @@ -1,4 +1,4 @@ -From 1c4096e92b45e128c7b10d7eb03c64b1f6437152 Mon Sep 17 00:00:00 2001 +From 9aed1b7bf6e3d84c2f046b44d89d1237b905c5b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaer...@suse.de> Date: Sun, 6 Sep 2015 20:12:42 +0200 Subject: [PATCH] tests: Add QOM property unit tests @@ -17,10 +17,10 @@ create mode 100644 tests/check-qom-props.c diff --git a/MAINTAINERS b/MAINTAINERS -index c60235eaf6..a023f5d70e 100644 +index ccee28b12d..1d6ae7b46c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -1419,6 +1419,7 @@ F: qom/ +@@ -1439,6 +1439,7 @@ F: qom/ X: qom/cpu.c F: tests/check-qom-interface.c F: tests/check-qom-proplist.c @@ -29,10 +29,10 @@ QMP diff --git a/tests/Makefile.include b/tests/Makefile.include -index f3de81fcfb..ca8f859f79 100644 +index 37c1bed683..1cffa2403f 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include -@@ -92,6 +92,8 @@ check-unit-y += tests/check-qom-interface$(EXESUF) +@@ -113,6 +113,8 @@ check-unit-y += tests/check-qom-interface$(EXESUF) gcov-files-check-qom-interface-y = qom/object.c check-unit-y += tests/check-qom-proplist$(EXESUF) gcov-files-check-qom-proplist-y = qom/object.c @@ -41,7 +41,7 @@ check-unit-y += tests/test-qemu-opts$(EXESUF) gcov-files-test-qemu-opts-y = util/qemu-option.c check-unit-y += tests/test-keyval$(EXESUF) -@@ -537,6 +539,7 @@ tests/check-qnull$(EXESUF): tests/check-qnull.o $(test-util-obj-y) +@@ -571,6 +573,7 @@ tests/check-qnull$(EXESUF): tests/check-qnull.o $(test-util-obj-y) tests/check-qjson$(EXESUF): tests/check-qjson.o $(test-util-obj-y) tests/check-qom-interface$(EXESUF): tests/check-qom-interface.o $(test-qom-obj-y) tests/check-qom-proplist$(EXESUF): tests/check-qom-proplist.o $(test-qom-obj-y) ++++++ 0045-tests-Add-scsi-disk-test.patch -> 0033-tests-Add-scsi-disk-test.patch ++++++ --- /work/SRC/openSUSE:Factory/qemu/0045-tests-Add-scsi-disk-test.patch 2017-06-04 01:49:59.643569718 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new/0033-tests-Add-scsi-disk-test.patch 2017-09-07 22:09:44.816295925 +0200 @@ -1,4 +1,4 @@ -From 5739c0d7a8ddc5aeb056aee239b2339df4d22189 Mon Sep 17 00:00:00 2001 +From 915562c2846fac9a51f8b76f4ec3fe9ef9bbc150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaer...@suse.de> Date: Fri, 25 Sep 2015 12:31:11 +0200 Subject: [PATCH] tests: Add scsi-disk test @@ -20,10 +20,10 @@ create mode 100644 tests/scsi-disk-test.c diff --git a/MAINTAINERS b/MAINTAINERS -index a023f5d70e..9840d5bb68 100644 +index 1d6ae7b46c..45a45935ea 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -957,6 +957,7 @@ M: Paolo Bonzini <pbonz...@redhat.com> +@@ -970,6 +970,7 @@ M: Paolo Bonzini <pbonz...@redhat.com> S: Supported F: include/hw/scsi/* F: hw/scsi/* @@ -32,10 +32,10 @@ T: git git://github.com/bonzini/qemu.git scsi-next diff --git a/tests/Makefile.include b/tests/Makefile.include -index ca8f859f79..85187d4b8c 100644 +index 1cffa2403f..27d4ce8bc3 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include -@@ -161,6 +161,8 @@ check-qtest-virtio-y += tests/virtio-rng-test$(EXESUF) +@@ -185,6 +185,8 @@ check-qtest-virtio-y += tests/virtio-rng-test$(EXESUF) gcov-files-virtio-y += hw/virtio/virtio-rng.c check-qtest-virtio-y += tests/virtio-scsi-test$(EXESUF) gcov-files-virtio-y += i386-softmmu/hw/scsi/virtio-scsi.c @@ -44,7 +44,7 @@ ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy) check-qtest-virtio-y += tests/virtio-9p-test$(EXESUF) gcov-files-virtio-y += hw/9pfs/virtio-9p.c -@@ -741,6 +743,7 @@ tests/postcopy-test$(EXESUF): tests/postcopy-test.o +@@ -779,6 +781,7 @@ tests/postcopy-test$(EXESUF): tests/postcopy-test.o tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o $(test-util-obj-y) \ $(qtest-obj-y) $(test-io-obj-y) $(libqos-virtio-obj-y) $(libqos-pc-obj-y) \ $(chardev-obj-y) @@ -54,7 +54,7 @@ tests/test-keyval$(EXESUF): tests/test-keyval.o $(test-util-obj-y) $(test-qapi-obj-y) diff --git a/tests/scsi-disk-test.c b/tests/scsi-disk-test.c new file mode 100644 -index 0000000000..f19f93d97a +index 0000000000..5dc7e71417 --- /dev/null +++ b/tests/scsi-disk-test.c @@ -0,0 +1,82 @@ @@ -71,13 +71,13 @@ +#include "qemu/osdep.h" +#include <glib.h> +#include "libqtest.h" -+#include "qapi/qmp/qint.h" ++#include "qapi/qmp/qnum.h" + +static void test_scsi_disk_common(const char *type, const char *id) +{ + char *cmdline, *path; + QDict *response; -+ QInt *value; ++ QNum *value; + + cmdline = g_strdup_printf( + "-drive id=drv0,if=none,file=/dev/null,format=raw " @@ -96,8 +96,8 @@ + path); + g_assert(response); + g_assert(qdict_haskey(response, "return")); -+ value = qobject_to_qint(qdict_get(response, "return")); -+ g_assert_cmpint(qint_get_int(value), ==, UINT64_MAX); ++ value = qobject_to_qnum(qdict_get(response, "return")); ++ g_assert_cmpint(qnum_get_uint(value), ==, UINT64_MAX); + + response = qmp("{ 'execute': 'qom-get'," + " 'arguments': { 'path': %s," @@ -105,8 +105,8 @@ + path); + g_assert(response); + g_assert(qdict_haskey(response, "return")); -+ value = qobject_to_qint(qdict_get(response, "return")); -+ g_assert_cmpint(qint_get_int(value), ==, UINT64_C(1) << 63); ++ value = qobject_to_qnum(qdict_get(response, "return")); ++ g_assert_cmpint(qnum_get_uint(value), ==, UINT64_C(1) << 63); + + g_free(path); + qtest_end(); ++++++ 0034-slirp-fix-clearing-ifq_so-from-pend.patch ++++++ >From dc8c3677038bae1bd06dca0167a790776f3e6b3b Mon Sep 17 00:00:00 2001 From: Samuel Thibault <samuel.thiba...@ens-lyon.org> Date: Fri, 25 Aug 2017 01:35:53 +0200 Subject: [PATCH] slirp: fix clearing ifq_so from pending packets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The if_fastq and if_batchq contain not only packets, but queues of packets for the same socket. When sofree frees a socket, it thus has to clear ifq_so from all the packets from the queues, not only the first. Signed-off-by: Samuel Thibault <samuel.thiba...@ens-lyon.org> Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org> Cc: qemu-sta...@nongnu.org Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> (cherry picked from commit 1201d308519f1e915866d7583d5136d03cc1d384) [BR: BSC#1056291 CVE-2017-13711] Signed-off-by: Bruce Rogers <brog...@suse.com> --- slirp/socket.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/slirp/socket.c b/slirp/socket.c index ecec0295a9..cb7b5b608d 100644 --- a/slirp/socket.c +++ b/slirp/socket.c @@ -59,6 +59,27 @@ socreate(Slirp *slirp) return(so); } +/* + * Remove references to so from the given message queue. + */ +static void +soqfree(struct socket *so, struct quehead *qh) +{ + struct mbuf *ifq; + + for (ifq = (struct mbuf *) qh->qh_link; + (struct quehead *) ifq != qh; + ifq = ifq->ifq_next) { + if (ifq->ifq_so == so) { + struct mbuf *ifm; + ifq->ifq_so = NULL; + for (ifm = ifq->ifs_next; ifm != ifq; ifm = ifm->ifs_next) { + ifm->ifq_so = NULL; + } + } + } +} + /* * remque and free a socket, clobber cache */ @@ -66,23 +87,9 @@ void sofree(struct socket *so) { Slirp *slirp = so->slirp; - struct mbuf *ifm; - for (ifm = (struct mbuf *) slirp->if_fastq.qh_link; - (struct quehead *) ifm != &slirp->if_fastq; - ifm = ifm->ifq_next) { - if (ifm->ifq_so == so) { - ifm->ifq_so = NULL; - } - } - - for (ifm = (struct mbuf *) slirp->if_batchq.qh_link; - (struct quehead *) ifm != &slirp->if_batchq; - ifm = ifm->ifq_next) { - if (ifm->ifq_so == so) { - ifm->ifq_so = NULL; - } - } + soqfree(so, &slirp->if_fastq); + soqfree(so, &slirp->if_batchq); if (so->so_emu==EMU_RSH && so->extra) { sofree(so->extra); ++++++ 0035-s390-ccw-Fix-alignment-for-CCW1.patch ++++++ >From adee899fc239f9eca87881a7f6c6e1dae346922e Mon Sep 17 00:00:00 2001 From: Farhan Ali <al...@linux.vnet.ibm.com> Date: Fri, 25 Aug 2017 09:24:46 -0400 Subject: [PATCH] s390-ccw: Fix alignment for CCW1 The commit 198c0d1f9df8c4 s390x/css: check ccw address validity exposes an alignment issue in ccw bios. According to PoP the CCW must be doubleword aligned. Let's fix this in the bios. Cc: qemu-sta...@nongnu.org Signed-off-by: Farhan Ali <al...@linux.vnet.ibm.com> Reviewed-by: Halil Pasic <pa...@linux.vnet.ibm.com> Reviewed-by: Eric Farman <far...@linux.vnet.ibm.com> Acked-by: Christian Borntraeger <borntrae...@de.ibm.com> Message-Id: <3ed8b810b6592daee6a775037ce21f850e40647d.1503667215.git.al...@linux.vnet.ibm.com> Signed-off-by: Cornelia Huck <coh...@redhat.com> (cherry picked from commit 3a1e4561ad63b303b092387ae006bd41468ece63) [BR: BSC#1056680] Signed-off-by: Bruce Rogers <brog...@suse.com> --- pc-bios/s390-ccw/cio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc-bios/s390-ccw/cio.h b/pc-bios/s390-ccw/cio.h index f5b4549ea3..55eaeee4b6 100644 --- a/pc-bios/s390-ccw/cio.h +++ b/pc-bios/s390-ccw/cio.h @@ -133,7 +133,7 @@ struct ccw1 { __u8 flags; __u16 count; __u32 cda; -} __attribute__ ((packed)); +} __attribute__ ((packed, aligned(8))); #define CCW_FLAG_DC 0x80 #define CCW_FLAG_CC 0x40 ++++++ ipxe-stub-out-the-SAN-req-s-in-int13.patch ++++++ >From 239e992583e342b3cca14e809c5ab9469d578072 Mon Sep 17 00:00:00 2001 From: Bruce Rogers <brog...@suse.com> Date: Mon, 24 Jul 2017 10:44:24 -0600 Subject: [PATCH] stub out the SAN req's in int13 --- src/arch/x86/interface/pcbios/int13.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/arch/x86/interface/pcbios/int13.c b/src/arch/x86/interface/pcbios/int13.c index ca789a0d..bfbe4150 100644 --- a/src/arch/x86/interface/pcbios/int13.c +++ b/src/arch/x86/interface/pcbios/int13.c @@ -23,6 +23,8 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); +#define INCLUDE_SAN_HOOKS 0 + #include <stdint.h> #include <stdlib.h> #include <limits.h> @@ -1243,6 +1245,7 @@ static void int13_unhook_vector ( void ) { */ static int int13_hook ( unsigned int drive, struct uri **uris, unsigned int count, unsigned int flags ) { +#if INCLUDE_SAN_HOOKS struct san_device *sandev; struct int13_data *int13; unsigned int natural_drive; @@ -1315,6 +1318,9 @@ static int int13_hook ( unsigned int drive, struct uri **uris, sandev_put ( sandev ); err_alloc: return rc; +#else + return -1; +#endif } /** @@ -1328,6 +1334,7 @@ static int int13_hook ( unsigned int drive, struct uri **uris, */ static void int13_unhook ( unsigned int drive ) { struct san_device *sandev; +#if INCLUDE_SAN_HOOKS /* Find drive */ sandev = sandev_find ( drive ); @@ -1353,6 +1360,7 @@ static void int13_unhook ( unsigned int drive ) { /* Drop reference to drive */ sandev_put ( sandev ); +#endif } /** @@ -1514,6 +1522,7 @@ static int int13_load_eltorito ( unsigned int drive, struct segoff *address ) { * Note that this function can never return success, by definition. */ static int int13_boot ( unsigned int drive, const char *filename __unused ) { +#if INCLUDE_SAN_HOOKS struct memory_map memmap; struct segoff address; int rc; @@ -1539,6 +1548,9 @@ static int int13_boot ( unsigned int drive, const char *filename __unused ) { } return -ECANCELED; /* -EIMPOSSIBLE */ +#else + return -1; +#endif } /** Maximum size of boot firmware table(s) */ @@ -1605,6 +1617,7 @@ static int int13_install ( struct acpi_header *acpi ) { * @ret rc Return status code */ static int int13_describe ( void ) { +#if INCLUDE_SAN_HOOKS int rc; /* Clear tables */ @@ -1619,6 +1632,9 @@ static int int13_describe ( void ) { } return 0; +#else + return -1; +#endif } PROVIDE_SANBOOT ( pcbios, san_hook, int13_hook ); -- 2.13.2 ++++++ qemu-2.9.0.tar.xz -> qemu-2.10.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/qemu/qemu-2.9.0.tar.xz /work/SRC/openSUSE:Factory/.qemu.new/qemu-2.10.0.tar.xz differ: char 26, line 1 ++++++ qemu-linux-user.spec.in ++++++ --- /var/tmp/diff_new_pack.ga9cmO/_old 2017-09-07 22:09:52.959148195 +0200 +++ /var/tmp/diff_new_pack.ga9cmO/_new 2017-09-07 22:09:52.959148195 +0200 @@ -23,7 +23,7 @@ Group: System/Emulators/PC QEMU_VERSION Release: 0 -Source: qemu-2.9.0.tar.xz +Source: qemu-2.10.0.tar.xz # Upstream First -- http://wiki.qemu-project.org/Contribute/SubmitAPatch # This patch queue is auto-generated from https://github.com/openSUSE/qemu PATCH_FILES @@ -79,7 +79,7 @@ run cross-architecture builds. %prep -%setup -q -n qemu-2.9.0 +%setup -q -n qemu-2.10.0 PATCH_EXEC %build ++++++ qemu-supportconfig ++++++ #!/bin/bash ############################################################# # Name: Supportconfig Plugin for QEMU/KVM # Description: Gathers important troubleshooting information # about QEMU # Author: Jim Fehlig <jfeh...@suse.com> ############################################################# RCFILE="/usr/lib/supportconfig/resources/scplugin.rc" if [ -s $RCFILE ]; then if ! source $RCFILE; then echo "ERROR: Initializing resource file: $RCFILE" >&2 exit 1 fi fi rpm_verify() { thisrpm="$1" local ret=0 echo echo "#==[ Validating RPM ]=================================#" if rpm -q "$thisrpm" >/dev/null 2>&1; then echo "# rpm -V $thisrpm" if rpm -V "$thisrpm"; then echo "Status: Passed" else echo "Status: WARNING" fi else echo "package $thisrpm is not installed" ret=1 fi echo return $ret } if ! rpm_verify qemu; then echo "Skipped" exit 0 fi # skip if the host is xen echo "#==[ Checking if booted Xen ]=================================#" if [ -d /proc/xen ] && [ -e /proc/xen/capabilities ] && [ `cat /proc/xen/capabilities` = "control_d" ]; then echo "Yes" echo "Skipped" exit 0 else echo "No" echo fi # basic system information plugin_command "uname -r" plugin_command "lscpu" plugin_command "kvm_stat -1" plugin_command "lsmod | grep ^kvm" for MODULE in `lsmod | grep ^kvm | cut -d ' ' -f 1`; do plugin_command "modinfo $MODULE" done plugin_command "ps -ef | grep qemu" # list contents of common config and image directories plugin_command "ls -alR /var/lib/kvm/images/" # network-related info often useful for debugging if [ systemctl is-enabled NetworkManager.service 2>&1 > /dev/null ]; then echo "NOTE: NetworkManager should not be enabled on a KVM host" fi plugin_command "route -n" plugin_command "arp -v" plugin_command "ip link show type bridge" plugin_command "bridge link show" echo "Done" ++++++ qemu.spec.in ++++++ --- /var/tmp/diff_new_pack.ga9cmO/_old 2017-09-07 22:09:53.015140303 +0200 +++ /var/tmp/diff_new_pack.ga9cmO/_new 2017-09-07 22:09:53.019139739 +0200 @@ -22,6 +22,7 @@ %define build_slof_from_source 0 %define kvm_available 0 %define legacy_qemu_kvm 0 +%define force_fit_virtio_pxe_rom 1 %ifarch %ix86 x86_64 # choice of building all from source or using provided binary x86 blobs @@ -86,7 +87,7 @@ %define with_seccomp 1 %endif -%ifarch %ix86 x86_64 +%ifarch %ix86 x86_64 s390x aarch64 ppc64le %define with_seccomp 1 %endif @@ -111,8 +112,8 @@ Group: System/Emulators/PC QEMU_VERSION Release: 0 -Source: http://wiki.qemu.org/download/qemu-2.9.0.tar.xz -Source99: http://wiki.qemu.org/download/qemu-2.9.0.tar.xz.sig +Source: http://wiki.qemu.org/download/qemu-2.10.0.tar.xz +Source99: http://wiki.qemu.org/download/qemu-2.10.0.tar.xz.sig Source1: 80-kvm.rules Source2: qemu-ifup Source3: kvm_stat @@ -128,6 +129,7 @@ Source13: supported.s390.txt Source14: supported.arm.txt Source15: supported.ppc.txt +Source16: qemu-supportconfig # Upstream First -- http://wiki.qemu-project.org/Contribute/SubmitAPatch # This patch queue is auto-generated from https://github.com/openSUSE/qemu PATCH_FILES @@ -140,10 +142,6 @@ # PATCH-FIX-OPENSUSE ipxe-stable-buildid.patch brog...@suse.com -- reproducible builds Patch1100: ipxe-stable-buildid.patch Patch1101: ipxe-use-gcc6-for-more-compact-code.patch -Patch1102: ipxe-build-Avoid-implicit-fallthrough-warnings-on-GCC-7.patch -Patch1103: ipxe-iscsi-Always-send-FirstBurstLength-parameter.patch -Patch1104: ipxe-ath-Add-missing-break-statements.patch -Patch1105: ipxe-mucurses-Fix-erroneous-__nonnull-attribute.patch # sgabios # PATCH-FIX-OPENSUSE sgabios-stable-buildid.patch brog...@suse.com -- reproducible builds @@ -153,6 +151,7 @@ # this is to make lint happy Source300: qemu-rpmlintrc +Source301: ipxe-stub-out-the-SAN-req-s-in-int13.patch Source302: bridge.conf Source400: update_git.sh ExcludeArch: s390 @@ -216,9 +215,6 @@ BuildRequires: libgbm-devel BuildRequires: libgcrypt-devel BuildRequires: libgnutls-devel -%if 0%{?suse_version} >= 1315 -BuildRequires: libibverbs-devel -%endif %if 0%{?with_rbd} %if 0%{?is_opensuse} || 0%{?sle_version} > 120100 BuildRequires: librbd-devel @@ -252,9 +248,6 @@ BuildRequires: libpixman-1-0-devel BuildRequires: libpng-devel BuildRequires: libpulse-devel -%if 0%{?suse_version} >= 1315 -BuildRequires: librdmacm-devel -%endif %if 0%{?with_seccomp} BuildRequires: libseccomp-devel %endif @@ -284,6 +277,9 @@ BuildRequires: pkgconfig BuildRequires: pwdutils BuildRequires: python +%if 0%{?suse_version} >= 1315 +BuildRequires: rdma-core-devel +%endif %if 0%{?suse_version} >= 1310 BuildRequires: snappy-devel %endif @@ -785,7 +781,7 @@ %endif # !qemu-testsuite %prep -%setup -q -n qemu-2.9.0 +%setup -q -n qemu-2.10.0 PATCH_EXEC pushd roms/ipxe @@ -793,10 +789,6 @@ %if 0%{?suse_version} <= 1320 %patch1101 -p1 %endif -%patch1102 -p1 -%patch1103 -p1 -%patch1104 -p1 -%patch1105 -p1 popd pushd roms/sgabios @@ -1018,6 +1010,14 @@ make %{?_smp_mflags} -C roms efirom %endif make -C roms sgabios + +%if %{force_fit_virtio_pxe_rom} +pushd roms/ipxe +patch -p1 < %{SOURCE301} +popd +make %{?_smp_mflags} -C roms pxerom_variants=virtio pxerom_targets=1af41000 NO_WERROR=1 pxerom +%endif + # enforce pxe rom sizes for migration compatability from SLE 11 SP3 forward # the following need to be > 64K %define supported_nics_large {e1000 rtl8139} @@ -1135,6 +1135,9 @@ install -D -m 0644 %{SOURCE14} %{buildroot}%{_docdir}/qemu-arm/supported.txt install -D -m 0644 %{SOURCE15} %{buildroot}%{_docdir}/qemu-ppc/supported.txt %endif +# install supportconfig plugin +mkdir -p %{buildroot}%{_libexecdir}/supportconfig/plugins +install -D -m 0755 %{SOURCE16} %{buildroot}%{_libexecdir}/supportconfig/plugins/qemu %if %{legacy_qemu_kvm} cat > %{buildroot}%{_bindir}/qemu-kvm << 'EOF' #!/bin/sh @@ -1297,6 +1300,9 @@ %_datadir/%name/qemu_logo_no_text.svg %dir %_sysconfdir/%name %_datadir/%name/qemu-ifup +%dir %_libexecdir/supportconfig +%dir %_libexecdir/supportconfig/plugins +%_libexecdir/supportconfig/plugins/qemu %if %{kvm_available} %if 0%{?suse_version} <= 1320 %_bindir/kvm_stat @@ -1341,6 +1347,8 @@ %_datadir/%name/bamboo.dtb %_datadir/%name/petalogix-ml605.dtb %_datadir/%name/skiboot.lid +%_datadir/%name/qemu_vga.ndrv +%_datadir/%name/s390-netboot.img %if 0%{?is_opensuse} == 0 %dir %_docdir/qemu-ppc %_docdir/qemu-ppc/supported.txt ++++++ supported.arm.txt ++++++ --- /var/tmp/diff_new_pack.ga9cmO/_old 2017-09-07 22:09:53.051135230 +0200 +++ /var/tmp/diff_new_pack.ga9cmO/_new 2017-09-07 22:09:53.051135230 +0200 @@ -1,11 +1,11 @@ [qemu-arm package document] -SLES 12 SP3 QEMU/KVM RELATED SUPPORT STATEMENTS +SLES 15 QEMU/KVM RELATED SUPPORT STATEMENTS Overview -------- - The QEMU based packages included with SLES 12 SP3 provide a large variety of + The QEMU based packages included with SLES 15 provide a large variety of features, from the very latest customer requests to features of questionable quality or value. The linux kernel includes components which contribute KVM virtualization features as well. This document was created to assist the user @@ -56,8 +56,8 @@ Since a KVM guest runs in the context of a normal linux process, some types of execution controls are managed with linux tools. -- QEMU is compatible with EDK based UEFI firmware available with SLES12-SP3, - which allow boot options common to physical systems along with other features +- QEMU is compatible with EDK based UEFI firmware available with SLES15, which + allow boot options common to physical systems along with other features tailored to virtualization. Various VGABIOS ROMs, from the SEABIOS project, are also available. @@ -72,7 +72,7 @@ - Guest execution state may be "moved" in both time (save/restore) and space (static and live migration). These migrations or save/restore operations can - take place either from certain prior SLES versioned hosts to a SLES 12 SP3 + take place either from certain prior SLES versioned hosts to a SLES 15 host or between hosts of the same version. Certain other restrictions also apply. - Security considerations include privileged helpers and a security model which @@ -111,7 +111,7 @@ - Portions of the host file system may be shared with a guest by using virtFS. -- A guest "agent" is available for SLES 12 KVM guests via the qemu-guest-agent +- A guest "agent" is available for SLES 15 KVM guests via the qemu-guest-agent package. This allows some introspection and control of the guest OS environment from the host. @@ -314,7 +314,9 @@ c change ... chardev-add ... + chardev-change ... chardev-remove ... + chardev-send-break ... client_migrate_info ... closefd ... cont @@ -329,6 +331,8 @@ dump_guest_memory ... eject ... gdbserver ... + gpa2hpa ... + gpa2hva ... help i ... info ... @@ -408,7 +412,9 @@ change change-vnc-password chardev-add + chardev-change chardev-remove + chardev-send-break client_migrate_info closefd cont @@ -527,28 +533,27 @@ at45db081d|bcm2835-aux|bcm2835-dma|bcm2835-fb|bcm2835-ic|bcm2835-mbox| bcm2835-peripherals|bcm2835-property|bcm2836|bcm2836-control| cadence_gem|cadence_ttc|cadence_uart|ccid-card-emulated| - ccid-card-passthrough|cfi.pflash01|cfi.pflash02|cirrus-vga|corgi-ssp| + ccid-card-passthrough|cfi.pflash02|cirrus-vga|corgi-ssp| cortex-a15-arm-cpu|cortex-a53-arm-cpu|cortex-a57-arm-cpu| cortex-a8-arm-cpu|cortex-a9-arm-cpu|cortex-m3-arm-cpu| cortex-m4-arm-cpu|cortex-r5-arm-cpu|cs4231a|digic|digic-timer| digic-uart|ds1338|dscm1xxxx|e1000|en25f32|en25p32|en25p64|en25q32b| - en25q64|esp|exynos4210.combiner|exynos4210-ehci-usb|exynos4210.fimd| + en25q64|exynos4210.combiner|exynos4210-ehci-usb|exynos4210.fimd| exynos4210.gic|exynos4210.i2c|exynos4210.irq_gate|exynos4210.mct| exynos4210.pmu|exynos4210.pwm|exynos4210.rtc|exynos4210.uart|floppy| fslimx25|fslimx31|fusbh200-ehci-usb|fw_cfg|gd25q32|gd25q64| - generic-sdhci|gpex-pcihost|gpex-root|gpio_i2c|gpio-key|gus| - hyperv-testdev|highbank-regs|host-arm-cpu|*-i386-cpu|i8042| - ib700|icp-ctrl-regs|igd-passthrough-isa-bridge|imx25.ccm|imx31.ccm| - imx6.ccm|imx.avic|imx.epit|imx.fec|imx.gpio|imx.gpt|imx.i2c| - imx.serial|integrator_core|integrator_debug|integrator_pic| - integrator_pit|intel_iommu|ipmi-bmc-extern|ipmi-bmc-sim|isa-applesmc| - isa-cirrus-vga|isa-debugcon|isa-debug-exit|isa-fdc|isa-ide| - isa-ipmi-bt|isa-ipmi-kcs|isa-parallel|isa-vga|isabus-bridge| - kvm-arm-gic|kvm-arm-gicv3|kvm-pci-assign|l2x0|lan9118|lm8323|loader| - lsi53c810a|lsi53c895a|m25p05|m25p10|m25p128|m25p16|m25p20|m25p32| - m25p40|m25p64|m25p80|m25pe16|m25pe20|m25pe80|m25px32|m25px32-s0| - m25px32-s1|m25px64|m45pe10|m45pe16|m45pe80|mainstone-fpga|max1110| - max1111|max7310|musicpal_gpio|musicpal_key|musicpal_lcd| + gpex-pcihost|gpex-root|gpio_i2c|gpio-key|gus|hyperv-testdev| + highbank-regs|host-arm-cpu|*-i386-cpu|i8042|ib700|icp-ctrl-regs| + igd-passthrough-isa-bridge|imx25.ccm|imx31.ccm|imx6.ccm|imx.avic| + imx.epit|imx.fec|imx.gpio|imx.gpt|imx.i2c|imx.serial|integrator_core| + integrator_debug|integrator_pic|integrator_pit|intel_iommu| + ipmi-bmc-extern|ipmi-bmc-sim|isa-applesmc|isa-cirrus-vga|isa-debugcon| + isa-debug-exit|isa-fdc|isa-ide|isa-ipmi-bt|isa-ipmi-kcs|isa-parallel| + isa-vga|kvm-arm-gic|kvm-arm-gicv3|kvm-pci-assign|l2x0|lan9118|lm8323| + loader|lsi53c810a|lsi53c895a|m25p05|m25p10|m25p128|m25p16|m25p20| + m25p32|m25p40|m25p64|m25p80|m25pe16|m25pe20|m25pe80|m25px32| + m25px32-s0|m25px32-s1|m25px64|m45pe10|m45pe16|m45pe80|mainstone-fpga| + max1110|max1111|max7310|musicpal_gpio|musicpal_key|musicpal_lcd| musicpal-misc|mv88w8618_audio|mv88w8618_eth|mv88w8618_flashcfg| mv88w8618_pic|mv88w8618_pit|mv88w8618_wlan|mx25l12805d|mx25l12855e| mx25l1606e|mx25l2005a|mx25l25635e|mx25l25655e|mx25l3205d|mx25l4005a| @@ -575,17 +580,17 @@ sst25wf080|sst25wf512|stellaris-adc|stellaris_enet|stellaris-gptm| stellaris-i2c|stm32f205-soc|stm32f2xx-syscfg|stm32f2xx-timer| stm32f2xx-usart|strongarm-gpio|strongarm_pic|strongarm-ppc| - strongarm-rtc|strongarm-ssp|strongarm-uart|sysbus-ahci|sysbus-ohci| - tegra2-ehci-usb|ti925t-arm-cpu|tmp105|tosa_dac|tosa-ssp|tusb6010| - twl92230|usb-redir|versatile_i2c|versatilepb_sic|versatile_pci| - versatile_pci_host|vfio-pci-igd-lpc-bridge|vhost-vsock-device| - vhost-vsock-pci|virtconsole|virtio-crypto-device|virtio-crypto-pci| - virtio-mmio|virtio-vga|vmware-svga|w25q256|w25q32|w25q32dw|w25q64| - w25q80|w25q80bl|w25x10|w25x16|w25x20|w25x32|w25x40|w25x64|w25x80| - wm8750|*-x86_64-cpu|xen-backend|xen-pci-passthrough|xen-platform| - xen-pvdevice|xen-sysdev|xgmac|xilinxzynq_slcr|xlnx.ps7-qspi| - xlnx.ps7-spi|xlnxps7-usb|xlnxzynqmp|xlnxzynq-xadc| - unimplemented-device|vmgenid] + strongarm-rtc|strongarm-ssp|strongarm-uart|tegra2-ehci-usb| + ti925t-arm-cpu|tmp105|tosa_dac|tosa-ssp|tusb6010|twl92230|usb-redir| + versatile_i2c|versatilepb_sic|versatile_pci|versatile_pci_host| + vfio-pci-igd-lpc-bridge|vhost-vsock-device|vhost-vsock-pci| + virtconsole|virtio-crypto-device|virtio-crypto-pci|virtio-vga| + vmware-svga|w25q256|w25q32|w25q32dw|w25q64|w25q80|w25q80bl|w25x10| + w25x16|w25x20|w25x32|w25x40|w25x64|w25x80|wm8750|*-x86_64-cpu| + xen-backend|xen-pci-passthrough|xen-platform|xen-pvdevice|xgmac| + xilinxzynq_slcr|xlnx.ps7-qspi|xlnx.ps7-spi|xlnxps7-usb|xlnxzynqmp| + xlnxzynq-xadc|vmgenid|vhost-user-scsi|vhost-user-scsi-pci| + mmio_interface] (the following are aliases of these unsupported devices: lsi| virtio-input-host|virtio-keyboard|virtio-mouse|virtio-tablet| virtio-gpu|pci-assign|piix-usb-uhci) @@ -622,7 +627,9 @@ -no-kvm-irqchip -no-kvm-pit -no-kvm-pit-reinjection - -numa ... + -numa cpu ... + -numa dist ... + -numa node ... -option-rom ... -pflash file -portrait @@ -642,6 +649,7 @@ -xen-attach ... -xen-create -xen-domid ... + -xen-domid-restrict ... - The following monitor commands are unsupported: acl_add ... @@ -695,6 +703,7 @@ x-blockdev-insert-medium x-blockdev-remove-medium x-colo-lost-heartbeat + x-debug-block-dirty-bitmap-sha256 xen-colo-do-checkpoint xen-load-devices-state xen-save-devices-state ++++++ supported.ppc.txt ++++++ ++++ 660 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/qemu/supported.ppc.txt ++++ and /work/SRC/openSUSE:Factory/.qemu.new/supported.ppc.txt ++++++ supported.s390.txt ++++++ --- /var/tmp/diff_new_pack.ga9cmO/_old 2017-09-07 22:09:53.107127337 +0200 +++ /var/tmp/diff_new_pack.ga9cmO/_new 2017-09-07 22:09:53.107127337 +0200 @@ -1,11 +1,11 @@ [qemu-s390 package document] -SLES 12 SP3 QEMU/KVM RELATED SUPPORT STATEMENTS +SLES 15 QEMU/KVM RELATED SUPPORT STATEMENTS Overview -------- - The QEMU based packages included with SLES 12 SP3 provide a large variety of + The QEMU based packages included with SLES 15 provide a large variety of features, from the very latest customer requests to features of questionable quality or value. The linux kernel includes components which contribute KVM virtualization features as well. This document was created to assist the user @@ -73,7 +73,7 @@ - Guest execution state may be "moved" in both time (save/restore) and space (static and live migration). These migrations or save/restore operations can - take place either from certain prior SLES versioned hosts to a SLES 12 SP3 + take place either from certain prior SLES versioned hosts to a SLES 15 host or between hosts of the same version. Certain other restrictions also apply. - Security considerations include privileged helpers and a security model which @@ -112,7 +112,7 @@ - Portions of the host file system may be shared with a guest by using virtFS. -- A guest "agent" is available for SLES 12 KVM guests via the qemu-guest-agent +- A guest "agent" is available for SLES 15 KVM guests via the qemu-guest-agent package. This allows some introspection and control of the guest OS environment from the host. @@ -305,7 +305,9 @@ c change ... chardev-add ... + chardev-change ... chardev-remove ... + chardev-send-break ... client_migrate_info ... closefd ... cont @@ -320,6 +322,8 @@ dump_guest_memory ... eject ... gdbserver ... + gpa2hpa ... + gpa2hva ... help i ... info ... @@ -397,7 +401,9 @@ change change-vnc-password chardev-add + chardev-change chardev-remove + chardev-send-break client_migrate_info closefd cont @@ -501,51 +507,50 @@ -chroot ... -cpu ... (all except host) -curses - -device [AC97|adlib|allwinner-ahci|am53c974|amd-iommu|AMDVI-PCI| - ccid-card-emulated|ccid-card-passthrough|cirrus-vga|cs4231a|dc390| - diag288|e1000-82544gc|e1000-82545em|edu|ES1370|floppy|generic-sdhci| - generic-sdhci|gus|hda-duplex|hda-micro|hda-output|hyperv-testdev| - *-i386-cpu|i8042|i82550|i82551|i82557a|i82557b|i82557c|i82558a| - i82558b|i82559a|i82559b|i82559c|i82562|i82801|i82801b11-bridge|ib700| - ich9-intel-hda|ich9-usb-ehci1|ich9-usb-ehci2|ich9-usb-uhci1| - ich9-usb-uhci2|ich9-usb-uhci3|ich9-usb-uhci4|ich9-usb-uhci5| - ich9-usb-uhci6|ide-cd|ide-drive|ide-hd|igd-passthrough-isa-bridge| - intel-hda|intel_iommu|ioh3420|ipmi-bmc-extern|ipmi-bmc-sim|ipoctal232| - isa-applesmc|isa-cirrus-vga|isa-debugcon|isa-debug-exit|isa-fdc| - isa-ide|isa-ipmi-bt|isa-ipmi-kcs|isa-parallel|isa-serial|isa-vga| - kvm-pci-assign|lsi53c810|lsi53c810a|megasas|mptsas1068|ne2k_isa| - ne2k_pci|nec-usb-xhci|nvdimm|nvme|pc-dimm|pci-testdev|pcnet| - pc-testdev|piix3-ide|piix3-ide|piix3-ide-xen|piix4-usb-uhci|pvscsi| - pxb|pxb-host|pxb-pcie|qemu-s390-cpu|rocker|s390-flic|s390-flic-qemu| - s390-ipl|s390-pcihost|s390-sclp-event-facility|s390-skeys-qemu|sb16| - sclp|sclpconsole|sclp-cpu-hotplug|sclplmconsole| - sclp-memory-hotplug-dev|sclpquiesce|sd-card|sdhci-pci|sdhci-pci| - secondary-vga|sga|smbus-eeprom|tpci200|unimplemented-device| + -device [AC97|adlib|am53c974|amd-iommu|AMDVI-PCI|ccid-card-emulated| + ccid-card-passthrough|cirrus-vga|cs4231a|dc390|diag288|e1000-82544gc| + e1000-82545em|edu|ES1370|floppy|generic-sdhci|gus|hda-duplex| + hda-micro|hda-output|hyperv-testdev|*-i386-cpu|i8042|i82550|i82551| + i82557a|i82557b|i82557c|i82558a|i82558b|i82559a|i82559b|i82559c| + i82562|i82801|i82801b11-bridge|ib700|ich9-intel-hda|ich9-usb-ehci1| + ich9-usb-ehci2|ich9-usb-uhci1|ich9-usb-uhci2|ich9-usb-uhci3| + ich9-usb-uhci4|ich9-usb-uhci5|ich9-usb-uhci6|ide-cd|ide-drive|ide-hd| + igd-passthrough-isa-bridge|intel-hda|intel_iommu|ioh3420| + ipmi-bmc-extern|ipmi-bmc-sim|ipoctal232|isa-applesmc|isa-cirrus-vga| + isa-debugcon|isa-debug-exit|isa-fdc|isa-ide|isa-ipmi-bt|isa-ipmi-kcs| + isa-parallel|isa-serial|isa-vga|kvm-pci-assign|lsi53c810|lsi53c810a| + megasas|mptsas1068|ne2k_isa|ne2k_pci|nec-usb-xhci|nvdimm|nvme|pc-dimm| + pci-testdev|pcnet|pc-testdev|piix3-ide|piix3-ide|piix3-ide-xen| + piix4-usb-uhci|pvscsi|pxb|pxb-host|pxb-pcie|qemu-s390-cpu|rocker| + s390-flic|s390-flic-qemu|s390-ipl|s390-pcihost| + s390-sclp-event-facility|s390-skeys-qemu|sb16|sclp|sclpconsole| + sclp-cpu-hotplug|sclplmconsole|sclp-memory-hotplug-dev|sclpquiesce| + sd-card|sdhci-pci|sdhci-pci|secondary-vga|sga|smbus-eeprom|tpci200| usb-audio|usb-bot|usb-bt-dongle|usb-ccid|usb-mtp|usb-uas|vfio-pci| vhost-scsi-ccw|vhost-vsock-ccw|virtio-9p-device|virtio-balloon-ccw| - virtio-blk-ccw|virtio-crypto-ccw|virtio-mmio|virtio-net-ccw| - virtio-rng-ccw|virtio-scsi-ccw|virtio-serial-ccw|virtio-vga| - virtual-css-bridge|vmware-svga|vmxnet3|vt82c686b-usb-uhci| - x3130-upstream|*-x86_64-cpu|xen-backend|xen-pci-passthrough| - xen-platform|xen-pvdevice|xen-sysdev|xio3130-downstream| - z10BC.2-base-s390-cpu|z10BC.2-s390-cpu|z10BC-base-s390-cpu| - z10BC-s390-cpu|z10EC.2-base-s390-cpu|z10EC.2-s390-cpu| - z10EC.3-base-s390-cpu|z10EC.3-s390-cpu|z10EC-base-s390-cpu| - z10EC-s390-cpu|z114-base-s390-cpu|z114-s390-cpu|z13.2-base-s390-cpu| - z13.2-s390-cpu|z13-base-s390-cpu|z13-s390-cpu|z13s-base-s390-cpu| - z13s-s390-cpu|z196.2-base-s390-cpu|z196.2-s390-cpu|z196-base-s390-cpu| - z196-s390-cpu|z800-base-s390-cpu|z800-s390-cpu|z890.2-base-s390-cpu| - z890.2-s390-cpu|z890.3-base-s390-cpu|z890.3-s390-cpu| - z890-base-s390-cpu|z890-s390-cpu|z900.2-base-s390-cpu|z900.2-s390-cpu| - z900.3-base-s390-cpu|z900.3-s390-cpu|z900-base-s390-cpu|z900-s390-cpu| - z990.2-base-s390-cpu|z990.2-s390-cpu|z990.3-base-s390-cpu| - z990.3-s390-cpu|z990.4-base-s390-cpu|z990.4-s390-cpu| - z990.5-base-s390-cpu|z990.5-s390-cpu|z990-base-s390-cpu|z990-s390-cpu| - z9BC.2-base-s390-cpu|z9BC.2-s390-cpu|z9BC-base-s390-cpu|z9BC-s390-cpu| - z9EC.2-base-s390-cpu|z9EC.2-s390-cpu|z9EC.3-base-s390-cpu| - z9EC.3-s390-cpu|z9EC-base-s390-cpu|z9EC-s390-cpu|zBC12-base-s390-cpu| - zBC12-s390-cpu|zEC12.2-base-s390-cpu|zEC12.2-s390-cpu| - zEC12-base-s390-cpu|zEC12-s390-cpu|zpci|vmgenid] + virtio-blk-ccw|virtio-crypto-ccw|virtio-net-ccw|virtio-rng-ccw| + virtio-scsi-ccw|virtio-serial-ccw|virtio-vga|virtual-css-bridge| + vmware-svga|vmxnet3|vt82c686b-usb-uhci|x3130-upstream|*-x86_64-cpu| + xen-backend|xen-pci-passthrough|xen-platform|xen-pvdevice| + xio3130-downstream|z10BC.2-base-s390-cpu|z10BC.2-s390-cpu| + z10BC-base-s390-cpu|z10BC-s390-cpu|z10EC.2-base-s390-cpu| + z10EC.2-s390-cpu|z10EC.3-base-s390-cpu|z10EC.3-s390-cpu| + z10EC-base-s390-cpu|z10EC-s390-cpu|z114-base-s390-cpu|z114-s390-cpu| + z13.2-base-s390-cpu|z13.2-s390-cpu|z13-base-s390-cpu|z13-s390-cpu| + z13s-base-s390-cpu|z13s-s390-cpu|z196.2-base-s390-cpu|z196.2-s390-cpu| + z196-base-s390-cpu|z196-s390-cpu|z800-base-s390-cpu|z800-s390-cpu| + z890.2-base-s390-cpu|z890.2-s390-cpu|z890.3-base-s390-cpu| + z890.3-s390-cpu|z890-base-s390-cpu|z890-s390-cpu|z900.2-base-s390-cpu| + z900.2-s390-cpu|z900.3-base-s390-cpu|z900.3-s390-cpu| + z900-base-s390-cpu|z900-s390-cpu|z990.2-base-s390-cpu|z990.2-s390-cpu| + z990.3-base-s390-cpu|z990.3-s390-cpu|z990.4-base-s390-cpu| + z990.4-s390-cpu|z990.5-base-s390-cpu|z990.5-s390-cpu| + z990-base-s390-cpu|z990-s390-cpu|z9BC.2-base-s390-cpu|z9BC.2-s390-cpu| + z9BC-base-s390-cpu|z9BC-s390-cpu|z9EC.2-base-s390-cpu|z9EC.2-s390-cpu| + z9EC.3-base-s390-cpu|z9EC.3-s390-cpu|z9EC-base-s390-cpu|z9EC-s390-cpu| + zBC12-base-s390-cpu|zBC12-s390-cpu|zEC12.2-base-s390-cpu| + zEC12.2-s390-cpu|zEC12-base-s390-cpu|zEC12-s390-cpu|zpci|vmgenid| + vhost-user-scsi|vhost-user-scsi-pci|mmio_interface] (the following are aliases of these unsupported devices: lsi| virtio-input-host|virtio-keyboard|virtio-mouse|virtio-tablet| virtio-gpu|virtio-9p|pci-assign|ahci|e1000-82540em) @@ -575,7 +580,9 @@ -no-kvm-irqchip -no-kvm-pit -no-kvm-pit-reinjection - -numa ... + -numa cpu ... + -numa dist ... + -numa node ... -option-rom ... -pflash file -portrait @@ -599,6 +606,7 @@ -xen-attach ... -xen-create -xen-domid ... + -xen-domid-restrict ... - The following monitor commands are unsupported: acl_add ... @@ -657,6 +665,7 @@ x-blockdev-insert-medium x-blockdev-remove-medium x-colo-lost-heartbeat + x-debug-block-dirty-bitmap-sha256 xen-colo-do-checkpoint xen-load-devices-state xen-save-devices-state ++++++ supported.x86.txt ++++++ --- /var/tmp/diff_new_pack.ga9cmO/_old 2017-09-07 22:09:53.135123392 +0200 +++ /var/tmp/diff_new_pack.ga9cmO/_new 2017-09-07 22:09:53.135123392 +0200 @@ -1,11 +1,11 @@ [qemu-x86 package document] -SLES 12 SP3 QEMU/KVM RELATED SUPPORT STATEMENTS +SLES 15 QEMU/KVM RELATED SUPPORT STATEMENTS Overview -------- - The QEMU based packages included with SLES 12 SP3 provide a large variety of + The QEMU based packages included with SLES 15 provide a large variety of features, from the very latest customer requests to features of questionable quality or value. The linux kernel includes components which contribute KVM virtualization features as well. This document was created to assist the user @@ -80,7 +80,7 @@ - Guest execution state may be "moved" in both time (save/restore) and space (static and live migration). These migrations or save/restore operations can - take place either from certain prior SLES versioned hosts to a SLES 12 SP3 + take place either from certain prior SLES versioned hosts to a SLES 15 host or between hosts of the same version. Certain other restrictions also apply. - Security considerations include seccomp2 based sandboxing, vTPM, privileged @@ -130,7 +130,7 @@ - Portions of the host file system may be shared with a guest by using virtFS. -- A guest "agent" is available for SLES 12 KVM guests via the qemu-guest-agent +- A guest "agent" is available for SLES 15 KVM guests via the qemu-guest-agent package. This allows some introspection and control of the guest OS environment from the host. @@ -380,6 +380,8 @@ -no-reboot -no-shutdown -no-user-config + -numa cpu ... + -numa dist ... -object ... -only-migratable -parallel ... @@ -415,6 +417,7 @@ -writeconfig ... -xen-attach ... -xen-domid ... + -xen-domid-restrict ... - The following monitor commands are supported: ? @@ -424,7 +427,9 @@ c change ... chardev-add ... + chardev-change ... chardev-remove ... + chardev-send-break ... client_migrate_info ... closefd ... cont @@ -439,6 +444,8 @@ dump_guest_memory ... eject ... gdbserver ... + gpa2hpa ... + gpa2hva ... help i ... info ... @@ -518,7 +525,9 @@ change change-vnc-password chardev-add + chardev-change chardev-remove + chardev-send-break client_migrate_info closefd cont @@ -642,19 +651,18 @@ virtio-balloon-device|virtio-blk-device|virtio-net-device| virtio-rng-device|virtio-scsi-device|virtio-serial-device|vmxnet3| xen-pci-passthrough|xen-platform|xen-pvdevice|piix3-ide|piix3-ide-xen| - piix3-ide|i8042|sdhci-pci|generic-sdhci|secondary-vga|edu|fw_cfg_io| - fw_cfg_mem|intel_iommu|usb-mtp|e1000-82544gc|e1000-82545em| - virtio-input-host-pci|virtio-keyboard-pci|virtio-mouse-pci| - virtio-tablet-pci|virtio-gpu-pci|pci-bridge-seat|pxb|pxb-pcie| - allwinner-ahci|sdhci-pci|rocker|virtio-input-host-device| + piix3-ide|i8042|sdhci-pci|secondary-vga|edu|intel_iommu|usb-mtp| + e1000-82544gc|e1000-82545em|virtio-input-host-pci|virtio-keyboard-pci| + virtio-mouse-pci|virtio-tablet-pci|virtio-gpu-pci|pci-bridge-seat|pxb| + pxb-pcie|sdhci-pci|rocker|virtio-input-host-device| virtio-keyboard-device|virtio-mouse-device|virtio-tablet-device| virtio-vga|hyperv-testdev|generic-sdhci|igd-passthrough-isa-bridge| ipmi-bmc-extern|ipmi-bmc-sim|isa-ipmi-bt|isa-ipmi-kcs|mptsas1068| - nvdimm|pxb-host|sd-card|virtio-gpu-device|kvm-pci-assign|xen-sysdev| - amd-iommu|AMDVI-PCI|vhost-vsock-device|vhost-vsock-pci| - virtio-crypto-device|virtio-crypto-pci|vfio-pci-igd-lpc-bridge| - isabus-bridge|pcie-root-port|qemu-xhci|unimplemented-device| - *-i386-cpu|*-x86_64-cpu] + nvdimm|pxb-host|sd-card|virtio-gpu-device|kvm-pci-assign|amd-iommu| + AMDVI-PCI|vhost-vsock-device|vhost-vsock-pci|virtio-crypto-device| + virtio-crypto-pci|vfio-pci-igd-lpc-bridge|pcie-root-port|qemu-xhci| + *-i386-cpu|*-x86_64-cpu|vhost-user-scsi|vhost-user-scsi-pci| + mmio_interface] (the following are aliases of these unsupported devices: lsi| virtio-input-host|virtio-keyboard|virtio-mouse|virtio-tablet| virtio-gpu|pci-assign) @@ -685,7 +693,7 @@ -no-kvm-irqchip -no-kvm-pit -no-kvm-pit-reinjection - -numa ... + -numa node ... -option-rom ... -pflash file -portrait @@ -755,5 +763,6 @@ x-blockdev-insert-medium x-blockdev-remove-medium x-colo-lost-heartbeat + x-debug-block-dirty-bitmap-sha256 xen-colo-do-checkpoint xen-set-replication ++++++ update_git.sh ++++++ --- /var/tmp/diff_new_pack.ga9cmO/_old 2017-09-07 22:09:53.155120573 +0200 +++ /var/tmp/diff_new_pack.ga9cmO/_new 2017-09-07 22:09:53.159120009 +0200 @@ -13,8 +13,8 @@ GIT_TREE=git://github.com/openSUSE/qemu.git GIT_LOCAL_TREE=~/git/qemu-opensuse -GIT_BRANCH=opensuse-2.9 -GIT_UPSTREAM_TAG=v2.9.0 +GIT_BRANCH=opensuse-2.10 +GIT_UPSTREAM_TAG=v2.10.0 GIT_DIR=/dev/shm/qemu-factory-git-dir CMP_DIR=/dev/shm/qemu-factory-cmp-dir
