Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at 2019-12-02 11:31:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qemu (Old) and /work/SRC/openSUSE:Factory/.qemu.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qemu" Mon Dec 2 11:31:53 2019 rev:164 rq:751314 version:4.1.93 Changes: -------- --- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2019-11-12 11:58:25.123534888 +0100 +++ /work/SRC/openSUSE:Factory/.qemu.new.4691/qemu.changes 2019-12-02 11:37:13.318446548 +0100 @@ -1,0 +2,95 @@ +Wed Nov 27 03:10:09 UTC 2019 - Bruce Rogers <brogers@suse.com> + +- Update to v4.2.0-rc3: See http://wiki.qemu.org/ChangeLog/4.2 +* Patches dropped (upstream unless otherwise noted): + ati-add-edid-support.patch + ati-vga-add-rage128-edid-support.patch + ati-vga-fix-ati_read.patch + ati-vga-make-i2c-register-and-bits-confi.patch + ati-vga-make-less-verbose.patch + ati-vga-try-vga-ddc-first.patch + Disable-Waddress-of-packed-member-for-GC.patch + hdata-vpd-fix-printing-char-0x00.patch + target-i386-add-PSCHANGE_NO-bit-for-the-.patch + target-i386-Export-TAA_NO-bit-to-guests.patch + vbe-add-edid-support.patch + vga-add-ati-bios-tables.patch + vga-add-atiext-driver.patch + vga-make-memcpy_high-public.patch + vga-move-modelist-from-bochsvga.c-to-new.patch +* Patches added: + Enable-cross-compile-prefix-for-C-compil.patch + ensure-headers-included-are-compatible-w.patch + roms-Makefile-enable-cross-compile-for-b.patch +* Add qemu-ui-spice-app package containing ui-spice-app.so +* Add qemu-microvm package containing bios-microvm.bin +- Add descriptors for the 128k and 256k SeaBios firmware images +- For the record, the following issues reported for SUSE SLE15-SP1 + are either fixed in this current package, or are otherwise not an + issue: bsc#1079730 bsc#1098403 bsc#1111025 bsc#1128106 bsc#1133031 + bsc#1134883 bsc#1135210 bsc#1135902 bsc#1136540 bsc#1136778 + bsc#1138534 bsc#1140402 bsc#1143794 bsc#1145379 bsc#1144087 + bsc#1145427 bsc#1145436 bsc#1145774 bsc#1146873 bsc#1149811 + bsc#1152506 bsc#1155812 bsc#1156642 CVE-2018-12207 CVE-2019-5008 + CVE-2019-11135 CVE-2019-12068 CVE-2019-12155 CVE-2019-13164 + CVE-2019-14378 CVE-2019-15890, and the following feature requests + are satisfied by this package: fate#327410 fate#327764 fate#327796 + jira-SLE-4883 jira-SLE-6132 jira-SLE-6237 jira-SLE-6754 + +------------------------------------------------------------------- +Tue Nov 19 19:13:41 UTC 2019 - Bruce Rogers <brogers@suse.com> + +- Expose pschange-mc-no "feature", indicating CPU does not have + the page size change machine check vulnerability (CVE-2018-12207 + bsc#1155812) + target-i386-add-PSCHANGE_NO-bit-for-the-.patch +- Expose taa-no "feature", indicating CPU does not have the + TSX Async Abort vulnerability. (CVE-2019-11135 bsc#1152506) + target-i386-Export-TAA_NO-bit-to-guests.patch +Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-4.1 + +------------------------------------------------------------------- +Fri Nov 15 15:45:45 UTC 2019 - Bruce Rogers <brogers@suse.com> + +- Update to v4.1.1, a stable, bug-fix-only release +* Besides incorporating the following fixes we already carried, it + includes about the same number of other, similar type fixes + which we hadn't yet incorporated. +* Patches dropped (subsumed by stable update): + block-Add-bdrv_co_get_self_request.patch + block-create-Do-not-abort-if-a-block-dri.patch + block-file-posix-Let-post-EOF-fallocate-.patch + block-file-posix-Reduce-xfsctl-use.patch + block-io-refactor-padding.patch + blockjob-update-nodes-head-while-removin.patch + block-Make-wait-mark-serialising-request.patch + block-nfs-tear-down-aio-before-nfs_close.patch + coroutine-Add-qemu_co_mutex_assert_locke.patch + curl-Check-completion-in-curl_multi_do.patch + curl-Handle-success-in-multi_check_compl.patch + curl-Keep-pointer-to-the-CURLState-in-CU.patch + curl-Keep-socket-until-the-end-of-curl_s.patch + curl-Pass-CURLSocket-to-curl_multi_do.patch + curl-Report-only-ready-sockets.patch + hw-arm-boot.c-Set-NSACR.-CP11-CP10-for-N.patch + hw-core-loader-Fix-possible-crash-in-rom.patch + make-release-pull-in-edk2-submodules-so-.patch + memory-Provide-an-equality-function-for-.patch + mirror-Keep-mirror_top_bs-drained-after-.patch + pr-manager-Fix-invalid-g_free-crash-bug.patch + qcow2-bitmap-Fix-uint64_t-left-shift-ove.patch + qcow2-Fix-corruption-bug-in-qcow2_detect.patch + qcow2-Fix-QCOW2_COMPRESSED_SECTOR_MASK.patch + qcow2-Fix-the-calculation-of-the-maximum.patch + roms-Makefile.edk2-don-t-pull-in-submodu.patch + s390-PCI-fix-IOMMU-region-init.patch + s390x-tcg-Fix-VERIM-with-32-64-bit-eleme.patch + target-alpha-fix-tlb_fill-trap_arg2-valu.patch + target-arm-Don-t-abort-on-M-profile-exce.patch + target-arm-Free-TCG-temps-in-trans_VMOV_.patch + util-iov-introduce-qemu_iovec_init_exten.patch + vhost-Fix-memory-region-section-comparis.patch + vpc-Return-0-from-vpc_co_create-on-succe.patch +Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-4.1 + +------------------------------------------------------------------- Old: ---- Disable-Waddress-of-packed-member-for-GC.patch ati-add-edid-support.patch ati-vga-add-rage128-edid-support.patch ati-vga-fix-ati_read.patch ati-vga-make-i2c-register-and-bits-confi.patch ati-vga-make-less-verbose.patch ati-vga-try-vga-ddc-first.patch block-Add-bdrv_co_get_self_request.patch block-Make-wait-mark-serialising-request.patch block-create-Do-not-abort-if-a-block-dri.patch block-file-posix-Let-post-EOF-fallocate-.patch block-file-posix-Reduce-xfsctl-use.patch block-io-refactor-padding.patch block-nfs-tear-down-aio-before-nfs_close.patch blockjob-update-nodes-head-while-removin.patch coroutine-Add-qemu_co_mutex_assert_locke.patch curl-Check-completion-in-curl_multi_do.patch curl-Handle-success-in-multi_check_compl.patch curl-Keep-pointer-to-the-CURLState-in-CU.patch curl-Keep-socket-until-the-end-of-curl_s.patch curl-Pass-CURLSocket-to-curl_multi_do.patch curl-Report-only-ready-sockets.patch hdata-vpd-fix-printing-char-0x00.patch hw-arm-boot.c-Set-NSACR.-CP11-CP10-for-N.patch hw-core-loader-Fix-possible-crash-in-rom.patch make-release-pull-in-edk2-submodules-so-.patch memory-Provide-an-equality-function-for-.patch mirror-Keep-mirror_top_bs-drained-after-.patch pr-manager-Fix-invalid-g_free-crash-bug.patch qcow2-Fix-QCOW2_COMPRESSED_SECTOR_MASK.patch qcow2-Fix-corruption-bug-in-qcow2_detect.patch qcow2-Fix-the-calculation-of-the-maximum.patch qcow2-bitmap-Fix-uint64_t-left-shift-ove.patch qemu-4.1.0.tar.xz qemu-4.1.0.tar.xz.sig roms-Makefile.edk2-don-t-pull-in-submodu.patch s390-PCI-fix-IOMMU-region-init.patch s390x-tcg-Fix-VERIM-with-32-64-bit-eleme.patch target-alpha-fix-tlb_fill-trap_arg2-valu.patch target-arm-Don-t-abort-on-M-profile-exce.patch target-arm-Free-TCG-temps-in-trans_VMOV_.patch util-iov-introduce-qemu_iovec_init_exten.patch vbe-add-edid-support.patch vga-add-ati-bios-tables.patch vga-add-atiext-driver.patch vga-make-memcpy_high-public.patch vga-move-modelist-from-bochsvga.c-to-new.patch vhost-Fix-memory-region-section-comparis.patch vpc-Return-0-from-vpc_co_create-on-succe.patch New: ---- 50-seabios-256k.json 60-seabios-128k.json Enable-cross-compile-prefix-for-C-compil.patch ensure-headers-included-are-compatible-w.patch qemu-4.2.0-rc3.tar.xz qemu-4.2.0-rc3.tar.xz.sig roms-Makefile-enable-cross-compile-for-b.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu.spec ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:31.874450453 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:31.878450454 +0100 @@ -1,7 +1,7 @@ # # spec file for package qemu # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -87,14 +87,15 @@ %define summary_string Machine emulator and virtualizer %endif +%define qemuver 4.1.93 +%define srcver 4.2.0-rc3 +%define sbver 1.12.1+ %define srcname qemu Name: qemu%{name_suffix} -Url: https://www.qemu.org/ +URL: https://www.qemu.org/ Summary: %{summary_string} License: BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT Group: System/Emulators/PC -%define qemuver 4.1.0 -%define srcver 4.1.0 Version: %qemuver Release: 0 Source: https://wiki.qemu.org/download/%{srcname}-%{srcver}.tar.xz @@ -113,6 +114,8 @@ Source11: supported.ppc.txt Source12: supported.x86.txt Source13: supported.s390.txt +Source14: 50-seabios-256k.json +Source15: 60-seabios-128k.json Source200: qemu-rpmlintrc Source300: bundles.tar.xz Source301: update_git.sh @@ -122,95 +125,51 @@ # This patch queue is auto-generated - see README.PACKAGING for process # Patches applied in base project: -Patch00000: mirror-Keep-mirror_top_bs-drained-after-.patch -Patch00001: s390x-tcg-Fix-VERIM-with-32-64-bit-eleme.patch -Patch00002: target-alpha-fix-tlb_fill-trap_arg2-valu.patch -Patch00003: target-arm-Free-TCG-temps-in-trans_VMOV_.patch -Patch00004: target-arm-Don-t-abort-on-M-profile-exce.patch -Patch00005: qcow2-Fix-the-calculation-of-the-maximum.patch -Patch00006: block-file-posix-Reduce-xfsctl-use.patch -Patch00007: pr-manager-Fix-invalid-g_free-crash-bug.patch -Patch00008: vpc-Return-0-from-vpc_co_create-on-succe.patch -Patch00009: block-nfs-tear-down-aio-before-nfs_close.patch -Patch00010: block-create-Do-not-abort-if-a-block-dri.patch -Patch00011: curl-Keep-pointer-to-the-CURLState-in-CU.patch -Patch00012: curl-Keep-socket-until-the-end-of-curl_s.patch -Patch00013: curl-Check-completion-in-curl_multi_do.patch -Patch00014: curl-Pass-CURLSocket-to-curl_multi_do.patch -Patch00015: curl-Report-only-ready-sockets.patch -Patch00016: curl-Handle-success-in-multi_check_compl.patch -Patch00017: blockjob-update-nodes-head-while-removin.patch -Patch00018: memory-Provide-an-equality-function-for-.patch -Patch00019: vhost-Fix-memory-region-section-comparis.patch -Patch00020: hw-arm-boot.c-Set-NSACR.-CP11-CP10-for-N.patch -Patch00021: s390-PCI-fix-IOMMU-region-init.patch -Patch00022: hw-core-loader-Fix-possible-crash-in-rom.patch -Patch00023: make-release-pull-in-edk2-submodules-so-.patch -Patch00024: roms-Makefile.edk2-don-t-pull-in-submodu.patch -Patch00025: coroutine-Add-qemu_co_mutex_assert_locke.patch -Patch00026: qcow2-Fix-corruption-bug-in-qcow2_detect.patch -Patch00027: block-io-refactor-padding.patch -Patch00028: util-iov-introduce-qemu_iovec_init_exten.patch -Patch00029: block-Make-wait-mark-serialising-request.patch -Patch00030: block-Add-bdrv_co_get_self_request.patch -Patch00031: block-file-posix-Let-post-EOF-fallocate-.patch -Patch00032: qcow2-bitmap-Fix-uint64_t-left-shift-ove.patch -Patch00033: qcow2-Fix-QCOW2_COMPRESSED_SECTOR_MASK.patch -Patch00034: XXX-dont-dump-core-on-sigabort.patch -Patch00035: qemu-binfmt-conf-Modify-default-path.patch -Patch00036: qemu-cvs-gettimeofday.patch -Patch00037: qemu-cvs-ioctl_debug.patch -Patch00038: qemu-cvs-ioctl_nodirection.patch -Patch00039: linux-user-add-binfmt-wrapper-for-argv-0.patch -Patch00040: PPC-KVM-Disable-mmu-notifier-check.patch -Patch00041: linux-user-binfmt-support-host-binaries.patch -Patch00042: linux-user-Fake-proc-cpuinfo.patch -Patch00043: linux-user-use-target_ulong.patch -Patch00044: Make-char-muxer-more-robust-wrt-small-FI.patch -Patch00045: linux-user-lseek-explicitly-cast-non-set.patch -Patch00046: AIO-Reduce-number-of-threads-for-32bit-h.patch -Patch00047: xen_disk-Add-suse-specific-flush-disable.patch -Patch00048: qemu-bridge-helper-reduce-security-profi.patch -Patch00049: qemu-binfmt-conf-use-qemu-ARCH-binfmt.patch -Patch00050: linux-user-properly-test-for-infinite-ti.patch -Patch00051: roms-Makefile-pass-a-packaging-timestamp.patch -Patch00052: Raise-soft-address-space-limit-to-hard-l.patch -Patch00053: increase-x86_64-physical-bits-to-42.patch -Patch00054: vga-Raise-VRAM-to-16-MiB-for-pc-0.15-and.patch -Patch00055: i8254-Fix-migration-from-SLE11-SP2.patch -Patch00056: acpi_piix4-Fix-migration-from-SLE11-SP2.patch -Patch00057: Switch-order-of-libraries-for-mpath-supp.patch -Patch00058: Make-installed-scripts-explicitly-python.patch -Patch00059: hw-smbios-handle-both-file-formats-regar.patch -Patch00060: xen-add-block-resize-support-for-xen-dis.patch -Patch00061: tests-qemu-iotests-Triple-timeout-of-i-o.patch -Patch00062: tests-Fix-block-tests-to-be-compatible-w.patch -Patch00063: xen-ignore-live-parameter-from-xen-save-.patch -Patch00064: Conditionalize-ui-bitmap-installation-be.patch -Patch00065: tests-change-error-message-in-test-162.patch -Patch00066: hw-usb-hcd-xhci-Fix-GCC-9-build-warning.patch -Patch00067: hw-usb-dev-mtp-Fix-GCC-9-build-warning.patch -Patch00068: hw-intc-exynos4210_gic-provide-more-room.patch -Patch00069: configure-only-populate-roms-if-softmmu.patch -Patch00070: pc-bios-s390-ccw-net-avoid-warning-about.patch -Patch00071: roms-change-cross-compiler-naming-to-be-.patch -Patch00072: tests-Disable-some-block-tests-for-now.patch -Patch00073: test-add-mapping-from-arch-of-i686-to-qe.patch +Patch00000: XXX-dont-dump-core-on-sigabort.patch +Patch00001: qemu-binfmt-conf-Modify-default-path.patch +Patch00002: qemu-cvs-gettimeofday.patch +Patch00003: qemu-cvs-ioctl_debug.patch +Patch00004: qemu-cvs-ioctl_nodirection.patch +Patch00005: linux-user-add-binfmt-wrapper-for-argv-0.patch +Patch00006: PPC-KVM-Disable-mmu-notifier-check.patch +Patch00007: linux-user-binfmt-support-host-binaries.patch +Patch00008: linux-user-Fake-proc-cpuinfo.patch +Patch00009: linux-user-use-target_ulong.patch +Patch00010: Make-char-muxer-more-robust-wrt-small-FI.patch +Patch00011: linux-user-lseek-explicitly-cast-non-set.patch +Patch00012: AIO-Reduce-number-of-threads-for-32bit-h.patch +Patch00013: xen_disk-Add-suse-specific-flush-disable.patch +Patch00014: qemu-bridge-helper-reduce-security-profi.patch +Patch00015: qemu-binfmt-conf-use-qemu-ARCH-binfmt.patch +Patch00016: linux-user-properly-test-for-infinite-ti.patch +Patch00017: roms-Makefile-pass-a-packaging-timestamp.patch +Patch00018: Raise-soft-address-space-limit-to-hard-l.patch +Patch00019: increase-x86_64-physical-bits-to-42.patch +Patch00020: vga-Raise-VRAM-to-16-MiB-for-pc-0.15-and.patch +Patch00021: i8254-Fix-migration-from-SLE11-SP2.patch +Patch00022: acpi_piix4-Fix-migration-from-SLE11-SP2.patch +Patch00023: Switch-order-of-libraries-for-mpath-supp.patch +Patch00024: Make-installed-scripts-explicitly-python.patch +Patch00025: hw-smbios-handle-both-file-formats-regar.patch +Patch00026: xen-add-block-resize-support-for-xen-dis.patch +Patch00027: tests-qemu-iotests-Triple-timeout-of-i-o.patch +Patch00028: tests-Fix-block-tests-to-be-compatible-w.patch +Patch00029: xen-ignore-live-parameter-from-xen-save-.patch +Patch00030: Conditionalize-ui-bitmap-installation-be.patch +Patch00031: tests-change-error-message-in-test-162.patch +Patch00032: hw-usb-hcd-xhci-Fix-GCC-9-build-warning.patch +Patch00033: hw-usb-dev-mtp-Fix-GCC-9-build-warning.patch +Patch00034: hw-intc-exynos4210_gic-provide-more-room.patch +Patch00035: configure-only-populate-roms-if-softmmu.patch +Patch00036: pc-bios-s390-ccw-net-avoid-warning-about.patch +Patch00037: roms-change-cross-compiler-naming-to-be-.patch +Patch00038: tests-Disable-some-block-tests-for-now.patch +Patch00039: test-add-mapping-from-arch-of-i686-to-qe.patch +Patch00040: roms-Makefile-enable-cross-compile-for-b.patch # Patches applied in roms/seabios/: Patch01000: seabios-use-python2-explicitly-as-needed.patch Patch01001: seabios-switch-to-python3-as-needed.patch Patch01002: enable-cross-compilation-on-ARM.patch -Patch01003: vga-move-modelist-from-bochsvga.c-to-new.patch -Patch01004: vga-make-memcpy_high-public.patch -Patch01005: vga-add-atiext-driver.patch -Patch01006: vga-add-ati-bios-tables.patch -Patch01007: vbe-add-edid-support.patch -Patch01008: ati-add-edid-support.patch -Patch01009: ati-vga-make-less-verbose.patch -Patch01010: ati-vga-fix-ati_read.patch -Patch01011: ati-vga-make-i2c-register-and-bits-confi.patch -Patch01012: ati-vga-try-vga-ddc-first.patch -Patch01013: ati-vga-add-rage128-edid-support.patch # Patches applied in roms/ipxe/: Patch02000: stub-out-the-SAN-req-s-in-int13.patch Patch02001: ipxe-Makefile-fix-issues-of-build-reprod.patch @@ -220,11 +179,11 @@ # Patches applied in roms/sgabios/: Patch03000: sgabios-Makefile-fix-issues-of-build-rep.patch Patch03001: roms-sgabios-Fix-csum8-to-be-built-by-ho.patch -# Patches applied in roms/skiboot/: -Patch05000: Disable-Waddress-of-packed-member-for-GC.patch -Patch05001: hdata-vpd-fix-printing-char-0x00.patch # Patches applied in ui/keycodemapdb/: Patch08000: Make-keycode-gen-output-reproducible-use.patch +# Patches applied in roms/qboot/: +Patch12000: ensure-headers-included-are-compatible-w.patch +Patch12001: Enable-cross-compile-prefix-for-C-compil.patch # Please do not add patches manually here. @@ -290,35 +249,38 @@ BuildRequires: fdupes BuildRequires: flex BuildRequires: gcc-c++ -BuildRequires: glib2-devel +BuildRequires: glib2-devel >= 2.48 +%if build_x86_firmware_from_source +BuildRequires: glibc-devel-32bit +%endif %if 0%{?with_glusterfs} -BuildRequires: glusterfs-devel +BuildRequires: glusterfs-devel >= 3 %endif -BuildRequires: gtk3-devel +BuildRequires: gtk3-devel >= 3.16 BuildRequires: libaio-devel BuildRequires: libattr-devel BuildRequires: libbz2-devel %if 0%{?is_opensuse} -BuildRequires: libcacard-devel +BuildRequires: libcacard-devel >= 2.5.1 %endif BuildRequires: libcap-devel BuildRequires: libcap-ng-devel BuildRequires: libdrm-devel BuildRequires: libepoxy-devel -BuildRequires: libfdt-devel +BuildRequires: libfdt-devel >= 1.4.2 BuildRequires: libgbm-devel -BuildRequires: libgcrypt-devel -BuildRequires: libgnutls-devel -BuildRequires: libiscsi-devel +BuildRequires: libgcrypt-devel >= 1.5.0 +BuildRequires: libgnutls-devel >= 3.1.18 +BuildRequires: libiscsi-devel >= 1.9.0 BuildRequires: libjpeg-devel %if 0%{?is_opensuse} -BuildRequires: libnfs-devel +BuildRequires: libnfs-devel >= 1.9.3 %endif %ifnarch %arm s390x BuildRequires: libnuma-devel %endif BuildRequires: libpcap-devel -BuildRequires: libpixman-1-0-devel +BuildRequires: libpixman-1-0-devel >= 0.21.8 %ifarch x86_64 BuildRequires: libpmem-devel %endif @@ -331,11 +293,11 @@ BuildRequires: libSDL2-devel BuildRequires: libSDL2_image-devel %endif -BuildRequires: libseccomp-devel -BuildRequires: libspice-server-devel -BuildRequires: libssh-devel +BuildRequires: libseccomp-devel >= 2.3.0 +BuildRequires: libspice-server-devel >= 0.12.5 +BuildRequires: libssh-devel >= 0.8 BuildRequires: libudev-devel -BuildRequires: libusb-1_0-devel +BuildRequires: libusb-1_0-devel >= 1.0.13 BuildRequires: libvdeplug-devel %if 0%{?is_opensuse} BuildRequires: lzfse-devel @@ -356,17 +318,17 @@ BuildRequires: python3-base BuildRequires: rdma-core-devel BuildRequires: snappy-devel -BuildRequires: spice-protocol-devel +BuildRequires: spice-protocol-devel >= 0.12.3 BuildRequires: systemd %{?systemd_requires} %if %{kvm_available} BuildRequires: pkgconfig(udev) %endif -BuildRequires: usbredir-devel +BuildRequires: usbredir-devel >= 0.6 BuildRequires: virglrenderer-devel >= 0.4.1 BuildRequires: vte-devel %ifarch x86_64 -BuildRequires: xen-devel +BuildRequires: xen-devel >= 4.2 %endif BuildRequires: xfsprogs-devel %if %{build_x86_firmware_from_source} @@ -407,7 +369,7 @@ BuildRequires: qemu-lang = %{qemuver} BuildRequires: qemu-ppc = %{qemuver} BuildRequires: qemu-s390 = %{qemuver} -BuildRequires: qemu-seabios = 1.12.1 +BuildRequires: qemu-seabios = %{sbver} BuildRequires: qemu-sgabios = 8 BuildRequires: qemu-tools = %{qemuver} BuildRequires: qemu-ui-curses = %{qemuver} @@ -415,7 +377,8 @@ %if 0%{?is_opensuse} BuildRequires: qemu-ui-sdl = %{qemuver} %endif -BuildRequires: qemu-vgabios = 1.12.1 +BuildRequires: qemu-ui-spice-app = %{qemuver} +BuildRequires: qemu-vgabios = %{sbver} BuildRequires: qemu-x86 = %{qemuver} %endif Requires(pre): shadow @@ -435,6 +398,7 @@ %if 0%{?is_opensuse} Recommends: qemu-ui-sdl %endif +Recommends: qemu-ui-spice-app Recommends: qemu-x86 %ifarch ppc ppc64 ppc64le Recommends: qemu-ppc @@ -468,6 +432,7 @@ %if 0%{?is_opensuse} Recommends: qemu-ksm = %{qemuver} %endif +Suggests: qemu-microvm Suggests: qemu-vhost-user-gpu Provides: qemu-audio-oss = %{qemuver} Obsoletes: qemu-audio-oss < %{qemuver} @@ -493,6 +458,7 @@ Release: 0 Requires: %name = %{qemuver} Requires: qemu-ipxe +Requires: qemu-microvm Requires: qemu-seabios Requires: qemu-sgabios Requires: qemu-vgabios @@ -722,6 +688,16 @@ This package contains a module for doing SDL based UI for QEMU. %endif +%package ui-spice-app +Summary: Spice UI support for QEMU +Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 +%{qemu_module_conflicts} + +%description ui-spice-app +This package contains a module for doing Spice based UI for QEMU. + %package audio-alsa Summary: ALSA based audio support for QEMU Group: System/Emulators/PC @@ -800,10 +776,21 @@ to provide information and control at the guest OS level. %ifarch %{build_rom_arch} +%package microvm +Summary: x86 MicroVM BIOS for QEMU +Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 +BuildArch: noarch + +%description microvm +MicroVM (qboot) is a miniam x86 firmware for booting Linux kernel. +It provides the minimum resources needed to boot PVH and bzImages. + %package seabios Summary: x86 Legacy BIOS for QEMU Group: System/Emulators/PC -Version: 1.12.1 +Version: %{sbver} Release: 0 BuildArch: noarch Conflicts: %name < 1.6.0 @@ -815,7 +802,7 @@ %package vgabios Summary: VGA BIOSes for QEMU Group: System/Emulators/PC -Version: 1.12.1 +Version: %{sbver} Release: 0 BuildArch: noarch Conflicts: %name < 1.6.0 @@ -926,53 +913,9 @@ %patch00038 -p1 %patch00039 -p1 %patch00040 -p1 -%patch00041 -p1 -%patch00042 -p1 -%patch00043 -p1 -%patch00044 -p1 -%patch00045 -p1 -%patch00046 -p1 -%patch00047 -p1 -%patch00048 -p1 -%patch00049 -p1 -%patch00050 -p1 -%patch00051 -p1 -%patch00052 -p1 -%patch00053 -p1 -%patch00054 -p1 -%patch00055 -p1 -%patch00056 -p1 -%patch00057 -p1 -%patch00058 -p1 -%patch00059 -p1 -%patch00060 -p1 -%patch00061 -p1 -%patch00062 -p1 -%patch00063 -p1 -%patch00064 -p1 -%patch00065 -p1 -%patch00066 -p1 -%patch00067 -p1 -%patch00068 -p1 -%patch00069 -p1 -%patch00070 -p1 -%patch00071 -p1 -%patch00072 -p1 -%patch00073 -p1 %patch01000 -p1 %patch01001 -p1 %patch01002 -p1 -%patch01003 -p1 -%patch01004 -p1 -%patch01005 -p1 -%patch01006 -p1 -%patch01007 -p1 -%patch01008 -p1 -%patch01009 -p1 -%patch01010 -p1 -%patch01011 -p1 -%patch01012 -p1 -%patch01013 -p1 %if 0%{?patch-possibly-applied-elsewhere} %patch02000 -p1 %endif @@ -984,9 +927,9 @@ %endif %patch03000 -p1 %patch03001 -p1 -%patch05000 -p1 -%patch05001 -p1 %patch08000 -p1 +%patch12000 -p1 +%patch12001 -p1 %if "%{name}" != "qemu-linux-user" # for the record, this set of firmware files is installed, but we don't @@ -998,19 +941,20 @@ # This first list group isn't specific to what this instance builds %define ppc_default_firmware {%nil} %define ppc_extra_firmware {skiboot.lid slof.bin} -%define ppc64_only_default_firmware {spapr-rtas.bin} +%define ppc64_only_default_firmware {%nil} %define ppc64_only_extra_firmware {%nil} -%define riscv64_default_firmware {opensbi-riscv64-sifive_u-fw_jump.bin opensbi-riscv64-virt-fw_jump.bin} +%define riscv64_default_firmware {opensbi-riscv64-sifive_u-fw_jump.bin \ +opensbi-riscv64-virt-fw_jump.bin} %define riscv64_extra_firmware {%nil} %define s390x_default_firmware {s390-ccw.img s390-netboot.img} %define s390x_extra_firmware {%nil} %define x86_default_firmware {linuxboot.bin linuxboot_dma.bin multiboot.bin \ kvmvapic.bin pvh.bin} -%define x86_extra_firmware {bios.bin bios-256k.bin pxe-e1000.rom \ -pxe-eepro100.rom pxe-ne2k_pci.rom pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \ -sgabios.bin vgabios-ati.bin vgabios-bochs-display.bin vgabios.bin \ -vgabios-cirrus.bin vgabios-qxl.bin vgabios-ramfb.bin vgabios-stdvga.bin \ -vgabios-virtio.bin vgabios-vmware.bin} +%define x86_extra_firmware {bios.bin bios-256k.bin bios-microvm.bin \ +pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom pxe-pcnet.rom pxe-rtl8139.rom \ +pxe-virtio.rom sgabios.bin vgabios-ati.bin vgabios-bochs-display.bin \ +vgabios.bin vgabios-cirrus.bin vgabios-qxl.bin vgabios-ramfb.bin \ +vgabios-stdvga.bin vgabios-virtio.bin vgabios-vmware.bin} %define x86_64_only_default_firmware {%nil} %define x86_64_only_extra_firmware {edk2-aarch64-code.fd.bz2 \ edk2-arm-code.fd.bz2 edk2-arm-vars.fd.bz2 edk2-i386-code.fd.bz2 \ @@ -1202,6 +1146,7 @@ %endif --enable-opengl \ --enable-parallels \ + --disable-plugins \ --enable-pvrdma \ --enable-qcow1 \ --enable-qed \ @@ -1239,6 +1184,7 @@ --enable-vhost-net \ --enable-vhost-scsi \ --enable-vhost-user \ + --enable-vhost-user-fs \ --enable-vhost-vsock \ --enable-virglrenderer \ --enable-virtfs \ @@ -1257,6 +1203,7 @@ --disable-xen \ %endif --enable-xfsctl \ + --enable-xkbcommon \ # ------------------------------------------------------------------------ %else # qemu-linux-user --without-default-devices \ @@ -1279,6 +1226,7 @@ --disable-malloc-trim \ --enable-membarrier \ --disable-parallels \ + --disable-plugins \ --disable-qcow1 \ --disable-qed \ --disable-replication \ @@ -1291,9 +1239,11 @@ --disable-vhost-net \ --disable-vhost-scsi \ --disable-vhost-user \ + --disable-vhost-user-fs \ --disable-vhost-vsock \ --disable-vnc \ --disable-vvfat \ + --disable-xkbcommon \ %endif # qemu-linux-user %if "%{name}" == "qemu" @@ -1345,6 +1295,8 @@ HOSTCC=cc \ %endif +make %{?_smp_mflags} -C %{_builddir}/%buildsubdir/roms bios-microvm + %ifnarch %ix86 %if %{provide_edk2_firmware} make %{?_smp_mflags} -C %{_builddir}/%buildsubdir/roms efi \ @@ -1373,7 +1325,9 @@ HOSTCC=cc %if %{force_fit_virtio_pxe_rom} +pushd %{_builddir}/%buildsubdir patch -p1 < %_sourcedir/stub-out-the-SAN-req-s-in-int13.patch +popd make %{?_smp_mflags} -C %{_builddir}/%buildsubdir/roms pxerom_variants=virtio pxerom_targets=1af41000 pxerom %endif @@ -1557,6 +1511,8 @@ unlink %{buildroot}%_datadir/%name/edk2-x86_64-code.fd unlink %{buildroot}%_datadir/%name/edk2-x86_64-secure-code.fd %endif +install -D -m 0644 %{SOURCE14} %{buildroot}%_datadir/%name/firmware/50-seabios-256k.json +install -D -m 0644 %{SOURCE15} %{buildroot}%_datadir/%name/firmware/60-seabios-128k.json %endif %if 0%{?do_more_edk2_unlinks} || %{provide_edk2_firmware} == 0 unlink %{buildroot}%_datadir/%name/edk2-licenses.txt || true @@ -1690,7 +1646,7 @@ # ======================================================================== %files %defattr(-, root, root) -%doc Changelog README VERSION +%doc Changelog README.rst VERSION %license COPYING COPYING.LIB LICENSE %if "%{name}" == "qemu" @@ -1711,6 +1667,7 @@ %_docdir/%name/interop/vhost-user.html %_docdir/%name/specs/.buildinfo %_docdir/%name/specs/_static/* +%_docdir/%name/specs/acpi_hw_reduced_hotplug.html %_docdir/%name/specs/genindex.html %_docdir/%name/specs/index.html %_docdir/%name/specs/objects.inv @@ -1786,7 +1743,6 @@ %_datadir/%name/qemu_vga.ndrv %_datadir/%name/skiboot.lid %_datadir/%name/slof.bin -%_datadir/%name/spapr-rtas.bin %_datadir/%name/u-boot.e500 %_datadir/%name/u-boot-sam460-20100605.bin %if 0%{?is_opensuse} == 0 @@ -1923,6 +1879,11 @@ %_libdir/%name/ui-sdl.so %endif +%files ui-spice-app +%defattr(-, root, root) +%dir %_libdir/%name +%_libdir/%name/ui-spice-app.so + %files audio-alsa %defattr(-, root, root) %dir %_libdir/%name @@ -1949,6 +1910,13 @@ %dir %_datadir/%name %_datadir/%name/bios.bin %_datadir/%name/bios-256k.bin +%_datadir/%name/firmware/50-seabios-256k.json +%_datadir/%name/firmware/60-seabios-128k.json + +%files microvm +%defattr(-, root, root) +%dir %_datadir/%name +%_datadir/%name/bios-microvm.bin %files vgabios %defattr(-, root, root) @@ -2039,6 +2007,8 @@ %files guest-agent %defattr(-, root, root) +%dir %_docdir/%name/interop +%_docdir/%name/interop/qemu-ga.html %_mandir/man8/qemu-ga.8.gz %attr(0755,root,kvm) %_bindir/qemu-ga %{_unitdir}/qemu-ga@.service ++++++ 50-seabios-256k.json ++++++ { "description": "SeaBIOS", "interface-types": [ "bios" ], "mapping": { "device": "memory", "filename": "/usr/share/qemu/bios-256k.bin" }, "targets": [ { "architecture": "i386", "machines": [ "pc-i440fx-*", "pc-q35-*" ] }, { "architecture": "x86_64", "machines": [ "pc-i440fx-*", "pc-q35-*" ] } ], "features": [ "acpi-s3", "acpi-s4" ], "tags": [ "CONFIG_QEMU=y", "CONFIG_ROM_SIZE=256", "CONFIG_ATA_DMA=n" ] } ++++++ 60-seabios-128k.json ++++++ { "description": "SeaBIOS", "interface-types": [ "bios" ], "mapping": { "device": "memory", "filename": "/usr/share/qemu/bios.bin" }, "targets": [ { "architecture": "i386", "machines": [ "pc-i440fx-*", "pc-q35-*" ] }, { "architecture": "x86_64", "machines": [ "pc-i440fx-*", "pc-q35-*" ] } ], "features": [ "acpi-s3", "acpi-s4" ], "tags": [ "CONFIG_QEMU=y", "CONFIG_ROM_SIZE=128", "CONFIG_ATA_DMA=n", "CONFIG_BOOTSPLASH=n", "CONFIG_XEN=n", "CONFIG_USB_OHCI=n", "CONFIG_USB_XHCI=n", "CONFIG_USB_UAS=n", "CONFIG_SDCARD=n", "CONFIG_TCGBIOS=n", "CONFIG_MPT_SCSI=n", "CONFIG_PVSCSI=n", "CONFIG_NVME=n", "CONFIG_USE_SMM=n", "CONFIG_VGAHOOKS=n" ] } ++++++ Conditionalize-ui-bitmap-installation-be.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:31.958450471 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:31.962450472 +0100 @@ -8,10 +8,10 @@ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile -index 00ed716275743a161ea05e7d2a1e..ab4d8683ad8f86aa680b343310e1 100644 +index 52881cbb12e7d980e0ed51f21174..edc3de72e6a94ef0503da640bbfe 100644 --- a/Makefile +++ b/Makefile -@@ -887,6 +887,7 @@ ifneq ($(DESCS),) +@@ -913,6 +913,7 @@ ifneq ($(DESCS),) "$(DESTDIR)$(qemu_datadir)/firmware/$$x"; \ done endif @@ -19,7 +19,7 @@ for s in $(ICON_SIZES); do \ mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \ $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_$${s}.png \ -@@ -901,6 +902,7 @@ endif +@@ -927,6 +928,7 @@ endif mkdir -p "$(DESTDIR)$(qemu_desktopdir)" $(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \ "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop" ++++++ Enable-cross-compile-prefix-for-C-compil.patch ++++++ From: Bruce Rogers <brogers@suse.com> Date: Fri, 1 Nov 2019 19:41:52 -0600 Subject: Enable cross compile prefix for C compiler invocation Signed-off-by: Bruce Rogers <brogers@suse.com> --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roms/qboot/Makefile b/roms/qboot/Makefile index adbf1b319e4a7bee78e2f95c5e51..cdde20fc37b13a1877668cd20e2f 100644 --- a/roms/qboot/Makefile +++ b/roms/qboot/Makefile @@ -1,3 +1,4 @@ +CROSS_COMPILE ?= obj-y = code16.o entry.o main.o string.o printf.o cstart.o fw_cfg.o obj-y += linuxboot.o malloc.o tables.o hwsetup.o pci.o code32seg.o obj-y += mptable.o @@ -25,9 +26,9 @@ autodepend-flags = -MMD -MF .deps/cc-$(patsubst %/,%,$(dir $*))-$(notdir $*).d .PRECIOUS: %.o %.o: %.c - $(CC) $(CFLAGS) $(BIOS_CFLAGS) $($@-cflags) -c -s $< -o $@ + $(CROSS_COMPILE)$(CC) $(CFLAGS) $(BIOS_CFLAGS) $($@-cflags) -c -s $< -o $@ %.o: %.S - $(CC) $(CFLAGS) $(BIOS_CFLAGS) -c -s $< -o $@ + $(CROSS_COMPILE)$(CC) $(CFLAGS) $(BIOS_CFLAGS) -c -s $< -o $@ bios.bin.elf: $(obj-y) flat.lds $(LD) -T flat.lds -o bios.bin.elf $(obj-y) ++++++ Make-char-muxer-more-robust-wrt-small-FI.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:31.974450474 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:31.978450475 +0100 @@ -108,7 +108,7 @@ int mux_cnt; int term_got_escape; diff --git a/tests/test-char.c b/tests/test-char.c -index f9440cdcfdb51f98b2f6542e6f21..d1f99632de1acb95ba8e1b4a8584 100644 +index 45e42af290d4c55c0d8ed9358ef2..8e8c983dc0adce3dea739c9d85fc 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -1,3 +1,4 @@ ++++++ Make-installed-scripts-explicitly-python.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:31.982450476 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:31.982450476 +0100 @@ -23,7 +23,7 @@ # Migration Stream Analyzer # diff --git a/scripts/vmstate-static-checker.py b/scripts/vmstate-static-checker.py -index d3467288dcc5dd2f7274576262f7..2046b1feddb4c225c8f3bee080ac 100755 +index f8b7b8f77252f2c03d6d7db9dc60..754159069dfae6838edaac14856f 100755 --- a/scripts/vmstate-static-checker.py +++ b/scripts/vmstate-static-checker.py @@ -1,4 +1,4 @@ ++++++ PPC-KVM-Disable-mmu-notifier-check.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:31.990450477 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:31.990450477 +0100 @@ -14,10 +14,10 @@ 1 file changed, 2 insertions(+) diff --git a/exec.c b/exec.c -index 3e78de3b8f8bb1914811a7965377..d2183f58816f53f15ef64e844291 100644 +index ffdb5185353bdbacc613d4730228..0d0c0618bb70f9747c71048f5cde 100644 --- a/exec.c +++ b/exec.c -@@ -2339,11 +2339,13 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, +@@ -2291,11 +2291,13 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, return NULL; } ++++++ README.PACKAGING ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.010450482 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.010450482 +0100 @@ -5,36 +5,32 @@ The qemu.spec file is generated from a qemu.spec.in template, so to make changes to the spec file (besides the script generated patch references), you'll need to edit the template, not the spec file. The spec file patch references are inserted -by scripts, which are described below. +by a script as described below. If you are not modifying any patches or their order, but just need to update the spec file from a changed template, run 'bash ./update_git.sh refresh'. If the set of patches is being modified, including their order, you will want to first run 'bash ./update_git.sh pkg2git', which makes the current package patch -queue available in a local git branch named frombundle (see confi.sh for the +queue available in a local git branch named frombundle (see config.sh for the locations). This set of patches comes from a "bundle of git bundles", the bundles.tar.xz file, which is included as a package source file. You will then -create an altered patch queue in the $GIT_BRANCH branch ( again,see config.sh), -and use the frombundle branch as the starting point for your changes (eg perhaps -start by doing git reset --hard frombundle, then cherry-pick upstream patches -from there). Once you have the patch queue ready to go run 'bash ./update_git.sh -git2pkg' which updates the bunndles.tar.xz file, as well as the spec and patch -files. +create an altered patch queue in the branch which corresponds to this release +(eg: opensuse-4.2), using the frombundle branch as the starting point for your +changes (eg perhaps start by doing git reset --hard frombundle, then cherry-pick +upstream patches from there). Once you have the patch queue ready to go run +'bash ./update_git.sh git2pkg' which updates the bundles.tar.xz file, as well as +the spec and patch files. + +The maintainer and automation use another workflow mode dealing with packaging +the latest upstream qemu. See 'LATEST' references in the scripts for details. ** SPECIAL NOTE ABOUT CURRENT STATUS *** -The current status as of 03 Oct 2019 is that for this incarnation of qemu +The current status as of 31 Oct 2019 is that for this incarnation of qemu packaging, the previous workflow which relied on the patches being in a shared git repo on github or gitlab is no longer supported. This new bundle based workflos is still a work in progress. If it isn't working right, please contact Bruce Rogers <brogers@suse.com>. - -Also note that qemu now takes advantage of the MultiBuild feature of the Build -Service. No longer do the qemu-linux-user and qemu-testsuite packages have build -service links to the qemu package, but instead are generated straight from the -main qemu spec file via the use of a _multibuild file which identifies those -package variants. -- Bruce Rogers *** END SPECIAL NOTE *** Additional Notes: ++++++ Raise-soft-address-space-limit-to-hard-l.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.014450482 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.018450483 +0100 @@ -16,26 +16,26 @@ 1 file changed, 12 insertions(+) diff --git a/vl.c b/vl.c -index b426b3213461210565bd1db15a0c..2b864f7dbe8b60ace40fa3258a37 100644 +index 6a65a64bfd647afcf539145f9cf9..57e68fdc4526b7156af155be933f 100644 --- a/vl.c +++ b/vl.c -@@ -30,6 +30,7 @@ - #include "qemu/cutils.h" - #include "qemu/help_option.h" +@@ -33,6 +33,7 @@ #include "qemu/uuid.h" + #include "sysemu/reset.h" + #include "sysemu/runstate.h" +#include <sys/resource.h> #include "sysemu/seccomp.h" #include "sysemu/tcg.h" -@@ -2889,6 +2890,7 @@ int main(int argc, char **argv, char **envp) - bool list_data_dirs = false; +@@ -2861,6 +2862,7 @@ int main(int argc, char **argv, char **envp) char *dir, **dirs; BlockdevOptionsQueue bdo_queue = QSIMPLEQ_HEAD_INITIALIZER(bdo_queue); + QemuPluginList plugin_list = QTAILQ_HEAD_INITIALIZER(plugin_list); + struct rlimit rlimit_as; os_set_line_buffering(); -@@ -2900,6 +2902,16 @@ int main(int argc, char **argv, char **envp) +@@ -2872,6 +2874,16 @@ int main(int argc, char **argv, char **envp) qemu_mutex_lock_iothread(); ++++++ Switch-order-of-libraries-for-mpath-supp.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.022450484 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.022450484 +0100 @@ -9,10 +9,10 @@ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 85862fb81a1d276c41133a31b2d9..00ed716275743a161ea05e7d2a1e 100644 +index b437a346d71a55d75f207f36e85b..52881cbb12e7d980e0ed51f21174 100644 --- a/Makefile +++ b/Makefile -@@ -556,7 +556,7 @@ fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap +@@ -579,7 +579,7 @@ fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap scsi/qemu-pr-helper$(EXESUF): scsi/qemu-pr-helper.o scsi/utils.o $(authz-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) ifdef CONFIG_MPATH @@ -22,10 +22,10 @@ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool diff --git a/configure b/configure -index 714e7fb6a1fbd72ccdcd92b506ce..578d208b374261803d84c22c2479 100755 +index 6099be1d848c7f52ea02694d6d86..09a33aecfd6ef543eeee8c5023b6 100755 --- a/configure +++ b/configure -@@ -3781,7 +3781,7 @@ int main(void) { +@@ -3836,7 +3836,7 @@ int main(void) { return 0; } EOF ++++++ acpi_piix4-Fix-migration-from-SLE11-SP2.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.054450491 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.054450491 +0100 @@ -16,15 +16,15 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c -index ec4e186cec7ccff739b7bad8dcc4..be5529867ab426b38b26dab5498a 100644 +index 93aec2dd2ce1767784076c3544b0..1f2a8ea850e9115b689af90bf708 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c -@@ -306,7 +306,7 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id) +@@ -273,7 +273,7 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id) static const VMStateDescription vmstate_acpi = { .name = "piix4_pm", .version_id = 3, - .minimum_version_id = 3, + .minimum_version_id = 2, /* qemu-kvm */ - .minimum_version_id_old = 1, - .load_state_old = acpi_load_old, .post_load = vmstate_acpi_post_load, + .fields = (VMStateField[]) { + VMSTATE_PCI_DEVICE(parent_obj, PIIX4PMState), ++++++ bundles.tar.xz ++++++ Binary files old/0d4f9d7dc7832a876f4a71138325c0fcefd587b6.bundle and new/0d4f9d7dc7832a876f4a71138325c0fcefd587b6.bundle differ Binary files old/9e06029aea3b2eca1d5261352e695edc1e7d7b8b.bundle and new/9e06029aea3b2eca1d5261352e695edc1e7d7b8b.bundle differ Binary files old/roms/qboot/cb1c49e0cfac99b9961d136ac0194da62c28cf64.bundle and new/roms/qboot/cb1c49e0cfac99b9961d136ac0194da62c28cf64.bundle differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/roms/qboot/repo new/roms/qboot/repo --- old/roms/qboot/repo 1970-01-01 01:00:00.000000000 +0100 +++ new/roms/qboot/repo 2019-11-26 19:50:49.000000000 +0100 @@ -0,0 +1 @@ +git@github.com:openSUSE/qemu-qboot.git Binary files old/roms/seabios/a5cab58e9a3fb6e168aba919c5669bea406573b4.bundle and new/roms/seabios/a5cab58e9a3fb6e168aba919c5669bea406573b4.bundle differ Binary files old/roms/seabios/c9ba5276e3217ac6a1ec772dbebf568ba3a8a55d.bundle and new/roms/seabios/c9ba5276e3217ac6a1ec772dbebf568ba3a8a55d.bundle differ Binary files old/roms/skiboot/261ca8e779e5138869a45f174caa49be6a274501.bundle and new/roms/skiboot/261ca8e779e5138869a45f174caa49be6a274501.bundle differ ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.118450504 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.122450505 +0100 @@ -7,14 +7,19 @@ # The following specifies the upstream tag or commit upon which our patchqueue # gets rebased. The special value LATEST may be used to "automatically" track # the upstream development tree in the master branch -GIT_UPSTREAM_COMMIT_ISH=v4.1.0 +GIT_UPSTREAM_COMMIT_ISH=LATEST # WARNING: If transitioning from using LATEST to not, MANUALLY re-set the # tarball present. If transitioning TO LATEST, make sure that # NEXT_RELEASE_IS_MAJOR is set correctly # This is used to choose the version number when LATEST processing is active NEXT_RELEASE_IS_MAJOR=0 -# The shared openSUSE specific git repo, on which $GIT_LOCAL_TREE is based +# Unfortunately, SeaBIOS doesn't always follow an "always increasing" version +# model, so there may be times we should overide the automated version setting. +# We can do so by specifing the value here: +SEABIOS_VERSION=1.12.1+ + +# The shared git repo, on which $GIT_LOCAL_TREE is based GIT_TREE=git://github.com/openSUSE/qemu.git # Temporary directories used by this script @@ -26,7 +31,7 @@ NUMBERED_PATCHES=0 PATCH_RANGE=1000 -REPO_COUNT=26 +REPO_COUNT=27 # Perhaps we need to instead use the terminal local dirname as the index # and store the ~/git/ as a separate VARIABLE @@ -45,6 +50,7 @@ ~/git/qemu-slirp ~/git/qemu-u-boot ~/git/qemu-openhackware + ~/git/qemu-qboot ~/git/qemu-dtc ~/git/qemu-opensbi ~/git/qemu-edk2-openssl @@ -74,6 +80,7 @@ "slirp/" "roms/u-boot/" "roms/openhackware/" + "roms/qboot/" "dtc/" "roms/opensbi/" "roms/edk2/CryptoPkg/Library/OpensslLib/openssl/" ++++++ configure-only-populate-roms-if-softmmu.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.126450506 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.126450506 +0100 @@ -8,21 +8,14 @@ Signed-off-by: Bruce Rogers <brogers@suse.com> --- - configure | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 578d208b374261803d84c22c2479..6cfe739061d2d8fef6d89147fcd5 100755 +index 09a33aecfd6ef543eeee8c5023b6..94984691ab378620ac2e0ae771ca 100755 --- a/configure +++ b/configure -@@ -6211,12 +6211,13 @@ if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \ - fi - done - fi --if test "$ARCH" = "ppc64" && test "$targetos" != "Darwin" ; then -+if test "$ARCH" = "ppc64" && test "$targetos" != "Darwin" && \ -+ test "$softmmu" = yes ; then - roms="$roms spapr-rtas" +@@ -6327,7 +6327,7 @@ if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \ fi # Only build s390-ccw bios if we're on s390x and the compiler has -march=z900 ++++++ enable-cross-compilation-on-ARM.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.134450508 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.134450508 +0100 @@ -8,7 +8,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roms/seabios/Makefile b/roms/seabios/Makefile -index bd34cfc2394a9103fec2e951bb67..7b8a5cd6b17254685df89798ed10 100644 +index ca8d0283922bbfa931e85511e921..d807c558ef0f09b5975f6ccc38f1 100644 --- a/roms/seabios/Makefile +++ b/roms/seabios/Makefile @@ -13,7 +13,7 @@ export CONFIG_SHELL := sh ++++++ ensure-headers-included-are-compatible-w.patch ++++++ From: Bruce Rogers <brogers@suse.com> Date: Fri, 1 Nov 2019 19:32:57 -0600 Subject: ensure headers included are compatible with freestanding mode Certain standard headers are designated for use in freestanding mode while others are prohibited. To conform to these rules, use <stdint.h> instead of <inttypes.h> as well as switch one <string.h> reference to the "string.h" implemented in project. Signed-off-by: Bruce Rogers <brogers@suse.com> --- include/bios.h | 2 +- malloc.c | 2 +- pci.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roms/qboot/include/bios.h b/roms/qboot/include/bios.h index f36638b977864c220bf3ed9a612f..7f8f677671d7b47e7c07f800646c 100644 --- a/roms/qboot/include/bios.h +++ b/roms/qboot/include/bios.h @@ -1,7 +1,7 @@ #ifndef BIOS_H_ #define BIOS_H_ -#include <inttypes.h> +#include <stdint.h> #include <stddef.h> #include <stdbool.h> diff --git a/roms/qboot/malloc.c b/roms/qboot/malloc.c index 8738373b774358425b2767fc7e9f..bd0ac0f23ee1e3c4a8f5e003ff1d 100644 --- a/roms/qboot/malloc.c +++ b/roms/qboot/malloc.c @@ -1,4 +1,4 @@ -#include <inttypes.h> +#include <stdint.h> #include "string.h" #include "bios.h" diff --git a/roms/qboot/pci.c b/roms/qboot/pci.c index 65c9e81793ab7aad9b5d1679e78e..63ebda6a0580463ea2b562317cec 100644 --- a/roms/qboot/pci.c +++ b/roms/qboot/pci.c @@ -1,7 +1,7 @@ #include "bios.h" #include "ioport.h" #include "pci.h" -#include <string.h> +#include "string.h" static uint16_t addend; static uint8_t bus, bridge_head; ++++++ hw-intc-exynos4210_gic-provide-more-room.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.146450510 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.146450510 +0100 @@ -41,10 +41,10 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c -index e37d457fcf3ae8f37ae3c4047161..640f146a50af42ccd03aa18786f2 100644 +index a1b699b6babc3105bfd4ad9a8383..17317c961caa9a09c476e9ecbd3f 100644 --- a/hw/intc/exynos4210_gic.c +++ b/hw/intc/exynos4210_gic.c -@@ -288,8 +288,8 @@ static void exynos4210_gic_realize(DeviceState *dev, Error **errp) +@@ -290,8 +290,8 @@ static void exynos4210_gic_realize(DeviceState *dev, Error **errp) SysBusDevice *sbd = SYS_BUS_DEVICE(obj); const char cpu_prefix[] = "exynos4210-gic-alias_cpu"; const char dist_prefix[] = "exynos4210-gic-alias_dist"; ++++++ hw-smbios-handle-both-file-formats-regar.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.150450512 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.150450512 +0100 @@ -16,10 +16,10 @@ 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c -index 7bcd67b098e91a0e724b77b224c1..44e62c2a627195d71ac569e9de49 100644 +index 11d476c4a2cbdabc546c02b4f076..570ffa3acfa48b3721bdc578ee57 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c -@@ -965,6 +965,7 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) +@@ -964,6 +964,7 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) struct smbios_structure_header *header; int size; struct smbios_table *table; /* legacy mode only */ @@ -27,7 +27,7 @@ qemu_opts_validate(opts, qemu_smbios_file_opts, &err); if (err) { -@@ -979,11 +980,21 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) +@@ -978,11 +979,21 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) } /* @@ -53,7 +53,7 @@ header = (struct smbios_structure_header *)(smbios_tables + smbios_tables_len); -@@ -998,6 +1009,19 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) +@@ -997,6 +1008,19 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) header->type); return; } @@ -73,7 +73,7 @@ set_bit(header->type, have_binfile_bitmap); if (header->type == 4) { -@@ -1018,6 +1042,17 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) +@@ -1017,6 +1041,17 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) * delete the one we don't need from smbios_set_defaults(), * once we know which machine version has been requested. */ ++++++ hw-usb-dev-mtp-Fix-GCC-9-build-warning.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.158450513 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.162450514 +0100 @@ -17,10 +17,10 @@ 1 file changed, 13 insertions(+) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c -index fd1b3394a5b4b4827deece722e0c..8de503cc4d55423ae0bd070867c0 100644 +index 7c07295519d33d13fd3755ea7e0a..13815df4737ef8f46e6f857153b1 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c -@@ -1720,9 +1720,22 @@ static void usb_mtp_write_metadata(MTPState *s, uint64_t dlen) +@@ -1722,9 +1722,22 @@ static void usb_mtp_write_metadata(MTPState *s, uint64_t dlen) assert(!s->write_pending); assert(p != NULL); ++++++ hw-usb-hcd-xhci-Fix-GCC-9-build-warning.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.166450515 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.166450515 +0100 @@ -28,10 +28,10 @@ 1 file changed, 1 insertion(+) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c -index 5894a186633414970fe748dbd9f4..47ea8dd3a5f6a09e361f0f59c7b9 100644 +index 80988bb305a149f2974d329576a0..00b59bee44f4780727ca0279ced5 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c -@@ -3324,6 +3324,7 @@ static void usb_xhci_init(XHCIState *xhci) +@@ -3330,6 +3330,7 @@ static void usb_xhci_init(XHCIState *xhci) usb_bus_new(&xhci->bus, sizeof(xhci->bus), &xhci_bus_ops, dev); for (i = 0; i < usbports; i++) { ++++++ i8254-Fix-migration-from-SLE11-SP2.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.170450515 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.170450515 +0100 @@ -16,10 +16,10 @@ 1 file changed, 7 insertions(+) diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c -index 76ca6ec4446998f62d384a909814..fb9d5047f8c50df8ad0e662a42ac 100644 +index 050875b49738809ac586ba9ed259..59aa28b8a72590e7fdda0feecefe 100644 --- a/hw/timer/i8254_common.c +++ b/hw/timer/i8254_common.c -@@ -261,6 +261,12 @@ static int pit_dispatch_post_load(void *opaque, int version_id) +@@ -224,6 +224,12 @@ static int pit_dispatch_post_load(void *opaque, int version_id) return 0; } @@ -32,7 +32,7 @@ static const VMStateDescription vmstate_pit_common = { .name = "i8254", .version_id = 3, -@@ -270,6 +276,7 @@ static const VMStateDescription vmstate_pit_common = { +@@ -231,6 +237,7 @@ static const VMStateDescription vmstate_pit_common = { .pre_save = pit_dispatch_pre_save, .post_load = pit_dispatch_post_load, .fields = (VMStateField[]) { ++++++ increase-x86_64-physical-bits-to-42.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.178450517 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.182450518 +0100 @@ -18,10 +18,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h -index 8b3dc5533e6994bf9066f88f1a5e..3440f1e4297940d8db2e533d5cb1 100644 +index cde2a16b941adeb1123d5d7411f3..39b9327a64d42bdace0d7346e038 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h -@@ -1713,7 +1713,7 @@ uint64_t cpu_get_tsc(CPUX86State *env); +@@ -1928,7 +1928,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) ++++++ linux-user-Fake-proc-cpuinfo.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.210450524 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.210450524 +0100 @@ -21,10 +21,10 @@ 1 file changed, 24 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index cf5de07a09235e6d92735332dc7f..3bb2c8921fc203264bbc0a37fe1d 100644 +index 57be4c98555e50f2263811cd11f4..243ec2a1e3bde8e6b3ac48989554 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -6958,6 +6958,27 @@ static int open_self_stat(void *cpu_env, int fd) +@@ -7068,6 +7068,27 @@ static int open_self_stat(void *cpu_env, int fd) return 0; } @@ -52,7 +52,7 @@ static int open_self_auxv(void *cpu_env, int fd) { CPUState *cpu = env_cpu((CPUArchState *)cpu_env); -@@ -7100,6 +7121,9 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags, +@@ -7210,6 +7231,9 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags, #if defined(TARGET_SPARC) { "/proc/cpuinfo", open_cpuinfo, is_proc }, #endif ++++++ linux-user-add-binfmt-wrapper-for-argv-0.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.214450525 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.214450525 +0100 @@ -35,12 +35,12 @@ 3 files changed, 57 insertions(+) diff --git a/Makefile.target b/Makefile.target -index 933b27453a1dbb9273e0a9ff2d58..6e401da667fe4295acec4dc11302 100644 +index 24d79d26ebd00034bd97309fe5a7..1e9600834a25544063c313eba92a 100644 --- a/Makefile.target +++ b/Makefile.target -@@ -42,6 +42,10 @@ STPFILES= - # Makefile Tests - include $(SRC_PATH)/tests/tcg/Makefile.include +@@ -39,6 +39,10 @@ endif + PROGS=$(QEMU_PROG) $(QEMU_PROGW) + STPFILES= +ifdef CONFIG_LINUX_USER +PROGS+=$(QEMU_PROG)-binfmt @@ -49,7 +49,7 @@ config-target.h: config-target.h-timestamp config-target.h-timestamp: config-target.mak -@@ -134,6 +138,8 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \ +@@ -133,6 +137,8 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \ obj-y += linux-user/ obj-y += gdbstub.o thunk.o @@ -58,7 +58,7 @@ endif #CONFIG_LINUX_USER ######################################################### -@@ -175,7 +181,11 @@ generated-files-y += config-devices.h +@@ -174,7 +180,11 @@ generated-files-y += config-devices.h endif # CONFIG_SOFTMMU @@ -70,7 +70,7 @@ all-obj-y := $(obj-y) include $(SRC_PATH)/Makefile.objs -@@ -212,6 +222,9 @@ ifdef CONFIG_DARWIN +@@ -211,6 +221,9 @@ ifdef CONFIG_DARWIN $(call quiet-command,SetFile -a C $@,"SETFILE","$(TARGET_DIR)$@") endif ++++++ linux-user-lseek-explicitly-cast-non-set.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.222450526 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.222450526 +0100 @@ -15,10 +15,10 @@ 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 8aa653262154326beced64bbe782..5360786be3466c44554b373b4238 100644 +index 61d976cca146a6deb2d74c95ec59..926a7dd587b39d0615cbbb077ef2 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -7619,8 +7619,13 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_ulong arg1, +@@ -7729,8 +7729,13 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_ulong arg1, return ret; #endif #ifdef TARGET_NR_lseek ++++++ linux-user-properly-test-for-infinite-ti.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.226450527 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.230450528 +0100 @@ -15,10 +15,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 5360786be3466c44554b373b4238..330fbecb120ebc9ebc1c0ec121f6 100644 +index 926a7dd587b39d0615cbbb077ef2..9330a1ec6a15f16e4f7fd0f825c2 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -9646,7 +9646,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_ulong arg1, +@@ -9758,7 +9758,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_ulong arg1, { struct timespec ts, *pts; ++++++ linux-user-use-target_ulong.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.234450529 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.238450529 +0100 @@ -16,10 +16,10 @@ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/linux-user/qemu.h b/linux-user/qemu.h -index aac0334627003fbf375dfd4c88d0..abd0b4569699ff87d015c951e651 100644 +index f6f5fe5fbb553c151cb57146350c..b45b68221434e29636bb34c9f0b0 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h -@@ -207,10 +207,10 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src, +@@ -206,10 +206,10 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src, void target_set_brk(abi_ulong new_brk); abi_long do_brk(abi_ulong new_brk); void syscall_init(void); @@ -35,10 +35,10 @@ extern __thread CPUState *thread_cpu; void cpu_loop(CPUArchState *env); diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 3bb2c8921fc203264bbc0a37fe1d..8aa653262154326beced64bbe782 100644 +index 243ec2a1e3bde8e6b3ac48989554..61d976cca146a6deb2d74c95ec59 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -7264,10 +7264,10 @@ static int host_to_target_cpu_mask(const unsigned long *host_mask, +@@ -7374,10 +7374,10 @@ static int host_to_target_cpu_mask(const unsigned long *host_mask, * of syscall results, can be performed. * All errnos that do_syscall() returns must be -TARGET_<errcode>. */ @@ -53,7 +53,7 @@ { CPUState *cpu = env_cpu(cpu_env); abi_long ret; -@@ -10013,7 +10013,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, +@@ -10125,7 +10125,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, */ ret = -TARGET_EINVAL; if (cpu_isar_feature(aa64_sve, env_archcpu(cpu_env)) @@ -62,7 +62,7 @@ CPUARMState *env = cpu_env; ARMCPU *cpu = env_archcpu(env); uint32_t vq, old_vq; -@@ -11993,10 +11993,10 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, +@@ -12116,10 +12116,10 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, return ret; } ++++++ qemu-binfmt-conf-Modify-default-path.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.250450533 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.250450533 +0100 @@ -13,10 +13,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh -index b5a16742a149c0d2e08c6a34d08e..4f1358e2fd8c0da34cf06a763ca8 100755 +index 9f1580a91c7d3ad64120fe8ee66d..246546b10ca5df38035e5ba46a09 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh -@@ -319,7 +319,7 @@ BINFMT_SET=qemu_register_interpreter +@@ -323,7 +323,7 @@ BINFMT_SET=qemu_register_interpreter SYSTEMDDIR="/etc/binfmt.d" DEBIANDIR="/usr/share/binfmts" ++++++ qemu-binfmt-conf-use-qemu-ARCH-binfmt.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.258450534 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.258450534 +0100 @@ -12,10 +12,10 @@ 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh -index 4f1358e2fd8c0da34cf06a763ca8..13add7775eb7d24c52735b02cd51 100755 +index 246546b10ca5df38035e5ba46a09..e0666a3afdc81f0f8277a53f3e1e 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh -@@ -262,7 +262,7 @@ qemu_generate_register() { +@@ -266,7 +266,7 @@ qemu_generate_register() { flags="${flags}F" fi @@ -24,7 +24,7 @@ } qemu_register_interpreter() { -@@ -301,9 +301,9 @@ qemu_set_binfmts() { +@@ -305,9 +305,9 @@ qemu_set_binfmts() { continue fi ++++++ qemu-cvs-gettimeofday.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.266450536 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.266450536 +0100 @@ -11,10 +11,10 @@ 1 file changed, 3 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 8367cb138dfe075e06ca455009cc..17914fadfc9f3390d4b8ab8d74a6 100644 +index 171c0caef3a191c861e76493ccfc..25b0f3bba38b8629cb4bc027be96 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -8446,6 +8446,9 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, +@@ -8558,6 +8558,9 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, case TARGET_NR_gettimeofday: { struct timeval tv; ++++++ qemu-cvs-ioctl_debug.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.270450536 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.274450537 +0100 @@ -13,10 +13,10 @@ 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 17914fadfc9f3390d4b8ab8d74a6..25fd641816c0a54e49a167f5e818 100644 +index 25b0f3bba38b8629cb4bc027be96..49db231f031015265f6d8cead831 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -5043,7 +5043,19 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) +@@ -5151,7 +5151,19 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) ie = ioctl_entries; for(;;) { if (ie->target_cmd == 0) { ++++++ qemu-cvs-ioctl_nodirection.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.278450538 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.278450538 +0100 @@ -16,10 +16,10 @@ 1 file changed, 8 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 25fd641816c0a54e49a167f5e818..cf5de07a09235e6d92735332dc7f 100644 +index 49db231f031015265f6d8cead831..57be4c98555e50f2263811cd11f4 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -5084,6 +5084,13 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) +@@ -5192,6 +5192,13 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) arg_type++; target_size = thunk_type_size(arg_type, 0); switch(ie->access) { @@ -33,7 +33,7 @@ case IOC_R: ret = get_errno(safe_ioctl(fd, ie->host_cmd, buf_temp)); if (!is_error(ret)) { -@@ -5102,6 +5109,7 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) +@@ -5210,6 +5217,7 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) unlock_user(argptr, arg, 0); ret = get_errno(safe_ioctl(fd, ie->host_cmd, buf_temp)); break; ++++++ qemu.spec.in ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.334450550 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.334450550 +0100 @@ -1,7 +1,7 @@ # # spec file for package qemu # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -87,13 +87,14 @@ %define summary_string Machine emulator and virtualizer %endif +INSERT_VERSIONING %define srcname qemu Name: qemu%{name_suffix} -Url: https://www.qemu.org/ +URL: https://www.qemu.org/ Summary: %{summary_string} License: BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT Group: System/Emulators/PC -QEMU_VERSION +Version: %qemuver Release: 0 Source: https://wiki.qemu.org/download/%{srcname}-%{srcver}.tar.xz Source100: %{srcname}.keyring @@ -110,6 +111,8 @@ Source11: supported.ppc.txt Source12: supported.x86.txt Source13: supported.s390.txt +Source14: 50-seabios-256k.json +Source15: 60-seabios-128k.json Source200: qemu-rpmlintrc Source300: bundles.tar.xz Source301: update_git.sh @@ -184,35 +187,38 @@ BuildRequires: fdupes BuildRequires: flex BuildRequires: gcc-c++ -BuildRequires: glib2-devel +BuildRequires: glib2-devel >= 2.48 +%if build_x86_firmware_from_source +BuildRequires: glibc-devel-32bit +%endif %if 0%{?with_glusterfs} -BuildRequires: glusterfs-devel +BuildRequires: glusterfs-devel >= 3 %endif -BuildRequires: gtk3-devel +BuildRequires: gtk3-devel >= 3.16 BuildRequires: libaio-devel BuildRequires: libattr-devel BuildRequires: libbz2-devel %if 0%{?is_opensuse} -BuildRequires: libcacard-devel +BuildRequires: libcacard-devel >= 2.5.1 %endif BuildRequires: libcap-devel BuildRequires: libcap-ng-devel BuildRequires: libdrm-devel BuildRequires: libepoxy-devel -BuildRequires: libfdt-devel +BuildRequires: libfdt-devel >= 1.4.2 BuildRequires: libgbm-devel -BuildRequires: libgcrypt-devel -BuildRequires: libgnutls-devel -BuildRequires: libiscsi-devel +BuildRequires: libgcrypt-devel >= 1.5.0 +BuildRequires: libgnutls-devel >= 3.1.18 +BuildRequires: libiscsi-devel >= 1.9.0 BuildRequires: libjpeg-devel %if 0%{?is_opensuse} -BuildRequires: libnfs-devel +BuildRequires: libnfs-devel >= 1.9.3 %endif %ifnarch %arm s390x BuildRequires: libnuma-devel %endif BuildRequires: libpcap-devel -BuildRequires: libpixman-1-0-devel +BuildRequires: libpixman-1-0-devel >= 0.21.8 %ifarch x86_64 BuildRequires: libpmem-devel %endif @@ -225,11 +231,11 @@ BuildRequires: libSDL2-devel BuildRequires: libSDL2_image-devel %endif -BuildRequires: libseccomp-devel -BuildRequires: libspice-server-devel -BuildRequires: libssh-devel +BuildRequires: libseccomp-devel >= 2.3.0 +BuildRequires: libspice-server-devel >= 0.12.5 +BuildRequires: libssh-devel >= 0.8 BuildRequires: libudev-devel -BuildRequires: libusb-1_0-devel +BuildRequires: libusb-1_0-devel >= 1.0.13 BuildRequires: libvdeplug-devel %if 0%{?is_opensuse} BuildRequires: lzfse-devel @@ -250,17 +256,17 @@ BuildRequires: python3-base BuildRequires: rdma-core-devel BuildRequires: snappy-devel -BuildRequires: spice-protocol-devel +BuildRequires: spice-protocol-devel >= 0.12.3 BuildRequires: systemd %{?systemd_requires} %if %{kvm_available} BuildRequires: pkgconfig(udev) %endif -BuildRequires: usbredir-devel +BuildRequires: usbredir-devel >= 0.6 BuildRequires: virglrenderer-devel >= 0.4.1 BuildRequires: vte-devel %ifarch x86_64 -BuildRequires: xen-devel +BuildRequires: xen-devel >= 4.2 %endif BuildRequires: xfsprogs-devel %if %{build_x86_firmware_from_source} @@ -301,7 +307,7 @@ BuildRequires: qemu-lang = %{qemuver} BuildRequires: qemu-ppc = %{qemuver} BuildRequires: qemu-s390 = %{qemuver} -BuildRequires: qemu-seabios = 1.12.1 +BuildRequires: qemu-seabios = %{sbver} BuildRequires: qemu-sgabios = 8 BuildRequires: qemu-tools = %{qemuver} BuildRequires: qemu-ui-curses = %{qemuver} @@ -309,7 +315,8 @@ %if 0%{?is_opensuse} BuildRequires: qemu-ui-sdl = %{qemuver} %endif -BuildRequires: qemu-vgabios = 1.12.1 +BuildRequires: qemu-ui-spice-app = %{qemuver} +BuildRequires: qemu-vgabios = %{sbver} BuildRequires: qemu-x86 = %{qemuver} %endif Requires(pre): shadow @@ -329,6 +336,7 @@ %if 0%{?is_opensuse} Recommends: qemu-ui-sdl %endif +Recommends: qemu-ui-spice-app Recommends: qemu-x86 %ifarch ppc ppc64 ppc64le Recommends: qemu-ppc @@ -362,6 +370,7 @@ %if 0%{?is_opensuse} Recommends: qemu-ksm = %{qemuver} %endif +Suggests: qemu-microvm Suggests: qemu-vhost-user-gpu Provides: qemu-audio-oss = %{qemuver} Obsoletes: qemu-audio-oss < %{qemuver} @@ -387,6 +396,7 @@ Release: 0 Requires: %name = %{qemuver} Requires: qemu-ipxe +Requires: qemu-microvm Requires: qemu-seabios Requires: qemu-sgabios Requires: qemu-vgabios @@ -616,6 +626,16 @@ This package contains a module for doing SDL based UI for QEMU. %endif +%package ui-spice-app +Summary: Spice UI support for QEMU +Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 +%{qemu_module_conflicts} + +%description ui-spice-app +This package contains a module for doing Spice based UI for QEMU. + %package audio-alsa Summary: ALSA based audio support for QEMU Group: System/Emulators/PC @@ -694,10 +714,21 @@ to provide information and control at the guest OS level. %ifarch %{build_rom_arch} +%package microvm +Summary: x86 MicroVM BIOS for QEMU +Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 +BuildArch: noarch + +%description microvm +MicroVM (qboot) is a miniam x86 firmware for booting Linux kernel. +It provides the minimum resources needed to boot PVH and bzImages. + %package seabios Summary: x86 Legacy BIOS for QEMU Group: System/Emulators/PC -SEABIOS_VERSION +Version: %{sbver} Release: 0 BuildArch: noarch Conflicts: %name < 1.6.0 @@ -709,7 +740,7 @@ %package vgabios Summary: VGA BIOSes for QEMU Group: System/Emulators/PC -SEABIOS_VERSION +Version: %{sbver} Release: 0 BuildArch: noarch Conflicts: %name < 1.6.0 @@ -791,19 +822,20 @@ # This first list group isn't specific to what this instance builds %define ppc_default_firmware {%nil} %define ppc_extra_firmware {skiboot.lid slof.bin} -%define ppc64_only_default_firmware {spapr-rtas.bin} +%define ppc64_only_default_firmware {%nil} %define ppc64_only_extra_firmware {%nil} -%define riscv64_default_firmware {opensbi-riscv64-sifive_u-fw_jump.bin opensbi-riscv64-virt-fw_jump.bin} +%define riscv64_default_firmware {opensbi-riscv64-sifive_u-fw_jump.bin \ +opensbi-riscv64-virt-fw_jump.bin} %define riscv64_extra_firmware {%nil} %define s390x_default_firmware {s390-ccw.img s390-netboot.img} %define s390x_extra_firmware {%nil} %define x86_default_firmware {linuxboot.bin linuxboot_dma.bin multiboot.bin \ kvmvapic.bin pvh.bin} -%define x86_extra_firmware {bios.bin bios-256k.bin pxe-e1000.rom \ -pxe-eepro100.rom pxe-ne2k_pci.rom pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \ -sgabios.bin vgabios-ati.bin vgabios-bochs-display.bin vgabios.bin \ -vgabios-cirrus.bin vgabios-qxl.bin vgabios-ramfb.bin vgabios-stdvga.bin \ -vgabios-virtio.bin vgabios-vmware.bin} +%define x86_extra_firmware {bios.bin bios-256k.bin bios-microvm.bin \ +pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom pxe-pcnet.rom pxe-rtl8139.rom \ +pxe-virtio.rom sgabios.bin vgabios-ati.bin vgabios-bochs-display.bin \ +vgabios.bin vgabios-cirrus.bin vgabios-qxl.bin vgabios-ramfb.bin \ +vgabios-stdvga.bin vgabios-virtio.bin vgabios-vmware.bin} %define x86_64_only_default_firmware {%nil} %define x86_64_only_extra_firmware {edk2-aarch64-code.fd.bz2 \ edk2-arm-code.fd.bz2 edk2-arm-vars.fd.bz2 edk2-i386-code.fd.bz2 \ @@ -995,6 +1027,7 @@ %endif --enable-opengl \ --enable-parallels \ + --disable-plugins \ --enable-pvrdma \ --enable-qcow1 \ --enable-qed \ @@ -1032,6 +1065,7 @@ --enable-vhost-net \ --enable-vhost-scsi \ --enable-vhost-user \ + --enable-vhost-user-fs \ --enable-vhost-vsock \ --enable-virglrenderer \ --enable-virtfs \ @@ -1050,6 +1084,7 @@ --disable-xen \ %endif --enable-xfsctl \ + --enable-xkbcommon \ # ------------------------------------------------------------------------ %else # qemu-linux-user --without-default-devices \ @@ -1072,6 +1107,7 @@ --disable-malloc-trim \ --enable-membarrier \ --disable-parallels \ + --disable-plugins \ --disable-qcow1 \ --disable-qed \ --disable-replication \ @@ -1084,9 +1120,11 @@ --disable-vhost-net \ --disable-vhost-scsi \ --disable-vhost-user \ + --disable-vhost-user-fs \ --disable-vhost-vsock \ --disable-vnc \ --disable-vvfat \ + --disable-xkbcommon \ %endif # qemu-linux-user %if "%{name}" == "qemu" @@ -1138,6 +1176,8 @@ HOSTCC=cc \ %endif +make %{?_smp_mflags} -C %{_builddir}/%buildsubdir/roms bios-microvm + %ifnarch %ix86 %if %{provide_edk2_firmware} make %{?_smp_mflags} -C %{_builddir}/%buildsubdir/roms efi \ @@ -1166,7 +1206,9 @@ HOSTCC=cc %if %{force_fit_virtio_pxe_rom} +pushd %{_builddir}/%buildsubdir patch -p1 < %_sourcedir/stub-out-the-SAN-req-s-in-int13.patch +popd make %{?_smp_mflags} -C %{_builddir}/%buildsubdir/roms pxerom_variants=virtio pxerom_targets=1af41000 pxerom %endif @@ -1350,6 +1392,8 @@ unlink %{buildroot}%_datadir/%name/edk2-x86_64-code.fd unlink %{buildroot}%_datadir/%name/edk2-x86_64-secure-code.fd %endif +install -D -m 0644 %{SOURCE14} %{buildroot}%_datadir/%name/firmware/50-seabios-256k.json +install -D -m 0644 %{SOURCE15} %{buildroot}%_datadir/%name/firmware/60-seabios-128k.json %endif %if 0%{?do_more_edk2_unlinks} || %{provide_edk2_firmware} == 0 unlink %{buildroot}%_datadir/%name/edk2-licenses.txt || true @@ -1483,7 +1527,7 @@ # ======================================================================== %files %defattr(-, root, root) -%doc Changelog README VERSION +%doc Changelog README.rst VERSION %license COPYING COPYING.LIB LICENSE %if "%{name}" == "qemu" @@ -1504,6 +1548,7 @@ %_docdir/%name/interop/vhost-user.html %_docdir/%name/specs/.buildinfo %_docdir/%name/specs/_static/* +%_docdir/%name/specs/acpi_hw_reduced_hotplug.html %_docdir/%name/specs/genindex.html %_docdir/%name/specs/index.html %_docdir/%name/specs/objects.inv @@ -1579,7 +1624,6 @@ %_datadir/%name/qemu_vga.ndrv %_datadir/%name/skiboot.lid %_datadir/%name/slof.bin -%_datadir/%name/spapr-rtas.bin %_datadir/%name/u-boot.e500 %_datadir/%name/u-boot-sam460-20100605.bin %if 0%{?is_opensuse} == 0 @@ -1716,6 +1760,11 @@ %_libdir/%name/ui-sdl.so %endif +%files ui-spice-app +%defattr(-, root, root) +%dir %_libdir/%name +%_libdir/%name/ui-spice-app.so + %files audio-alsa %defattr(-, root, root) %dir %_libdir/%name @@ -1742,6 +1791,13 @@ %dir %_datadir/%name %_datadir/%name/bios.bin %_datadir/%name/bios-256k.bin +%_datadir/%name/firmware/50-seabios-256k.json +%_datadir/%name/firmware/60-seabios-128k.json + +%files microvm +%defattr(-, root, root) +%dir %_datadir/%name +%_datadir/%name/bios-microvm.bin %files vgabios %defattr(-, root, root) @@ -1832,6 +1888,8 @@ %files guest-agent %defattr(-, root, root) +%dir %_docdir/%name/interop +%_docdir/%name/interop/qemu-ga.html %_mandir/man8/qemu-ga.8.gz %attr(0755,root,kvm) %_bindir/qemu-ga %{_unitdir}/qemu-ga@.service ++++++ roms-Makefile-enable-cross-compile-for-b.patch ++++++ From: Bruce Rogers <brogers@suse.com> Date: Sun, 3 Nov 2019 07:21:40 -0700 Subject: roms/Makefile: enable cross compile for building microvm bios Signed-off-by: Bruce Rogers <brogers@suse.com> --- roms/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roms/Makefile b/roms/Makefile index 091ad51c1e91a2b9709c5810e562..a6f084820f489bef42c6f487a6b2 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -198,7 +198,7 @@ opensbi64-sifive_u: cp opensbi/build/platform/sifive/fu540/firmware/fw_jump.bin ../pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin bios-microvm: - $(MAKE) -C qboot + $(MAKE) -C qboot CROSS_COMPILE=$(x86_64_cross_prefix) CC=gcc cp qboot/bios.bin ../pc-bios/bios-microvm.bin clean: ++++++ roms-Makefile-pass-a-packaging-timestamp.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.346450552 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.346450552 +0100 @@ -20,7 +20,7 @@ 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/roms/Makefile b/roms/Makefile -index 775c963f9dd55bfa17772afb73f4..6efeb1ef7c38fb71556b762d6bf1 100644 +index 28e1e557b0763cabe6da3d07602d..091ad51c1e91a2b9709c5810e562 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -51,6 +51,12 @@ SEABIOS_EXTRAVERSION="-prebuilt.qemu.org" @@ -33,10 +33,10 @@ +# build. +PACKAGING_TIMESTAMP = $(shell date -r ../VERSION +%s) + - default: + default help: @echo "nothing is build by default" @echo "available build targets:" -@@ -99,7 +105,7 @@ build-seabios-config-%: config.% +@@ -100,7 +106,7 @@ build-seabios-config-%: config.% .PHONY: sgabios skiboot sgabios: @@ -45,7 +45,7 @@ cp sgabios/sgabios.bin ../pc-bios -@@ -119,11 +125,13 @@ efi-rom-%: build-pxe-roms build-efi-roms edk2-basetools +@@ -120,11 +126,13 @@ efi-rom-%: build-pxe-roms build-efi-roms edk2-basetools build-pxe-roms: $(MAKE) -C ipxe/src CONFIG=qemu \ @@ -59,7 +59,7 @@ CROSS_COMPILE=$(x86_64_cross_prefix) \ $(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \ $(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets)) -@@ -145,7 +153,9 @@ edk2-basetools: +@@ -147,7 +155,9 @@ edk2-basetools: EXTRA_LDFLAGS='$(EDK2_BASETOOLS_LDFLAGS)' slof: ++++++ roms-change-cross-compiler-naming-to-be-.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.354450555 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.354450555 +0100 @@ -8,7 +8,7 @@ 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/roms/edk2-funcs.sh b/roms/edk2-funcs.sh -index a9fae7ee891bc4cadbe1a3cb3f54..d70bed1729cf0a3ce41ab72df78e 100644 +index 3f4485b201f1f6f8cff47a9933da..5a3a8d885c9138d3c857d8b1e6d0 100644 --- a/roms/edk2-funcs.sh +++ b/roms/edk2-funcs.sh @@ -113,7 +113,15 @@ qemu_edk2_get_cross_prefix() ++++++ seabios-switch-to-python3-as-needed.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.362450556 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.362450556 +0100 @@ -17,7 +17,7 @@ 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/roms/seabios/Makefile b/roms/seabios/Makefile -index 629185ed9f7153fa08ba56c121ee..bd34cfc2394a9103fec2e951bb67 100644 +index de1fa90035b82ef3608d68d62f59..ca8d0283922bbfa931e85511e921 100644 --- a/roms/seabios/Makefile +++ b/roms/seabios/Makefile @@ -22,7 +22,7 @@ LD=$(CROSS_PREFIX)ld ++++++ seabios-use-python2-explicitly-as-needed.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.366450557 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.366450557 +0100 @@ -14,7 +14,7 @@ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roms/seabios/Makefile b/roms/seabios/Makefile -index d2d11dbef87521d82c30a7c6f0bf..629185ed9f7153fa08ba56c121ee 100644 +index 5f7d5370198abac950b24e08a7aa..de1fa90035b82ef3608d68d62f59 100644 --- a/roms/seabios/Makefile +++ b/roms/seabios/Makefile @@ -22,7 +22,7 @@ LD=$(CROSS_PREFIX)ld ++++++ tests-Disable-some-block-tests-for-now.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.446450573 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.450450574 +0100 @@ -14,13 +14,15 @@ disable 065, 129, 169, 182, 205, 218, 242, 248, 250 (other architectures not evaluated at this time) +27NOV2019 - added 161 since it is failing on s390x and ppc consistently + Signed-off-by: Bruce Rogers <brogers@suse.com> --- - tests/qemu-iotests/group | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) + tests/qemu-iotests/group | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group -index f13e5f2e23417b94bd84d820bcf6..ed532134bb8af0a1f78a1a2abcf3 100644 +index 6b10a6a762..150800ce1c 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -86,7 +86,7 @@ @@ -38,10 +40,15 @@ 128 rw quick -129 rw quick +#DISABLE FOR NOW 129 rw quick - 130 rw auto quick + 130 rw quick 131 rw quick 132 rw quick -@@ -186,7 +186,7 @@ +@@ -182,11 +182,11 @@ + 158 rw auto quick + 159 rw auto quick + 160 rw quick +-161 rw auto quick ++#DISABLE FOR NOW 161 rw auto quick 162 quick 163 rw 165 rw quick @@ -96,3 +103,6 @@ 251 rw auto quick 252 rw auto backing quick 253 rw quick +-- +2.24.0 + ++++++ tests-Fix-block-tests-to-be-compatible-w.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.454450576 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.454450576 +0100 @@ -3,7 +3,9 @@ Subject: tests: Fix block tests to be compatible with membarrier configuration The use of membarriers collides with the block test's practice of -SIGKILLing test vm's. Have them quit politely. Tests: 130, 153, 161 +SIGKILLing test vm's. Have them quit politely. Tests: 130, 153 - and +though test 161 seems to have the same issue, it is not yet fixed, but +just marked here as possibly needing a fix. Signed-off-by: Bruce Rogers <brogers@suse.com> --- @@ -11,8 +13,7 @@ tests/qemu-iotests/130.out | 2 ++ tests/qemu-iotests/153 | 6 ++++-- tests/qemu-iotests/153.out | 4 ++++ - tests/qemu-iotests/161 | 3 +++ - 5 files changed, 17 insertions(+), 4 deletions(-) + 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130 index 77ad2aa13a06094f26d2c8991e48..fd84a4c77d192e15ee961b07994b 100755 @@ -83,19 +84,19 @@ echo echo "== Detecting -U and force-share conflicts ==" diff --git a/tests/qemu-iotests/153.out b/tests/qemu-iotests/153.out -index e9694200066280fa0637292de3ef..177b08b7e3e6606db552d7e54c8e 100644 +index f7464dd8d345a853f7b64a67c6d0..8bc14f6abf94662473d6d93b5672 100644 --- a/tests/qemu-iotests/153.out +++ b/tests/qemu-iotests/153.out -@@ -416,6 +416,8 @@ Is another process using the image [TEST_DIR/t.qcow2]? - +@@ -421,6 +421,8 @@ Is another process using the image [TEST_DIR/t.qcow2]? _qemu_img_wrapper commit -b TEST_DIR/t.qcow2.b TEST_DIR/t.qcow2.c + { 'execute': 'qmp_capabilities' } {"return": {}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} +{"return": {}} Adding drive + { 'execute': 'human-monitor-command', 'arguments': { 'command-line': 'drive_add 0 if=none,id=d0,file=TEST_DIR/t.IMGFMT' } } {"return": "OKrn"} - -@@ -443,6 +445,8 @@ Closing the other +@@ -454,6 +456,8 @@ Closing the other {"return": ""} _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512 @@ -104,31 +105,3 @@ == Detecting -U and force-share conflicts == -diff --git a/tests/qemu-iotests/161 b/tests/qemu-iotests/161 -index 456a4bd8c4cb54c9c0d295f83bed..990af8a412d72fd522068490638b 100755 ---- a/tests/qemu-iotests/161 -+++ b/tests/qemu-iotests/161 -@@ -68,6 +68,7 @@ _send_qemu_cmd $QEMU_HANDLE \ - 'qemu-io none0 \"reopen -o backing.detect-zeroes=on\"' } }" \ - "return" - -+_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'quit' }" '' - _cleanup_qemu - - # Second test: stream $TEST_IMG.base into $TEST_IMG.int and then -@@ -96,6 +97,7 @@ _send_qemu_cmd $QEMU_HANDLE \ - 'qemu-io none0 \"reopen -o backing.detect-zeroes=on\"' } }" \ - "return" - -+_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'quit' }" '' - _cleanup_qemu - - # Third test: commit $TEST_IMG.int into $TEST_IMG.base and then reopen -@@ -129,6 +131,7 @@ _send_qemu_cmd $QEMU_HANDLE \ - 'qemu-io none0 \"reopen -o backing.detect-zeroes=on\"' } }" \ - "return" - -+_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'quit' }" '' - _cleanup_qemu - - # success, all done ++++++ tests-change-error-message-in-test-162.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.462450577 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.462450577 +0100 @@ -13,14 +13,14 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/162.out b/tests/qemu-iotests/162.out -index 3c5be2c5699a225cc80bbdc40bec..390cca9027e918f1a0d252753ce5 100644 +index 5a00d36d17878376380430dad705..390cca9027e918f1a0d252753ce5 100644 --- a/tests/qemu-iotests/162.out +++ b/tests/qemu-iotests/162.out @@ -1,7 +1,7 @@ QA output created by 162 === NBD === --qemu-img: Could not open 'json:{"driver": "nbd", "host": 42}': Failed to connect socket: Invalid argument +-qemu-img: Could not open 'json:{"driver": "nbd", "host": -1}': address resolution failed for -1:10809: Name or service not known +qemu-img: Could not open 'json:{"driver": "nbd", "host": 42}': Failed to connect socket: Network is unreachable image: nbd://localhost:PORT image: nbd+unix://?socket=42 ++++++ tests-qemu-iotests-Triple-timeout-of-i-o.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.466450578 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.466450578 +0100 @@ -13,7 +13,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/common.qemu b/tests/qemu-iotests/common.qemu -index 8d2021a7eb0c7085802c6f4c0597..e19ea76fff5789e4bc5b925bdcb9 100644 +index de680cf1c7c92e50b82aa2bc0262..4f2557cc568beed038223af7660b 100644 --- a/tests/qemu-iotests/common.qemu +++ b/tests/qemu-iotests/common.qemu @@ -76,7 +76,7 @@ _timed_wait_for() ++++++ update_git.sh ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.478450580 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.478450580 +0100 @@ -8,6 +8,26 @@ # # (default is git2pkg) +# TODO NOTES: + +# after ensuring current status of local repo is clean, incl submodules, we checkout master+submodules, then also ensure they're clean, then checkout the commit or tag corresponding to latest / stable-release + submodules (but don't bother to verift that's clean) - so this is a detached HEAD for stable-release and IS master (almost certainly) for LATEST. WOW - is that what we need to be doing!?!?! At least it seems to be working for the cases I've seen!!!! +# initbundle operates from the current checked out state of the local superproject, to get the submodule ids - CORRECT!!!! +# the LATEST processing of cloning the local repo, clones master - but perhaps it doesn't matter? because it adds upstream as a remote and probably gets most things from there? INVESTIGATE!!!!!!!!!!!!!!!!!!!1 +# bundle2local checks out master in local repo to ensure we're off the frombundle branch (doesn't seem needed the way the script currently is). It fetches the bundle's head (FETCH_HEAD) REQUIRING that the base commit be present (which it seems to be. Then it creates the frombundle branch, with the current FETCH_HEAD (SAME AS IN BUNDLE, RIGHT?) +# The LATEST's rebase loop checks out the frombundle branch (with force), so we are now OFF of the "correct checkout" that happened at the beginning, it DELETES the GIT_BRANCH (so in this case it DIDN'T MATTER WHAT WAS THERE WHEN SCRIPT STARTED !!!!!!! WARNING !!!!!, branches off of the frombundle branch (w/checkout), then rebases that (which came from bundle) onto the current superproject, or submodule commit id. +# At this point, if the GIT_BRANCH rebased ok, it's ready for making a patchqueue, out of, if the rebase failed, it's time to manually fix that.!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1 + +# LATEST processing implies updated upstream/master IS the right thing +# HOW do we protect against a bad bundle being created (we do have the build service's tracking of previous files - is that sufficient? +# initbundle - what does it need? Currently we take the default branch in local superproject for the superproject and submodule commit ids, so it needs to be right! (ie which ever branch it is (DECIDE!), make it the RIGHT ONE for this release. It takes the commits from the $GIT_BUNDLE branch of each of superproject and submodule repos, which are beyond above found commits. IT CERTIANLY SEEMS REASONABLE THAT WE WOULD HAVE THE $$GIT_BRANCH BRANCH BE THE DEFAULT AND CORRECT BUT HOW DO WE GUARANTEE THATS OK? GIVEN OUR REQS HERE QEMU_VERSION CAN BE GRABBED HERE IN LOCAL SUPERPROJECT RIGHT AWAY! +# bundle2local - what does it need? This checks out local master just to get off of frombundle (could have been $GIT_BRANCH as well) No other req's +# bundle2spec - what does it need? THIS SHOULD HAVE LATEST SPLIT OUT!!!! We allow this alone, so see what setup it alone needs - for this one particularly, we don't want to REQUIRE local repo. FOR NOW I ASSUME THE RIGHT THING IS CHECKED OUT! +# +# SEEMS WE SHOULD NOT,NOT,NOT require user to have previously updated, or set local repo a certain way, but for us to enforce it or actually do it +# TODO: confirm local repo present, correct remotes, correct local branches, somehow validate local branch content against remote, ... +# +# In both cases we DO require the $GIT_BRANCH to exist, and should confirm that the appropriate upstream basis commit is indeed part of that. In the LATEST case, we can treat master as a source for initial current upstream. + set -e source ./config.sh @@ -52,6 +72,7 @@ ~/git/qemu-sgabios ~/git/qemu-skiboot ~/git/qemu-keycodemapdb + ~/git/qemu-qboot ) # Validate that all the local repos that we currently have patches in are available @@ -462,8 +483,8 @@ echo "QEMU source version: $SOURCE_VERSION" echo "QEMU version extra: $VERSION_EXTRA" - SEABIOS_VERSION=$(tar JxfO qemu-$SOURCE_VERSION$VERSION_EXTRA.tar.xz \ - qemu-$SOURCE_VERSION/roms/seabios/.version | cut -d '-' -f 2) + SEABIOS_VERSION=${SEABIOS_VERSION:-$(tar JxfO qemu-$SOURCE_VERSION$VERSION_EXTRA.tar.xz \ + qemu-$SOURCE_VERSION/roms/seabios/.version | cut -d '-' -f 2)} for package in qemu; do while IFS= read -r line; do @@ -507,18 +528,16 @@ echo "%patch$NUM -p1" fi done - elif [ "$line" = "QEMU_VERSION" ]; then + elif [ "$line" = "INSERT_VERSIONING" ]; then echo "%define qemuver $QEMU_VERSION$VERSION_EXTRA" echo "%define srcver $SOURCE_VERSION$VERSION_EXTRA" - echo "Version: %qemuver" + echo "%define sbver $SEABIOS_VERSION" elif [[ "$line" =~ ^Source: ]]; then echo "$line" if [ ${#QEMU_TARBALL_SIG[@]} -eq 1 ]; then # We assume the signature file corresponds - just add .sig echo "$line.sig"|sed 's/^Source: /Source99:/' fi - elif [ "$line" = "SEABIOS_VERSION" ]; then - echo "Version: $SEABIOS_VERSION" else echo "$line" fi ++++++ vga-Raise-VRAM-to-16-MiB-for-pc-0.15-and.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.486450582 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.486450582 +0100 @@ -24,10 +24,10 @@ 1 file changed, 25 insertions(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c -index c2280c72effb7e2a4dd5aec1eed4..53ee84b542496cbdfebb2eebaa1c 100644 +index 1bd70d1abbc434edb8b5ca69ee5d..d760d3589607daf4997ea76854c4 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c -@@ -800,6 +800,31 @@ static void pc_i440fx_0_15_machine_options(MachineClass *m) +@@ -804,6 +804,31 @@ static void pc_i440fx_0_15_machine_options(MachineClass *m) { static GlobalProperty compat[] = { PC_CPU_MODEL_IDS("0.15") ++++++ xen-add-block-resize-support-for-xen-dis.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.490450583 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.490450583 +0100 @@ -15,10 +15,10 @@ 1 file changed, 3 insertions(+) diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c -index 9bc6db52b4be8510e322e61ba5a7..1f8c8ae85abde736b5a58d1f4cb9 100644 +index 0007ee64c75f38a2a3256f0b9462..86de57f9c6f7405bc26303065d2c 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c -@@ -273,6 +273,9 @@ static void xen_block_realize(XenDevice *xendev, Error **errp) +@@ -274,6 +274,9 @@ static void xen_block_realize(XenDevice *xendev, Error **errp) xen_block_set_size(blockdev); ++++++ xen-ignore-live-parameter-from-xen-save-.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.498450584 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.498450584 +0100 @@ -27,10 +27,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/savevm.c b/migration/savevm.c -index 79ed44d47576ff2942da04827eae..106e6e640e87c99b655aca3a5d96 100644 +index a71b930b91f71ed9763fcb07b525..c5cc5fed211e693723538e19850b 100644 --- a/migration/savevm.c +++ b/migration/savevm.c -@@ -2693,7 +2693,7 @@ void qmp_xen_save_devices_state(const char *filename, bool has_live, bool live, +@@ -2774,7 +2774,7 @@ void qmp_xen_save_devices_state(const char *filename, bool has_live, bool live, * So call bdrv_inactivate_all (release locks) here to let the other * side of the migration take controle of the images. */ ++++++ xen_disk-Add-suse-specific-flush-disable.patch ++++++ --- /var/tmp/diff_new_pack.My6y8f/_old 2019-12-02 11:37:32.506450587 +0100 +++ /var/tmp/diff_new_pack.My6y8f/_new 2019-12-02 11:37:32.506450587 +0100 @@ -18,10 +18,10 @@ 1 file changed, 12 insertions(+) diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c -index 69d73196e2a074e771f5fb771649..9bc6db52b4be8510e322e61ba5a7 100644 +index 879fc310a4c5dfa4a7d8936f7d8e..0007ee64c75f38a2a3256f0b9462 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c -@@ -741,6 +741,8 @@ static XenBlockDrive *xen_block_drive_create(const char *id, +@@ -743,6 +743,8 @@ static XenBlockDrive *xen_block_drive_create(const char *id, const char *mode = qdict_get_try_str(opts, "mode"); const char *direct_io_safe = qdict_get_try_str(opts, "direct-io-safe"); const char *discard_enable = qdict_get_try_str(opts, "discard-enable"); @@ -30,7 +30,7 @@ char *driver = NULL; char *filename = NULL; XenBlockDrive *drive = NULL; -@@ -810,6 +812,16 @@ static XenBlockDrive *xen_block_drive_create(const char *id, +@@ -812,6 +814,16 @@ static XenBlockDrive *xen_block_drive_create(const char *id, } }