Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at 2020-05-02 22:14:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qemu (Old) and /work/SRC/openSUSE:Factory/.qemu.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu" Sat May 2 22:14:51 2020 rev:174 rq:799032 version:5.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2020-04-28 22:29:05.393386511 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new.2738/qemu.changes 2020-05-02 22:15:02.300247065 +0200 @@ -1,0 +2,166 @@ +Tue Apr 28 18:10:25 UTC 2020 - Bruce Rogers <[email protected]> + +- Update to v5.0.0: See http://wiki.qemu.org/ChangeLog/5.0 + Take note that ongoing feature deprecation is tracked at both + http://wiki.qemu-project.org/Features/LegacyRemoval and in + the deprecated.html file installed with the qemu package + Some noteworthy changes: +* x86: EPYC-Rome vcpu model +* x86: vcpu model fixes for EPYC, Denverton, and Icelake-Server +* s390: (as previously mentioned) Protected Virtualization support: + start and control guest in secure mode (bsc#1167075 jsc#SLE-7407) +* s390: support for Adapter Interrupt Suppression while running in + KVM mode +* PowerPC: pseries: NVDIMMs with file backend supported +* PowerPC: powernv: KVM guests now runnable under TCG emulation +* PowerPC: powernv: Basic POWER10 support +* ARM: new boards: tacoma-bmc, Netduindo Plus 2, Orangepi PC +* ARM: 'virt' machine now supports vTPM and virtio-iommu devices +* ARM:Cortex-M7 CPU support +* ARM: Lots of architecture features now emulated +* ARM: TPM supported +* ARM: Timekeeping improvements +* ARM: LOTS more - refer to upstream changelog +* virtio-iommu +* VNC compatibility with noVNC improved +* Support for using memory backends for main/"built-in" guest RAM +* hostmem backends can now specify prealloc thread count +* Better Azure compatibility of VHD images +* Ceph namespaces supported +* Compress block filter driver can create compressed backup images +* virtiofsd availble for host filesystem passthrough +* Improved html based documentation is provided with this release +* Live migration support for external processes running on QEMU D-Bus +* Patches dropped (upstream unless otherwise noted): + i386-Add-MSR-feature-bit-for-MDS-NO.patch + i386-Add-macro-for-stibp.patch + i386-Add-new-CPU-model-Cooperlake.patch + arm-arm-powerctl-set-NSACR.-CP11-CP10-bi.patch + iotests-Skip-test-060-if-it-is-not-possi.patch + iotests-Skip-test-079-if-it-is-not-possi.patch + Revert-qemu-options.hx-Update-for-reboot.patch + iotests-Provide-a-function-for-checking-.patch + Fix-double-free-issue-in-qemu_set_log_fi.patch + iotests-Fix-IMGOPTSSYNTAX-for-nbd.patch + virtio-blk-fix-out-of-bounds-access-to-b.patch + block-Activate-recursively-even-for-alre.patch + i386-Resolve-CPU-models-to-v1-by-default.patch + numa-properly-check-if-numa-is-supported.patch + vhost-user-gpu-Drop-trailing-json-comma.patch + display-bochs-display-fix-memory-leak.patch + hw-arm-smmuv3-Apply-address-mask-to-line.patch + hw-arm-smmuv3-Correct-SMMU_BASE_ADDR_MAS.patch + hw-arm-smmuv3-Check-stream-IDs-against-a.patch + hw-arm-smmuv3-Align-stream-table-base-ad.patch + hw-arm-smmuv3-Use-correct-bit-positions-.patch + hw-arm-smmuv3-Report-F_STE_FETCH-fault-a.patch + block-Add-bdrv_qapi_perm_to_blk_perm.patch + blkdebug-Allow-taking-unsharing-permissi.patch + virtio-add-ability-to-delete-vq-through-.patch + virtio-update-queue-size-on-guest-write.patch + virtio-don-t-enable-notifications-during.patch + numa-Extend-CLI-to-provide-initiator-inf.patch + numa-Extend-CLI-to-provide-memory-latenc.patch + numa-Extend-CLI-to-provide-memory-side-c.patch + hmat-acpi-Build-Memory-Proximity-Domain-.patch + hmat-acpi-Build-System-Locality-Latency-.patch + hmat-acpi-Build-Memory-Side-Cache-Inform.patch + tests-numa-Add-case-for-QMP-build-HMAT.patch + qcow2-bitmaps-fix-qcow2_can_store_new_di.patch + backup-top-Begin-drain-earlier.patch + virtio-mmio-update-queue-size-on-guest-w.patch + virtio-net-delete-also-control-queue-whe.patch + intel_iommu-a-fix-to-vtd_find_as_from_bu.patch + target-i386-Add-new-bit-definitions-of-M.patch + target-i386-Add-missed-features-to-Coope.patch + hw-i386-pc-fix-regression-in-parsing-vga.patch + migration-test-ppc64-fix-FORTH-test-prog.patch + target-arm-Return-correct-IL-bit-in-merg.patch + target-arm-Set-ISSIs16Bit-in-make_issinf.patch + runstate-ignore-finishmigrate-prelaunch-.patch + migration-Rate-limit-inside-host-pages.patch + m68k-Fix-regression-causing-Single-Step-.patch + Revert-vnc-allow-fall-back-to-RAW-encodi.patch + vnc-prioritize-ZRLE-compression-over-ZLI.patch + target-i386-kvm-initialize-feature-MSRs-.patch + s390x-adapter-routes-error-handling.patch + iscsi-Cap-block-count-from-GET-LBA-STATU.patch + block-backup-fix-memory-leak-in-bdrv_bac.patch + tpm-ppi-page-align-PPI-RAM.patch + hw-intc-arm_gicv3_kvm-Stop-wrongly-progr.patch + target-arm-fix-TCG-leak-for-fcvt-half-do.patch + block-fix-memleaks-in-bdrv_refresh_filen.patch + block-backup-top-fix-failure-path.patch + iotests-add-test-for-backup-top-failure-.patch + audio-oss-fix-buffer-pos-calculation.patch + target-arm-monitor-query-cpu-model-expan.patch + block-fix-crash-on-zero-length-unaligned.patch + block-Fix-VM-size-field-width-in-snapsho.patch + target-arm-Correct-definition-of-PMCRDP.patch + block-nbd-extract-the-common-cleanup-cod.patch + block-nbd-fix-memory-leak-in-nbd_open.patch + virtio-crypto-do-delete-ctrl_vq-in-virti.patch + virtio-pmem-do-delete-rq_vq-in-virtio_pm.patch + vhost-user-blk-delete-virtioqueues-in-un.patch + hw-arm-cubieboard-use-ARM-Cortex-A8-as-t.patch + pc-bios-s390x-Save-iplb-location-in-lowc.patch + iotests-Fix-nonportable-use-of-od-endian.patch + block-qcow2-threads-fix-qcow2_decompress.patch + job-refactor-progress-to-separate-object.patch + block-block-copy-fix-progress-calculatio.patch + block-io-fix-bdrv_co_do_copy_on_readv.patch + scsi-qemu-pr-helper-Fix-out-of-bounds-ac.patch + target-ppc-Fix-rlwinm-on-ppc64.patch + compat-disable-edid-on-correct-virtio-gp.patch + ppc-ppc405_boards-Remove-unnecessary-NUL.patch + block-Avoid-memleak-on-qcow2-image-info-.patch + block-bdrv_set_backing_bs-fix-use-after-.patch + hmp-vnc-Fix-info-vnc-list-leak.patch + migration-colo-fix-use-after-free-of-loc.patch + migration-ram-fix-use-after-free-of-loca.patch + qcow2-List-autoclear-bit-names-in-header.patch + sheepdog-Consistently-set-bdrv_has_zero_.patch + target-arm-Fix-PAuth-sbox-functions.patch + tcg-i386-Fix-INDEX_op_dup2_vec.patch + net-tulip-check-frame-size-and-r-w-data-.patch + target-i386-do-not-set-unsupported-VMX-s.patch + spapr-Fix-failure-path-for-attempting-to.patch + ati-vga-Fix-checks-in-ati_2d_blt-to-avoi.patch + xen-block-Fix-double-qlist-remove-and-re.patch + vpc-Don-t-round-up-already-aligned-BAT-s.patch + target-xtensa-fix-pasto-in-pfwait.r-opco.patch + aio-wait-delegate-polling-of-main-AioCon.patch + async-use-explicit-memory-barriers.patch + tcg-mips-mips-sync-encode-error.patch + vhost-user-gpu-Release-memory-returned-b.patch + vga-Raise-VRAM-to-16-MiB-for-pc-0.15-and.patch (no pc-0.15) + hw-i386-disable-smbus-migration-for-xenf.patch + s390x-Don-t-do-a-normal-reset-on-the-ini.patch + s390x-Move-reset-normal-to-shared-reset-.patch + s390x-Move-initial-reset.patch + s390x-Move-clear-reset.patch + s390x-kvm-Make-kvm_sclp_service_call-voi.patch + s390x-ipl-Consolidate-iplb-validity-chec.patch + s390x-Beautify-diag308-handling.patch + s390x-Add-missing-vcpu-reset-functions.patch + s390-sclp-improve-special-wait-psw-logic.patch + vhost-correctly-turn-on-VIRTIO_F_IOMMU_P.patch + util-add-slirp_fmt-helpers.patch + slirp-use-correct-size-while-emulating-I.patch + tcp_emu-Fix-oob-access.patch + slirp-use-correct-size-while-emulating-c.patch + tcp_emu-fix-unsafe-snprintf-usages.patch +- For SLE builds, leverage the html documentation by adding a link + to the SUSE specific support documentation (the *.txt support doc + was slightly tweaked to be acceptable as reStructuredText for + conversion to html) + docs-add-SUSE-support-statements-to-html.patch + +------------------------------------------------------------------- +Mon Apr 27 19:35:55 UTC 2020 - Bruce Rogers <[email protected]> + +-Fix potential DoS in ATI VGA emulation (CVE-2020-11869 + bsc#1170537) + ati-vga-Fix-checks-in-ati_2d_blt-to-avoi.patch + +------------------------------------------------------------------- Old: ---- Fix-double-free-issue-in-qemu_set_log_fi.patch Revert-qemu-options.hx-Update-for-reboot.patch Revert-vnc-allow-fall-back-to-RAW-encodi.patch aio-wait-delegate-polling-of-main-AioCon.patch arm-arm-powerctl-set-NSACR.-CP11-CP10-bi.patch async-use-explicit-memory-barriers.patch audio-oss-fix-buffer-pos-calculation.patch backup-top-Begin-drain-earlier.patch blkdebug-Allow-taking-unsharing-permissi.patch block-Activate-recursively-even-for-alre.patch block-Add-bdrv_qapi_perm_to_blk_perm.patch block-Avoid-memleak-on-qcow2-image-info-.patch block-Fix-VM-size-field-width-in-snapsho.patch block-backup-fix-memory-leak-in-bdrv_bac.patch block-backup-top-fix-failure-path.patch block-bdrv_set_backing_bs-fix-use-after-.patch block-block-copy-fix-progress-calculatio.patch block-fix-crash-on-zero-length-unaligned.patch block-fix-memleaks-in-bdrv_refresh_filen.patch block-io-fix-bdrv_co_do_copy_on_readv.patch block-nbd-extract-the-common-cleanup-cod.patch block-nbd-fix-memory-leak-in-nbd_open.patch block-qcow2-threads-fix-qcow2_decompress.patch compat-disable-edid-on-correct-virtio-gp.patch display-bochs-display-fix-memory-leak.patch hmat-acpi-Build-Memory-Proximity-Domain-.patch hmat-acpi-Build-Memory-Side-Cache-Inform.patch hmat-acpi-Build-System-Locality-Latency-.patch hmp-vnc-Fix-info-vnc-list-leak.patch hw-arm-cubieboard-use-ARM-Cortex-A8-as-t.patch hw-arm-smmuv3-Align-stream-table-base-ad.patch hw-arm-smmuv3-Apply-address-mask-to-line.patch hw-arm-smmuv3-Check-stream-IDs-against-a.patch hw-arm-smmuv3-Correct-SMMU_BASE_ADDR_MAS.patch hw-arm-smmuv3-Report-F_STE_FETCH-fault-a.patch hw-arm-smmuv3-Use-correct-bit-positions-.patch hw-i386-disable-smbus-migration-for-xenf.patch hw-i386-pc-fix-regression-in-parsing-vga.patch hw-intc-arm_gicv3_kvm-Stop-wrongly-progr.patch i386-Add-MSR-feature-bit-for-MDS-NO.patch i386-Add-macro-for-stibp.patch i386-Add-new-CPU-model-Cooperlake.patch i386-Resolve-CPU-models-to-v1-by-default.patch intel_iommu-a-fix-to-vtd_find_as_from_bu.patch iotests-Fix-IMGOPTSSYNTAX-for-nbd.patch iotests-Fix-nonportable-use-of-od-endian.patch iotests-Provide-a-function-for-checking-.patch iotests-Skip-test-060-if-it-is-not-possi.patch iotests-Skip-test-079-if-it-is-not-possi.patch iotests-add-test-for-backup-top-failure-.patch iscsi-Cap-block-count-from-GET-LBA-STATU.patch job-refactor-progress-to-separate-object.patch m68k-Fix-regression-causing-Single-Step-.patch migration-Rate-limit-inside-host-pages.patch migration-colo-fix-use-after-free-of-loc.patch migration-ram-fix-use-after-free-of-loca.patch migration-test-ppc64-fix-FORTH-test-prog.patch net-tulip-check-frame-size-and-r-w-data-.patch numa-Extend-CLI-to-provide-initiator-inf.patch numa-Extend-CLI-to-provide-memory-latenc.patch numa-Extend-CLI-to-provide-memory-side-c.patch numa-properly-check-if-numa-is-supported.patch pc-bios-s390x-Save-iplb-location-in-lowc.patch ppc-ppc405_boards-Remove-unnecessary-NUL.patch qcow2-List-autoclear-bit-names-in-header.patch qcow2-bitmaps-fix-qcow2_can_store_new_di.patch qemu-4.2.0.tar.xz qemu-4.2.0.tar.xz.sig runstate-ignore-finishmigrate-prelaunch-.patch s390-sclp-improve-special-wait-psw-logic.patch s390x-Add-missing-vcpu-reset-functions.patch s390x-Beautify-diag308-handling.patch s390x-Don-t-do-a-normal-reset-on-the-ini.patch s390x-Move-clear-reset.patch s390x-Move-initial-reset.patch s390x-Move-reset-normal-to-shared-reset-.patch s390x-adapter-routes-error-handling.patch s390x-ipl-Consolidate-iplb-validity-chec.patch s390x-kvm-Make-kvm_sclp_service_call-voi.patch scsi-qemu-pr-helper-Fix-out-of-bounds-ac.patch sheepdog-Consistently-set-bdrv_has_zero_.patch slirp-use-correct-size-while-emulating-I.patch slirp-use-correct-size-while-emulating-c.patch spapr-Fix-failure-path-for-attempting-to.patch target-arm-Correct-definition-of-PMCRDP.patch target-arm-Fix-PAuth-sbox-functions.patch target-arm-Return-correct-IL-bit-in-merg.patch target-arm-Set-ISSIs16Bit-in-make_issinf.patch target-arm-fix-TCG-leak-for-fcvt-half-do.patch target-arm-monitor-query-cpu-model-expan.patch target-i386-Add-missed-features-to-Coope.patch target-i386-Add-new-bit-definitions-of-M.patch target-i386-do-not-set-unsupported-VMX-s.patch target-i386-kvm-initialize-feature-MSRs-.patch target-ppc-Fix-rlwinm-on-ppc64.patch target-xtensa-fix-pasto-in-pfwait.r-opco.patch tcg-i386-Fix-INDEX_op_dup2_vec.patch tcg-mips-mips-sync-encode-error.patch tcp_emu-Fix-oob-access.patch tcp_emu-fix-unsafe-snprintf-usages.patch tests-numa-Add-case-for-QMP-build-HMAT.patch tpm-ppi-page-align-PPI-RAM.patch util-add-slirp_fmt-helpers.patch vga-Raise-VRAM-to-16-MiB-for-pc-0.15-and.patch vhost-correctly-turn-on-VIRTIO_F_IOMMU_P.patch vhost-user-blk-delete-virtioqueues-in-un.patch vhost-user-gpu-Drop-trailing-json-comma.patch vhost-user-gpu-Release-memory-returned-b.patch virtio-add-ability-to-delete-vq-through-.patch virtio-blk-fix-out-of-bounds-access-to-b.patch virtio-crypto-do-delete-ctrl_vq-in-virti.patch virtio-don-t-enable-notifications-during.patch virtio-mmio-update-queue-size-on-guest-w.patch virtio-net-delete-also-control-queue-whe.patch virtio-pmem-do-delete-rq_vq-in-virtio_pm.patch virtio-update-queue-size-on-guest-write.patch vnc-prioritize-ZRLE-compression-over-ZLI.patch vpc-Don-t-round-up-already-aligned-BAT-s.patch xen-block-Fix-double-qlist-remove-and-re.patch New: ---- docs-add-SUSE-support-statements-to-html.patch qemu-5.0.0.tar.xz qemu-5.0.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu.spec ++++++ ++++ 797 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/qemu/qemu.spec ++++ and /work/SRC/openSUSE:Factory/.qemu.new.2738/qemu.spec ++++++ Conditionalize-ui-bitmap-installation-be.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:08.696260464 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:08.696260464 +0200 @@ -8,10 +8,10 @@ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile -index 52881cbb12e7d980e0ed51f21174..edc3de72e6a94ef0503da640bbfe 100644 +index 1a2f649a21a85e1849a3ca40991d..a7851435c0ba8c60df39ebad492b 100644 --- a/Makefile +++ b/Makefile -@@ -913,6 +913,7 @@ ifneq ($(DESCS),) +@@ -974,6 +974,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 \ -@@ -927,6 +928,7 @@ endif +@@ -988,6 +989,7 @@ endif mkdir -p "$(DESTDIR)$(qemu_desktopdir)" $(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \ "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop" ++++++ Make-char-muxer-more-robust-wrt-small-FI.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:08.712260498 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:08.716260506 +0200 @@ -41,7 +41,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" diff --git a/chardev/char-mux.c b/chardev/char-mux.c -index 200c62a0d08bd779de8efdc95aad..10acb4fce1d3bda0d9f818eeb5ee 100644 +index 46c44af67c4ea5348eb1b6db637f..1d3eaf1e37bc2995ae4b8e80f0ff 100644 --- a/chardev/char-mux.c +++ b/chardev/char-mux.c @@ -22,6 +22,7 @@ @@ -82,7 +82,7 @@ * set of muxes */ diff --git a/chardev/char.c b/chardev/char.c -index 7b6b2cb12300042c6adf257e188c..d2134d72f60e58f35ee9e7869db4 100644 +index e77564060dbc8d60e964787b9150..7f08483a4fc8b1c2c01d57546eca 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -22,6 +22,7 @@ @@ -94,7 +94,7 @@ #include "qemu/cutils.h" #include "monitor/monitor.h" diff --git a/include/chardev/char-mux.h b/include/chardev/char-mux.h -index 572cefd517c8fa9d605cbd10fc21..6e80785bd9c12b85e747fa9f924e 100644 +index 417fe32eedf29b206c4c7a20f8ef..225a4d1c37d051bca576a1b73607 100644 --- a/include/chardev/char-mux.h +++ b/include/chardev/char-mux.h @@ -34,6 +34,9 @@ typedef struct MuxChardev { @@ -108,7 +108,7 @@ int mux_cnt; int term_got_escape; diff --git a/tests/test-char.c b/tests/test-char.c -index 45e42af290d4c55c0d8ed9358ef2..8e8c983dc0adce3dea739c9d85fc 100644 +index 3afc9b1b8d59802919139012c2cb..530cf7c2414e85e00e2685e7482c 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.vyryzL/_old 2020-05-02 22:15:08.724260523 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:08.724260523 +0200 @@ -13,21 +13,21 @@ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/analyze-migration.py b/scripts/analyze-migration.py -index e527eb168e9ce7c3944094ec6701..fd376eac71f73e6366a9e17a1c51 100755 +index 96a31d3974ba2af13d419b71c409..4cae695244a00003d1431c02febf 100755 --- a/scripts/analyze-migration.py +++ b/scripts/analyze-migration.py @@ -1,4 +1,4 @@ --#!/usr/bin/env python +-#!/usr/bin/env python3 +#!/usr/bin/python3 # # Migration Stream Analyzer # diff --git a/scripts/vmstate-static-checker.py b/scripts/vmstate-static-checker.py -index f8b7b8f77252f2c03d6d7db9dc60..754159069dfae6838edaac14856f 100755 +index 539ead62b498202fc40b42bff05f..0b7d30eef392cd659dbd722d8bdc 100755 --- a/scripts/vmstate-static-checker.py +++ b/scripts/vmstate-static-checker.py @@ -1,4 +1,4 @@ --#!/usr/bin/python +-#!/usr/bin/env python3 +#!/usr/bin/python3 # # Compares vmstate information stored in JSON format, obtained from ++++++ PPC-KVM-Disable-mmu-notifier-check.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:08.736260548 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:08.736260548 +0200 @@ -14,10 +14,10 @@ 1 file changed, 2 insertions(+) diff --git a/exec.c b/exec.c -index ffdb5185353bdbacc613d4730228..0d0c0618bb70f9747c71048f5cde 100644 +index 2874bb508853d353bca3b9790e5d..76ac1f619b563c591f36f9601c15 100644 --- a/exec.c +++ b/exec.c -@@ -2291,11 +2291,13 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, +@@ -2297,11 +2297,13 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, return NULL; } ++++++ README.PACKAGING ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:08.764260606 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:08.764260606 +0200 @@ -16,7 +16,7 @@ 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 branch which corresponds to this release -(eg: opensuse-4.2), using the frombundle branch as the starting point for your +(eg: opensuse-5.0), 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 @@ -47,7 +47,7 @@ Bug or feature tracking identifiers should also be added to the patch similarly, using the abbreviations identified here: http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations -using the "References:" tag, with multiple entries comma separated. +using the "Reference:" tag, with multiple entries comma separated. The ability to provide a conditional inclusion of a patch (eg based on architecture, is provided by using the "Include-If:" tag similarly, as follows: ++++++ Raise-soft-address-space-limit-to-hard-l.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:08.776260632 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:08.776260632 +0200 @@ -12,14 +12,14 @@ [BR: add include for sys/resource.h] Signed-off-by: Bruce Rogers <[email protected]> --- - vl.c | 12 ++++++++++++ + softmmu/vl.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) -diff --git a/vl.c b/vl.c -index bf0a6345d2394ad25adfe53c4006..68de8184f91c6ef3903859c70526 100644 ---- a/vl.c -+++ b/vl.c -@@ -33,6 +33,7 @@ +diff --git a/softmmu/vl.c b/softmmu/vl.c +index 32c004788919e4f50b4bfc88113b..97e3888e832f0c9051f720bb701c 100644 +--- a/softmmu/vl.c ++++ b/softmmu/vl.c +@@ -34,6 +34,7 @@ #include "qemu/uuid.h" #include "sysemu/reset.h" #include "sysemu/runstate.h" @@ -27,15 +27,15 @@ #include "sysemu/seccomp.h" #include "sysemu/tcg.h" -@@ -2863,6 +2864,7 @@ int main(int argc, char **argv, char **envp) - char *dir, **dirs; +@@ -2851,6 +2852,7 @@ void qemu_init(int argc, char **argv, char **envp) BlockdevOptionsQueue bdo_queue = QSIMPLEQ_HEAD_INITIALIZER(bdo_queue); QemuPluginList plugin_list = QTAILQ_HEAD_INITIALIZER(plugin_list); + int mem_prealloc = 0; /* force preallocation of physical target memory */ + struct rlimit rlimit_as; os_set_line_buffering(); -@@ -2874,6 +2876,16 @@ int main(int argc, char **argv, char **envp) +@@ -2862,6 +2864,16 @@ void qemu_init(int argc, char **argv, char **envp) qemu_mutex_lock_iothread(); ++++++ Switch-order-of-libraries-for-mpath-supp.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:08.784260648 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:08.788260657 +0200 @@ -9,10 +9,10 @@ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index b437a346d71a55d75f207f36e85b..52881cbb12e7d980e0ed51f21174 100644 +index 8a9113e6663eb51cf842b2f4f5a2..1a2f649a21a85e1849a3ca40991d 100644 --- a/Makefile +++ b/Makefile -@@ -579,7 +579,7 @@ fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap +@@ -619,7 +619,7 @@ fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/9p-marshal 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 6099be1d848c7f52ea02694d6d86..09a33aecfd6ef543eeee8c5023b6 100755 +index 23b5e93752b6a2597b2099b50218..ef127fb1e0715da446b4a822e3ab 100755 --- a/configure +++ b/configure -@@ -3836,7 +3836,7 @@ int main(void) { +@@ -3961,7 +3961,7 @@ int main(void) { return 0; } EOF ++++++ Sync-pv.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:08.800260682 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:08.800260682 +0200 @@ -8,14 +8,14 @@ (cherry picked from commit 6807f464961cfee1dd81c95e22ddd91fa352fcc4) Signed-off-by: Bruce Rogers <[email protected]> --- - linux-headers/linux/kvm.h | 50 +++++++++++++++++++++++++++++++++++++-- - 1 file changed, 48 insertions(+), 2 deletions(-) + linux-headers/linux/kvm.h | 45 +++++++++++++++++++++++++++++++++++++-- + 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h -index 3d9b18f7f871acd0d13a0c42f184..18c636070edaf09dd8cf33ddb400 100644 +index 265099100e65b3e86d9e42e8806e..c30344ab0095e8568e785a237c89 100644 --- a/linux-headers/linux/kvm.h +++ b/linux-headers/linux/kvm.h -@@ -468,12 +468,17 @@ struct kvm_s390_mem_op { +@@ -474,12 +474,17 @@ struct kvm_s390_mem_op { __u32 size; /* amount of bytes */ __u32 op; /* type of operation */ __u64 buf; /* buffer in userspace */ @@ -35,23 +35,18 @@ /* flags for kvm_s390_mem_op->flags */ #define KVM_S390_MEMOP_F_CHECK_ONLY (1ULL << 0) #define KVM_S390_MEMOP_F_INJECT_EXCEPTION (1ULL << 1) -@@ -1000,6 +1005,8 @@ struct kvm_ppc_resize_hpt { - #define KVM_CAP_PMU_EVENT_FILTER 173 - #define KVM_CAP_ARM_IRQ_LINE_LAYOUT_2 174 - #define KVM_CAP_HYPERV_DIRECT_TLBFLUSH 175 -+#define KVM_CAP_S390_VCPU_RESETS 179 +@@ -1010,6 +1015,7 @@ struct kvm_ppc_resize_hpt { + #define KVM_CAP_ARM_NISV_TO_USER 177 + #define KVM_CAP_ARM_INJECT_EXT_DABT 178 + #define KVM_CAP_S390_VCPU_RESETS 179 +#define KVM_CAP_S390_PROTECTED 180 #ifdef KVM_CAP_IRQ_ROUTING -@@ -1461,6 +1468,45 @@ struct kvm_enc_region { - /* Available with KVM_CAP_ARM_SVE */ - #define KVM_ARM_VCPU_FINALIZE _IOW(KVMIO, 0xc2, int) +@@ -1478,6 +1484,41 @@ struct kvm_enc_region { + #define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3) + #define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4) -+/* Available with KVM_CAP_S390_VCPU_RESETS */ -+#define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3) -+#define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4) -+ +struct kvm_s390_pv_sec_parm { + __u64 origin; + __u64 length; ++++++ XXX-dont-dump-core-on-sigabort.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:08.812260707 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:08.816260716 +0200 @@ -8,10 +8,10 @@ 1 file changed, 6 insertions(+) diff --git a/linux-user/signal.c b/linux-user/signal.c -index 5ca6d62b15d3e4d3faee3f554fff..1d6382ce881795b057ab229e4129 100644 +index 8cf51ffecde659742b7aac6dfaae..08cb813a8a1782ed4b845d716ce2 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c -@@ -581,6 +581,10 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig) +@@ -632,6 +632,10 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig) trace_user_force_sig(env, target_sig, host_sig); gdb_signalled(env, target_sig); @@ -22,7 +22,7 @@ /* dump core if supported by target binary format */ if (core_dump_signal(target_sig) && (ts->bprm->core_dump != NULL)) { stop_all_tasks(); -@@ -598,6 +602,8 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig) +@@ -649,6 +653,8 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig) target_sig, strsignal(host_sig), "core dumped" ); } ++++++ acpi_piix4-Fix-migration-from-SLE11-SP2.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:08.848260782 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:08.852260791 +0200 @@ -16,10 +16,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c -index 93aec2dd2ce1767784076c3544b0..1f2a8ea850e9115b689af90bf708 100644 +index 964d6f5990faf6ff7521bb2377a2..7b5f8234444b8b29ae66098b8d39 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c -@@ -273,7 +273,7 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id) +@@ -274,7 +274,7 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id) static const VMStateDescription vmstate_acpi = { .name = "piix4_pm", .version_id = 3, ++++++ bundles.tar.xz ++++++ Binary files old/b0ca999a43a22b38158a222233d3f5881648bb4f.bundle and new/b0ca999a43a22b38158a222233d3f5881648bb4f.bundle differ Binary files old/fdd76fecdde1ad444ff4deb7f1c4f7e4a1ef97d6.bundle and new/fdd76fecdde1ad444ff4deb7f1c4f7e4a1ef97d6.bundle differ Binary files old/roms/ipxe/de4565cbe76ea9f7913a01f331be3ee901bb6e17.bundle and new/roms/ipxe/de4565cbe76ea9f7913a01f331be3ee901bb6e17.bundle differ Binary files old/roms/seabios/c9ba5276e3217ac6a1ec772dbebf568ba3a8a55d.bundle and new/roms/seabios/c9ba5276e3217ac6a1ec772dbebf568ba3a8a55d.bundle differ Binary files old/roms/seabios/f21b5a4aeb020f2a5e2c6503f906a9349dd2f069.bundle and new/roms/seabios/f21b5a4aeb020f2a5e2c6503f906a9349dd2f069.bundle differ Binary files old/roms/sgabios/cbaee52287e5f32373181cff50a00b6c4ac9015a.bundle and new/roms/sgabios/cbaee52287e5f32373181cff50a00b6c4ac9015a.bundle differ Binary files old/slirp/126c04acbabd7ad32c2b018fe10dfac2a3bc1210.bundle and new/slirp/126c04acbabd7ad32c2b018fe10dfac2a3bc1210.bundle differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slirp/repo new/slirp/repo --- old/slirp/repo 2019-12-12 23:25:12.000000000 +0100 +++ new/slirp/repo 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -https://github.com/openSUSE/qemu-slirp.git ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:08.960261017 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:08.960261017 +0200 @@ -7,17 +7,17 @@ # 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.2.0 +GIT_UPSTREAM_COMMIT_ISH=v5.0.0 # WARNING: If transitioning from using LATEST to not, MANUALLY re-set the # tarball present. If transitioning TO LATEST, make sure that # NEXT_RELEASE_IS_MAJOR is set correctly # This is used to choose the version number when LATEST processing is active -NEXT_RELEASE_IS_MAJOR=1 +NEXT_RELEASE_IS_MAJOR=0 # 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+ +#SEABIOS_VERSION=1.13.0 # The shared git repo, on which $GIT_LOCAL_TREE is based GIT_TREE=git://github.com/openSUSE/qemu.git @@ -31,7 +31,7 @@ NUMBERED_PATCHES=0 PATCH_RANGE=1000 -REPO_COUNT=27 +REPO_COUNT=26 # Perhaps we need to instead use the terminal local dirname as the index # and store the ~/git/ as a separate VARIABLE @@ -49,7 +49,6 @@ ~/git/qemu-keycodemapdb ~/git/qemu-slirp ~/git/qemu-u-boot - ~/git/qemu-openhackware ~/git/qemu-qboot ~/git/qemu-dtc ~/git/qemu-opensbi @@ -74,7 +73,6 @@ ~/git/qemu-ipxe ~/git/qemu-sgabios ~/git/qemu-keycodemapdb - ~/git/qemu-slirp ~/git/qemu-qboot ) @@ -90,7 +88,6 @@ "ui/keycodemapdb/" "slirp/" "roms/u-boot/" - "roms/openhackware/" "roms/qboot/" "dtc/" "roms/opensbi/" ++++++ configure-only-populate-roms-if-softmmu.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:08.968261034 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:08.972261042 +0200 @@ -12,10 +12,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 09a33aecfd6ef543eeee8c5023b6..94984691ab378620ac2e0ae771ca 100755 +index ef127fb1e0715da446b4a822e3ab..5a0a52e842df70b757252f89b74a 100755 --- a/configure +++ b/configure -@@ -6327,7 +6327,7 @@ if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \ +@@ -6495,7 +6495,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 ++++++ configure-remove-pkgversion-from-CONFIG_.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:08.980261059 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:08.980261059 +0200 @@ -18,10 +18,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 94984691ab378620ac2e0ae771ca..c68e378776336748b227013a1a3f 100755 +index 5a0a52e842df70b757252f89b74a..790337b204cdfa6d84b1f8524f90 100755 --- a/configure +++ b/configure -@@ -6811,7 +6811,7 @@ fi +@@ -6939,7 +6939,7 @@ fi if test "$modules" = "yes"; then # $shacmd can generate a hash started with digit, which the compiler doesn't # like as an symbol. So prefix it with an underscore @@ -29,4 +29,4 @@ + echo "CONFIG_STAMP=_$( (echo $qemu_version; cat $0) | $shacmd - | cut -f1 -d\ )" >> $config_host_mak echo "CONFIG_MODULES=y" >> $config_host_mak fi - if test "$have_x11" = "yes" && test "$need_x11" = "yes"; then + if test "$module_upgrades" = "yes"; then ++++++ docs-add-SUSE-support-statements-to-html.patch ++++++ From: Bruce Rogers <[email protected]> Date: Tue, 28 Apr 2020 09:53:49 -0600 Subject: docs: add SUSE support statements to html docs Include-If: %if %{legacy_qemu_kvm} && 0%{?is_opensuse} == 0 We can fairly easily produce an html version of our support statements. Now that qemu includes fairly good html-based documentation, leverage it to expose our SUSE specific in-package support documentation. Signed-off-by: Bruce Rogers <[email protected]> --- docs/index.html.in | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/index.html.in b/docs/index.html.in index e9a160384cfe939a3bccc51e5da9..2a76ade7bfd053f359d7782c7473 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -7,6 +7,7 @@ <body> <h1>QEMU @@VERSION@@ Documentation</h1> <ul> + <li><a href="/usr/share/doc/packages/qemu-kvm/kvm-supported.html">SUSE Support Statements</a></li> <li><a href="system/index.html">System Emulation User's Guide</a></li> <li><a href="user/index.html">User Mode Emulation User's Guide</a></li> <li><a href="tools/index.html">Tools Guide</a></li> ++++++ gcc10-maybe-uninitialized.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.000261101 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.004261109 +0200 @@ -17,7 +17,7 @@ 1 file changed, 1 insertion(+) diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c -index 79e70493fc77e50556a4a92a4231..bc4b71059ff6d922e3cdc83bfc79 100644 +index d08ce6181199aa1e75a7c5bc2157..02f5259e5e33272b17bba701f5d5 100644 --- a/hw/openrisc/openrisc_sim.c +++ b/hw/openrisc/openrisc_sim.c @@ -134,6 +134,7 @@ static void openrisc_sim_init(MachineState *machine) ++++++ hw-intc-exynos4210_gic-provide-more-room.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.012261126 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.016261134 +0200 @@ -41,7 +41,7 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c -index a1b699b6babc3105bfd4ad9a8383..17317c961caa9a09c476e9ecbd3f 100644 +index 82c8f4192cbc34fe4c8762846728..50958b31c9173aba84b7443950cb 100644 --- a/hw/intc/exynos4210_gic.c +++ b/hw/intc/exynos4210_gic.c @@ -290,8 +290,8 @@ static void exynos4210_gic_realize(DeviceState *dev, Error **errp) @@ -53,5 +53,5 @@ + char cpu_alias_name[sizeof(cpu_prefix) + 7]; + char dist_alias_name[sizeof(cpu_prefix) + 8]; SysBusDevice *gicbusdev; + uint32_t n = s->num_cpu; uint32_t i; - ++++++ hw-smbios-handle-both-file-formats-regar.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.024261151 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.024261151 +0200 @@ -16,10 +16,10 @@ 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c -index 11d476c4a2cbdabc546c02b4f076..570ffa3acfa48b3721bdc578ee57 100644 +index ffd98727ee9e503dfce5e5c92241..a50b5aea6545f1d702278e838cf2 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c -@@ -964,6 +964,7 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) +@@ -963,6 +963,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) { -@@ -978,11 +979,21 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) +@@ -977,11 +978,21 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) } /* @@ -53,7 +53,7 @@ header = (struct smbios_structure_header *)(smbios_tables + smbios_tables_len); -@@ -997,6 +1008,19 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) +@@ -996,6 +1007,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) { -@@ -1017,6 +1041,17 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) +@@ -1016,6 +1040,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.vyryzL/_old 2020-05-02 22:15:09.036261176 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.036261176 +0200 @@ -17,7 +17,7 @@ 1 file changed, 13 insertions(+) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c -index 7c07295519d33d13fd3755ea7e0a..13815df4737ef8f46e6f857153b1 100644 +index 20717f026bc03922944317f73a68..e640fe183a0b407db555aade6e16 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -1722,9 +1722,22 @@ static void usb_mtp_write_metadata(MTPState *s, uint64_t dlen) ++++++ hw-usb-hcd-xhci-Fix-GCC-9-build-warning.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.048261201 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.048261201 +0200 @@ -28,10 +28,10 @@ 1 file changed, 1 insertion(+) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c -index 80988bb305a149f2974d329576a0..00b59bee44f4780727ca0279ced5 100644 +index b330e36fe6cc69a3b47ddd51ccba..8c4e4b66dd33ee482125b98846b7 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c -@@ -3330,6 +3330,7 @@ static void usb_xhci_init(XHCIState *xhci) +@@ -3340,6 +3340,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++) { ++++++ increase-x86_64-physical-bits-to-42.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.060261227 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.060261227 +0200 @@ -18,10 +18,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h -index 594326a7946798aba6ac42415164..5da6b243db2824f79676e4e1bbae 100644 +index e818fc712aca18df805859d10ede..bafc094406d16f6f8c1d41d69ff6 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h -@@ -1934,7 +1934,7 @@ uint64_t cpu_get_tsc(CPUX86State *env); +@@ -1942,7 +1942,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.vyryzL/_old 2020-05-02 22:15:09.096261302 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.096261302 +0200 @@ -21,10 +21,10 @@ 1 file changed, 24 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 57be4c98555e50f2263811cd11f4..243ec2a1e3bde8e6b3ac48989554 100644 +index 894627b9dc8d4f72c06bab90aa9b..39b824760a29765dc9538d8574e5 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -7068,6 +7068,27 @@ static int open_self_stat(void *cpu_env, int fd) +@@ -7344,6 +7344,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); -@@ -7210,6 +7231,9 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags, +@@ -7486,6 +7507,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.vyryzL/_old 2020-05-02 22:15:09.108261327 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.112261335 +0200 @@ -30,12 +30,12 @@ Signed-off-by: Andreas Färber <[email protected]> --- Makefile.target | 13 +++++++++++++ - linux-user/Makefile.objs | 2 ++ + linux-user/Makefile.objs | 1 + linux-user/binfmt.c | 42 ++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 57 insertions(+) + 3 files changed, 56 insertions(+) diff --git a/Makefile.target b/Makefile.target -index 24d79d26ebd00034bd97309fe5a7..1e9600834a25544063c313eba92a 100644 +index 8ed1eba95b9c29ab4e47349cbdb2..8b5d84006cb32d4463f13059de93 100644 --- a/Makefile.target +++ b/Makefile.target @@ -39,6 +39,10 @@ endif @@ -49,7 +49,7 @@ config-target.h: config-target.h-timestamp config-target.h-timestamp: config-target.mak -@@ -133,6 +137,8 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \ +@@ -134,6 +138,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 ######################################################### -@@ -174,7 +180,11 @@ generated-files-y += config-devices.h +@@ -176,7 +182,11 @@ generated-files-y += config-devices.h endif # CONFIG_SOFTMMU @@ -81,14 +81,13 @@ $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES),"GEN","$(TARGET_DIR)$@") diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs -index d2f33beb5e52efce6adc7fb85b7f..ffc6b095e253d4c448000a974d4d 100644 +index 1940910a7321c5a44d29c2602f9e..84c770a6cb58193d73afdffa2b01 100644 --- a/linux-user/Makefile.objs +++ b/linux-user/Makefile.objs -@@ -8,3 +8,5 @@ obj-$(TARGET_I386) += vm86.o - obj-$(TARGET_ARM) += arm/nwfpe/ - obj-$(TARGET_ARM) += arm/semihost.o - obj-$(TARGET_AARCH64) += arm/semihost.o -+ +@@ -23,3 +23,4 @@ obj-$(TARGET_SPARC) += sparc/ + obj-$(TARGET_SPARC64) += $(TARGET_ABI_DIR)/ + obj-$(TARGET_X86_64) += x86_64/ + obj-$(TARGET_XTENSA) += xtensa/ +obj-binfmt-y = binfmt.o diff --git a/linux-user/binfmt.c b/linux-user/binfmt.c new file mode 100644 ++++++ linux-user-lseek-explicitly-cast-non-set.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.124261361 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.124261361 +0200 @@ -15,10 +15,10 @@ 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 61d976cca146a6deb2d74c95ec59..926a7dd587b39d0615cbbb077ef2 100644 +index 0317c64f4ae460c972fe4fe67ef8..6ada54d3a19e455c0c12a1d4b321 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -7729,8 +7729,13 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_ulong arg1, +@@ -8005,8 +8005,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.vyryzL/_old 2020-05-02 22:15:09.136261386 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.136261386 +0200 @@ -15,10 +15,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 926a7dd587b39d0615cbbb077ef2..9330a1ec6a15f16e4f7fd0f825c2 100644 +index 6ada54d3a19e455c0c12a1d4b321..69c9dee831d8fdb96cde3a0b996c 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -9758,7 +9758,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_ulong arg1, +@@ -10052,7 +10052,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.vyryzL/_old 2020-05-02 22:15:09.148261411 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.148261411 +0200 @@ -16,10 +16,10 @@ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/linux-user/qemu.h b/linux-user/qemu.h -index f6f5fe5fbb553c151cb57146350c..b45b68221434e29636bb34c9f0b0 100644 +index 792c74290f8d376235b07f3f8ef0..956ad6db3df11684132402dd877b 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h -@@ -206,10 +206,10 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src, +@@ -207,10 +207,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); @@ -31,14 +31,14 @@ + abi_ulong arg2, abi_ulong arg3, abi_ulong arg4, + abi_ulong arg5, abi_ulong arg6, abi_ulong arg7, + abi_ulong arg8); - void gemu_log(const char *fmt, ...) GCC_FMT_ATTR(1, 2); extern __thread CPUState *thread_cpu; void cpu_loop(CPUArchState *env); + const char *target_strerror(int err); diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 243ec2a1e3bde8e6b3ac48989554..61d976cca146a6deb2d74c95ec59 100644 +index 39b824760a29765dc9538d8574e5..0317c64f4ae460c972fe4fe67ef8 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -7374,10 +7374,10 @@ static int host_to_target_cpu_mask(const unsigned long *host_mask, +@@ -7650,10 +7650,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; -@@ -10125,7 +10125,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, +@@ -10423,7 +10423,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; -@@ -12116,10 +12116,10 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, +@@ -12456,10 +12456,10 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, return ret; } ++++++ qemu-4.2.0.tar.xz -> qemu-5.0.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/qemu/qemu-4.2.0.tar.xz /work/SRC/openSUSE:Factory/.qemu.new.2738/qemu-5.0.0.tar.xz differ: char 26, line 1 ++++++ qemu-bridge-helper-reduce-security-profi.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.196261511 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.196261511 +0200 @@ -19,7 +19,7 @@ 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c -index 3d50ec094c794b9c0835628f10c5..f2291b398f8e4589f649af226dba 100644 +index 88b26747fc866116637716264dea..9ed35df944fa6968045e675e023a 100644 --- a/qemu-bridge-helper.c +++ b/qemu-bridge-helper.c @@ -123,7 +123,12 @@ static int parse_acl_file(const char *filename, ACLList *acl_list) ++++++ qemu-cvs-gettimeofday.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.208261537 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.208261537 +0200 @@ -11,16 +11,16 @@ 1 file changed, 3 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 171c0caef3a191c861e76493ccfc..25b0f3bba38b8629cb4bc027be96 100644 +index 05f03919ff070a06444d82e86a70..1a350d1a9e0ff9f99e36817a6ecc 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -8558,6 +8558,9 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, - case TARGET_NR_gettimeofday: +@@ -8837,6 +8837,9 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, { struct timeval tv; + struct timezone tz; + if (copy_from_user_timeval(&tv, arg1)) { + return -TARGET_EFAULT; + } - ret = get_errno(gettimeofday(&tv, NULL)); + + ret = get_errno(gettimeofday(&tv, &tz)); if (!is_error(ret)) { - if (copy_to_user_timeval(arg1, &tv)) ++++++ qemu-cvs-ioctl_debug.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.220261562 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.220261562 +0200 @@ -9,27 +9,29 @@ [BR: minor edits to pass qemu's checkpatch script] Signed-off-by: Bruce Rogers <[email protected]> --- - linux-user/syscall.c | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) + linux-user/syscall.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 25b0f3bba38b8629cb4bc027be96..49db231f031015265f6d8cead831 100644 +index 1a350d1a9e0ff9f99e36817a6ecc..946c1e3a1957ea43368311acecda 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -5151,7 +5151,19 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) +@@ -5301,8 +5301,21 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) ie = ioctl_entries; for(;;) { if (ie->target_cmd == 0) { -- gemu_log("Unsupported ioctl: cmd=0x%04lx\n", (long)cmd); + int i; -+ gemu_log("Unsupported ioctl: cmd=0x%04lx (%x)\n", (unsigned long)cmd, + qemu_log_mask( +- LOG_UNIMP, "Unsupported ioctl: cmd=0x%04lx\n", (long)cmd); ++ LOG_UNIMP, "Unsupported ioctl: cmd=0x%04lx (%x)\n", (unsigned long)cmd, + (unsigned int)(cmd & (TARGET_IOC_SIZEMASK << TARGET_IOC_SIZESHIFT)) + >> TARGET_IOC_SIZESHIFT); + for (i = 0; ioctl_entries[i].target_cmd; i++) { + if ((ioctl_entries[i].target_cmd & ~(TARGET_IOC_SIZEMASK + << TARGET_IOC_SIZESHIFT)) == (cmd & ~(TARGET_IOC_SIZEMASK << + TARGET_IOC_SIZESHIFT))) -+ gemu_log("%p\t->\t%s (%x)\n", (void *)(unsigned long) ++ qemu_log_mask( ++ LOG_UNIMP, "%p\t->\t%s (%x)\n", (void *)(unsigned long) + ioctl_entries[i].host_cmd, ioctl_entries[i].name, + (ioctl_entries[i].target_cmd & (TARGET_IOC_SIZEMASK + << TARGET_IOC_SIZESHIFT)) >> TARGET_IOC_SIZESHIFT); ++++++ qemu-cvs-ioctl_nodirection.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.232261587 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.232261587 +0200 @@ -16,10 +16,10 @@ 1 file changed, 8 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 49db231f031015265f6d8cead831..57be4c98555e50f2263811cd11f4 100644 +index 946c1e3a1957ea43368311acecda..894627b9dc8d4f72c06bab90aa9b 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -5192,6 +5192,13 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) +@@ -5346,6 +5346,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)) { -@@ -5210,6 +5217,7 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) +@@ -5364,6 +5371,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.vyryzL/_old 2020-05-02 22:15:09.316261763 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.316261763 +0200 @@ -138,7 +138,7 @@ BuildRequires: glibc-devel-static BuildRequires: makeinfo BuildRequires: pcre-devel-static -BuildRequires: python3-base +BuildRequires: python3-base >= 3.5 BuildRequires: zlib-devel-static # we must not install the qemu-linux-user package when under QEMU build %if 0%{?qemu_user_space_build:1} @@ -161,7 +161,6 @@ BuildRequires: binutils-devel %endif BuildRequires: bison -BuildRequires: bluez-devel BuildRequires: brlapi-devel %ifnarch %{ix86} aarch64 %arm BuildRequires: cross-aarch64-binutils @@ -203,7 +202,6 @@ %if 0%{?is_opensuse} BuildRequires: libcacard-devel >= 2.5.1 %endif -BuildRequires: libcap-devel BuildRequires: libcap-ng-devel BuildRequires: libdrm-devel BuildRequires: libepoxy-devel @@ -236,9 +234,9 @@ BuildRequires: libseccomp-devel >= 2.3.0 BuildRequires: libspice-server-devel >= 0.12.5 BuildRequires: libssh-devel >= 0.8 +BuildRequires: pkgconfig(libudev) BuildRequires: libusb-1_0-devel >= 1.0.13 BuildRequires: libvdeplug-devel -BuildRequires: pkgconfig(libudev) %if 0%{?is_opensuse} BuildRequires: lzfse-devel %endif @@ -253,9 +251,8 @@ BuildRequires: ncurses-devel BuildRequires: pkgconfig BuildRequires: pwdutils -BuildRequires: python-base BuildRequires: python3-Sphinx -BuildRequires: python3-base +BuildRequires: python3-base >= 3.5 BuildRequires: rdma-core-devel BuildRequires: snappy-devel BuildRequires: spice-protocol-devel >= 0.12.3 @@ -277,7 +274,6 @@ BuildRequires: zlib-devel %if "%{name}" == "qemu-testsuite" BuildRequires: bc -BuildRequires: python-base BuildRequires: qemu-arm = %{qemuver} BuildRequires: qemu-audio-alsa = %{qemuver} BuildRequires: qemu-audio-pa = %{qemuver} @@ -819,10 +815,10 @@ %if "%{name}" != "qemu-linux-user" # for the record, this set of firmware files is installed, but we don't -# build (yet): bamboo.dtb canyonlands.dtb hppa-firmware.img openbios-ppc openbios-sparc32 -# openbios-sparc64 palcode-clipper petalogix-ml605.dtb petalogix-s3adsp1800.dtb ppc_rom.bin -# QEMU,cgthree.bin QEMU,tcx.bin qemu_vga.ndrv u-boot.e500 u-boot-sam460-20100605.bin -# opensbi-riscv32-virt-fw_jump.bin +# build (yet): bamboo.dtb canyonlands.dtb hppa-firmware.img openbios-ppc +# openbios-sparc32 openbios-sparc64 palcode-clipper petalogix-ml605.dtb +# petalogix-s3adsp1800.dtb QEMU,cgthree.bin QEMU,tcx.bin qemu_vga.ndrv +# u-boot.e500 u-boot-sam460-20100605.bin opensbi-riscv32-virt-fw_jump.bin # This first list group isn't specific to what this instance builds %define ppc_default_firmware {%nil} @@ -952,6 +948,7 @@ --firmwarepath=%_datadir/%name \ --python=%_bindir/python3 \ --extra-cflags="%{optflags}" \ + --disable-fuzzing \ --disable-stack-protector \ --disable-strip \ %if "%{name}" != "qemu-linux-user" @@ -960,6 +957,7 @@ --enable-system --disable-linux-user \ --enable-tools --enable-guest-agent \ --enable-modules \ + --disable-module-upgrades \ --enable-pie \ --enable-docs \ %if 0%{?is_opensuse} @@ -969,7 +967,6 @@ %endif --enable-attr \ --disable-auth-pam \ - --enable-bluez \ --enable-bochs \ --enable-brlapi \ --enable-bzip2 \ @@ -1299,7 +1296,7 @@ # Compile the QOM test binary first, so that ... touch -r config-host.mak pc-bios -make %{?_smp_mflags} tests/qom-test %{?_smp_mflags} V=1 +make %{?_smp_mflags} tests/qtest/qom-test %{?_smp_mflags} V=1 # ... make comes in fresh and has lots of address space (needed for 32bit, bsc#957379) make %{?_smp_mflags} check-report.tap V=1 @@ -1445,8 +1442,10 @@ install -d %{buildroot}%_docdir/qemu-kvm %ifarch s390x ln -s ../qemu-s390/supported.txt %{buildroot}%_docdir/qemu-kvm/kvm-supported.txt +rst2html --exit-status=2 %{buildroot}%_docdir/qemu-s390/supported.txt %{buildroot}%_docdir/qemu-kvm/kvm-supported.html %else ln -s ../qemu-x86/supported.txt %{buildroot}%_docdir/qemu-kvm/kvm-supported.txt +rst2html --exit-status=2 %{buildroot}%_docdir/qemu-x86/supported.txt %{buildroot}%_docdir/qemu-kvm/kvm-supported.html %endif %endif %endif @@ -1540,13 +1539,46 @@ %license COPYING COPYING.LIB LICENSE %if "%{name}" == "qemu" +%dir %_datadir/icons/hicolor +%dir %_datadir/icons/hicolor/*/ +%dir %_datadir/icons/hicolor/*/apps +%dir %_datadir/%name +%dir %_datadir/%name/firmware +%dir %_datadir/%name/vhost-user +%_datadir/applications/qemu.desktop +%_datadir/icons/hicolor/16x16/apps/qemu.png +%_datadir/icons/hicolor/24x24/apps/qemu.png +%_datadir/icons/hicolor/32x32/apps/qemu.bmp +%_datadir/icons/hicolor/32x32/apps/qemu.png +%_datadir/icons/hicolor/48x48/apps/qemu.png +%_datadir/icons/hicolor/64x64/apps/qemu.png +%_datadir/icons/hicolor/128x128/apps/qemu.png +%_datadir/icons/hicolor/256x256/apps/qemu.png +%_datadir/icons/hicolor/512x512/apps/qemu.png +%_datadir/icons/hicolor/scalable/apps/qemu.svg +%_datadir/%name/keymaps +%_datadir/%name/qemu-ifup +%_datadir/%name/qemu-nsis.bmp +%_datadir/%name/trace-events-all +%_datadir/%name/vhost-user/50-qemu-virtiofsd.json %dir %_docdir/%name/interop %dir %_docdir/%name/interop/_static %dir %_docdir/%name/specs %dir %_docdir/%name/specs/_static +%dir %_docdir/%name/system +%dir %_docdir/%name/system/_static +%dir %_docdir/%name/system/arm +%dir %_docdir/%name/system/s390x +%dir %_docdir/%name/tools +%dir %_docdir/%name/tools/_static +%dir %_docdir/%name/user +%dir %_docdir/%name/user/_static +%_docdir/%name/index.html %_docdir/%name/interop/.buildinfo %_docdir/%name/interop/_static/* %_docdir/%name/interop/bitmaps.html +%_docdir/%name/interop/dbus.html +%_docdir/%name/interop/dbus-vmstate.html %_docdir/%name/interop/genindex.html %_docdir/%name/interop/index.html %_docdir/%name/interop/live-block-operations.html @@ -1555,6 +1587,11 @@ %_docdir/%name/interop/search.html %_docdir/%name/interop/searchindex.js %_docdir/%name/interop/vhost-user.html +%_docdir/%name/interop/vhost-user-gpu.html +%_docdir/%name/qemu-qmp-ref.txt +%_docdir/%name/qemu-qmp-ref.html +%_docdir/%name/qemu-ga-ref.txt +%_docdir/%name/qemu-ga-ref.html %_docdir/%name/specs/.buildinfo %_docdir/%name/specs/_static/* %_docdir/%name/specs/acpi_hw_reduced_hotplug.html @@ -1565,48 +1602,94 @@ %_docdir/%name/specs/ppc-xive.html %_docdir/%name/specs/search.html %_docdir/%name/specs/searchindex.js -%_docdir/%name/qemu-doc.txt -%_docdir/%name/qemu-doc.html -%_docdir/%name/qemu-qmp-ref.txt -%_docdir/%name/qemu-qmp-ref.html -%_docdir/%name/qemu-ga-ref.txt -%_docdir/%name/qemu-ga-ref.html +%_docdir/%name/specs/tpm.html +%_docdir/%name/system/.buildinfo +%_docdir/%name/system/_static/* +%_docdir/%name/system/arm/cpu-features.html +%_docdir/%name/system/arm/integratorcp.html +%_docdir/%name/system/arm/musicpal.html +%_docdir/%name/system/arm/nseries.html +%_docdir/%name/system/arm/orangepi.html +%_docdir/%name/system/arm/palm.html +%_docdir/%name/system/arm/realview.html +%_docdir/%name/system/arm/stellaris.html +%_docdir/%name/system/arm/sx1.html +%_docdir/%name/system/arm/versatile.html +%_docdir/%name/system/arm/xscale.html +%_docdir/%name/system/build-platforms.html +%_docdir/%name/system/deprecated.html +%_docdir/%name/system/gdb.html +%_docdir/%name/system/genindex.html +%_docdir/%name/system/images.html +%_docdir/%name/system/index.html +%_docdir/%name/system/invocation.html +%_docdir/%name/system/ivshmem.html +%_docdir/%name/system/keys.html +%_docdir/%name/system/license.html +%_docdir/%name/system/linuxboot.html +%_docdir/%name/system/managed-startup.html +%_docdir/%name/system/monitor.html +%_docdir/%name/system/mux-chardev.html +%_docdir/%name/system/net.html +%_docdir/%name/system/objects.inv +%_docdir/%name/system/qemu-block-drivers.html +%_docdir/%name/system/qemu-cpu-models.html +%_docdir/%name/system/qemu-manpage.html +%_docdir/%name/system/quickstart.html +%_docdir/%name/system/s390x/vfio-ap.html +%_docdir/%name/system/search.html +%_docdir/%name/system/searchindex.js +%_docdir/%name/system/security.html +%_docdir/%name/system/target-arm.html +%_docdir/%name/system/target-i386.html +%_docdir/%name/system/target-m68k.html +%_docdir/%name/system/target-mips.html +%_docdir/%name/system/target-ppc.html +%_docdir/%name/system/targets.html +%_docdir/%name/system/target-s390x.html +%_docdir/%name/system/target-sparc64.html +%_docdir/%name/system/target-sparc.html +%_docdir/%name/system/target-xtensa.html +%_docdir/%name/system/tls.html +%_docdir/%name/system/usb.html +%_docdir/%name/system/vnc-security.html +%_docdir/%name/tools/.buildinfo +%_docdir/%name/tools/_static/* +%_docdir/%name/tools/genindex.html +%_docdir/%name/tools/index.html +%_docdir/%name/tools/objects.inv +%_docdir/%name/tools/qemu-img.html +%_docdir/%name/tools/qemu-nbd.html +%_docdir/%name/tools/qemu-trace-stap.html +%_docdir/%name/tools/search.html +%_docdir/%name/tools/searchindex.js +%_docdir/%name/tools/virtfs-proxy-helper.html +%_docdir/%name/tools/virtiofsd.html +%_docdir/%name/user/.buildinfo +%_docdir/%name/user/_static/* +%_docdir/%name/user/genindex.html +%_docdir/%name/user/index.html +%_docdir/%name/user/main.html +%_docdir/%name/user/objects.inv +%_docdir/%name/user/search.html +%_docdir/%name/user/searchindex.js +%dir %_libexecdir/supportconfig +%dir %_libexecdir/supportconfig/plugins +%_libexecdir/supportconfig/plugins/%name %_mandir/man1/%name.1.gz +%_mandir/man1/virtiofsd.1.gz %_mandir/man7/qemu-block-drivers.7.gz %_mandir/man7/qemu-cpu-models.7.gz %_mandir/man7/qemu-qmp-ref.7.gz %_mandir/man7/qemu-ga-ref.7.gz -%dir %_datadir/%name -%dir %_datadir/%name/firmware -%_datadir/%name/keymaps -%_datadir/%name/qemu-nsis.bmp -%_datadir/%name/trace-events-all %dir %_sysconfdir/%name %dir %_sysconfdir/%name/firmware -%_datadir/%name/qemu-ifup -%dir %_libexecdir/supportconfig -%dir %_libexecdir/supportconfig/plugins -%_libexecdir/supportconfig/plugins/%name %if %{kvm_available} -/usr/lib/udev/rules.d/80-kvm.rules %ifarch s390x %_libexecdir/modules-load.d/kvm.conf %endif +/usr/lib/udev/rules.d/80-kvm.rules %endif -%dir %_datadir/icons/hicolor -%dir %_datadir/icons/hicolor/*/ -%dir %_datadir/icons/hicolor/*/apps -%_datadir/icons/hicolor/16x16/apps/qemu.png -%_datadir/icons/hicolor/24x24/apps/qemu.png -%_datadir/icons/hicolor/32x32/apps/qemu.bmp -%_datadir/icons/hicolor/32x32/apps/qemu.png -%_datadir/icons/hicolor/48x48/apps/qemu.png -%_datadir/icons/hicolor/64x64/apps/qemu.png -%_datadir/icons/hicolor/128x128/apps/qemu.png -%_datadir/icons/hicolor/256x256/apps/qemu.png -%_datadir/icons/hicolor/512x512/apps/qemu.png -%_datadir/icons/hicolor/scalable/apps/qemu.svg -%_datadir/applications/qemu.desktop %files x86 %defattr(-, root, root) @@ -1629,7 +1712,6 @@ %_datadir/%name/bamboo.dtb %_datadir/%name/canyonlands.dtb %_datadir/%name/openbios-ppc -%_datadir/%name/ppc_rom.bin %_datadir/%name/qemu_vga.ndrv %_datadir/%name/skiboot.lid %_datadir/%name/slof.bin @@ -1677,6 +1759,7 @@ %_bindir/qemu-system-or1k %_bindir/qemu-system-riscv32 %_bindir/qemu-system-riscv64 +%_bindir/qemu-system-rx %_bindir/qemu-system-sh4 %_bindir/qemu-system-sh4eb %_bindir/qemu-system-sparc @@ -1686,6 +1769,7 @@ %_bindir/qemu-system-xtensa %_bindir/qemu-system-xtensaeb %_datadir/%name/hppa-firmware.img +%_datadir/%name/opensbi-riscv32-sifive_u-fw_jump.bin %_datadir/%name/opensbi-riscv32-virt-fw_jump.bin %_datadir/%name/opensbi-riscv64-sifive_u-fw_jump.bin %_datadir/%name/opensbi-riscv64-virt-fw_jump.bin @@ -1704,6 +1788,7 @@ %_mandir/man1/qemu-kvm.1.gz %if 0%{?is_opensuse} == 0 %dir %_docdir/qemu-kvm +%_docdir/qemu-kvm/kvm-supported.html %_docdir/qemu-kvm/kvm-supported.txt %endif %endif @@ -1869,16 +1954,13 @@ %files vhost-user-gpu %defattr(-, root, root) -%_libexecdir/vhost-user-gpu -%_docdir/%name/interop/vhost-user-gpu.html %dir %_datadir/%name/vhost-user %_datadir/%name/vhost-user/50-qemu-gpu.json +%_libexecdir/vhost-user-gpu %files tools %defattr(-, root, root) -%_mandir/man1/qemu-img.1.gz -%_mandir/man1/virtfs-proxy-helper.1.gz -%_mandir/man8/qemu-nbd.8.gz +%_bindir/analyze-migration.py %_bindir/elf2dmp %_bindir/ivshmem-client %_bindir/ivshmem-server @@ -1888,19 +1970,23 @@ %_bindir/qemu-keymap %_bindir/qemu-nbd %_bindir/qemu-pr-helper +%_bindir/qemu-storage-daemon %_bindir/virtfs-proxy-helper +%_bindir/vmstate-static-checker.py %verify(not mode) %attr(4750,root,kvm) %_libexecdir/qemu-bridge-helper +%_libexecdir/virtiofsd +%_mandir/man1/qemu-img.1.gz +%_mandir/man1/virtfs-proxy-helper.1.gz +%_mandir/man8/qemu-nbd.8.gz %dir %_sysconfdir/%name %config %_sysconfdir/%name/bridge.conf -%_bindir/analyze-migration.py -%_bindir/vmstate-static-checker.py %files guest-agent %defattr(-, root, root) +%attr(0755,root,kvm) %_bindir/qemu-ga %dir %_docdir/%name/interop %_docdir/%name/interop/qemu-ga.html %_mandir/man8/qemu-ga.8.gz -%attr(0755,root,kvm) %_bindir/qemu-ga %{_unitdir}/[email protected] /usr/lib/udev/rules.d/80-qemu-ga.rules @@ -1926,25 +2012,25 @@ %_bindir/qemu-microblaze %_bindir/qemu-microblazeel %_bindir/qemu-mips +%_bindir/qemu-mips64 +%_bindir/qemu-mips64el %_bindir/qemu-mipsel %_bindir/qemu-mipsn32 %_bindir/qemu-mipsn32el -%_bindir/qemu-mips64 -%_bindir/qemu-mips64el %_bindir/qemu-nios2 %_bindir/qemu-or1k +%_bindir/qemu-ppc %_bindir/qemu-ppc64 %_bindir/qemu-ppc64abi32 %_bindir/qemu-ppc64le -%_bindir/qemu-ppc %_bindir/qemu-riscv32 %_bindir/qemu-riscv64 %_bindir/qemu-s390x %_bindir/qemu-sh4 %_bindir/qemu-sh4eb +%_bindir/qemu-sparc %_bindir/qemu-sparc32plus %_bindir/qemu-sparc64 -%_bindir/qemu-sparc %_bindir/qemu-tilegx %_bindir/qemu-x86_64 %_bindir/qemu-xtensa ++++++ roms-Makefile-enable-cross-compile-for-b.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.328261788 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.332261797 +0200 @@ -8,10 +8,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roms/Makefile b/roms/Makefile -index 091ad51c1e91a2b9709c5810e562..a6f084820f489bef42c6f487a6b2 100644 +index 3aaf3835730023e9a941fc9cd2c2..1bfe34b404d2822bda71edf25ae4 100644 --- a/roms/Makefile +++ b/roms/Makefile -@@ -198,7 +198,7 @@ opensbi64-sifive_u: +@@ -205,7 +205,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: ++++++ roms-Makefile-pass-a-packaging-timestamp.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.344261821 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.344261821 +0200 @@ -20,7 +20,7 @@ 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/roms/Makefile b/roms/Makefile -index 28e1e557b0763cabe6da3d07602d..091ad51c1e91a2b9709c5810e562 100644 +index f9acf39954dcf96618fab21cafe7..3aaf3835730023e9a941fc9cd2c2 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -51,6 +51,12 @@ SEABIOS_EXTRAVERSION="-prebuilt.qemu.org" @@ -36,7 +36,7 @@ default help: @echo "nothing is build by default" @echo "available build targets:" -@@ -100,7 +106,7 @@ build-seabios-config-%: config.% +@@ -101,7 +107,7 @@ build-seabios-config-%: config.% .PHONY: sgabios skiboot sgabios: @@ -45,7 +45,7 @@ cp sgabios/sgabios.bin ../pc-bios -@@ -120,11 +126,13 @@ efi-rom-%: build-pxe-roms build-efi-roms edk2-basetools +@@ -121,11 +127,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)) -@@ -147,7 +155,9 @@ edk2-basetools: +@@ -148,7 +156,9 @@ edk2-basetools: EXTRA_LDFLAGS='$(EDK2_BASETOOLS_LDFLAGS)' slof: ++++++ roms-change-cross-compiler-naming-to-be-.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.356261847 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.360261855 +0200 @@ -8,12 +8,12 @@ 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/roms/edk2-funcs.sh b/roms/edk2-funcs.sh -index 3f4485b201f1f6f8cff47a9933da..5a3a8d885c9138d3c857d8b1e6d0 100644 +index cd6e4f2c82d2b346cdb7b3199bca..529e335121fcb60e419bfc656b6d 100644 --- a/roms/edk2-funcs.sh +++ b/roms/edk2-funcs.sh -@@ -113,7 +113,15 @@ qemu_edk2_get_cross_prefix() - # no cross-compiler needed - : +@@ -116,7 +116,15 @@ qemu_edk2_get_cross_prefix() + # force soft-float cross-compiler on Debian + printf 'arm-linux-gnueabi-' else - printf '%s-linux-gnu-\n' "$gcc_arch" + if [ "$emulation_target" == arm ]; then ++++++ s390x-Add-SIDA-memory-ops.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.376261888 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.376261888 +0200 @@ -27,10 +27,10 @@ 4 files changed, 48 insertions(+), 1 deletion(-) diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h -index d2af13b345ccd9094f82385cd528..2ec0f78b48ee15978b62f5fdc1b2 100644 +index 1d17709d6e10b5e0668bc09e21c7..035427521cec252877c70288d597 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h -@@ -821,7 +821,12 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf, +@@ -823,7 +823,12 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf, #define s390_cpu_virt_mem_check_write(cpu, laddr, ar, len) \ s390_cpu_virt_mem_rw(cpu, laddr, ar, NULL, len, true) void s390_cpu_virt_mem_handle_exc(S390CPU *cpu, uintptr_t ra); @@ -45,7 +45,7 @@ /* sigp.c */ int s390_cpu_restart(S390CPU *cpu); diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c -index abeeaaa67452b0b938557b0d0dea..941e4df630ad9b3dc780d3c92e6b 100644 +index 1988809ec2e7b1b6db33ba85eaef..0e93778ed15d0e04e83eff1baccf 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -154,6 +154,7 @@ static int cap_ri; @@ -64,7 +64,7 @@ if (!kvm_check_extension(s, KVM_CAP_S390_GMAP) || !kvm_check_extension(s, KVM_CAP_S390_COW)) { -@@ -848,6 +850,30 @@ int kvm_s390_mem_op(S390CPU *cpu, vaddr addr, uint8_t ar, void *hostbuf, +@@ -851,6 +853,30 @@ int kvm_s390_mem_op(S390CPU *cpu, vaddr addr, uint8_t ar, void *hostbuf, return ret; } @@ -109,7 +109,7 @@ int kvm_s390_set_cpu_state(S390CPU *cpu, uint8_t cpu_state); void kvm_s390_vcpu_interrupt_pre_save(S390CPU *cpu); diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c -index c9f3f347501097b894333a36cac3..ec8befbdc87d4c88d83baeeab20e 100644 +index 0be2f300bbe4ac8b68619b8c2285..7d9f3059cd502c49108b459c8d23 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -474,6 +474,20 @@ static int translate_pages(S390CPU *cpu, vaddr addr, int nr_pages, ++++++ s390x-Add-unpack-facility-feature-to-GA1.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.388261914 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.392261922 +0200 @@ -41,10 +41,10 @@ /* Default features (in order of release) diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c -index d94b915da419c3ad0a1f9622ca13..8b82e4c93dfa7e89127bce74cde7 100644 +index 870dd1b52b6e424f6cbd751cce0d..69881a0da0b31f72c4c3794d17ab 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c -@@ -2407,6 +2407,14 @@ void kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp) +@@ -2425,6 +2425,14 @@ void kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp) clear_bit(S390_FEAT_BPB, model->features); } ++++++ s390x-protvirt-Add-migration-blocker.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.404261947 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.408261956 +0200 @@ -18,10 +18,10 @@ 1 file changed, 18 insertions(+) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c -index 5149030d2216040c396a02d977c8..ed910a099627dae96ab5da747fb3 100644 +index b4d681da43af43f23f66206cacf6..e00040a00ba60b20b42ee26a299b 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c -@@ -44,6 +44,9 @@ +@@ -45,6 +45,9 @@ #include "sysemu/sysemu.h" #include "hw/s390x/pv.h" #include <linux/kvm.h> @@ -31,7 +31,7 @@ S390CPU *s390_cpu_addr2state(uint16_t cpu_addr) { -@@ -325,15 +328,30 @@ static void s390_machine_unprotect(S390CcwMachineState *ms) +@@ -324,15 +327,30 @@ static void s390_machine_unprotect(S390CcwMachineState *ms) { s390_pv_vm_disable(); ms->pv = false; ++++++ s390x-protvirt-Disable-address-checks-fo.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.416261973 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.420261980 +0200 @@ -23,7 +23,7 @@ 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/target/s390x/ioinst.c b/target/s390x/ioinst.c -index c437a1d8c6afed80199034ab6f6a..bbcccf6be23456393282287bf116 100644 +index 0e840cc5792afe02d543568ba880..8828482eec306a2bccd8bef269b7 100644 --- a/target/s390x/ioinst.c +++ b/target/s390x/ioinst.c @@ -16,6 +16,25 @@ ++++++ s390x-protvirt-Handle-SIGP-store-status-.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.432262006 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.432262006 +0200 @@ -19,7 +19,7 @@ 1 file changed, 6 insertions(+) diff --git a/target/s390x/helper.c b/target/s390x/helper.c -index 6808dfda01f42acbaa1d36ef787b..36b6d3d9d1bca9db90aac1c7bec6 100644 +index ed726849114f2f353471233f670b..09f60406aa33c938ff54a0dbda13 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -25,6 +25,7 @@ @@ -39,6 +39,6 @@ + return 0; + } + - sa = cpu_physical_memory_map(addr, &len, 1); + sa = cpu_physical_memory_map(addr, &len, true); if (!sa) { return -EFAULT; ++++++ s390x-protvirt-Inhibit-balloon-when-swit.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.444262031 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.444262031 +0200 @@ -36,10 +36,10 @@ 1 file changed, 11 insertions(+) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c -index ed910a099627dae96ab5da747fb3..85250bf046ed72313b03c6ff6c54 100644 +index e00040a00ba60b20b42ee26a299b..db45249320abf7920ec8730790c2 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c -@@ -42,6 +42,7 @@ +@@ -43,6 +43,7 @@ #include "hw/qdev-properties.h" #include "hw/s390x/tod.h" #include "sysemu/sysemu.h" @@ -47,7 +47,7 @@ #include "hw/s390x/pv.h" #include <linux/kvm.h> #include "migration/blocker.h" -@@ -330,6 +331,7 @@ static void s390_machine_unprotect(S390CcwMachineState *ms) +@@ -329,6 +330,7 @@ static void s390_machine_unprotect(S390CcwMachineState *ms) ms->pv = false; migrate_del_blocker(pv_mig_blocker); error_free_or_abort(&pv_mig_blocker); @@ -55,7 +55,7 @@ } static int s390_machine_protect(S390CcwMachineState *ms) -@@ -337,10 +339,18 @@ static int s390_machine_protect(S390CcwMachineState *ms) +@@ -336,10 +338,18 @@ static int s390_machine_protect(S390CcwMachineState *ms) Error *local_err = NULL; int rc; @@ -74,7 +74,7 @@ error_report_err(local_err); error_free_or_abort(&pv_mig_blocker); return rc; -@@ -349,6 +359,7 @@ static int s390_machine_protect(S390CcwMachineState *ms) +@@ -348,6 +358,7 @@ static int s390_machine_protect(S390CcwMachineState *ms) /* Create SE VM */ rc = s390_pv_vm_enable(); if (rc) { ++++++ s390x-protvirt-KVM-intercept-changes.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.456262056 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.456262056 +0200 @@ -37,7 +37,7 @@ 1 file changed, 4 insertions(+) diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c -index d8d02ff34f4fc942cb7935deec58..abeeaaa67452b0b938557b0d0dea 100644 +index b2b14bde2b251986230153adca9a..1988809ec2e7b1b6db33ba85eaef 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -115,6 +115,8 @@ @@ -49,7 +49,7 @@ #define NR_LOCAL_IRQS 32 /* -@@ -1695,6 +1697,8 @@ static int handle_intercept(S390CPU *cpu) +@@ -1698,6 +1700,8 @@ static int handle_intercept(S390CPU *cpu) (long)cs->kvm_run->psw_addr); switch (icpt_code) { case ICPT_INSTRUCTION: ++++++ s390x-protvirt-Move-IO-control-structure.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.468262081 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.472262090 +0200 @@ -17,7 +17,7 @@ 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/target/s390x/ioinst.c b/target/s390x/ioinst.c -index bbcccf6be23456393282287bf116..f40c35c6ff58315622510ae72103 100644 +index 8828482eec306a2bccd8bef269b7..7a14c52c123b842bba0b13f96b16 100644 --- a/target/s390x/ioinst.c +++ b/target/s390x/ioinst.c @@ -138,7 +138,9 @@ void ioinst_handle_msch(S390CPU *cpu, uint64_t reg1, uint32_t ipb, uintptr_t ra) ++++++ s390x-protvirt-Move-STSI-data-over-SIDAD.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.484262115 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.484262115 +0200 @@ -18,7 +18,7 @@ 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c -index 941e4df630ad9b3dc780d3c92e6b..d00e05cc10d274790a215d0f4359 100644 +index 0e93778ed15d0e04e83eff1baccf..e0b61680ab086a5ff5875c42b7e5 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -50,6 +50,7 @@ @@ -29,9 +29,9 @@ #ifndef DEBUG_KVM #define DEBUG_KVM 0 -@@ -1803,7 +1804,9 @@ static void insert_stsi_3_2_2(S390CPU *cpu, __u64 addr, uint8_t ar) +@@ -1808,7 +1809,9 @@ static void insert_stsi_3_2_2(S390CPU *cpu, __u64 addr, uint8_t ar) SysIB_322 sysib; - int del; + int del, i; - if (s390_cpu_virt_mem_read(cpu, addr, ar, &sysib, sizeof(sysib))) { + if (s390_is_pv()) { @@ -40,7 +40,7 @@ return; } /* Shift the stack of Extended Names to prepare for our own data */ -@@ -1843,7 +1846,11 @@ static void insert_stsi_3_2_2(S390CPU *cpu, __u64 addr, uint8_t ar) +@@ -1861,7 +1864,11 @@ static void insert_stsi_3_2_2(S390CPU *cpu, __u64 addr, uint8_t ar) /* Insert UUID */ memcpy(sysib.vm[0].uuid, &qemu_uuid, sizeof(sysib.vm[0].uuid)); ++++++ s390x-protvirt-SCLP-interpretation.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.500262148 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.504262156 +0200 @@ -25,7 +25,7 @@ 3 files changed, 67 insertions(+), 16 deletions(-) diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c -index f57ce7b73943564f4d44dcbe0cf0..1c380a49cc7140687329e43e9745 100644 +index f0c35aa57afde03f7ec3e5f52f49..ede056b3efd7d92445d00f2e1298 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -33,6 +33,22 @@ static inline SCLPDevice *get_sclp_device(void) @@ -86,8 +86,8 @@ int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code) { SCLPDevice *sclp = get_sclp_device(); -@@ -230,17 +274,7 @@ int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code) - goto out; +@@ -225,17 +269,7 @@ int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code) + return -PGM_SPECIFICATION; } - switch (code & SCLP_CMD_CODE_MASK) { @@ -106,7 +106,7 @@ goto out_write; } diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h -index c54413b78cf01b274cc249b1409b..c0a3faa37d7304536e75d32f2050 100644 +index cd7b24359f28deb4b659b1f284f6..822eff4396ff5dded7496e50575d 100644 --- a/include/hw/s390x/sclp.h +++ b/include/hw/s390x/sclp.h @@ -217,5 +217,7 @@ void s390_sclp_init(void); @@ -118,10 +118,10 @@ #endif diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c -index d00e05cc10d274790a215d0f4359..d94b915da419c3ad0a1f9622ca13 100644 +index e0b61680ab086a5ff5875c42b7e5..870dd1b52b6e424f6cbd751cce0d 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c -@@ -1230,12 +1230,27 @@ static void kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run, +@@ -1233,12 +1233,27 @@ static void kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run, sccb = env->regs[ipbh0 & 0xf]; code = env->regs[(ipbh0 & 0xf0) >> 4]; ++++++ s390x-protvirt-Set-guest-IPL-PSW.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.516262182 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.516262182 +0200 @@ -17,22 +17,37 @@ (cherry picked from commit e8686d9849f1625f4f4b28403f0555181b72d1b6) Signed-off-by: Bruce Rogers <[email protected]> --- - target/s390x/cpu.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) + target/s390x/cpu.c | 26 +++++++++++++++++--------- + 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c -index 479f1978c974722ceeb72ac5fb32..6da0c3f15530310fba5f609b8c7f 100644 +index bb7a588e3b791fe48b4e0a0826dd..f2ccf0a06a0c9c1dde202988ceee 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c -@@ -77,8 +77,16 @@ static bool s390_cpu_has_work(CPUState *cs) +@@ -77,16 +77,24 @@ static bool s390_cpu_has_work(CPUState *cs) static void s390_cpu_load_normal(CPUState *s) { S390CPU *cpu = S390_CPU(s); -- cpu->env.psw.addr = ldl_phys(s->as, 4) & PSW_MASK_ESA_ADDR; -- cpu->env.psw.mask = PSW_MASK_32 | PSW_MASK_64; +- uint64_t spsw = ldq_phys(s->as, 0); +- +- cpu->env.psw.mask = spsw & PSW_MASK_SHORT_CTRL; +- /* +- * Invert short psw indication, so SIE will report a specification +- * exception if it was not set. +- */ +- cpu->env.psw.mask ^= PSW_MASK_SHORTPSW; +- cpu->env.psw.addr = spsw & PSW_MASK_SHORT_ADDR; ++ uint64_t spsw; + + if (!s390_is_pv()) { -+ cpu->env.psw.addr = ldl_phys(s->as, 4) & PSW_MASK_ESA_ADDR; -+ cpu->env.psw.mask = PSW_MASK_32 | PSW_MASK_64; ++ spsw = ldq_phys(s->as, 0); ++ cpu->env.psw.mask = spsw & PSW_MASK_SHORT_CTRL; ++ /* ++ * Invert short psw indication, so SIE will report a specification ++ * exception if it was not set. ++ */ ++ cpu->env.psw.mask ^= PSW_MASK_SHORTPSW; ++ cpu->env.psw.addr = spsw & PSW_MASK_SHORT_ADDR; + } else { + /* + * Firmware requires us to set the load state before we set ++++++ s390x-protvirt-Support-unpack-facility.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.528262207 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.528262207 +0200 @@ -44,10 +44,10 @@ 14 files changed, 468 insertions(+), 10 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS -index 5e5e3e52d614d05e7d6e8225e3b7..1dbe9345a022a25b7b40a5b5e9c8 100644 +index 8cbc1fac2bfcec86e0e9415ab244..831d4b014aea8c3ce17050cea880 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -385,6 +385,8 @@ F: target/s390x/machine.c +@@ -396,6 +396,8 @@ F: target/s390x/machine.c F: target/s390x/sigp.c F: target/s390x/cpu_features*.[ch] F: target/s390x/cpu_models.[ch] @@ -69,7 +69,7 @@ obj-y += ap-device.o obj-y += ap-bridge.o diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c -index ca544d64c5e04782fb49d12521d5..c343cfb0bed4272cecf31207dae8 100644 +index 8c3e019571764920857540be62aa..ce21494c08f77a35269b5e4b3ad5 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -1,10 +1,11 @@ @@ -93,7 +93,7 @@ #include "ipl.h" #include "qemu/error-report.h" #include "qemu/config-file.h" -@@ -533,11 +535,30 @@ void s390_ipl_update_diag308(IplParameterBlock *iplb) +@@ -566,12 +568,31 @@ void s390_ipl_update_diag308(IplParameterBlock *iplb) { S390IPLState *ipl = get_ipl_device(); @@ -111,6 +111,7 @@ + ipl->iplb_valid = true; + } ipl->netboot = is_virtio_net_device(iplb); + update_machine_ipl_properties(iplb); } +IplParameterBlock *s390_ipl_get_iplb_pv(void) @@ -126,7 +127,7 @@ IplParameterBlock *s390_ipl_get_iplb(void) { S390IPLState *ipl = get_ipl_device(); -@@ -626,6 +647,38 @@ static void s390_ipl_prepare_qipl(S390CPU *cpu) +@@ -660,6 +681,38 @@ static void s390_ipl_prepare_qipl(S390CPU *cpu) cpu_physical_memory_unmap(addr, len, 1, len); } @@ -444,7 +445,7 @@ + s390_pv_cmd_exit(KVM_PV_VM_UNSHARE_ALL, NULL); +} diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c -index c1d1440272a42eef86eb14724f52..5149030d2216040c396a02d977c8 100644 +index 0fa00a9fff3dbda8b34d29aad187..b4d681da43af43f23f66206cacf6 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1,9 +1,10 @@ @@ -459,7 +460,7 @@ * * This work is licensed under the terms of the GNU GPL, version 2 or (at * your option) any later version. See the COPYING file in the top-level -@@ -41,6 +42,8 @@ +@@ -42,6 +43,8 @@ #include "hw/qdev-properties.h" #include "hw/s390x/tod.h" #include "sysemu/sysemu.h" @@ -468,7 +469,7 @@ S390CPU *s390_cpu_addr2state(uint16_t cpu_addr) { -@@ -318,10 +321,78 @@ static inline void s390_do_cpu_ipl(CPUState *cs, run_on_cpu_data arg) +@@ -317,10 +320,78 @@ static inline void s390_do_cpu_ipl(CPUState *cs, run_on_cpu_data arg) s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu); } @@ -547,7 +548,7 @@ /* get the reset parameters, reset them once done */ s390_ipl_get_reset_request(&cs, &reset_type); -@@ -329,9 +400,15 @@ static void s390_machine_reset(MachineState *machine) +@@ -328,9 +399,15 @@ static void s390_machine_reset(MachineState *machine) /* all CPUs are paused and synchronized at this point */ s390_cmma_reset(); @@ -563,7 +564,7 @@ qemu_devices_reset(); s390_crypto_reset(); -@@ -339,22 +416,56 @@ static void s390_machine_reset(MachineState *machine) +@@ -338,22 +415,56 @@ static void s390_machine_reset(MachineState *machine) run_on_cpu(cs, s390_do_cpu_ipl, RUN_ON_CPU_NULL); break; case S390_RESET_MODIFIED_CLEAR: @@ -697,7 +698,7 @@ } S390CcwMachineState; diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c -index 52fefa1586caa3cbd366fe230630..479f1978c974722ceeb72ac5fb32 100644 +index 427a46e3e1b61da1b7aae1f0e543..bb7a588e3b791fe48b4e0a0826dd 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -37,6 +37,7 @@ @@ -839,7 +840,7 @@ { return 0; diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c -index f633472980b48757989db245fb1f..d8d02ff34f4fc942cb7935deec58 100644 +index 7f7ebab84279290cb0992d41e706..b2b14bde2b251986230153adca9a 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -321,6 +321,11 @@ void kvm_s390_set_max_pagesize(uint64_t pagesize, Error **errp) ++++++ s390x-s390-virtio-ccw-Fix-build-on-syste.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.540262232 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.544262240 +0200 @@ -63,10 +63,10 @@ + env->regs[r1 + 1] = DIAG_308_RC_INVAL_FOR_PV; +} diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c -index 85250bf046ed72313b03c6ff6c54..5df455e065504bc0eef0f1f084dc 100644 +index db45249320abf7920ec8730790c2..501d4a66b346cfe9a987cebe884d 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c -@@ -44,7 +44,6 @@ +@@ -45,7 +45,6 @@ #include "sysemu/sysemu.h" #include "sysemu/balloon.h" #include "hw/s390x/pv.h" @@ -74,7 +74,7 @@ #include "migration/blocker.h" static Error *pv_mig_blocker; -@@ -392,15 +391,6 @@ out_err: +@@ -391,15 +390,6 @@ out_err: return rc; } @@ -90,7 +90,7 @@ static void s390_pv_prepare_reset(S390CcwMachineState *ms) { CPUState *cs; -@@ -486,7 +476,7 @@ static void s390_machine_reset(MachineState *machine) +@@ -485,7 +475,7 @@ static void s390_machine_reset(MachineState *machine) run_on_cpu(cs, s390_do_cpu_reset, RUN_ON_CPU_NULL); if (s390_machine_protect(ms)) { ++++++ supported.arm.txt ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.592262341 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.592262341 +0200 @@ -1,6 +1,6 @@ [qemu-arm package document] -SLES 15 SP2 QEMU/KVM RELATED SUPPORT STATEMENTS +POST SLES 15 SP2 QEMU/KVM RELATED SUPPORT STATEMENTS Overview -------- @@ -202,9 +202,10 @@ and could possibly change syntax in the future. - This previously unsupported command line option is now deprecated: - -bt + -tb-size - These previously unsupported command line options are no longer recognized: + -bt -device at24c-eeprom -device mmio_interface -device ssi-sd @@ -299,7 +300,9 @@ -d ... -daemonize -debugcon ... - -device [VGA|rtl8139|virtio-net-pci|virtio-blk-pci|virtio-balloon-pci| + -device + + [VGA|rtl8139|virtio-net-pci|virtio-blk-pci|virtio-balloon-pci| virtio-9p-pci|usb-hub|usb-ehci|usb-tablet|usb-storage|usb-mouse| usb-kbd|virtserialport|virtconsole|virtio-serial-pci|i82559er| virtio-scsi-pci|scsi-cd|scsi-hd|scsi-generic|scsi-disk|scsi-block| @@ -328,10 +331,14 @@ virtio-blk|virtio-net|virtio-serial|virtio-balloon| virtio-9p| virtio-input-host|virtio-keyboard|virtio-mouse|virtio-tablet| virtio-gpu|virtio-scsi|virtio-rng|e1000-82540em) + -dfilter range, ... -display ... - -drive ... (if specified if=[virtio] and format=[qcow2|raw] and + -drive + + ... (if specified if=[virtio] and format=[qcow2|raw] and snapshot=off only) + -echr ... -enable-fips -enable-kvm @@ -357,8 +364,11 @@ -monitor ... -msg ... -name ... - -net [bridge|l2tpv3|nic|none|tap|user] ... (for model= only e1000, rtl8139, + -net + + [bridge|l2tpv3|nic|none|tap|user] ... (for model= only e1000, rtl8139, and virtio are supported) + -netdev [bridge|tap|user] ... -nic ... -no-acpi @@ -634,12 +644,14 @@ watchdog-set-action - The following command line options are unsupported: + -acpitable ... - -bt ... -chroot ... -cpu ... (all except host) -curses - -device [160s33b|320s33b|640s33b|a15mpcore_priv|a9mpcore_priv|a9-scu|adlib| + -device + + [160s33b|320s33b|640s33b|a15mpcore_priv|a9mpcore_priv|a9-scu|adlib| ads7846|allwinner-a10|allwinner-a10-pic|allwinner-A10-timer| allwinner-emac|amd-iommu|AMDVI-PCI|arm1026-arm-cpu|arm1136-arm-cpu| arm1136-r2-arm-cpu|arm1176-arm-cpu|arm11mpcore-arm-cpu| @@ -703,24 +715,35 @@ strongarm-gpio|strongarm_pic|strongarm-ppc|strongarm-rtc| strongarm-ssp|strongarm-uart|tegra2-ehci-usb|ti925t-arm-cpu|tmp105| tosa_dac|tosa-ssp|tusb6010|twl92230|tz-msc|usb-redir|versatile_i2c| - versatilepb_sic|versatile_pci|versatile_pci_host| - vfio-pci-igd-lpc-bridge|vfio-pci-nohotplug|vfio-platform| - vhost-vsock-device|virtconsole|virtio-crypto-device|vmgenid| - vmware-svga|w25q256|w25q32|w25q32dw|w25q64|w25q80|w25q80bl|w25x10| - w25x16|w25x20|w25x32|w25x40|w25x64|w25x80|wm8750|*-x86_64-cpu| + versatilepb_sic|versatile_pci|versatile_pci_host|vfio-pci-nohotplug| + vfio-platform|vhost-vsock-device|virtconsole|virtio-crypto-device| + vmgenid|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-versal|xlnx.ps7-qspi|xlnx.ps7-spi|xlnxps7-usb| - xlnxzynqmp|xlnxzynq-xadc|armsse-cpuid|armsse-mhu|cpu-cluster| - luminary-watchdog|microbit.i2c|nrf51_soc.gpio|nrf51_soc.nvm| - nrf51_soc.rng|nrf51_soc.timer|platform-ehci-usb|sse-200|vmware-svga| - vmxnet3|ati-vga|cirrus-vga|vhost-user-fs-device|tulip|ati-vga] + xilinxzynq_slcr|xlnx-versal|xlnx.ps7-qspi|xlnx.ps7-spi|xlnxzynqmp| + xlnxzynq-xadc|armsse-cpuid|armsse-mhu|cpu-cluster|luminary-watchdog| + microbit.i2c|nrf51_soc.gpio|nrf51_soc.nvm|nrf51_soc.rng| + nrf51_soc.timer|platform-ehci-usb|sse-200|vmware-svga|vmxnet3|ati-vga| + cirrus-vga|vhost-user-fs-device|tulip|ati-vga|aw-hc-ehci-usb| + virtio-iommu-device|virtio-iommu-pci| + virtio-iommu-pci-non-transitional|virtio-iommu-pci-transitional| + cortex-m7-arm-cpu|allwinner-cpucfg|allwinner-h3|allwinner-h3-ccu| + allwinner-h3-dramc|allwinner-h3-sysctrl|allwinner-rtc-sun4i| + allwinner-rtc-sun6i|allwinner-rtc-sun7i|allwinner-sdhost-sun4i| + allwinner-sdhost-sun5i|allwinner-sid|allwinner-sun8i-emac|imx.rngc| + imx.usbphy|serial|serial-io|stm32f405-soc|stm32f4xx-exti| + stm32f4xx-syscfg|tpm-tis-device] (the following are aliases of these unsupported devices: lsi| piix3-usb-uhci) (note that some of these device names represent supported devices and are used internally, but are not specifyable via -device even though they appear in the list of devices) - -drive ,if=[scsi|mtd|pflash], snapshot=on, format=[anything besides qcow2 or + + -drive + + ,if=[scsi|mtd|pflash], snapshot=on, format=[anything besides qcow2 or raw] + -dtb file -enable-hax -enable-sync-profile @@ -729,25 +752,33 @@ -hda/-hdb/-hdc/-hdd ... -icount ... -L ... - -M [akita|ast2500-evb|ast2600-evb|borzoi|canon-a1100|cheetah|collie|connex| + -M + + [akita|ast2500-evb|ast2600-evb|borzoi|canon-a1100|cheetah|collie|connex| cubieboard|highbank|imx25-pdk|integratorcp|kzm|lm3s6965evb|lm3s811evb| mainstone|mcimx6ul-evk|mcimx7d-sabre|microbit|midway|mps2-an385|mps2-an505| - mps2-an511|mps2-an521|musca-a|musca-b1|musicpal|n800|n810|netduino2|nuri| - palmetto-bmc|raspi2|raspi3|realview-eb|realview-eb-mpcore|realview-pb-a8| - realview-pbx-a9|romulus-bmc|sabrelite|sbsa-ref|smdkc210|spitz|swift-bmc| - sx1|sx1-v1|terrier|tosa|verdex|versatileab|versatilepb|vexpress-a15| - vexpress-a9|virt-2.7|virt-2.8|virt-2.12|virt-3.0|virt-4.0|virt-4.1| - witherspoon-bmc|xilinx-zynq-a9|xlnx-versal-virt|xlnx-zcu102|z2] - -machine [akita|ast2500-evb|ast2600-evb|borzoi|canon-a1100|cheetah|collie| + mps2-an511|mps2-an521|musca-a|musca-b1|musicpal|n800|n810|netduino2| + netduinoplus2|nuri|orangepi-pc|palmetto-bmc|raspi2|raspi3|realview-eb| + realview-eb-mpcore|realview-pb-a8|realview-pbx-a9|romulus-bmc|sabrelite| + sbsa-ref|smdkc210|spitz|swift-bmc|sx1|sx1-v1|tacoma-bmc|terrier|tosa| + verdex|versatileab|versatilepb|vexpress-a15|vexpress-a9|virt-2.7|virt-2.8| + virt-2.12|virt-3.0|virt-4.0|virt-4.1|virt-5.0|witherspoon-bmc| + xilinx-zynq-a9|xlnx-versal-virt|xlnx-zcu102|z2] + + -machine + + [akita|ast2500-evb|ast2600-evb|borzoi|canon-a1100|cheetah|collie| connex|cubieboard|highbank|imx25-pdk|integratorcp|kzm|lm3s6965evb| lm3s811evb|mainstone|mcimx6ul-evk|mcimx7d-sabre|microbit|midway| mps2-an385|mps2-an521|mps2-an505|mps2-an511|musca-a|musca-b1| - musicpal|n800|n810|netduino2|nuri|palmetto-bmc|raspi2|raspi3| - realview-eb|realview-eb-mpcore|realview-pb-a8|realview-pbx-a9| - romulus-bmc|sabrelite|sbsa-ref|smdkc210|spitz|swift-bmc|sx1|sx1-v1| - terrier|tosa|verdex|versatileab|versatilepb|vexpress-a15|vexpress-a9| - virt-2.7|virt-2.8|virt-2.12|virt-3.0|virt-4.0|virt-4.1| - witherspoon-bmc|xilinx-zynq-a9|xlnx-versal-virt|xlnx-zcu102|z2] + musicpal|n800|n810|netduino2|netduinoplus2|nuri|orangepi-pc| + palmetto-bmc|raspi2|raspi3|realview-eb|realview-eb-mpcore| + realview-pb-a8|realview-pbx-a9|romulus-bmc|sabrelite|sbsa-ref| + smdkc210|spitz|swift-bmc|sx1|sx1-v1|tacoma-bmc|terrier|tosa|verdex| + versatileab|versatilepb|vexpress-a15|vexpress-a9|virt-2.7|virt-2.8| + virt-2.12|virt-3.0|virt-4.0|virt-4.1|virt-5.0|witherspoon-bmc| + xilinx-zynq-a9|xlnx-versal-virt|xlnx-zcu102|z2] + -mtdblock file -net [dump|socket|vde] ... -netdev [dump|hubport|l2tpv3|socket|vde] ... ++++++ supported.ppc.txt ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.620262400 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.620262400 +0200 @@ -1,5 +1,5 @@ [qemu-ppc package document] -SLES 15 SP2 QEMU/KVM RELATED SUPPORT STATEMENTS +POST SLES 15 SP2 QEMU/KVM RELATED SUPPORT STATEMENTS QEMU/KVM on ppc is not supported. ++++++ supported.s390.txt ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.656262475 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.660262484 +0200 @@ -1,6 +1,6 @@ [qemu-s390 package document] -SLES 15 SP2 QEMU/KVM RELATED SUPPORT STATEMENTS +POST SLES 15 SP2 QEMU/KVM RELATED SUPPORT STATEMENTS Overview -------- @@ -197,6 +197,7 @@ -bt -device ide-drive (use ide-hd or ide-cd) -device scsi-disk (use scsi-hd or scsi-cd) + -tb-size - These previously unsupported command line options are no longer recognized: -device mmio_interface @@ -292,7 +293,9 @@ -d ... -daemonize -debugcon ... - -device [virtio-net-pci|virtio-blk-pci|virtio-balloon-pci|virtserialport| + -device + + [virtio-net-pci|virtio-blk-pci|virtio-balloon-pci|virtserialport| virtconsole|virtio-serial-pci|virtio-scsi-pci|scsi-cd|scsi-hd| scsi-generic|scsi-disk|scsi-block|virtio-rng-pci|pci-bridge| megasas-gen2|e1000e|e1000|zpci|virtio-gpu-ccw|virtio-keyboard-ccw| @@ -319,10 +322,14 @@ virtio-input-host|virtio-keyboard|virtio-mouse|virtio-tablet| virtio-gpu|virtio-9p|virtio-net|virtio-serial|virtio-balloon| virtio-scsi|virtio-rng) + -dfilter range, ... -display ... - -drive ... (if specified if=[virtio] and format=[qcow2|raw] and + -drive + + ... (if specified if=[virtio] and format=[qcow2|raw] and snapshot=off only) + -echr ... -enable-fips -enable-kvm @@ -340,18 +347,27 @@ -kernel ... -loadvm ... -m ... - -M [help|?|none|s390-ccw-virtio|s390-ccw-virtio-2.6|s390-ccw-virtio-2.9| + -M + + [help|?|none|s390-ccw-virtio|s390-ccw-virtio-2.6|s390-ccw-virtio-2.9| s390-ccw-virtio-2.11|s390-ccw-virtio-3.1|s390-ccw-virtio-4.2] - -machine [help|?|none|s390-ccw-virtio|s390-ccw-virtio-2.6|s390-ccw-virtio-2.9| + + -machine + + [help|?|none|s390-ccw-virtio|s390-ccw-virtio-2.6|s390-ccw-virtio-2.9| s390-ccw-virtio-2.11|s390-ccw-virtio-3.1|s390-ccw-virtio-4.2] + -mem-path ... -mem-prealloc -mon ... -monitor ... -msg ... -name ... - -net [bridge|l2tpv3|nic|none|tap|user] ... (for model= only e1000, rtl8139, + -net + + [bridge|l2tpv3|nic|none|tap|user] ... (for model= only e1000, rtl8139, and virtio are supported) + -netdev [bridge|tap|user] ... -nic ... -nodefaults @@ -618,12 +634,14 @@ watchdog-set-action - The following command line options are unsupported: + -acpitable ... - -bt ... -chroot ... -cpu ... (all except host) -curses - -device [AC97|adlib|am53c974|amd-iommu|AMDVI-PCI|ccid-card-emulated| + -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| @@ -642,40 +660,45 @@ s390-sclp-event-facility|s390-skeys-qemu|sb16|sclp|sclpconsole| sclp-cpu-hotplug|sclplmconsole|sclp-memory-hotplug-dev|sclpquiesce| sd-card|sdhci-pci|secondary-vga|sga|smbus-eeprom|tpci200|usb-audio| - usb-bot|usb-bt-dongle|usb-ccid|usb-mtp|usb-uas|vfio-ap| - vfio-pci-nohotplug|virtio-9p-device|virtual-css-bridge|vmcoreinfo| - vmgenid|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-s390x-cpu| - z10BC.2-s390x-cpu|z10BC-base-s390x-cpu|z10BC-s390x-cpu| - z10EC.2-base-s390x-cpu|z10EC.2-s390x-cpu|z10EC.3-base-s390x-cpu| - z10EC.3-s390x-cpu|z10EC-base-s390x-cpu|z10EC-s390x-cpu| - z114-base-s390x-cpu|z114-s390x-cpu|z13.2-base-s390x-cpu| - z13.2-s390x-cpu|z13-base-s390x-cpu|z13-s390x-cpu|z13s-base-s390x-cpu| - z13s-s390x-cpu|z196.2-base-s390x-cpu|z196.2-s390x-cpu| - z196-base-s390x-cpu|z196-s390x-cpu|z800-base-s390x-cpu|z800-s390x-cpu| - z890.2-base-s390x-cpu|z890.2-s390x-cpu|z890.3-base-s390x-cpu| - z890.3-s390x-cpu|z890-base-s390x-cpu|z890-s390x-cpu| - z900.2-base-s390x-cpu|z900.2-s390x-cpu|z900.3-base-s390x-cpu| - z900.3-s390x-cpu|z900-base-s390x-cpu|z900-s390x-cpu| - z990.2-base-s390x-cpu|z990.2-s390x-cpu|z990.3-base-s390x-cpu| - z990.3-s390x-cpu|z990.4-base-s390x-cpu|z990.4-s390x-cpu| - z990.5-base-s390x-cpu|z990.5-s390x-cpu|z990-base-s390x-cpu| - z990-s390x-cpu|z9BC.2-base-s390x-cpu|z9BC.2-s390x-cpu| - z9BC-base-s390x-cpu|z9BC-s390x-cpu|z9EC.2-base-s390x-cpu| - z9EC.2-s390x-cpu|z9EC.3-base-s390x-cpu|z9EC.3-s390x-cpu| - z9EC-base-s390x-cpu|z9EC-s390x-cpu|z14ZR1-base-s390x-cpu| - z14ZR1-s390x-cpu|zBC12-base-s390x-cpu|zBC12-s390x-cpu| - zEC12.2-base-s390x-cpu|zEC12.2-s390x-cpu|zEC12-base-s390x-cpu| - zEC12-s390x-cpu|cpu-cluster|z14.2-base-s390x-cpu|z14.2-s390x-cpu| - vhost-user-fs-device] + usb-bot|usb-ccid|usb-mtp|usb-uas|vfio-ap|vfio-pci-nohotplug| + virtio-9p-device|virtual-css-bridge|vmcoreinfo|vmgenid|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-s390x-cpu|z10BC.2-s390x-cpu|z10BC-base-s390x-cpu| + z10BC-s390x-cpu|z10EC.2-base-s390x-cpu|z10EC.2-s390x-cpu| + z10EC.3-base-s390x-cpu|z10EC.3-s390x-cpu|z10EC-base-s390x-cpu| + z10EC-s390x-cpu|z114-base-s390x-cpu|z114-s390x-cpu| + z13.2-base-s390x-cpu|z13.2-s390x-cpu|z13-base-s390x-cpu|z13-s390x-cpu| + z13s-base-s390x-cpu|z13s-s390x-cpu|z196.2-base-s390x-cpu| + z196.2-s390x-cpu|z196-base-s390x-cpu|z196-s390x-cpu| + z800-base-s390x-cpu|z800-s390x-cpu|z890.2-base-s390x-cpu| + z890.2-s390x-cpu|z890.3-base-s390x-cpu|z890.3-s390x-cpu| + z890-base-s390x-cpu|z890-s390x-cpu|z900.2-base-s390x-cpu| + z900.2-s390x-cpu|z900.3-base-s390x-cpu|z900.3-s390x-cpu| + z900-base-s390x-cpu|z900-s390x-cpu|z990.2-base-s390x-cpu| + z990.2-s390x-cpu|z990.3-base-s390x-cpu|z990.3-s390x-cpu| + z990.4-base-s390x-cpu|z990.4-s390x-cpu|z990.5-base-s390x-cpu| + z990.5-s390x-cpu|z990-base-s390x-cpu|z990-s390x-cpu| + z9BC.2-base-s390x-cpu|z9BC.2-s390x-cpu|z9BC-base-s390x-cpu| + z9BC-s390x-cpu|z9EC.2-base-s390x-cpu|z9EC.2-s390x-cpu| + z9EC.3-base-s390x-cpu|z9EC.3-s390x-cpu|z9EC-base-s390x-cpu| + z9EC-s390x-cpu|z14ZR1-base-s390x-cpu|z14ZR1-s390x-cpu| + zBC12-base-s390x-cpu|zBC12-s390x-cpu|zEC12.2-base-s390x-cpu| + zEC12.2-s390x-cpu|zEC12-base-s390x-cpu|zEC12-s390x-cpu|cpu-cluster| + z14.2-base-s390x-cpu|z14.2-s390x-cpu|vhost-user-fs-device| + virtio-iommu-device|virtio-iommu-pci| + virtio-iommu-pci-non-transitional|virtio-iommu-pci-transitional] (the following are aliases of these unsupported devices: lsi| ahci|e1000-82540em|vfio-ccw) (note that some of these device names represent supported devices and are used internally, but are not specifyable via -device even though they appear in the list of devices) - -drive ,if=[scsi|mtd|pflash], snapshot=on, format=[anything besides qcow2 or + + -drive + + ,if=[scsi|mtd|pflash], snapshot=on, format=[anything besides qcow2 or raw] + -dtb file -enable-hax -enable-sync-profile @@ -684,12 +707,20 @@ -hda/-hdb/-hdc/-hdd ... -icount ... -L ... - -M [s390-ccw-virtio-2.4|s390-ccw-virtio-2.5|s390-ccw-virtio-2.7| + -M + + [s390-ccw-virtio-2.4|s390-ccw-virtio-2.5|s390-ccw-virtio-2.7| s390-ccw-virtio-2.8|s390-ccw-virtio-2.10|s390-ccw-virtio-2.12| - s390-ccw-virtio-3.0|s390-ccw-virtio-4.0|s390-ccw-virtio-4.1] - -machine [s390-ccw-virtio-2.4|s390-ccw-virtio-2.5|s390-ccw-virtio-2.7| + s390-ccw-virtio-3.0|s390-ccw-virtio-4.0|s390-ccw-virtio-4.1| + s390-ccw-virtio-5.0] + + -machine + + [s390-ccw-virtio-2.4|s390-ccw-virtio-2.5|s390-ccw-virtio-2.7| s390-ccw-virtio-2.8|s390-ccw-virtio-2.10|s390-ccw-virtio-2.12| - s390-ccw-virtio-3.0|s390-ccw-virtio-4.0|s390-ccw-virtio-4.1] + s390-ccw-virtio-3.0|s390-ccw-virtio-4.0|s390-ccw-virtio-4.1| + s390-ccw-virtio-5.0] + -mtdblock file -net [dump|socket|vde] ... -netdev [dump|hubport|l2tpv3|socket|vde] ... ++++++ supported.x86.txt ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.692262550 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.696262559 +0200 @@ -1,6 +1,6 @@ [qemu-x86 package document] -SLES 15 SP2 QEMU/KVM RELATED SUPPORT STATEMENTS +POST SLES 15 SP2 QEMU/KVM RELATED SUPPORT STATEMENTS Overview -------- @@ -205,9 +205,6 @@ threads) the derived guest ABI is not guaranteed to be equivalent in future versions. -- The previously supported machine types pc-0.12, pc-0.14 and pc-0.15 are now - deprecated. - - These previously supported command line options are now considered deprecated: -device ide-drive (use ide-hd or ide-cd instead) -device scsi-disk (use scsi-hd or scsi-cd instead) @@ -218,6 +215,9 @@ - These previously supported command line options are no longer supported: <previously mentioned items have been moved to another category> +- The previously supported machine types pc-0.12, pc-0.14 and pc-0.15 are no + longer recognized. Switch to a newer machine type. + - These previously supported command line options are no longer recognized: -balloon (use -device virtio-balloon instead) -clock @@ -240,17 +240,15 @@ and could possibly change syntax in the future. - These previously unsupported command line options are now deprecated: - -bt -no-kvm-pit + -tb-size -- The previously unsupported machine types pc-0.13 and pc-0.14 are now - deprecated. - - The case of specified sockets, cores, and threads not matching the vcpu count is no longer silently ignored. QEMU now requires that the topology match the vcpu count. - These previously unsupported command line options are no longer recognized: + -bt -device at24c-eeprom -device ccid-card-passthru -device cfi.pflash01 @@ -287,8 +285,11 @@ -tdf (note: mistakenly listed previously as supported) -xen-create -- The previously unsupported machine types pc-0.10 and pc-0.11 are no longer - recognized. +- The previously unsupported machine types pc-1.0, pc-1.1, pc-1.2 and pc-1.3 are + now deprecated. + +- The previously unsupported machine types pc-0.10, pc-0.13, pc-0.14 and + pc-0.11 are no longer recognized. - These previously supported QMP commands are now deprecated: change (use blockdev-change-medium or change-vnc-password instead) @@ -390,7 +391,9 @@ -d ... -daemonize -debugcon ... - -device [isa-serial|isa-parallel|isa-fdc|ide-drive|ide-hd|ide-cd|VGA| + -device + + [isa-serial|isa-parallel|isa-fdc|ide-drive|ide-hd|ide-cd|VGA| cirrus-vga|rtl8139|usb-hub|usb-ehci|usb-tablet|usb-storage|usb-mouse| usb-kbd|virtserialport|virtconsole|sga|i82559er|scsi-cd|scsi-hd| scsi-generic|scsi-disk|scsi-block|pci-serial|pci-serial-2x| @@ -427,10 +430,14 @@ e1000|virtio-blk|virtio-net|virtio-serial|virtio-balloon|virtio-9p| virtio-scsi|virtio-rng|virtio-input-host|virtio-keyboard|virtio-mouse| virtio-tablet|virtio-gpu) + -dfilter range, ... -display ... - -drive ... (if specified if=[floppy|ide|virtio] and format=[qcow2|raw] and + -drive + + ... (if specified if=[floppy|ide|virtio] and format=[qcow2|raw] and snapshot=off only) + -echr ... -enable-fips -enable-kvm @@ -450,22 +457,30 @@ -kernel ... -loadvm ... -m ... - -M [help|?|none|pc|pc-0.12|pc-0.14|pc-0.15|pc-i440fx-1.4|pc-i440fx-1.7| - pc-i440fx-2.0|pc-i440fx-2.3|pc-i440fx-2.6|pc-i440fx-2.9|pc-i440fx-2.11| - pc-i440fx-3.1|pc-i440fx-4.2|q35|pc-q35-2.6|pc-q35-2.9|pc-q35-2.11| - pc-q35-3.1|pc-q35-4.2|xenfv|xenpv] - -machine [help|?|none|pc|pc-0.12|pc-0.14|pc-0.15|pc-i440fx-1.4|pc-i440fx-1.7| - pc-i440fx-2.0|pc-i440fx-2.3|pc-440fx-2.6|pc-i440fx-2.9| - pc-i440fx-2.11|pc-i440fx-3.1|pc-i440fx-4.2|q35|pc-q35-2.6|pc-q35-2.9| - pc-q35-2.11|pc-q35-3.1|pc-q35-4.2|xenfv|xenpv] + -M + + [help|?|none|pc|pc-i440fx-1.4|pc-i440fx-1.7|pc-i440fx-2.0|pc-i440fx-2.3| + pc-i440fx-2.6|pc-i440fx-2.9|pc-i440fx-2.11|pc-i440fx-3.1|pc-i440fx-4.2|q35| + pc-q35-2.6|pc-q35-2.9|pc-q35-2.11|pc-q35-3.1|pc-q35-4.2|xenfv|xenfv-4.2] + + -machine + + [help|?|none|pc|pc-i440fx-1.4|pc-i440fx-1.7|pc-i440fx-2.0| + pc-i440fx-2.3|pc-440fx-2.6|pc-i440fx-2.9|pc-i440fx-2.11| + pc-i440fx-3.1|pc-i440fx-4.2|q35|pc-q35-2.6|pc-q35-2.9|pc-q35-2.11| + pc-q35-3.1|pc-q35-4.2|xenfv|xenifv-4.2] + -mem-path ... -mem-prealloc -mon ... -monitor ... -msg ... -name ... - -net [bridge|l2tpv3|nic|none|tap|user] ... (for model= only e1000, rtl8139, + -net + + [bridge|l2tpv3|nic|none|tap|user] ... (for model= only e1000, rtl8139, and virtio are supported) + -netdev [bridge|tap|user] ... -nic ... -no-acpi @@ -754,20 +769,22 @@ xen-set-global-dirty-log - The following command line options are unsupported: + -acpitable ... - -bt ... -chroot ... -cpu host -curses - -device [ipoctal232|i82562|nec-usb-xhci|hda-duplex|hda-output|usb-bot| + -device + + [ipoctal232|i82562|nec-usb-xhci|hda-duplex|hda-output|usb-bot| lsi53c810a|isa-debug-exit|ne2k_pci|usb-uas|ioh3420|isa-ide|usb-ccid| pcnet|ich9-intel-hda|dc390|hda-micro|x3130-upstream|isa-cirrus-vga| pc-testdev|ne2k_isa|isa-vga|cs4231a|gus|vmware-svga|i82801b11-bridge| i82557a|i82557c|i82557b|i82801|AC97|am53c974|intel-hda|i82558a| i82558b|usb-audio|i82550|isa-debugcon|sb16|megasas|i82551| xio3130-downstream|vt82c686b-usb-uhci|tpci200|i82559a|i82559b|i82559c| - isa-applesmc|usb-bt-dongle|adlib|ES1370|lsi53c810|nvme|pci-testdev| - pvscsi|virtio-9p-device|virtio-balloon-device|virtio-blk-device| + isa-applesmc|adlib|ES1370|lsi53c810|nvme|pci-testdev|pvscsi| + virtio-9p-device|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| @@ -783,33 +800,46 @@ mioe3680_pci|pcm3680_pci|hyperv-synic|vfio-pci-nohotplug| vfio-platform|xen-bridge|xen-cdrom|xen-disk|ati-vga|cpu-cluster| intel-iommu|vhost-user-fs-device|tulip|ati-vga|i2c-ddc|pci-ipmi-bt| - pci-ipmi-kcs] + pci-ipmi-kcs|serial|serial-io|serial-mm|virtio-iommu-device| + virtio-iommu-pci|virtio-iommu-pci-nontransitional| + virtio-iommu-pci-transitional|xen-sysdev|imx.usbphy] (the following are aliases of these unsupported devices: lsi) (note that some of these device names represent supported devices and are used internally, but are not specifyable via -device even though they appear in the list of devices) - -drive ,if=[scsi|mtd|pflash], snapshot=on, format=[anything besides qcow2 or + + -drive + + ,if=[scsi|mtd|pflash], snapshot=on, format=[anything besides qcow2 or raw] + -dtb file -enable-hax -enable-sync-profile -g ... -icount ... -L ... - -M [isapc|microvm|pc-0.13|pc-1.0|pc-1.1|pc-1.2|pc-1.3|pc-i440fx-1.5| - pc-i440fx-1.6|pc-i440fx-2.1|pc-i440fx-2.2|pc-i440fx-2.4|pc-i440fx-2.5| - pc-i440fx-2.7|pc-i440fx-2.8|pc-i440fx-2.10|pc-i440fx-2.12|pc-i440fx-3.0| - pc-i440fx-4.0|pc-i440fx-4.1|pc-q35-1.4|pc-q35-1.5|pc-q35-1.6|pc-q35-1.7| + -M + + [isapc|microvm|pc-1.0|pc-1.1|pc-1.2|pc-1.3|pc-i440fx-1.5|pc-i440fx-1.6| + pc-i440fx-2.1|pc-i440fx-2.2|pc-i440fx-2.4|pc-i440fx-2.5|pc-i440fx-2.7| + pc-i440fx-2.8|pc-i440fx-2.10|pc-i440fx-2.12|pc-i440fx-3.0|pc-i440fx-4.0| + pc-i440fx-4.1|pc-i440fx-5.0|pc-q35-1.4|pc-q35-1.5|pc-q35-1.6|pc-q35-1.7| pc-q35-2.0|pc-q35-2.1|pc-q35-2.2|pc-q35-2.3|pc-q35-2.4|pc-q35-2.5| pc-q35-2.7|pc-q35-2.8|pc-q35-2.10|pc-q35-2.12|pc-q35-3.0|pc-q35-4.0| - pc-q35-4.1] - -machine [isapc|microvm|pc-0.13|pc-1.0|pc-1.1|pc-1.2|pc-1.3|pc-i440fx-1.5| + pc-q35-4.1|pc-q35-5.0] + + -machine + + [isapc|microvm|pc-1.0|pc-1.1|pc-1.2|pc-1.3|pc-i440fx-1.5| pc-i440fx-1.6|pc-i440fx-2.1|pc-i440fx-2.2|pc-i440fx-2.4| pc-i440fx-2.5|pc-i440fx-2.7|pc-i440fx-2.8|pc-i440fx-2.10| - pc-i440fx-2.12|pc-i440fx-3.0|pc-i440fx-4.0|pc-i440fx-4.1|pc-q35-1.4| - pc-q35-1.5|pc-q35-1.6|pc-q35-1.7|pc-q35-2.0|pc-q35-2.1|pc-q35-2.2| - pc-q35-2.3|pc-q35-2.4|pc-q35-2.5|pc-q35-2.7|pc-q35-2.8|pc-q35-2.10| - pc-q35-2.12|pc-q35-3.0|pc-q35-4.0|pc-q35-4.1] + pc-i440fx-2.12|pc-i440fx-3.0|pc-i440fx-4.0|pc-i440fx-4.1| + pc-i440fx-5.0|pc-q35-1.4|pc-q35-1.5|pc-q35-1.6|pc-q35-1.7| + pc-q35-2.0|pc-q35-2.1|pc-q35-2.2|pc-q35-2.3|pc-q35-2.4|pc-q35-2.5| + pc-q35-2.7|pc-q35-2.8|pc-q35-2.10|pc-q35-2.12|pc-q35-3.0| + pc-q35-4.0|pc-q35-4.1|pc-q35-5.0] + -mtdblock file -net [dump|socket|vde] ... -netdev [dump|hubport|l2tpv3|socket|vde] ... ++++++ tests-Disable-some-block-tests-for-now.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.712262592 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.712262592 +0200 @@ -22,7 +22,7 @@ 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group -index 1c1b69f0581c9a0043376b440600..d293735679e23235092c614e2206 100644 +index 435dccd5af90754a3f80f4455bdb..8409dad73f2cbd7447235ea10b03 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -86,7 +86,7 @@ @@ -36,7 +36,7 @@ 068 rw quick @@ -150,7 +150,7 @@ 126 rw auto backing - 127 rw backing quick + 127 rw auto backing quick 128 rw quick -129 rw quick +#DISABLE FOR NOW 129 rw quick @@ -60,7 +60,7 @@ @@ -198,7 +198,7 @@ 178 img 179 rw auto quick - 181 rw migration + 181 rw auto migration -182 rw quick +#DISABLE FOR NOW 182 rw quick 183 rw migration @@ -68,7 +68,7 @@ 185 rw @@ -220,7 +220,7 @@ 202 rw quick - 203 rw migration + 203 rw auto migration 204 rw quick -205 rw quick +#DISABLE FOR NOW 205 rw quick ++++++ tests-Fix-block-tests-to-be-compatible-w.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.724262618 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.724262618 +0200 @@ -60,10 +60,10 @@ file format: IMGFMT virtual size: 64 MiB (67108864 bytes) diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153 -index c969a1a16ff8382b9bb69252f6de..39d6da725bff3932a7cb88acff8e 100755 +index 2b1311176801e30485cf39ec65d8..608a377af5f3662dc25ddcebb01e 100755 --- a/tests/qemu-iotests/153 +++ b/tests/qemu-iotests/153 -@@ -206,7 +206,8 @@ _send_qemu_cmd $QEMU_HANDLE \ +@@ -202,7 +202,8 @@ _send_qemu_cmd $QEMU_HANDLE \ 'return' _run_cmd $QEMU_IMG commit -b "${TEST_IMG}.b" "${TEST_IMG}.c" @@ -73,7 +73,7 @@ _launch_qemu -@@ -258,7 +259,8 @@ _send_qemu_cmd $QEMU_HANDLE \ +@@ -254,7 +255,8 @@ _send_qemu_cmd $QEMU_HANDLE \ _run_cmd $QEMU_IO "${TEST_IMG}" -c 'write 0 512' ++++++ update_git.sh ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.748262668 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.752262676 +0200 @@ -1,8 +1,4 @@ #!/bin/bash -#POKEALL used to document where ALL repos are POKED -#POKEALL? question what repos are actually poked here -#TEMP_CHECK - try to eliminate -# !! FIX AFTER RUN - LEAVING REPO NOT IN GOOD STATE # update_git.sh: script to manage package maintenance using a git-based # workflow. Commands are as follows: @@ -123,25 +119,23 @@ # Now go through all the submodule local repos that are present and create a bundle file for the patches found there for (( i=0; i <$REPO_COUNT; i++ )); do -#POKEALL (conditional on whether it IS there) if [[ -e $(readlink -f ${LOCAL_REPO_MAP[$i]}) ]]; then SUBDIR=${PATCH_PATH_MAP[$i]} GITREPO_COMMIT_ISH=($BUNDLE_DIR/$SUBDIR*.id) if [[ $GITREPO_COMMIT_ISH =~ .*(.{40})[.]id ]]; then GITREPO_COMMIT_ISH=${BASH_REMATCH[1]} echo "Using $GITREPO_COMMIT_ISH" + PATCH_RANGE_INDEX=$i mkdir -p $GIT_DIR/$SUBDIR git -C $GIT_DIR/$SUBDIR init -#POKEALL git -C $GIT_DIR/$SUBDIR remote add origin file://$(readlink -f \ - ${LOCAL_REPO_MAP[$i]}) + ${LOCAL_REPO_MAP[$PATCH_RANGE_INDEX]}) if [[ $(git -C $GIT_DIR/$SUBDIR ls-remote --heads origin $GIT_BRANCH) ]]; then git -C $GIT_DIR/$SUBDIR fetch origin $GIT_BRANCH if [[ $(git -C $GIT_DIR/$SUBDIR rev-list $GITREPO_COMMIT_ISH..FETCH_HEAD) ]]; then git -C $GIT_DIR/$SUBDIR bundle create $BUNDLE_DIR/$SUBDIR$GITREPO_COMMIT_ISH.bundle $GITREPO_COMMIT_ISH..FETCH_HEAD #TODO: post-process repo info to avoid un-needed diffs (eg git vs https) -#POKEALL - git -C $(readlink -f ${LOCAL_REPO_MAP[$i]}) remote get-url origin >$BUNDLE_DIR/$SUBDIR/repo + git -C $(readlink -f ${LOCAL_REPO_MAP[$PATCH_RANGE_INDEX]}) remote get-url origin >$BUNDLE_DIR/$SUBDIR/repo fi fi fi @@ -177,12 +171,12 @@ fi for (( i=0; i <$REPO_COUNT; i++ )); do if [[ "$SUBDIR" = "${PATCH_PATH_MAP[$i]}" ]]; then + PATCH_RANGE_INDEX=$i break fi done -#POKEALL ? - LOCAL_REPO=$(readlink -f ${LOCAL_REPO_MAP[$i]}) + LOCAL_REPO=$(readlink -f ${LOCAL_REPO_MAP[$PATCH_RANGE_INDEX]}) if [ -e $LOCAL_REPO ]; then git -C $LOCAL_REPO remote remove bundlerepo || true # git won't let you delete a branch we're on - so get onto master temporarily (TODO: is there a better approach?) @@ -280,7 +274,6 @@ tar xJf bundles.tar.xz -C $BUNDLE_DIR # Now go through all the submodule local repos that are present and create a bundle file for the patches found there for (( i=0; i <$REPO_COUNT; i++ )); do -#POKEALL if [[ -e $(readlink -f ${LOCAL_REPO_MAP[$i]}) ]]; then if $(git -C ${LOCAL_REPO_MAP[$i]} branch | grep -F "frombundle" >/dev/null); then SUBDIR=${PATCH_PATH_MAP[$i]} @@ -332,19 +325,15 @@ fi for (( i=0; i <$REPO_COUNT; i++ )); do if [[ "$SUBDIR" = "${PATCH_PATH_MAP[$i]}" ]]; then + PATCH_RANGE_INDEX=$i break fi done - if [[ $i = $REPO_COUNT ]]; then - echo "Error matching bundle dir to project submodule path" - exit - fi mkdir -p $GIT_DIR/$SUBDIR git -C $GIT_DIR/$SUBDIR init -#POKEALL? git -C $GIT_DIR/$SUBDIR remote add origin file://$(readlink -f \ - ${LOCAL_REPO_MAP[$i]}) + ${LOCAL_REPO_MAP[$PATCH_RANGE_INDEX]}) git -C $GIT_DIR/$SUBDIR fetch origin $GIT_BRANCH git -C $GIT_DIR/$SUBDIR reset --hard $GITREPO_COMMIT_ISH git -C $GIT_DIR/$SUBDIR remote add bundle $BUNDLE_DIR/$entry @@ -352,7 +341,7 @@ git -C $GIT_DIR/$SUBDIR format-patch -N --suffix= --no-renames -o $CMP_DIR -k --stat=72 \ --indent-heuristic --zero-commit --no-signature --full-index \ --src-prefix=a/$SUBDIR --dst-prefix=b/$SUBDIR \ - --start-number=$(expr $i \* $PATCH_RANGE) \ + --start-number=$(expr $PATCH_RANGE_INDEX \* $PATCH_RANGE) \ $GITREPO_COMMIT_ISH..FETCH_HEAD > /dev/null done @@ -627,23 +616,35 @@ #============================================================================== -#?? Should we be LATEST or not specific here? if [[ ! -e $(readlink -f ${LOCAL_REPO_MAP[0]}) ]]; then - echo "ERROR: Main local QEMU related git repo not found. Please follow these setup instructions:" + echo "ERROR: Local QEMU related git repos not found. Please follow these setup instructions:" explain_setup exit fi +# There are some req's on needing a recent git, and a recent osc (double chk the osc part - I guess it's related to the osc service ) +# get the current state of the git superproject +# TODO: This sends output to stdout which we don't want to see +git -C ${LOCAL_REPO_MAP[0]} status --untracked-files=no --branch --porcelain=2 \ + | awk '{print "var"NR"="$3}' +# $var1 is the current commit +# $var2 is the current branch or 'detached', if not on a branch +# $var3 is the current upstream branch (if set), as in eg 'origin/opensuse-5.0' +# $var4 is not of use to us + +# TODO: What checks should be different between LATEST and non-LATEST? +# If we don't actually patch from the submodule repo, we shouldn't care about what's in the local one +# Does non-LATEST really require master? echo "WARNING: Script using local git repos. Some operations may be time consuming..." #TODO: Most of these checks are not necessary for (( i=0; i <$REPO_COUNT; i++ )); do -#POKEALL if [[ -e $(readlink -f ${LOCAL_REPO_MAP[$i]}) ]]; then if [[ -d ${LOCAL_REPO_MAP[$i]}/.git/rebase-merge || \ -d ${LOCAL_REPO_MAP[$i]}/.git/rebase-apply ]]; then echo "ERROR! Rebase appears to be in progress in ${LOCAL_REPO_MAP[$i]}. Please resolve" exit fi +# !! Does this presume the branch as indicated in config is the current branch? (I believe that's been my modus operandi to date, so perhaps THAT should be enforced at this point?) if ! git -C ${LOCAL_REPO_MAP[$i]} submodule update --init --recursive &> /dev/null; then echo "Please clean up state of local repo ${LOCAL_REPO_MAP[$i]} before using script" echo "(ensure git submodule update --init --recursive is successful)" @@ -684,7 +685,6 @@ fi fi fi -#POKEALL for (( i=0; i <$REPO_COUNT; i++ )); do if [[ -e $(readlink -f ${LOCAL_REPO_MAP[$i]}) ]]; then git -C ${LOCAL_REPO_MAP[$i]} remote update upstream &> /dev/null @@ -717,7 +717,7 @@ WRITE_LOG=0 echo "Processing LATEST upstream changes" echo "(If SUCCESS is not printed upon completion, see /tmp/latest.log for issues)" - TEMP_CHECK # DOING LATEST + TEMP_CHECK if [[ $QEMU_TARBALL =~ $BASE_RE$EXTRA_RE$SUFFIX_RE ]]; then OLD_COMMIT_ISH=${BASH_REMATCH[3]} else @@ -771,7 +771,7 @@ SOURCE_VERSION=$OLD_SOURCE_VERSION_AND_EXTRA QEMU_VERSION=$(tar JxfO qemu-$SOURCE_VERSION$VERSION_EXTRA.tar.xz qemu-$SOURCE_VERSION/VERSION) if [ ! "$QEMU_VERSION" = "$OLD_SOURCE_VERSION_AND_EXTRA" ]; then - echo "Tarball name (which we decode) doesn't correspond to the VERSION file contained therein" + echo "Tarball name (which we decode) doesn't correspond to the VERSION file contained therein" exit fi MAJOR_VERSION=$(echo $QEMU_VERSION|awk -F. '{print $1}') @@ -788,7 +788,7 @@ git2pkg ) echo "Updating the package using the $GIT_BRANCH branch of the local repos." echo "(If SUCCESS is not printed upon completion, see /tmp/git2pkg.log for issues)" - TEMP_CHECK #NOT LATEST + TEMP_CHECK initbundle &> /tmp/git2pkg.log bundle2spec &>> /tmp/git2pkg.log echo "SUCCESS" @@ -797,7 +797,7 @@ pkg2git ) echo "Exporting the package's git bundles to the local repo's frombundle branches..." echo "(If SUCCESS is not printed upon completion, see /tmp/pkg2git.log for issues)" - TEMP_CHECK #NOT LATEST + TEMP_CHECK bundle2local &> /tmp/pkg2git.log echo "SUCCESS" echo "To modify package patches, use the frombundle branch as the basis for updating" @@ -808,7 +808,7 @@ echo "Updating the spec file and patches from the spec file template and the bundle" echo "of bundles (bundles.tar.xz)" echo "(If SUCCESS is not printed upon completion, see /tmp/refresh.log for issues)" - TEMP_CHECK #NOT LATEST + TEMP_CHECK bundle2spec &> /tmp/refresh.log echo "SUCCESS" tail -9 /tmp/refresh.log ++++++ xen-add-block-resize-support-for-xen-dis.patch ++++++ --- /var/tmp/diff_new_pack.vyryzL/_old 2020-05-02 22:15:09.764262702 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.764262702 +0200 @@ -15,10 +15,10 @@ 1 file changed, 3 insertions(+) diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c -index 0007ee64c75f38a2a3256f0b9462..86de57f9c6f7405bc26303065d2c 100644 +index 57d0e2804860e6776b509c5b6d6e..f9a22ec8d7d13a242775797f1e1f 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c -@@ -274,6 +274,9 @@ static void xen_block_realize(XenDevice *xendev, Error **errp) +@@ -275,6 +275,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.vyryzL/_old 2020-05-02 22:15:09.776262726 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.776262726 +0200 @@ -27,10 +27,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/savevm.c b/migration/savevm.c -index a71b930b91f71ed9763fcb07b525..c5cc5fed211e693723538e19850b 100644 +index c00a6807d92371380208762dc440..03ff4491a64861fcdf2b91d3ffed 100644 --- a/migration/savevm.c +++ b/migration/savevm.c -@@ -2774,7 +2774,7 @@ void qmp_xen_save_devices_state(const char *filename, bool has_live, bool live, +@@ -2782,7 +2782,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.vyryzL/_old 2020-05-02 22:15:09.788262752 +0200 +++ /var/tmp/diff_new_pack.vyryzL/_new 2020-05-02 22:15:09.788262752 +0200 @@ -18,10 +18,10 @@ 1 file changed, 12 insertions(+) diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c -index 879fc310a4c5dfa4a7d8936f7d8e..0007ee64c75f38a2a3256f0b9462 100644 +index 99cb4c67cb09aa2bd8f12982984f..57d0e2804860e6776b509c5b6d6e 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c -@@ -743,6 +743,8 @@ static XenBlockDrive *xen_block_drive_create(const char *id, +@@ -744,6 +744,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; -@@ -812,6 +814,16 @@ static XenBlockDrive *xen_block_drive_create(const char *id, +@@ -813,6 +815,16 @@ static XenBlockDrive *xen_block_drive_create(const char *id, } }
