Hello community, here is the log from the commit of package qemu for openSUSE:Factory checked in at 2020-08-14 09:31:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qemu (Old) and /work/SRC/openSUSE:Factory/.qemu.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu" Fri Aug 14 09:31:14 2020 rev:178 rq:825863 version:5.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2020-07-26 16:15:37.540607256 +0200 +++ /work/SRC/openSUSE:Factory/.qemu.new.3399/qemu.changes 2020-08-14 09:32:27.932371863 +0200 @@ -1,0 +2,81 @@ +Tue Aug 11 20:05:25 UTC 2020 - Bruce Rogers <[email protected]> + +- Update to v5.1.0: See http://wiki.qemu.org/ChangeLog/5.1 + 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: +* s390: Protected virtualization (secure execute) is fully merged + upstream +* s390: vfio-ccw devices no longer require setting the allow + prefetch bit in the ORB, but is still dependent on host kernel + support +* s390: vfio-ccw now has basic support for relaying path state + changes to the guest +* PowerPC: pseries: NVDIMMs require label-size property +* PowerPC: pseries: POWER10 support +* PowerPC: added interface to inject POWER style NMIs +* ARM: new board: sonorapass-bmc +* ARM: new emulated features: ARMv8.2-TTSUXN, ARMv8.5-MemTag +* ARM: Raspberry Pi boards now support a USB controller +* ARM: virt board now supports hot-remove memory +* RISC-V lots of improvements +* qemu-img resize now requires -shrink to shrinking raw images +* The mem parameter of the -numa option is no longer recognized + starting with 5.1 machine types - instead use the memdev parameter +* The ACPI WAET table is now exposed to guests +* The max blocksize for virtual storage device is now 2 MiB +* NVMe improvements +* Crypto subsystem improvements +* Block backends and tools: Numerous improvements and fixes +* Firmware updates: SeaBIOS (essentially v1.14.0), OpenBIOS, SLOF + (20200717), OpenSBI (v0.7) +* Patches dropped (upstream unless otherwise noted): + ati-vga-check-mm_index-before-recursive-.patch + audio-fix-wavcapture-segfault.patch + es1370-check-total-frame-count-against-c.patch + exec-set-map-length-to-zero-when-returni.patch + gcc10-maybe-uninitialized.patch + hw-vfio-pci-quirks-Fix-broken-legacy-IGD.patch + megasas-use-unsigned-type-for-reply_queu.patch + nbd-server-Avoid-long-error-message-asse.patch + ppc-spapr_caps-Don-t-disable-cap_cfpc-on.patch + s390x-Add-SIDA-memory-ops.patch + s390x-Add-unpack-facility-feature-to-GA1.patch + s390x-Move-diagnose-308-subcodes-and-rcs.patch + s390x-protvirt-Add-migration-blocker.patch + s390x-protvirt-Disable-address-checks-fo.patch + s390x-protvirt-Handle-SIGP-store-status-.patch + s390x-protvirt-Inhibit-balloon-when-swit.patch + s390x-protvirt-KVM-intercept-changes.patch + s390x-protvirt-Move-diag-308-data-over-S.patch + s390x-protvirt-Move-IO-control-structure.patch + s390x-protvirt-Move-STSI-data-over-SIDAD.patch + s390x-protvirt-SCLP-interpretation.patch + s390x-protvirt-Set-guest-IPL-PSW.patch + s390x-protvirt-Support-unpack-facility.patch + s390x-s390-virtio-ccw-Fix-build-on-syste.patch + Sync-pv.patch + tests-Disable-some-block-tests-for-now.patch (no longer needed) + vga-fix-cirrus-bios.patch + virtiofsd-add-rlimit-nofile-NUM-option.patch + virtiofsd-stay-below-fs.file-max-sysctl-.patch +* Patches renamed: + build-Do-not-apply-WORKAROUND_CFLAGS-for.patch + -> Do-not-apply-WORKAROUND_CFLAGS-for-host-.patch + build-Fix-s-directive-argument-is-null-e.patch + -> Fix-s-directive-argument-is-null-error.patch +* Patches added: + hw-hyperv-vmbus-Fix-32bit-compilation.patch +- New subpackages, due to modularization: qemu-chardev-baum, + qemu-hw-display-qxl, qemu-hw-usb-redirect, qemu-hw-usb-smartcard +- Configure to use "system" libslirp and libdaxctl (libnvdimm) + when available + +------------------------------------------------------------------- +Thu Jul 23 19:26:05 UTC 2020 - Liang Yan <[email protected]> + +- Don't disable cap_cfpc on POWER8 by default (bsc#1174374) + ppc-spapr_caps-Don-t-disable-cap_cfpc-on.patch + +------------------------------------------------------------------- Old: ---- Sync-pv.patch ati-vga-check-mm_index-before-recursive-.patch audio-fix-wavcapture-segfault.patch build-Do-not-apply-WORKAROUND_CFLAGS-for.patch build-Fix-s-directive-argument-is-null-e.patch es1370-check-total-frame-count-against-c.patch exec-set-map-length-to-zero-when-returni.patch gcc10-maybe-uninitialized.patch hw-vfio-pci-quirks-Fix-broken-legacy-IGD.patch megasas-use-unsigned-type-for-reply_queu.patch nbd-server-Avoid-long-error-message-asse.patch qemu-5.0.0.tar.xz qemu-5.0.0.tar.xz.sig s390x-Add-SIDA-memory-ops.patch s390x-Add-unpack-facility-feature-to-GA1.patch s390x-Move-diagnose-308-subcodes-and-rcs.patch s390x-protvirt-Add-migration-blocker.patch s390x-protvirt-Disable-address-checks-fo.patch s390x-protvirt-Handle-SIGP-store-status-.patch s390x-protvirt-Inhibit-balloon-when-swit.patch s390x-protvirt-KVM-intercept-changes.patch s390x-protvirt-Move-IO-control-structure.patch s390x-protvirt-Move-STSI-data-over-SIDAD.patch s390x-protvirt-Move-diag-308-data-over-S.patch s390x-protvirt-SCLP-interpretation.patch s390x-protvirt-Set-guest-IPL-PSW.patch s390x-protvirt-Support-unpack-facility.patch s390x-s390-virtio-ccw-Fix-build-on-syste.patch tests-Disable-some-block-tests-for-now.patch vga-fix-cirrus-bios.patch virtiofsd-add-rlimit-nofile-NUM-option.patch virtiofsd-stay-below-fs.file-max-sysctl-.patch New: ---- Do-not-apply-WORKAROUND_CFLAGS-for-host-.patch Fix-s-directive-argument-is-null-error.patch hw-hyperv-vmbus-Fix-32bit-compilation.patch qemu-5.1.0.tar.xz qemu-5.1.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemu.spec ++++++ ++++ 716 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/qemu/qemu.spec ++++ and /work/SRC/openSUSE:Factory/.qemu.new.3399/qemu.spec ++++++ AIO-Reduce-number-of-threads-for-32bit-h.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:34.588375274 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:34.592375276 +0200 @@ -20,10 +20,10 @@ 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/util/thread-pool.c b/util/thread-pool.c -index 4ed9b89ab2d9c4e6d805ea47c2b2..697c989885ca8aa4dd1185b780df 100644 +index d763cea505b68575af8e1b39cd95..785487b8767d96ca76c643f1851f 100644 --- a/util/thread-pool.c +++ b/util/thread-pool.c -@@ -307,7 +307,12 @@ static void thread_pool_init_one(ThreadPool *pool, AioContext *ctx) +@@ -306,7 +306,12 @@ static void thread_pool_init_one(ThreadPool *pool, AioContext *ctx) qemu_mutex_init(&pool->lock); qemu_cond_init(&pool->worker_stopped); qemu_sem_init(&pool->sem, 0); ++++++ Conditionalize-ui-bitmap-installation-be.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:34.604375282 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:34.604375282 +0200 @@ -8,10 +8,10 @@ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile -index 1a2f649a21a85e1849a3ca40991d..a7851435c0ba8c60df39ebad492b 100644 +index e7116289550f169a65f8aecfeccf..3da7feaf0d9e9b3f1222efb8823b 100644 --- a/Makefile +++ b/Makefile -@@ -974,6 +974,7 @@ ifneq ($(DESCS),) +@@ -970,6 +970,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 \ -@@ -988,6 +989,7 @@ endif +@@ -984,6 +985,7 @@ endif mkdir -p "$(DESTDIR)$(qemu_desktopdir)" $(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \ "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop" ++++++ Do-not-apply-WORKAROUND_CFLAGS-for-host-.patch ++++++ From: Michael Brown <[email protected]> Date: Mon, 22 Jul 2019 14:51:28 +0100 Subject: Do not apply WORKAROUND_CFLAGS for host compiler Git-commit: a4f8c6e31f6c62522cfc633bbbffa81b22f9d6f3 Include-If: %ifarch aarch64 The WORKAROUND_CFLAGS list is constructed based on running tests on the target compiler, and the results may not be valid for the host compiler. The only relevant workaround required for the host compiler is -Wno-stringop-truncation, which is needed to avoid a spurious compiler warning for a totally correct usage of strncpy() in util/elf2efi.c. Duplicating the workaround tests for the host compiler is messy, as is conditionally applying __attribute__((nonstring)). Fix instead by disapplying WORKAROUND_CFLAGS for the host compiler, and using memcpy() with an explicitly calculated length instead of strncpy() in util/elf2efi.c. Reported-by: Ignat Korchagin <[email protected]> Reported-by: Christopher Clark <[email protected]> Signed-off-by: Michael Brown <[email protected]> Signed-off-by: Bruce Rogers <[email protected]> --- src/Makefile.housekeeping | 2 +- src/util/elf2efi.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/roms/ipxe/src/Makefile.housekeeping b/roms/ipxe/src/Makefile.housekeeping index d94eb1454c9168545c933ec6e900..9c33cc08c4db1bbd0f9966924fce 100644 --- a/roms/ipxe/src/Makefile.housekeeping +++ b/roms/ipxe/src/Makefile.housekeeping @@ -455,7 +455,7 @@ endif CFLAGS += $(WORKAROUND_CFLAGS) $(EXTRA_CFLAGS) ASFLAGS += $(WORKAROUND_ASFLAGS) $(EXTRA_ASFLAGS) LDFLAGS += $(WORKAROUND_LDFLAGS) $(EXTRA_LDFLAGS) -HOST_CFLAGS += $(WORKAROUND_CFLAGS) -O2 -g +HOST_CFLAGS += -O2 -g # Inhibit -Werror if NO_WERROR is specified on make command line # diff --git a/roms/ipxe/src/util/elf2efi.c b/roms/ipxe/src/util/elf2efi.c index 2c5b9df8aae853bfce4d5d3bae89..bcd53c9afda7880d42ec80c07f17 100644 --- a/roms/ipxe/src/util/elf2efi.c +++ b/roms/ipxe/src/util/elf2efi.c @@ -458,6 +458,7 @@ static struct pe_section * process_section ( struct elf_file *elf, struct pe_header *pe_header ) { struct pe_section *new; const char *name; + size_t name_len; size_t section_memsz; size_t section_filesz; unsigned long code_start; @@ -494,7 +495,10 @@ static struct pe_section * process_section ( struct elf_file *elf, memset ( new, 0, sizeof ( *new ) + section_filesz ); /* Fill in section header details */ - strncpy ( ( char * ) new->hdr.Name, name, sizeof ( new->hdr.Name ) ); + name_len = strlen ( name ); + if ( name_len > sizeof ( new->hdr.Name ) ) + name_len = sizeof ( new->hdr.Name ); + memcpy ( new->hdr.Name, name, name_len ); new->hdr.Misc.VirtualSize = section_memsz; new->hdr.VirtualAddress = shdr->sh_addr; new->hdr.SizeOfRawData = section_filesz; ++++++ Fix-s-directive-argument-is-null-error.patch ++++++ From: Valentine Barshak <[email protected]> Date: Sun, 9 Jun 2019 13:30:11 +0300 Subject: Fix "'%s' directive argument is null" error Git-commit: 412acd7854de10e7194f362a6b1a3257a17974f7 References: bsc#1121464 Use '%p' directive, and print handle's address if the address is null and the handle doesn't have a name. This fixes the following compilation error: interface/efi/efi_debug.c:334:3: error: '%s' directive argument is null [-Werror=format-overflow=] Signed-off-by: Valentine Barshak <[email protected]> Signed-off-by: Michael Brown <[email protected]> Signed-off-by: Bruce Rogers <[email protected]> --- src/interface/efi/efi_debug.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/roms/ipxe/src/interface/efi/efi_debug.c b/roms/ipxe/src/interface/efi/efi_debug.c index 8ea0a822d044caca088c64ca2407..de9b1af5579cfddba1b55788b7b6 100644 --- a/roms/ipxe/src/interface/efi/efi_debug.c +++ b/roms/ipxe/src/interface/efi/efi_debug.c @@ -331,8 +331,7 @@ void dbg_efi_protocols ( EFI_HANDLE handle ) { /* Sanity check */ if ( ! handle ) { - printf ( "HANDLE %s could not retrieve protocols\n", - efi_handle_name ( handle ) ); + printf ( "HANDLE %p could not retrieve protocols\n", handle ); return; } ++++++ Make-char-muxer-more-robust-wrt-small-FI.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:34.644375303 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:34.644375303 +0200 @@ -3,7 +3,7 @@ Subject: Make char muxer more robust wrt small FIFOs Virtio-Console can only process one character at a time. Using it on S390 -gave me strage "lags" where I got the character I pressed before when +gave me strange "lags" where I got the character I pressed before when pressing one. So I typed in "abc" and only received "a", then pressed "d" but the guest received "b" and so on. @@ -24,12 +24,13 @@ chardev/char-fe.c | 1 + chardev/char-mux.c | 16 ++++++++++++++++ chardev/char.c | 1 + - include/chardev/char-mux.h | 3 +++ + chardev/chardev-internal.h | 3 +++ + chardev/chardev-sysemu.c | 1 + tests/test-char.c | 1 + - 5 files changed, 22 insertions(+) + 6 files changed, 23 insertions(+) diff --git a/chardev/char-fe.c b/chardev/char-fe.c -index f3530a90e6364d813097105b6113..f8aa0daf31692810efc7d5ca32eb 100644 +index 474715c5a9257ae9e9e286d2e02d..eeb1b3e0b548027e2bcda0c272d5 100644 --- a/chardev/char-fe.c +++ b/chardev/char-fe.c @@ -21,6 +21,7 @@ @@ -41,7 +42,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" diff --git a/chardev/char-mux.c b/chardev/char-mux.c -index 46c44af67c4ea5348eb1b6db637f..1d3eaf1e37bc2995ae4b8e80f0ff 100644 +index 6f980bb83647da13c62f514391b3..094bc6703a3febdf5fefb7c0024f 100644 --- a/chardev/char-mux.c +++ b/chardev/char-mux.c @@ -22,6 +22,7 @@ @@ -82,7 +83,7 @@ * set of muxes */ diff --git a/chardev/char.c b/chardev/char.c -index e77564060dbc8d60e964787b9150..7f08483a4fc8b1c2c01d57546eca 100644 +index 77e7ec814f2196d8352e2f3ec75e..bcdec537e8753025b715e75214e6 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -22,6 +22,7 @@ @@ -93,11 +94,11 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" #include "monitor/monitor.h" -diff --git a/include/chardev/char-mux.h b/include/chardev/char-mux.h -index 417fe32eedf29b206c4c7a20f8ef..225a4d1c37d051bca576a1b73607 100644 ---- a/include/chardev/char-mux.h -+++ b/include/chardev/char-mux.h -@@ -34,6 +34,9 @@ typedef struct MuxChardev { +diff --git a/chardev/chardev-internal.h b/chardev/chardev-internal.h +index f4d0429763bc28438e6cd6e7de1a..fc6cd39eb2d98af15aec25642438 100644 +--- a/chardev/chardev-internal.h ++++ b/chardev/chardev-internal.h +@@ -36,6 +36,9 @@ typedef struct MuxChardev { Chardev parent; CharBackend *backends[MAX_MUX]; CharBackend chr; @@ -107,8 +108,20 @@ int focus; int mux_cnt; int term_got_escape; +diff --git a/chardev/chardev-sysemu.c b/chardev/chardev-sysemu.c +index eecdc615ee1c6c64060452ac837d..c052f101e89c193af1effa9c6fa5 100644 +--- a/chardev/chardev-sysemu.c ++++ b/chardev/chardev-sysemu.c +@@ -22,6 +22,7 @@ + * THE SOFTWARE. + */ + ++#define HW_POISON_H /* avoid poison since we patch against rules it "enforces" */ + #include "qemu/osdep.h" + #include "sysemu/sysemu.h" + #include "chardev/char.h" diff --git a/tests/test-char.c b/tests/test-char.c -index 3afc9b1b8d59802919139012c2cb..530cf7c2414e85e00e2685e7482c 100644 +index d35cc839bc60db1884c3f265629b..51635ba059ef2302608459e84a65 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.ZGqvYI/_old 2020-08-14 09:32:34.656375309 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:34.656375309 +0200 @@ -13,7 +13,7 @@ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/analyze-migration.py b/scripts/analyze-migration.py -index 96a31d3974ba2af13d419b71c409..4cae695244a00003d1431c02febf 100755 +index 95838cbff3f00f1ba097ee032032..d5f6c67bf1f7305461bb536f57b1 100755 --- a/scripts/analyze-migration.py +++ b/scripts/analyze-migration.py @@ -1,4 +1,4 @@ ++++++ PPC-KVM-Disable-mmu-notifier-check.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:34.676375320 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:34.676375320 +0200 @@ -14,10 +14,10 @@ 1 file changed, 2 insertions(+) diff --git a/exec.c b/exec.c -index 2c419f327cf925ee55c46d111272..7adf108c66ed8912588cb83bc15e 100644 +index 6f381f98e2a01c432c28c0c094db..0cec6a514147a1b90e2056f3eac4 100644 --- a/exec.c +++ b/exec.c -@@ -2297,11 +2297,13 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, +@@ -2328,11 +2328,13 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, return NULL; } ++++++ README.PACKAGING ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:34.708375336 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:34.708375336 +0200 @@ -1,11 +1,17 @@ -The qemu package, and derived packages have a special maintenance workflow in -order to support git based patching. Please use it in order to have changes -you make be acceptable to the package maintainers. +The qemu package includes a special maintenance workflow in order to support git +based patching. Please use it in order to have changes you make be acceptable to +the package maintainers. + +Currently a local clone of the upstream repo(s) is required for the packaging +workflow. It is anticipated that the need for any extra setup will be reduced or +even eliminated entirely in the future, but for now, you will need do so some +setup. See config.sh for details. The qemu.spec file is generated from a qemu.spec.in template, so to make changes -to the spec file (besides the script generated patch references), you'll need to -edit the template, not the spec file. The spec file patch references are inserted -by a script as described below. +to the spec file beyond the patch name generation, patch reference and automated +versioning done by the scripts, you need to edit the template. Do not directly +edit the spec file. The spec file's version and patch references are added when +the update_git.sh script is passed certain commands, as described below. If you are not modifying any patches or their order, but just need to update the spec file from a changed template, run 'bash ./update_git.sh refresh'. @@ -22,16 +28,13 @@ 'bash ./update_git.sh git2pkg' which updates the bundles.tar.xz file, as well as the spec and patch files. +The default action for update_git.sh is git2pkg, which helps simplify repeated +package updates as you modify the patch queue from the local git repo. + The maintainer and automation use another workflow mode dealing with packaging the latest upstream qemu. See 'LATEST' references in the scripts for details. -** SPECIAL NOTE ABOUT CURRENT STATUS *** -The current status as of 31 Oct 2019 is that for this incarnation of qemu -packaging, the previous workflow which relied on the patches being in a shared -git repo on github or gitlab is no longer supported. This new bundle based -workflow is still a work in progress. -If it isn't working right, please contact Bruce Rogers <[email protected]>. -*** END SPECIAL NOTE *** +* * * * * * * * * Additional Notes: @@ -60,11 +63,12 @@ %endif A trick worth noting is, if a given git tracked patch is to be applied in a way -that can't be done in the normal patching section of the spec file, you can still -include the patch, and use it by name with the patch program elsewhere in the -spec file by doing something such as: +that can't be done in the normal patching section of the spec file, you can +still include the patch, and use it by name with the patch program elsewhere in +the spec file by doing something such as: Include-If: %if 0%{?patch-possibly-applied-elsewhere} -(this variable will remain undefined in the spec file) And then elsewhere in spec -file, the actual patch (eg specially-handled-change.patch) is referenced as, eg: +(this variable will remain undefined in the spec file) And then elsewhere in the +spec file, the actual patch (eg specially-handled-change.patch) is referenced as +eg: patch -p1 < %_sourcedir/specially-handled-change.patch ++++++ Raise-soft-address-space-limit-to-hard-l.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:34.720375342 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:34.720375342 +0200 @@ -16,7 +16,7 @@ 1 file changed, 12 insertions(+) diff --git a/softmmu/vl.c b/softmmu/vl.c -index 32c004788919e4f50b4bfc88113b..97e3888e832f0c9051f720bb701c 100644 +index 4eb9d1f7fd54f27583bfb1ce9407..c6e7530b012db308d0c607ec749d 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -34,6 +34,7 @@ @@ -26,8 +26,8 @@ +#include <sys/resource.h> #include "sysemu/seccomp.h" #include "sysemu/tcg.h" - -@@ -2851,6 +2852,7 @@ void qemu_init(int argc, char **argv, char **envp) + #include "sysemu/xen.h" +@@ -2868,6 +2869,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 */ @@ -35,7 +35,7 @@ os_set_line_buffering(); -@@ -2862,6 +2864,16 @@ void qemu_init(int argc, char **argv, char **envp) +@@ -2879,6 +2881,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.ZGqvYI/_old 2020-08-14 09:32:34.732375348 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:34.736375350 +0200 @@ -9,10 +9,10 @@ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 8a9113e6663eb51cf842b2f4f5a2..1a2f649a21a85e1849a3ca40991d 100644 +index 13dd708c4af52df3bc932812fc60..e7116289550f169a65f8aecfeccf 100644 --- a/Makefile +++ b/Makefile -@@ -619,7 +619,7 @@ fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/9p-marshal +@@ -613,7 +613,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 23b5e93752b6a2597b2099b50218..ef127fb1e0715da446b4a822e3ab 100755 +index 2acc4d1465f8165ae3a238784231..a47fda0fb5267e153a3f1f3ee3bc 100755 --- a/configure +++ b/configure -@@ -3961,7 +3961,7 @@ int main(void) { +@@ -4100,7 +4100,7 @@ int main(void) { return 0; } EOF ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:34.764375364 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:34.764375364 +0200 @@ -1,5 +1,5 @@ <constraints> - <!-- All builds are fine with 8GB disk --> + <!-- All builds are fine with 9GB disk --> <overwrite> <conditions> <package>qemu</package> @@ -8,10 +8,22 @@ </conditions> <hardware> <disk> - <size unit="G">8</size> + <size unit="G">9</size> </disk> </hardware> </overwrite> + <!-- To test qemu-linux-user, armv7l needs more than the default memory --> + <overwrite> + <conditions> + <arch>armv7l</arch> + <package>qemu:linux-user</package> + </conditions> + <hardware> + <memory> + <size unit="M">8192</size> + </memory> + </hardware> + </overwrite> <!-- To build qemu, s390x needs more than the default memory --> <overwrite> <conditions> ++++++ acpi_piix4-Fix-migration-from-SLE11-SP2.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:34.796375381 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:34.796375381 +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 964d6f5990faf6ff7521bb2377a2..7b5f8234444b8b29ae66098b8d39 100644 +index 26bac4f16c18a7d32b3821e5e3e6..81c2a3410319e6236c1a09b07bb1 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c -@@ -274,7 +274,7 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id) +@@ -275,7 +275,7 @@ static bool piix4_vmstate_need_smbus(void *opaque, int version_id) static const VMStateDescription vmstate_acpi = { .name = "piix4_pm", .version_id = 3, ++++++ build-Be-explicit-about-fcommon-compiler.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:34.824375395 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:34.824375395 +0200 @@ -2,7 +2,7 @@ Date: Wed, 6 May 2020 15:03:02 -0600 Subject: [build] Be explicit about -fcommon compiler directive -Git-commit: 6260364cc4bfea9a78867da63be8d4bf50e4a561 +Git-commit: f982a712979619dbae2c6e0d741757e2ce94be11 References: boo#1171140 gcc10 switched default behavior from -fcommon to -fno-common. Since @@ -11,12 +11,13 @@ Signed-off-by: Bruce Rogers <[email protected]> Modified-by: Michael Brown <[email protected]> Signed-off-by: Michael Brown <[email protected]> +Signed-off-by: Bruce Rogers <[email protected]> --- src/Makefile.housekeeping | 1 + 1 file changed, 1 insertion(+) diff --git a/roms/ipxe/src/Makefile.housekeeping b/roms/ipxe/src/Makefile.housekeeping -index 1b175b9508c0d20f169801f8763d..893bd20f1fd5cecf0e480dee05bd 100644 +index 4b09e81f0b1eb82e79f6af11986d..f6f3e29248d3e59b76de690aeb0c 100644 --- a/roms/ipxe/src/Makefile.housekeeping +++ b/roms/ipxe/src/Makefile.housekeeping @@ -422,6 +422,7 @@ CFLAGS += -Os ++++++ build-Workaround-compilation-error-with-.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:34.836375402 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:34.836375402 +0200 @@ -4,6 +4,7 @@ Git-commit: 1dd56dbd11082fb622c2ed21cfaced4f47d798a6 References: bsc#1121464 +Include-If: %if 0%{?suse_version} > 1500 && 0%{?is_opensuse} Compiling with gcc 9.1 generates lots of "taking address of packed member of ... may result in an unaligned pointer value" warnings. ++++++ bundles.tar.xz ++++++ Binary files old/e1d322c40524d2c544d1fcd37b267d106d16d328.bundle and new/e1d322c40524d2c544d1fcd37b267d106d16d328.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/d9c812dda519a1a73e8370e1b81ddf46eb22ed16.bundle and new/roms/seabios/d9c812dda519a1a73e8370e1b81ddf46eb22ed16.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 ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:34.920375444 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:34.924375446 +0200 @@ -7,7 +7,7 @@ # 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=v5.0.0 +GIT_UPSTREAM_COMMIT_ISH=v5.1.0 # WARNING: If transitioning from using LATEST to not, MANUALLY re-set the # tarball present. If transitioning TO LATEST, make sure that # NEXT_RELEASE_IS_MAJOR is set correctly ++++++ configure-only-populate-roms-if-softmmu.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:34.936375453 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:34.936375453 +0200 @@ -12,10 +12,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index ef127fb1e0715da446b4a822e3ab..5a0a52e842df70b757252f89b74a 100755 +index a47fda0fb5267e153a3f1f3ee3bc..3b3c5dc2f93b87a91d247079f4c8 100755 --- a/configure +++ b/configure -@@ -6495,7 +6495,7 @@ if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \ +@@ -6770,7 +6770,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.ZGqvYI/_old 2020-08-14 09:32:34.948375459 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:34.948375459 +0200 @@ -18,10 +18,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 5a0a52e842df70b757252f89b74a..790337b204cdfa6d84b1f8524f90 100755 +index 3b3c5dc2f93b87a91d247079f4c8..4340229b47a3294307a08df3339e 100755 --- a/configure +++ b/configure -@@ -6939,7 +6939,7 @@ fi +@@ -7229,7 +7229,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 ++++++ docs-add-SUSE-support-statements-to-html.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:34.960375465 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:34.964375467 +0200 @@ -14,7 +14,7 @@ 1 file changed, 1 insertion(+) diff --git a/docs/index.html.in b/docs/index.html.in -index e9a160384cfe939a3bccc51e5da9..2a76ade7bfd053f359d7782c7473 100644 +index 6736fa4360cfb8c40cbab2a362b0..ad431321ee858bcbe3e237e687b5 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -7,6 +7,7 @@ ++++++ docs-fix-trace-docs-build-with-sphinx-3..patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:34.972375471 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:34.972375471 +0200 @@ -6,6 +6,7 @@ Content-Transfer-Encoding: 8bit Git-commit: 0000000000000000000000000000000000000000 +Include-If: %if 0%{?suse_version} > 1500 In Fedora 33 rawhide, we now have sphinx 3.1.1, as opposed to previous 2.2.2. This new version generates a warning on ++++++ enable-cross-compilation-on-ARM.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:34.984375477 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:34.984375477 +0200 @@ -8,7 +8,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roms/seabios/Makefile b/roms/seabios/Makefile -index ca8d0283922bbfa931e85511e921..d807c558ef0f09b5975f6ccc38f1 100644 +index edb83b7a1c77f7bb75c371330b2c..74a01853f26458d94d4a4e056b7b 100644 --- a/roms/seabios/Makefile +++ b/roms/seabios/Makefile @@ -13,7 +13,7 @@ export CONFIG_SHELL := sh ++++++ hw-hyperv-vmbus-Fix-32bit-compilation.patch ++++++ From: Jon Doron <[email protected]> Date: Wed, 15 Jul 2020 11:43:26 +0300 Subject: hw: hyperv: vmbus: Fix 32bit compilation Git-commit: 0000000000000000000000000000000000000000 Signed-off-by: Jon Doron <[email protected]> Signed-off-by: Bruce Rogers <[email protected]> --- hw/hyperv/vmbus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index 34392e892af6228f270ec327563e..c28bb4201be449eb6dae4b0e0218 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -383,7 +383,8 @@ static ssize_t gpadl_iter_io(GpadlIter *iter, void *buf, uint32_t len) } } - p = (void *)(((uintptr_t)iter->map & TARGET_PAGE_MASK) | off_in_page); + p = (void *)(uintptr_t)(((uintptr_t)iter->map & TARGET_PAGE_MASK) | + off_in_page); if (iter->dir == DMA_DIRECTION_FROM_DEVICE) { memcpy(p, buf, cplen); } else { ++++++ hw-intc-exynos4210_gic-provide-more-room.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.012375492 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.016375494 +0200 @@ -41,10 +41,10 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c -index 82c8f4192cbc34fe4c8762846728..50958b31c9173aba84b7443950cb 100644 +index 0aa3b843a9e045348b719cb4b8a4..83506dda3c9142350319d7f4dd5c 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) +@@ -291,8 +291,8 @@ static void exynos4210_gic_realize(DeviceState *dev, Error **errp) SysBusDevice *sbd = SYS_BUS_DEVICE(obj); const char cpu_prefix[] = "exynos4210-gic-alias_cpu"; const char dist_prefix[] = "exynos4210-gic-alias_dist"; ++++++ hw-smbios-handle-both-file-formats-regar.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.028375500 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.032375502 +0200 @@ -16,18 +16,18 @@ 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c -index ffd98727ee9e503dfce5e5c92241..a50b5aea6545f1d702278e838cf2 100644 +index f56082690437df2962681ea823d3..4ad74efc8e764429b5567c91d7ed 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c -@@ -963,6 +963,7 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) +@@ -962,6 +962,7 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) struct smbios_structure_header *header; int size; struct smbios_table *table; /* legacy mode only */ + uint8_t *dbl_nulls, *orig_end; - qemu_opts_validate(opts, qemu_smbios_file_opts, &err); - if (err) { -@@ -977,11 +978,21 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) + if (!qemu_opts_validate(opts, qemu_smbios_file_opts, errp)) { + return; +@@ -974,11 +975,21 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) } /* @@ -53,7 +53,7 @@ header = (struct smbios_structure_header *)(smbios_tables + smbios_tables_len); -@@ -996,6 +1007,19 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) +@@ -993,6 +1004,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) { -@@ -1016,6 +1040,17 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) +@@ -1013,6 +1037,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.ZGqvYI/_old 2020-08-14 09:32:35.044375508 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.048375510 +0200 @@ -17,10 +17,10 @@ 1 file changed, 13 insertions(+) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c -index 20717f026bc03922944317f73a68..e640fe183a0b407db555aade6e16 100644 +index 15a2243101f8c465e038e26c6551..d4d3a388f2034d735a6595fdaa36 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) +@@ -1721,9 +1721,22 @@ static void usb_mtp_write_metadata(MTPState *s, uint64_t dlen) assert(!s->write_pending); assert(p != NULL); ++++++ hw-usb-hcd-xhci-Fix-GCC-9-build-warning.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.064375518 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.064375518 +0200 @@ -28,7 +28,7 @@ 1 file changed, 1 insertion(+) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c -index b330e36fe6cc69a3b47ddd51ccba..8c4e4b66dd33ee482125b98846b7 100644 +index 67a18fe2b64c2cc0f77be5897c5d..79386df49b7aaec7c2f2b4c19b6f 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -3340,6 +3340,7 @@ static void usb_xhci_init(XHCIState *xhci) ++++++ increase-x86_64-physical-bits-to-42.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.080375526 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.080375526 +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 e818fc712aca18df805859d10ede..bafc094406d16f6f8c1d41d69ff6 100644 +index e1a5c174dce15c4620bb94bc2826..2dc6d4ae0b61303401cc08bfb7ae 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h -@@ -1942,7 +1942,7 @@ uint64_t cpu_get_tsc(CPUX86State *env); +@@ -1963,7 +1963,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) ++++++ intel-Avoid-spurious-compiler-warning-on.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.092375533 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.092375533 +0200 @@ -4,7 +4,7 @@ Git-commit: 28cf9806d1632d378485005babec295da0c77fcf References: boo#1171123 -` + GCC 10 produces a spurious warning about an out-of-bounds array access for the unsized raw dword array in union intelvf_msg. ++++++ ipxe-Makefile-fix-issues-of-build-reprod.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.100375536 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.104375539 +0200 @@ -14,7 +14,7 @@ 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/roms/ipxe/src/Makefile.housekeeping b/roms/ipxe/src/Makefile.housekeeping -index 893bd20f1fd5cecf0e480dee05bd..9c33cc08c4db1bbd0f9966924fce 100644 +index f6f3e29248d3e59b76de690aeb0c..d94eb1454c9168545c933ec6e900 100644 --- a/roms/ipxe/src/Makefile.housekeeping +++ b/roms/ipxe/src/Makefile.housekeeping @@ -1172,11 +1172,18 @@ blib : $(BLIB) ++++++ linux-user-Fake-proc-cpuinfo.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.140375557 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.140375557 +0200 @@ -21,10 +21,10 @@ 1 file changed, 24 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 894627b9dc8d4f72c06bab90aa9b..39b824760a29765dc9538d8574e5 100644 +index 1a835798d19cc77da8d7ec6bdc7b..5cd29859d6ac5349f04c03996b12 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -7344,6 +7344,27 @@ static int open_self_stat(void *cpu_env, int fd) +@@ -7473,6 +7473,27 @@ static int open_self_stat(void *cpu_env, int fd) return 0; } @@ -52,8 +52,8 @@ static int open_self_auxv(void *cpu_env, int fd) { CPUState *cpu = env_cpu((CPUArchState *)cpu_env); -@@ -7486,6 +7507,9 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags, - #if defined(TARGET_SPARC) +@@ -7627,6 +7648,9 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags, + #if defined(TARGET_SPARC) || defined(TARGET_HPPA) { "/proc/cpuinfo", open_cpuinfo, is_proc }, #endif +#if defined(TARGET_ARM) ++++++ linux-user-add-binfmt-wrapper-for-argv-0.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.152375563 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.152375563 +0200 @@ -35,7 +35,7 @@ 3 files changed, 56 insertions(+) diff --git a/Makefile.target b/Makefile.target -index 8ed1eba95b9c29ab4e47349cbdb2..8b5d84006cb32d4463f13059de93 100644 +index ffa2657269ac5e4ed4eab213e1bd..b6621549b8909d76e64cc0c5c2f3 100644 --- a/Makefile.target +++ b/Makefile.target @@ -39,6 +39,10 @@ endif @@ -58,7 +58,7 @@ endif #CONFIG_LINUX_USER ######################################################### -@@ -176,7 +182,11 @@ generated-files-y += config-devices.h +@@ -173,7 +179,11 @@ generated-files-y += config-devices.h endif # CONFIG_SOFTMMU @@ -69,8 +69,8 @@ +endif all-obj-y := $(obj-y) - include $(SRC_PATH)/Makefile.objs -@@ -211,6 +221,9 @@ ifdef CONFIG_DARWIN + # +@@ -222,6 +232,9 @@ ifdef CONFIG_DARWIN $(call quiet-command,SetFile -a C $@,"SETFILE","$(TARGET_DIR)$@") endif ++++++ linux-user-lseek-explicitly-cast-non-set.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.168375571 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.172375574 +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 0317c64f4ae460c972fe4fe67ef8..6ada54d3a19e455c0c12a1d4b321 100644 +index 9ec933bdc0078f3fc62bfd499957..78a1f6c347511b85634da898f831 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -8005,8 +8005,13 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_ulong arg1, +@@ -8149,8 +8149,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.ZGqvYI/_old 2020-08-14 09:32:35.184375580 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.184375580 +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 6ada54d3a19e455c0c12a1d4b321..69c9dee831d8fdb96cde3a0b996c 100644 +index 78a1f6c347511b85634da898f831..d70d8a59f44feaf126d8b6187f17 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -10052,7 +10052,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_ulong arg1, +@@ -10207,7 +10207,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.ZGqvYI/_old 2020-08-14 09:32:35.196375586 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.200375588 +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 792c74290f8d376235b07f3f8ef0..956ad6db3df11684132402dd877b 100644 +index 5c964389c101ce00fcffe206bc69..76d0399e82d5c2b599b9472e0743 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h -@@ -207,10 +207,10 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src, +@@ -227,10 +227,10 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src, void target_set_brk(abi_ulong new_brk); abi_long do_brk(abi_ulong new_brk); void syscall_init(void); @@ -35,10 +35,10 @@ void cpu_loop(CPUArchState *env); const char *target_strerror(int err); diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 39b824760a29765dc9538d8574e5..0317c64f4ae460c972fe4fe67ef8 100644 +index 5cd29859d6ac5349f04c03996b12..9ec933bdc0078f3fc62bfd499957 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -7650,10 +7650,10 @@ static int host_to_target_cpu_mask(const unsigned long *host_mask, +@@ -7791,10 +7791,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; -@@ -10423,7 +10423,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, +@@ -10578,7 +10578,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; -@@ -12456,10 +12456,10 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, +@@ -12610,10 +12610,10 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, return ret; } ++++++ pc-bios-s390-ccw-net-avoid-warning-about.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.208375592 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.212375594 +0200 @@ -11,13 +11,13 @@ 1 file changed, 1 insertion(+) diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak -index 5eefb7c289395ca37fcd241ce53d..ea2994722cde7e8a65796d374dc7 100644 +index 577c023afe3db17ada307b2abbcc..cea8fb8532ddccda2390d936c93f 100644 --- a/pc-bios/s390-ccw/netboot.mak +++ b/pc-bios/s390-ccw/netboot.mak -@@ -53,6 +53,7 @@ libc.a: $(LIBCOBJS) - LIBNETOBJS := args.o dhcp.o dns.o icmpv6.o ipv6.o tcp.o udp.o bootp.o \ +@@ -54,6 +54,7 @@ LIBNETOBJS := args.o dhcp.o dns.o icmpv6.o ipv6.o tcp.o udp.o bootp.o \ dhcpv6.o ethernet.o ipv4.o ndp.o tftp.o pxelinux.o - LIBNETCFLAGS := $(QEMU_CFLAGS) $(CFLAGS) -DDHCPARCH=0x1F $(LIBC_INC) $(LIBNET_INC) + LIBNETCFLAGS = $(QEMU_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) \ + -DDHCPARCH=0x1F -MMD -MP -MT $@ -MF $(@:%.o=%.d) +LIBNETCFLAGS += -Wno-address-of-packed-member %.o : $(SLOF_DIR)/lib/libnet/%.c ++++++ qemu-5.0.0.tar.xz -> qemu-5.1.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/qemu/qemu-5.0.0.tar.xz /work/SRC/openSUSE:Factory/.qemu.new.3399/qemu-5.1.0.tar.xz differ: char 26, line 1 ++++++ qemu-cvs-gettimeofday.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.256375617 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.260375618 +0200 @@ -11,10 +11,10 @@ 1 file changed, 3 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 05f03919ff070a06444d82e86a70..1a350d1a9e0ff9f99e36817a6ecc 100644 +index 945fc252791ce79d968dba5f9545..b1e68b7b1b3d689af62cd271cf31 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -8837,6 +8837,9 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, +@@ -8988,6 +8988,9 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, { struct timeval tv; struct timezone tz; ++++++ qemu-cvs-ioctl_debug.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.268375623 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.272375625 +0200 @@ -13,10 +13,10 @@ 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 1a350d1a9e0ff9f99e36817a6ecc..946c1e3a1957ea43368311acecda 100644 +index b1e68b7b1b3d689af62cd271cf31..8a80cf418ab4299548a85b90e427 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -5301,8 +5301,21 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) +@@ -5440,8 +5440,21 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) ie = ioctl_entries; for(;;) { if (ie->target_cmd == 0) { ++++++ qemu-cvs-ioctl_nodirection.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.280375629 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.284375631 +0200 @@ -16,10 +16,10 @@ 1 file changed, 8 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 946c1e3a1957ea43368311acecda..894627b9dc8d4f72c06bab90aa9b 100644 +index 8a80cf418ab4299548a85b90e427..1a835798d19cc77da8d7ec6bdc7b 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -5346,6 +5346,13 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) +@@ -5485,6 +5485,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)) { -@@ -5364,6 +5371,7 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) +@@ -5503,6 +5510,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.ZGqvYI/_old 2020-08-14 09:32:35.376375678 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.380375680 +0200 @@ -73,6 +73,12 @@ %define with_rbd 1 %endif +%if 0%{?is_opensuse} +%ifarch x86_64 ppc64le +%define with_daxctl 1 +%endif +%endif + # qemu, qemu-linux-user, and qemu-testsuite "flavors" enabled via OBS Multibuild %define flavor @BUILD_FLAVOR@%{nil} %if "%flavor" == "" @@ -195,7 +201,7 @@ %if 0%{?with_glusterfs} BuildRequires: glusterfs-devel >= 3 %endif -BuildRequires: gtk3-devel >= 3.16 +BuildRequires: gtk3-devel >= 3.22 BuildRequires: libaio-devel BuildRequires: libattr-devel BuildRequires: libbz2-devel @@ -211,6 +217,9 @@ BuildRequires: libgnutls-devel >= 3.1.18 BuildRequires: libiscsi-devel >= 1.9.0 BuildRequires: libjpeg-devel +%if 0%{?with_daxctl} +BuildRequires: libndctl-devel +%endif %if 0%{?is_opensuse} BuildRequires: libnfs-devel >= 1.9.3 %endif @@ -232,6 +241,9 @@ BuildRequires: libSDL2_image-devel %endif BuildRequires: libseccomp-devel >= 2.3.0 +%if 0%{?is_opensuse} +BuildRequires: libslirp-devel >= 4.2.0 +%endif BuildRequires: libspice-server-devel >= 0.12.5 BuildRequires: libssh-devel >= 0.8 BuildRequires: pkgconfig(libudev) @@ -293,11 +305,17 @@ BuildRequires: qemu-block-rbd = %{qemuver} %endif BuildRequires: qemu-block-ssh = %{qemuver} +BuildRequires: qemu-chardev-baum = %{qemuver} %if %{provide_edk2_firmware} BuildRequires: qemu-edk2 = %{qemuver} %endif BuildRequires: qemu-extra = %{qemuver} BuildRequires: qemu-guest-agent = %{qemuver} +BuildRequires: qemu-hw-display-qxl = %{qemuver} +BuildRequires: qemu-hw-usb-redirect = %{qemuver} +%if 0%{?is_opensuse} +BuildRequires: qemu-hw-usb-smartcard = %{qemuver} +%endif BuildRequires: qemu-ipxe = 1.0.0+ %if 0%{?is_opensuse} BuildRequires: qemu-ksm = %{qemuver} @@ -328,6 +346,11 @@ Recommends: kvm_stat %endif Recommends: qemu-block-curl +Recommends: qemu-hw-display-qxl +Recommends: qemu-hw-usb-redirect +%if 0%{?is_opensuse} +Recommends: qemu-hw-usb-smartcard +%endif Recommends: qemu-tools Recommends: qemu-ui-curses Recommends: qemu-ui-gtk @@ -366,6 +389,7 @@ Suggests: qemu-block-rbd %endif Suggests: qemu-block-ssh +Suggests: qemu-chardev-baum Suggests: qemu-extra Suggests: qemu-lang %if 0%{?is_opensuse} @@ -513,6 +537,38 @@ Conflicts: qemu-tools < %{qemuver}-%{release} \ Conflicts: qemu-tools > %{qemuver}-%{release} +%package audio-alsa +Summary: ALSA based audio support for QEMU +Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 +%{qemu_module_conflicts} + +%description audio-alsa +This package contains a module for ALSA based audio support for QEMU. + +%package audio-pa +Summary: Pulse Audio based audio support for QEMU +Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 +%{qemu_module_conflicts} + +%description audio-pa +This package contains a module for Pulse Audio based audio support for QEMU. + +%if 0%{?is_opensuse} +%package audio-sdl +Summary: SDL based audio support for QEMU +Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 +%{qemu_module_conflicts} + +%description audio-sdl +This package contains a module for SDL based audio support for QEMU. +%endif + %package block-curl Summary: cURL block support for QEMU Group: System/Emulators/PC @@ -595,80 +651,88 @@ This package contains a module for accessing network-based image files over an SSH network connection from qemu-img tool and QEMU system emulation. -%package ui-curses -Summary: Curses based UI support for QEMU +%package chardev-baum +Summary: Baum braille chardev support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 %{qemu_module_conflicts} -%description ui-curses -This package contains a module for doing curses based UI for QEMU. +%description chardev-baum +This package contains a module for baum braille chardev support. -%package ui-gtk -Summary: GTK based UI support for QEMU +%package hw-display-qxl +Summary: QXL display support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 %{qemu_module_conflicts} -%description ui-gtk -This package contains a module for doing GTK based UI for QEMU. +%description hw-display-qxl +This package contains a module for QXL display support. -%if 0%{?is_opensuse} -%package ui-sdl -Summary: SDL based UI support for QEMU +%package hw-usb-redirect +Summary: USB redirection support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 %{qemu_module_conflicts} -%description ui-sdl -This package contains a module for doing SDL based UI for QEMU. -%endif +%description hw-usb-redirect +This package contains a module for USB redirection support. -%package ui-spice-app -Summary: Spice UI support for QEMU +%package hw-usb-smartcard +Summary: USB smartcard support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 %{qemu_module_conflicts} -%description ui-spice-app -This package contains a module for doing Spice based UI for QEMU. +%description hw-usb-smartcard +This package contains a modules for USB smartcard support. -%package audio-alsa -Summary: ALSA based audio support for QEMU +%package ui-curses +Summary: Curses based UI support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 %{qemu_module_conflicts} -%description audio-alsa -This package contains a module for ALSA based audio support for QEMU. +%description ui-curses +This package contains a module for doing curses based UI for QEMU. -%package audio-pa -Summary: Pulse Audio based audio support for QEMU +%package ui-gtk +Summary: GTK based UI support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 %{qemu_module_conflicts} -%description audio-pa -This package contains a module for Pulse Audio based audio support for QEMU. +%description ui-gtk +This package contains a module for doing GTK based UI for QEMU. %if 0%{?is_opensuse} -%package audio-sdl -Summary: SDL based audio support for QEMU +%package ui-sdl +Summary: SDL based UI support for QEMU Group: System/Emulators/PC Version: %{qemuver} Release: 0 %{qemu_module_conflicts} -%description audio-sdl -This package contains a module for SDL based audio support for QEMU. +%description ui-sdl +This package contains a module for doing SDL based UI for QEMU. %endif +%package ui-spice-app +Summary: Spice UI support for QEMU +Group: System/Emulators/PC +Version: %{qemuver} +Release: 0 +%{qemu_module_conflicts} + +%description ui-spice-app +This package contains a module for doing Spice based UI for QEMU. + %package vhost-user-gpu Summary: Vhost user mode virtio-gpu 2D/3D rendering backend for QEMU Group: System/Emulators/PC @@ -958,6 +1022,11 @@ --enable-tools --enable-guest-agent \ --enable-modules \ --disable-module-upgrades \ +%if 0%{?is_opensuse} + --enable-slirp=system \ +%else + --enable-slirp=git \ +%endif --enable-pie \ --enable-docs \ %if 0%{?is_opensuse} @@ -996,6 +1065,11 @@ %else --disable-kvm \ %endif +%if 0%{?with_daxctl} + --enable-libdaxctl \ +%else + --disable-libdaxctl \ +%endif --enable-libiscsi \ %if 0%{?is_opensuse} --enable-libnfs \ @@ -1044,6 +1118,7 @@ %endif --enable-rdma \ --enable-replication \ + --disable-safe-stack \ --disable-sanitizers \ %if 0%{?is_opensuse} --enable-sdl \ @@ -1072,6 +1147,7 @@ --enable-vhost-scsi \ --enable-vhost-user \ --enable-vhost-user-fs \ + --enable-vhost-vdpa \ --enable-vhost-vsock \ --enable-virglrenderer \ --enable-virtfs \ @@ -1110,6 +1186,7 @@ --disable-fdt \ --disable-iconv \ --disable-kvm \ + --disable-libdaxctl \ --disable-malloc-trim \ %if %{with system_membarrier} --enable-membarrier \ @@ -1122,6 +1199,7 @@ --disable-qed \ --disable-replication \ --disable-sheepdog \ + --disable-safe-stack \ --disable-slirp \ --disable-tpm \ --disable-vdi \ @@ -1215,8 +1293,7 @@ pushd %{_builddir}/%buildsubdir patch -p1 < %_sourcedir/stub-out-the-SAN-req-s-in-int13.patch popd -make %{?_smp_mflags} -C %{_builddir}/%buildsubdir/roms \ - pxerom_variants=virtio pxerom_targets=1af41000 pxerom +make %{?_smp_mflags} -C %{_builddir}/%buildsubdir/roms pxerom_variants=virtio pxerom_targets=1af41000 pxerom %endif # enforce pxe rom sizes for migration compatability from SLE 11 SP3 forward @@ -1585,16 +1662,18 @@ %_docdir/%name/interop/live-block-operations.html %_docdir/%name/interop/objects.inv %_docdir/%name/interop/pr-helper.html +%_docdir/%name/interop/qemu-ga-ref.html +%_docdir/%name/interop/qemu-ga-ref.txt +%_docdir/%name/interop/qemu-qmp-ref.html +%_docdir/%name/interop/qemu-qmp-ref.txt %_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/interop/vhost-vdpa.html %_docdir/%name/specs/.buildinfo %_docdir/%name/specs/_static/* +%_docdir/%name/specs/acpi_hest_ghes.html %_docdir/%name/specs/acpi_hw_reduced_hotplug.html %_docdir/%name/specs/genindex.html %_docdir/%name/specs/index.html @@ -1606,8 +1685,14 @@ %_docdir/%name/specs/tpm.html %_docdir/%name/system/.buildinfo %_docdir/%name/system/_static/* +%_docdir/%name/system/arm/aspeed.html +%_docdir/%name/system/arm/collie.html %_docdir/%name/system/arm/cpu-features.html +%_docdir/%name/system/arm/digic.html +%_docdir/%name/system/arm/gumstix.html %_docdir/%name/system/arm/integratorcp.html +%_docdir/%name/system/arm/mps2.html +%_docdir/%name/system/arm/musca.html %_docdir/%name/system/arm/musicpal.html %_docdir/%name/system/arm/nseries.html %_docdir/%name/system/arm/orangepi.html @@ -1616,6 +1701,8 @@ %_docdir/%name/system/arm/stellaris.html %_docdir/%name/system/arm/sx1.html %_docdir/%name/system/arm/versatile.html +%_docdir/%name/system/arm/vexpress.html +%_docdir/%name/system/arm/virt.html %_docdir/%name/system/arm/xscale.html %_docdir/%name/system/build-platforms.html %_docdir/%name/system/deprecated.html @@ -1637,20 +1724,26 @@ %_docdir/%name/system/qemu-cpu-models.html %_docdir/%name/system/qemu-manpage.html %_docdir/%name/system/quickstart.html +%_docdir/%name/system/s390x/3270.html +%_docdir/%name/system/s390x/css.html +%_docdir/%name/system/s390x/protvirt.html %_docdir/%name/system/s390x/vfio-ap.html +%_docdir/%name/system/s390x/vfio-ccw.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-avr.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-rx.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/targets.html %_docdir/%name/system/tls.html %_docdir/%name/system/usb.html %_docdir/%name/system/vnc-security.html @@ -1745,6 +1838,7 @@ %files extra %defattr(-, root, root) %_bindir/qemu-system-alpha +%_bindir/qemu-system-avr %_bindir/qemu-system-cris %_bindir/qemu-system-hppa %_bindir/qemu-system-lm32 @@ -1794,6 +1888,23 @@ %endif %endif +%files audio-alsa +%defattr(-, root, root) +%dir %_libdir/%name +%_libdir/%name/audio-alsa.so + +%files audio-pa +%defattr(-, root, root) +%dir %_libdir/%name +%_libdir/%name/audio-pa.so + +%if 0%{?is_opensuse} +%files audio-sdl +%defattr(-, root, root) +%dir %_libdir/%name +%_libdir/%name/audio-sdl.so +%endif + %files block-curl %defattr(-, root, root) %dir %_libdir/%name @@ -1838,45 +1949,50 @@ %dir %_libdir/%name %_libdir/%name/block-ssh.so -%files ui-curses +%files chardev-baum %defattr(-, root, root) %dir %_libdir/%name -%_libdir/%name/ui-curses.so +%_libdir/%name/chardev-baum.so -%files ui-gtk +%files hw-display-qxl %defattr(-, root, root) %dir %_libdir/%name -%_libdir/%name/ui-gtk.so +%_libdir/%name/hw-display-qxl.so -%if 0%{?is_opensuse} -%files ui-sdl +%files hw-usb-redirect %defattr(-, root, root) %dir %_libdir/%name -%_libdir/%name/ui-sdl.so -%endif +%_libdir/%name/hw-usb-redirect.so -%files ui-spice-app +%if 0%{?is_opensuse} +%files hw-usb-smartcard %defattr(-, root, root) %dir %_libdir/%name -%_libdir/%name/ui-spice-app.so +%_libdir/%name/hw-usb-smartcard.so +%endif -%files audio-alsa +%files ui-curses %defattr(-, root, root) %dir %_libdir/%name -%_libdir/%name/audio-alsa.so +%_libdir/%name/ui-curses.so -%files audio-pa +%files ui-gtk %defattr(-, root, root) %dir %_libdir/%name -%_libdir/%name/audio-pa.so +%_libdir/%name/ui-gtk.so %if 0%{?is_opensuse} -%files audio-sdl +%files ui-sdl %defattr(-, root, root) %dir %_libdir/%name -%_libdir/%name/audio-sdl.so +%_libdir/%name/ui-sdl.so %endif +%files ui-spice-app +%defattr(-, root, root) +%dir %_libdir/%name +%_libdir/%name/ui-spice-app.so + %files lang -f %mybuilddir/%name.lang %defattr(-, root, root) @@ -1970,11 +2086,11 @@ %_bindir/qemu-io %_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/qemu-pr-helper +%_libexecdir/virtfs-proxy-helper %_libexecdir/virtiofsd %_mandir/man1/qemu-img.1.gz %_mandir/man1/virtfs-proxy-helper.1.gz ++++++ seabios-switch-to-python3-as-needed.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.404375692 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.404375692 +0200 @@ -17,7 +17,7 @@ 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/roms/seabios/Makefile b/roms/seabios/Makefile -index de1fa90035b82ef3608d68d62f59..ca8d0283922bbfa931e85511e921 100644 +index 87a6ac92e69f23c1ce799d16512a..edb83b7a1c77f7bb75c371330b2c 100644 --- a/roms/seabios/Makefile +++ b/roms/seabios/Makefile @@ -22,7 +22,7 @@ LD=$(CROSS_PREFIX)ld ++++++ seabios-use-python2-explicitly-as-needed.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.420375700 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.420375700 +0200 @@ -14,7 +14,7 @@ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roms/seabios/Makefile b/roms/seabios/Makefile -index 5f7d5370198abac950b24e08a7aa..de1fa90035b82ef3608d68d62f59 100644 +index 3d8943ef5f25afb9c41db84ad2a0..87a6ac92e69f23c1ce799d16512a 100644 --- a/roms/seabios/Makefile +++ b/roms/seabios/Makefile @@ -22,7 +22,7 @@ LD=$(CROSS_PREFIX)ld ++++++ supported.arm.txt ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.460375721 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.460375721 +0200 @@ -202,6 +202,7 @@ and could possibly change syntax in the future. - This previously unsupported command line option is now deprecated: + -soundhw (use -device ... instead) -tb-size - These previously unsupported command line options are no longer recognized: @@ -732,7 +733,9 @@ 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] + stm32f4xx-syscfg|tpm-tis-device|nvdimm|vhost-user-vsock-device|i + vhost-user-vsock-pci|vhost-user-vsock-pci-non-transitional| + vhost-user-vsock-pci-transitional] (the following are aliases of these unsupported devices: lsi| piix3-usb-uhci) (note that some of these device names represent supported devices and @@ -760,10 +763,10 @@ 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] + sbsa-ref|smdkc210|sonorapass-bmc|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|virt-5.1| + witherspoon-bmc|xilinx-zynq-a9|xlnx-versal-virt|xlnx-zcu102|z2] -machine @@ -774,10 +777,11 @@ 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] + smdkc210|sonorapass-bmc|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| + virt-5.1|witherspoon-bmc|xilinx-zynq-a9|xlnx-versal-virt|xlnx-zcu102| + z2] -mtdblock file -net [dump|socket|vde] ... @@ -865,6 +869,7 @@ query-colo-status query-sev query-sev-launch-measure + x-blockdev-amend x-blockdev-change x-blockdev-insert-medium x-blockdev-remove-medium ++++++ supported.s390.txt ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.520375752 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.524375754 +0200 @@ -197,6 +197,7 @@ -bt -device ide-drive (use ide-hd or ide-cd) -device scsi-disk (use scsi-hd or scsi-cd) + -soundhw (use -device ... instead) -tb-size - These previously unsupported command line options are no longer recognized: @@ -687,7 +688,10 @@ 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] + virtio-iommu-pci-non-transitional|virtio-iommu-pci-transitional| + vhost-user-vsock-device|vhost-user-vsock-pci| + vhost-user-vsock-pci-non-transitional| + vhost-user-vsock-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 @@ -712,14 +716,14 @@ [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-5.0] + s390-ccw-virtio-5.0|s390-ccw-virtio-5.1] -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-5.0] + s390-ccw-virtio-5.0|s390-ccw-virtio-5.1] -mtdblock file -net [dump|socket|vde] ... @@ -817,6 +821,7 @@ query-tpm query-tpm-models query-tpm-types + x-blockdev-amend x-blockdev-change x-blockdev-insert-medium x-blockdev-remove-medium ++++++ supported.x86.txt ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.564375774 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.564375774 +0200 @@ -241,6 +241,7 @@ - These previously unsupported command line options are now deprecated: -no-kvm-pit + -soundhw (use -device ... instead) -tb-size - The case of specified sockets, cores, and threads not matching the vcpu count @@ -802,7 +803,10 @@ intel-iommu|vhost-user-fs-device|tulip|ati-vga|i2c-ddc|pci-ipmi-bt| 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] + virtio-iommu-pci-transitional|xen-sysdev|imx.usbphy|vmbus-bridge| + vhost-user-vsock-device|vhost-user-vsock-pci| + vhost-user-vsock-pci-non-transitional| + vhost-user-vsock-pci-transitional|virtio-mem|virtio-mem-pci] (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 @@ -824,10 +828,10 @@ [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|pc-q35-5.0] + pc-i440fx-4.1|pc-i440fx-5.0|pc-i440fx-5.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-q35-5.0|pc-q35-5.1] -machine @@ -835,10 +839,10 @@ 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|pc-q35-5.0] + pc-i440fx-5.0|pc-i440fx-5.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-q35-5.0|pc-q35-5.1] -mtdblock file -net [dump|socket|vde] ... @@ -916,6 +920,7 @@ query-colo-status query-sev query-sev-launch-measure + x-blockdev-amend x-blockdev-change x-blockdev-insert-medium x-blockdev-remove-medium ++++++ tests-Fix-block-tests-to-be-compatible-w.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.584375784 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.584375784 +0200 @@ -16,10 +16,10 @@ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130 -index 77ad2aa13a06094f26d2c8991e48..fd84a4c77d192e15ee961b07994b 100755 +index a7b365701c490b4b4894eb0c26a8..02cb0f8216a6618b5e0dc526c361 100755 --- a/tests/qemu-iotests/130 +++ b/tests/qemu-iotests/130 -@@ -64,7 +64,8 @@ echo +@@ -63,7 +63,8 @@ echo _launch_qemu -drive id=testdisk,file="$TEST_IMG",backing.file.filename="$TEST_IMG.base" _send_qemu_cmd $QEMU_HANDLE "commit testdisk" "(qemu)" _send_qemu_cmd $QEMU_HANDLE '' '(qemu)' @@ -29,7 +29,7 @@ _img_info | _filter_img_info # Make sure that if there was a backing file that was just overridden on the -@@ -73,7 +74,8 @@ _make_test_img -F raw -b "$TEST_IMG.orig" 64M +@@ -72,7 +73,8 @@ _make_test_img -F raw -b "$TEST_IMG.orig" 64M _launch_qemu -drive id=testdisk,file="$TEST_IMG",backing.file.filename="$TEST_IMG.base",backing.driver=$IMGFMT _send_qemu_cmd $QEMU_HANDLE "commit testdisk" "(qemu)" _send_qemu_cmd $QEMU_HANDLE '' '(qemu)' @@ -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 2b1311176801e30485cf39ec65d8..608a377af5f3662dc25ddcebb01e 100755 +index 34045ea3cfeb5e30acac17ae8a10..b5cec71dd9a718055d9264e51946 100755 --- a/tests/qemu-iotests/153 +++ b/tests/qemu-iotests/153 -@@ -202,7 +202,8 @@ _send_qemu_cmd $QEMU_HANDLE \ +@@ -201,7 +201,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 -@@ -254,7 +255,8 @@ _send_qemu_cmd $QEMU_HANDLE \ +@@ -253,7 +254,8 @@ _send_qemu_cmd $QEMU_HANDLE \ _run_cmd $QEMU_IO "${TEST_IMG}" -c 'write 0 512' @@ -84,10 +84,10 @@ echo echo "== Detecting -U and force-share conflicts ==" diff --git a/tests/qemu-iotests/153.out b/tests/qemu-iotests/153.out -index f7464dd8d345a853f7b64a67c6d0..8bc14f6abf94662473d6d93b5672 100644 +index 8a79e1ee870d72c6d346898113b1..d1d6b673b22d5443700ae9c146c7 100644 --- a/tests/qemu-iotests/153.out +++ b/tests/qemu-iotests/153.out -@@ -421,6 +421,8 @@ Is another process using the image [TEST_DIR/t.qcow2]? +@@ -424,6 +424,8 @@ Is another process using the image [TEST_DIR/t.qcow2]? _qemu_img_wrapper commit -b TEST_DIR/t.qcow2.b TEST_DIR/t.qcow2.c { 'execute': 'qmp_capabilities' } {"return": {}} @@ -96,7 +96,7 @@ Adding drive { 'execute': 'human-monitor-command', 'arguments': { 'command-line': 'drive_add 0 if=none,id=d0,file=TEST_DIR/t.IMGFMT' } } {"return": "OKrn"} -@@ -454,6 +456,8 @@ Closing the other +@@ -457,6 +459,8 @@ Closing the other {"return": ""} _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512 ++++++ update_git.sh ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.608375797 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.612375799 +0200 @@ -245,6 +245,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # !! We (perhaps temporarily) do MORE recursive submodules, since we are tracking ALL in these scripts, while upstream doesn't include all in tarball currently +# !!! THIS IS AT LEAST PARTLY REDUNDANT WITH THE update --init DONE ABOUT 30 LINES AGO (cd $GIT_DIR && git submodule update --init --recursive &>/dev/null) SUBMODULE_COMMIT_IDS=($(git -C $GIT_DIR submodule status --recursive|awk '{print $1}')) SUBMODULE_DIRS=($(git -C $GIT_DIR submodule status --recursive|awk '{print $2}')) @@ -479,8 +480,9 @@ echo "QEMU source version: $SOURCE_VERSION" echo "QEMU version extra: $VERSION_EXTRA" +# get rid of "rel-" prefix to the seabios version - keep any trailing git info, such as: "-44-g88ab0c1" SEABIOS_VERSION=${SEABIOS_VERSION:-$(tar JxfO qemu-$SOURCE_VERSION$VERSION_EXTRA.tar.xz \ - qemu-$SOURCE_VERSION/roms/seabios/.version | cut -d '-' -f 2)} + qemu-$SOURCE_VERSION/roms/seabios/.version | cut -c5- | tr '-' '_')} for package in qemu; do while IFS= read -r line; do ++++++ xen-add-block-resize-support-for-xen-dis.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.624375805 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.624375805 +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 57d0e2804860e6776b509c5b6d6e..f9a22ec8d7d13a242775797f1e1f 100644 +index 1a379e8771faee970808dd2efd89..310b9639e06b0d543f22652fadd9 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c -@@ -275,6 +275,9 @@ static void xen_block_realize(XenDevice *xendev, Error **errp) +@@ -270,6 +270,9 @@ static void xen_block_realize(XenDevice *xendev, Error **errp) xen_block_set_size(blockdev); ++++++ xen-ignore-live-parameter-from-xen-save-.patch ++++++ --- /var/tmp/diff_new_pack.ZGqvYI/_old 2020-08-14 09:32:35.640375814 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.640375814 +0200 @@ -27,10 +27,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/savevm.c b/migration/savevm.c -index c00a6807d92371380208762dc440..03ff4491a64861fcdf2b91d3ffed 100644 +index a843d202b5b4dd449e6982b59d80..d75642353e8276f5d3c391fe2c48 100644 --- a/migration/savevm.c +++ b/migration/savevm.c -@@ -2782,7 +2782,7 @@ void qmp_xen_save_devices_state(const char *filename, bool has_live, bool live, +@@ -2820,7 +2820,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.ZGqvYI/_old 2020-08-14 09:32:35.652375820 +0200 +++ /var/tmp/diff_new_pack.ZGqvYI/_new 2020-08-14 09:32:35.656375822 +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 99cb4c67cb09aa2bd8f12982984f..57d0e2804860e6776b509c5b6d6e 100644 +index 8a7a3f54523ed050587c3e2047de..1a379e8771faee970808dd2efd89 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c -@@ -744,6 +744,8 @@ static XenBlockDrive *xen_block_drive_create(const char *id, +@@ -729,6 +729,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; -@@ -813,6 +815,16 @@ static XenBlockDrive *xen_block_drive_create(const char *id, +@@ -797,6 +799,16 @@ static XenBlockDrive *xen_block_drive_create(const char *id, } }
