From c2d625a6fd9334da158b6889a920e4f40d75e0032cb39a2d31dcb832a0401bfe Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Tue, 15 Oct 2019 20:37:05 +0000 Subject: [PATCH] Accepting request 738698 from home:bfrogers:branches:Virtualization Minor tweaks to improve qemu-testsuite build reliability and edk2 build capability OBS-URL: https://build.opensuse.org/request/show/738698 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=499 --- bundles.tar.xz | 4 +- ...-release-pull-in-edk2-submodules-so-.patch | 58 ++++++++ qemu.changes | 16 +++ qemu.spec | 84 +++++------ ...-Makefile.edk2-don-t-invoke-git-sinc.patch | 22 --- ...-Makefile.edk2-don-t-pull-in-submodu.patch | 52 +++++++ tests-Disable-some-block-tests-for-now.patch | 34 +---- ...s-Fix-block-tests-to-be-compatible-w.patch | 134 ++++++++++++++++++ ...s-block-io-test-130-needs-some-delay.patch | 32 ----- 9 files changed, 312 insertions(+), 124 deletions(-) create mode 100644 make-release-pull-in-edk2-submodules-so-.patch delete mode 100644 roms-Makefile.edk2-don-t-invoke-git-sinc.patch create mode 100644 roms-Makefile.edk2-don-t-pull-in-submodu.patch create mode 100644 tests-Fix-block-tests-to-be-compatible-w.patch delete mode 100644 tests-block-io-test-130-needs-some-delay.patch diff --git a/bundles.tar.xz b/bundles.tar.xz index 75d6c49e..f1f6be13 100644 --- a/bundles.tar.xz +++ b/bundles.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88df3a40c42a4a202f358e77ed3802dd7ced53178a60b14f142d39f4f097f97e -size 53292 +oid sha256:2769241dc2dbb205bd1e1fe5b54a5fc79b782c8ec0f1455a4649920e98a2247f +size 54868 diff --git a/make-release-pull-in-edk2-submodules-so-.patch b/make-release-pull-in-edk2-submodules-so-.patch new file mode 100644 index 00000000..bf5f2a8e --- /dev/null +++ b/make-release-pull-in-edk2-submodules-so-.patch @@ -0,0 +1,58 @@ +From: Michael Roth +Date: Thu, 12 Sep 2019 18:12:01 -0500 +Subject: make-release: pull in edk2 submodules so we can build it from + tarballs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Git-commit: 45c61c6c23918e3b05ed9ecac5b2328ebae5f774 + +The `make efi` target added by 536d2173 is built from the roms/edk2 +submodule, which in turn relies on additional submodules nested under +roms/edk2. + +The make-release script currently only pulls in top-level submodules, +so these nested submodules are missing in the resulting tarball. + +We could try to address this situation more generally by recursively +pulling in all submodules, but this doesn't necessarily ensure the +end-result will build properly (this case also required other changes). + +Additionally, due to the nature of submodules, we may not always have +control over how these sorts of things are dealt with, so for now we +continue to handle it on a case-by-case in the make-release script. + +Cc: Laszlo Ersek +Cc: Bruce Rogers +Cc: qemu-stable@nongnu.org # v4.1.0 +Reported-by: Bruce Rogers +Reviewed-by: Philippe Mathieu-Daudé +Tested-by: Philippe Mathieu-Daudé +Signed-off-by: Michael Roth +Message-Id: <20190912231202.12327-2-mdroth@linux.vnet.ibm.com> +Signed-off-by: Philippe Mathieu-Daudé +Signed-off-by: Bruce Rogers +--- + scripts/make-release | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/scripts/make-release b/scripts/make-release +index b4af9c9e5202cb5c4f092d67ea51..a2a8cda33c0e0da3caa1f8641515 100755 +--- a/scripts/make-release ++++ b/scripts/make-release +@@ -20,6 +20,14 @@ git checkout "v${version}" + git submodule update --init + (cd roms/seabios && git describe --tags --long --dirty > .version) + (cd roms/skiboot && ./make_version.sh > .version) ++# Fetch edk2 submodule's submodules, since it won't have access to them via ++# the tarball later. ++# ++# A more uniform way to handle this sort of situation would be nice, but we ++# don't necessarily have much control over how a submodule handles its ++# submodule dependencies, so we continue to handle these on a case-by-case ++# basis for now. ++(cd roms/edk2 && git submodule update --init) + popd + tar --exclude=.git -cjf ${destination}.tar.bz2 ${destination} + rm -rf ${destination} diff --git a/qemu.changes b/qemu.changes index c2a53d20..3df26708 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Oct 15 20:13:27 UTC 2019 - Bruce Rogers + +- Add upstream edk2 submodule fix for creating tarball +- Switch to upstream patch for avoiding git ref in edk2 makefile +- Fix failing block tests which aren't compatible with the configure + option --enable-membarrier +* Patches dropped: + roms-Makefile.edk2-don-t-invoke-git-sinc.patch + tests-block-io-test-130-needs-some-delay.patch +* Patches added: + make-release-pull-in-edk2-submodules-so-.patch + roms-Makefile.edk2-don-t-pull-in-submodu.patch + tests-Fix-block-tests-to-be-compatible-w.patch +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-4.1 + ------------------------------------------------------------------- Thu Oct 10 01:42:04 UTC 2019 - Bruce Rogers diff --git a/qemu.spec b/qemu.spec index 489ba828..87965618 100644 --- a/qemu.spec +++ b/qemu.spec @@ -145,47 +145,48 @@ Patch00019: vhost-Fix-memory-region-section-comparis.patch Patch00020: hw-arm-boot.c-Set-NSACR.-CP11-CP10-for-N.patch Patch00021: s390-PCI-fix-IOMMU-region-init.patch Patch00022: hw-core-loader-Fix-possible-crash-in-rom.patch -Patch00023: XXX-dont-dump-core-on-sigabort.patch -Patch00024: qemu-binfmt-conf-Modify-default-path.patch -Patch00025: qemu-cvs-gettimeofday.patch -Patch00026: qemu-cvs-ioctl_debug.patch -Patch00027: qemu-cvs-ioctl_nodirection.patch -Patch00028: linux-user-add-binfmt-wrapper-for-argv-0.patch -Patch00029: PPC-KVM-Disable-mmu-notifier-check.patch -Patch00030: linux-user-binfmt-support-host-binaries.patch -Patch00031: linux-user-Fake-proc-cpuinfo.patch -Patch00032: linux-user-use-target_ulong.patch -Patch00033: Make-char-muxer-more-robust-wrt-small-FI.patch -Patch00034: linux-user-lseek-explicitly-cast-non-set.patch -Patch00035: AIO-Reduce-number-of-threads-for-32bit-h.patch -Patch00036: xen_disk-Add-suse-specific-flush-disable.patch -Patch00037: qemu-bridge-helper-reduce-security-profi.patch -Patch00038: qemu-binfmt-conf-use-qemu-ARCH-binfmt.patch -Patch00039: linux-user-properly-test-for-infinite-ti.patch -Patch00040: roms-Makefile-pass-a-packaging-timestamp.patch -Patch00041: Raise-soft-address-space-limit-to-hard-l.patch -Patch00042: increase-x86_64-physical-bits-to-42.patch -Patch00043: vga-Raise-VRAM-to-16-MiB-for-pc-0.15-and.patch -Patch00044: i8254-Fix-migration-from-SLE11-SP2.patch -Patch00045: acpi_piix4-Fix-migration-from-SLE11-SP2.patch -Patch00046: Switch-order-of-libraries-for-mpath-supp.patch -Patch00047: Make-installed-scripts-explicitly-python.patch -Patch00048: hw-smbios-handle-both-file-formats-regar.patch -Patch00049: xen-add-block-resize-support-for-xen-dis.patch -Patch00050: tests-qemu-iotests-Triple-timeout-of-i-o.patch -Patch00051: tests-block-io-test-130-needs-some-delay.patch -Patch00052: xen-ignore-live-parameter-from-xen-save-.patch -Patch00053: Conditionalize-ui-bitmap-installation-be.patch -Patch00054: tests-change-error-message-in-test-162.patch -Patch00055: hw-usb-hcd-xhci-Fix-GCC-9-build-warning.patch -Patch00056: hw-usb-dev-mtp-Fix-GCC-9-build-warning.patch -Patch00057: hw-intc-exynos4210_gic-provide-more-room.patch -Patch00058: configure-only-populate-roms-if-softmmu.patch -Patch00059: pc-bios-s390-ccw-net-avoid-warning-about.patch -Patch00060: roms-change-cross-compiler-naming-to-be-.patch -Patch00061: roms-Makefile.edk2-don-t-invoke-git-sinc.patch -Patch00062: tests-Disable-some-block-tests-for-now.patch -Patch00063: test-add-mapping-from-arch-of-i686-to-qe.patch +Patch00023: make-release-pull-in-edk2-submodules-so-.patch +Patch00024: roms-Makefile.edk2-don-t-pull-in-submodu.patch +Patch00025: XXX-dont-dump-core-on-sigabort.patch +Patch00026: qemu-binfmt-conf-Modify-default-path.patch +Patch00027: qemu-cvs-gettimeofday.patch +Patch00028: qemu-cvs-ioctl_debug.patch +Patch00029: qemu-cvs-ioctl_nodirection.patch +Patch00030: linux-user-add-binfmt-wrapper-for-argv-0.patch +Patch00031: PPC-KVM-Disable-mmu-notifier-check.patch +Patch00032: linux-user-binfmt-support-host-binaries.patch +Patch00033: linux-user-Fake-proc-cpuinfo.patch +Patch00034: linux-user-use-target_ulong.patch +Patch00035: Make-char-muxer-more-robust-wrt-small-FI.patch +Patch00036: linux-user-lseek-explicitly-cast-non-set.patch +Patch00037: AIO-Reduce-number-of-threads-for-32bit-h.patch +Patch00038: xen_disk-Add-suse-specific-flush-disable.patch +Patch00039: qemu-bridge-helper-reduce-security-profi.patch +Patch00040: qemu-binfmt-conf-use-qemu-ARCH-binfmt.patch +Patch00041: linux-user-properly-test-for-infinite-ti.patch +Patch00042: roms-Makefile-pass-a-packaging-timestamp.patch +Patch00043: Raise-soft-address-space-limit-to-hard-l.patch +Patch00044: increase-x86_64-physical-bits-to-42.patch +Patch00045: vga-Raise-VRAM-to-16-MiB-for-pc-0.15-and.patch +Patch00046: i8254-Fix-migration-from-SLE11-SP2.patch +Patch00047: acpi_piix4-Fix-migration-from-SLE11-SP2.patch +Patch00048: Switch-order-of-libraries-for-mpath-supp.patch +Patch00049: Make-installed-scripts-explicitly-python.patch +Patch00050: hw-smbios-handle-both-file-formats-regar.patch +Patch00051: xen-add-block-resize-support-for-xen-dis.patch +Patch00052: tests-qemu-iotests-Triple-timeout-of-i-o.patch +Patch00053: tests-Fix-block-tests-to-be-compatible-w.patch +Patch00054: xen-ignore-live-parameter-from-xen-save-.patch +Patch00055: Conditionalize-ui-bitmap-installation-be.patch +Patch00056: tests-change-error-message-in-test-162.patch +Patch00057: hw-usb-hcd-xhci-Fix-GCC-9-build-warning.patch +Patch00058: hw-usb-dev-mtp-Fix-GCC-9-build-warning.patch +Patch00059: hw-intc-exynos4210_gic-provide-more-room.patch +Patch00060: configure-only-populate-roms-if-softmmu.patch +Patch00061: pc-bios-s390-ccw-net-avoid-warning-about.patch +Patch00062: roms-change-cross-compiler-naming-to-be-.patch +Patch00063: tests-Disable-some-block-tests-for-now.patch +Patch00064: test-add-mapping-from-arch-of-i686-to-qe.patch # Patches applied in roms/seabios/: Patch01000: seabios-use-python2-explicitly-as-needed.patch Patch01001: seabios-switch-to-python3-as-needed.patch @@ -955,6 +956,7 @@ This package provides a service file for starting and stopping KSM. %patch00061 -p1 %patch00062 -p1 %patch00063 -p1 +%patch00064 -p1 %patch01000 -p1 %patch01001 -p1 %patch01002 -p1 diff --git a/roms-Makefile.edk2-don-t-invoke-git-sinc.patch b/roms-Makefile.edk2-don-t-invoke-git-sinc.patch deleted file mode 100644 index 203e0539..00000000 --- a/roms-Makefile.edk2-don-t-invoke-git-sinc.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Bruce Rogers -Date: Thu, 20 Jun 2019 18:45:36 -0600 -Subject: roms/Makefile.edk2: don't invoke git, since the tarball is complete - -Signed-off-by: Bruce Rogers ---- - roms/Makefile.edk2 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 -index c2f2ff59d5b1d8b3fa394ed42c8d..98328b883c6578dd9591f069cd2d 100644 ---- a/roms/Makefile.edk2 -+++ b/roms/Makefile.edk2 -@@ -47,7 +47,7 @@ all: $(foreach flashdev,$(flashdevs),../pc-bios/edk2-$(flashdev).fd.bz2) \ - .INTERMEDIATE: $(foreach flashdev,$(flashdevs),../pc-bios/edk2-$(flashdev).fd) - - submodules: -- cd edk2 && git submodule update --init --force -+ cd edk2 - - # See notes on the ".NOTPARALLEL" target and the "+" indicator in - # "tests/uefi-test-tools/Makefile". diff --git a/roms-Makefile.edk2-don-t-pull-in-submodu.patch b/roms-Makefile.edk2-don-t-pull-in-submodu.patch new file mode 100644 index 00000000..7fc25684 --- /dev/null +++ b/roms-Makefile.edk2-don-t-pull-in-submodu.patch @@ -0,0 +1,52 @@ +From: Michael Roth +Date: Thu, 12 Sep 2019 18:12:02 -0500 +Subject: roms/Makefile.edk2: don't pull in submodules when building from + tarball +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Git-commit: f3e330e3c319160ac04954399b5a10afc965098c + +Currently the `make efi` target pulls submodules nested under the +roms/edk2 submodule as dependencies. However, when we attempt to build +from a tarball this fails since we are no longer in a git tree. + +A preceding patch will pre-populate these submodules in the tarball, +so assume this build dependency is only needed when building from a +git tree. + +Cc: Laszlo Ersek +Cc: Bruce Rogers +Cc: qemu-stable@nongnu.org # v4.1.0 +Reported-by: Bruce Rogers +Reviewed-by: Laszlo Ersek +Reviewed-by: Philippe Mathieu-Daudé +Tested-by: Philippe Mathieu-Daudé +Signed-off-by: Michael Roth +Message-Id: <20190912231202.12327-3-mdroth@linux.vnet.ibm.com> +Signed-off-by: Philippe Mathieu-Daudé +Signed-off-by: Bruce Rogers +--- + roms/Makefile.edk2 | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2 +index c2f2ff59d5b1d8b3fa394ed42c8d..33a074d3a4c21b5460d98bbc7d4a 100644 +--- a/roms/Makefile.edk2 ++++ b/roms/Makefile.edk2 +@@ -46,8 +46,13 @@ all: $(foreach flashdev,$(flashdevs),../pc-bios/edk2-$(flashdev).fd.bz2) \ + # files. + .INTERMEDIATE: $(foreach flashdev,$(flashdevs),../pc-bios/edk2-$(flashdev).fd) + ++# Fetch edk2 submodule's submodules. If it is not in a git tree, assume ++# we're building from a tarball and that they've already been fetched by ++# make-release/tarball scripts. + submodules: +- cd edk2 && git submodule update --init --force ++ if test -d edk2/.git; then \ ++ cd edk2 && git submodule update --init --force; \ ++ fi + + # See notes on the ".NOTPARALLEL" target and the "+" indicator in + # "tests/uefi-test-tools/Makefile". diff --git a/tests-Disable-some-block-tests-for-now.patch b/tests-Disable-some-block-tests-for-now.patch index e69f5439..75b02d65 100644 --- a/tests-Disable-some-block-tests-for-now.patch +++ b/tests-Disable-some-block-tests-for-now.patch @@ -9,22 +9,18 @@ problematic to just ignore. Until we can address these failures, which seem to be tied to the build environment in some way, disable the tests which are either randomly or reliably failing. -At least some test failures are partly understood: tests 130, 153, and -161 fail due to an incompatibility with our use of --enable-membarrier -and the way the tests are driven. - Currently, this patch is based on these failures seen on 09OCT2019 on v4.1.0 qemu: -disable 065, 129, 130, 153, 161, 169, 182, 205, 218, 242, 248, 250 +disable 065, 129, 169, 182, 205, 218, 242, 248, 250 (other architectures not evaluated at this time) Signed-off-by: Bruce Rogers --- - tests/qemu-iotests/group | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) + tests/qemu-iotests/group | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group -index f13e5f2e23417b94bd84d820bcf6..d1579db09669797b0584e0892ff3 100644 +index f13e5f2e23417b94bd84d820bcf6..ed532134bb8af0a1f78a1a2abcf3 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -86,7 +86,7 @@ @@ -36,32 +32,16 @@ index f13e5f2e23417b94bd84d820bcf6..d1579db09669797b0584e0892ff3 100644 066 rw auto quick 067 rw quick 068 rw quick -@@ -150,8 +150,8 @@ +@@ -150,7 +150,7 @@ 126 rw auto backing 127 rw backing quick 128 rw quick -129 rw quick --130 rw auto quick +#DISABLE FOR NOW 129 rw quick -+#DISABLE FOR NOW 130 rw auto quick + 130 rw auto quick 131 rw quick 132 rw quick - 133 auto quick -@@ -174,7 +174,7 @@ - 150 rw auto quick - 151 rw - 152 rw quick --153 rw quick -+#DISABLE FOR NOW 153 rw quick - 154 rw auto backing quick - 155 rw - 156 rw auto quick -@@ -182,11 +182,11 @@ - 158 rw auto quick - 159 rw auto quick - 160 rw quick --161 rw auto quick -+#DISABLE FOR NOW 161 rw auto quick +@@ -186,7 +186,7 @@ 162 quick 163 rw 165 rw quick diff --git a/tests-Fix-block-tests-to-be-compatible-w.patch b/tests-Fix-block-tests-to-be-compatible-w.patch new file mode 100644 index 00000000..e327b34a --- /dev/null +++ b/tests-Fix-block-tests-to-be-compatible-w.patch @@ -0,0 +1,134 @@ +From: Bruce Rogers +Date: Tue, 15 Oct 2019 11:16:14 -0600 +Subject: tests: Fix block tests to be compatible with membarrier configuration + +The use of membarriers collides with the block test's practice of +SIGKILLing test vm's. Have them quit politely. Tests: 130, 153, 161 + +Signed-off-by: Bruce Rogers +--- + tests/qemu-iotests/130 | 6 ++++-- + tests/qemu-iotests/130.out | 2 ++ + tests/qemu-iotests/153 | 6 ++++-- + tests/qemu-iotests/153.out | 4 ++++ + tests/qemu-iotests/161 | 3 +++ + 5 files changed, 17 insertions(+), 4 deletions(-) + +diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130 +index 77ad2aa13a06094f26d2c8991e48..fd84a4c77d192e15ee961b07994b 100755 +--- a/tests/qemu-iotests/130 ++++ b/tests/qemu-iotests/130 +@@ -64,7 +64,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)' +-_cleanup_qemu ++_send_qemu_cmd $QEMU_HANDLE 'quit' '' ++wait=1 _cleanup_qemu + _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 + _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)' +-_cleanup_qemu ++_send_qemu_cmd $QEMU_HANDLE 'quit' '' ++wait=1 _cleanup_qemu + _img_info | _filter_img_info + + echo +diff --git a/tests/qemu-iotests/130.out b/tests/qemu-iotests/130.out +index e45285ccc311522481ac1b27ba99..7168bdf70c3eb32d4de0d28bb947 100644 +--- a/tests/qemu-iotests/130.out ++++ b/tests/qemu-iotests/130.out +@@ -11,6 +11,7 @@ virtual size: 64 MiB (67108864 bytes) + QEMU X.Y.Z monitor - type 'help' for more information + (qemu) commit testdisk + (qemu) ++(qemu) quit + image: TEST_DIR/t.IMGFMT + file format: IMGFMT + virtual size: 64 MiB (67108864 bytes) +@@ -18,6 +19,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t + QEMU X.Y.Z monitor - type 'help' for more information + (qemu) commit testdisk + (qemu) ++(qemu) quit + image: TEST_DIR/t.IMGFMT + 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 +--- a/tests/qemu-iotests/153 ++++ b/tests/qemu-iotests/153 +@@ -206,7 +206,8 @@ _send_qemu_cmd $QEMU_HANDLE \ + 'return' + _run_cmd $QEMU_IMG commit -b "${TEST_IMG}.b" "${TEST_IMG}.c" + +-_cleanup_qemu ++_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'quit' }" '' ++wait=1 _cleanup_qemu + + _launch_qemu + +@@ -258,7 +259,8 @@ _send_qemu_cmd $QEMU_HANDLE \ + + _run_cmd $QEMU_IO "${TEST_IMG}" -c 'write 0 512' + +-_cleanup_qemu ++_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'quit' }" '' ++wait=1 _cleanup_qemu + + echo + echo "== Detecting -U and force-share conflicts ==" +diff --git a/tests/qemu-iotests/153.out b/tests/qemu-iotests/153.out +index e9694200066280fa0637292de3ef..177b08b7e3e6606db552d7e54c8e 100644 +--- a/tests/qemu-iotests/153.out ++++ b/tests/qemu-iotests/153.out +@@ -416,6 +416,8 @@ Is another process using the image [TEST_DIR/t.qcow2]? + + _qemu_img_wrapper commit -b TEST_DIR/t.qcow2.b TEST_DIR/t.qcow2.c + {"return": {}} ++{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} ++{"return": {}} + Adding drive + {"return": "OKrn"} + +@@ -443,6 +445,8 @@ Closing the other + {"return": ""} + + _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512 ++{"return": {}} ++{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} + + == Detecting -U and force-share conflicts == + +diff --git a/tests/qemu-iotests/161 b/tests/qemu-iotests/161 +index 456a4bd8c4cb54c9c0d295f83bed..990af8a412d72fd522068490638b 100755 +--- a/tests/qemu-iotests/161 ++++ b/tests/qemu-iotests/161 +@@ -68,6 +68,7 @@ _send_qemu_cmd $QEMU_HANDLE \ + 'qemu-io none0 \"reopen -o backing.detect-zeroes=on\"' } }" \ + "return" + ++_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'quit' }" '' + _cleanup_qemu + + # Second test: stream $TEST_IMG.base into $TEST_IMG.int and then +@@ -96,6 +97,7 @@ _send_qemu_cmd $QEMU_HANDLE \ + 'qemu-io none0 \"reopen -o backing.detect-zeroes=on\"' } }" \ + "return" + ++_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'quit' }" '' + _cleanup_qemu + + # Third test: commit $TEST_IMG.int into $TEST_IMG.base and then reopen +@@ -129,6 +131,7 @@ _send_qemu_cmd $QEMU_HANDLE \ + 'qemu-io none0 \"reopen -o backing.detect-zeroes=on\"' } }" \ + "return" + ++_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'quit' }" '' + _cleanup_qemu + + # success, all done diff --git a/tests-block-io-test-130-needs-some-delay.patch b/tests-block-io-test-130-needs-some-delay.patch deleted file mode 100644 index 9e78849d..00000000 --- a/tests-block-io-test-130-needs-some-delay.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Bruce Rogers -Date: Sun, 25 Nov 2018 18:01:36 -0700 -Subject: tests: block-io test 130 needs some delays - -I haven't figured out exactly the best solution, but we need some delays -in this test. - -Signed-off-by: Bruce Rogers ---- - tests/qemu-iotests/130 | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130 -index 77ad2aa13a06094f26d2c8991e48..14a2b759f628e8ec0030127e9dad 100755 ---- a/tests/qemu-iotests/130 -+++ b/tests/qemu-iotests/130 -@@ -63,6 +63,7 @@ echo - # Test that a backing file isn't written - _launch_qemu -drive id=testdisk,file="$TEST_IMG",backing.file.filename="$TEST_IMG.base" - _send_qemu_cmd $QEMU_HANDLE "commit testdisk" "(qemu)" -+sleep 5 - _send_qemu_cmd $QEMU_HANDLE '' '(qemu)' - _cleanup_qemu - _img_info | _filter_img_info -@@ -72,6 +73,7 @@ _img_info | _filter_img_info - _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)" -+sleep 5 - _send_qemu_cmd $QEMU_HANDLE '' '(qemu)' - _cleanup_qemu - _img_info | _filter_img_info