OpenBSD: Enable qtesting
v2 cover OpenBSD: Enable qtesting
Various fixes I encountered while trying to run QEMU test suite on OpenBSD. Now than various tests are disabled, we can run the qtests again. (Conversely, if we can not test a feature, we should deprecate/remove it.)
Since v1:
- various qemu-block fixes and notes.
Some patches care be applied by respective maintainers, but I prefer to submit the series as a whole, since it makes the testing easier than various 'based-on:' ...
- patches 1, 3, 9, 11, !14 can go via 'test automation' (Alex/Fam)
- patche 2: Brad or Paolo 'Misc'???
- patche 8 eventually 'ACPI' (MST)
- patches 4-7 via the 'block layer' (Kevin)
- other RFC patches require review by the block team!!!
Regards,
Phil.
v1: https://lists.gnu.org/archive/html/qemu-devel/2019-01/msg06676.html
Philippe Mathieu-Daudé (18):
tests/vm: Be verbose while extracting compressed images
configure: Disable W^X on OpenBSD
tests/vm/openbsd: Disable the W^X protection on the build partition
ahci-test: Add dependency to qemu-img tool
qemu-iotests: Add dependency to qemu-nbd tool
qemu-iotests: Improve portability by searching bash in the $PATH tests/multiboot: Improve portability by searching bash in the $PATH tests/bios-tables: Improve portability by searching bash in the $PATH tests/vm/openbsd: Install Bash from the ports
RFC qemu-iotests: Ensure GNU sed is used
tests/vm/openbsd: Install GNU sed from the ports
RFC test-iov: Disable iov/io test on OpenBSD
RFC oslib-posix: Ignore fcntl("/dev/null", F_SETFL, O_NONBLOCK)
failure
tests/vm: Run tests on OpenBSD
iotests: Let verify_platform() check for unsupported platforms RFC iotests: Disable 208 on OpenBSD
RFC iotests: Disable 209 on OpenBSD
RFC iotests: Disable 236 and 238 on OpenBSD
configure | 11 +++++++ tests/Makefile.include | 4 +-- tests/data/acpi/rebuild-expected-aml.sh | 2 +- tests/multiboot/run_test.sh | 2 +- tests/qemu-iotests/001 | 2 +- tests/qemu-iotests/002 | 2 +- tests/qemu-iotests/003 | 2 +- tests/qemu-iotests/004 | 2 +- tests/qemu-iotests/005 | 2 +- tests/qemu-iotests/007 | 2 +- tests/qemu-iotests/008 | 2 +- tests/qemu-iotests/009 | 2 +- tests/qemu-iotests/010 | 2 +- tests/qemu-iotests/011 | 2 +- tests/qemu-iotests/012 | 2 +- tests/qemu-iotests/013 | 2 +- tests/qemu-iotests/014 | 2 +- tests/qemu-iotests/015 | 2 +- tests/qemu-iotests/017 | 2 +- tests/qemu-iotests/018 | 2 +- tests/qemu-iotests/019 | 2 +- tests/qemu-iotests/020 | 2 +- tests/qemu-iotests/021 | 2 +- tests/qemu-iotests/022 | 2 +- tests/qemu-iotests/023 | 2 +- tests/qemu-iotests/024 | 2 +- tests/qemu-iotests/025 | 2 +- tests/qemu-iotests/026 | 2 +- tests/qemu-iotests/027 | 2 +- tests/qemu-iotests/028 | 2 +- tests/qemu-iotests/029 | 2 +- tests/qemu-iotests/031 | 2 +- tests/qemu-iotests/032 | 2 +- tests/qemu-iotests/033 | 2 +- tests/qemu-iotests/034 | 2 +- tests/qemu-iotests/035 | 2 +- tests/qemu-iotests/036 | 2 +- tests/qemu-iotests/037 | 2 +- tests/qemu-iotests/038 | 2 +- tests/qemu-iotests/039 | 2 +- tests/qemu-iotests/042 | 2 +- tests/qemu-iotests/043 | 2 +- tests/qemu-iotests/046 | 2 +- tests/qemu-iotests/047 | 2 +- tests/qemu-iotests/048 | 2 +- tests/qemu-iotests/049 | 2 +- tests/qemu-iotests/050 | 2 +- tests/qemu-iotests/051 | 2 +- tests/qemu-iotests/052 | 2 +- tests/qemu-iotests/053 | 2 +- tests/qemu-iotests/054 | 2 +- tests/qemu-iotests/058 | 2 +- tests/qemu-iotests/059 | 2 +- tests/qemu-iotests/060 | 2 +- tests/qemu-iotests/061 | 2 +- tests/qemu-iotests/062 | 2 +- tests/qemu-iotests/063 | 2 +- tests/qemu-iotests/064 | 2 +- tests/qemu-iotests/066 | 2 +- tests/qemu-iotests/067 | 2 +- tests/qemu-iotests/068 | 2 +- tests/qemu-iotests/069 | 2 +- tests/qemu-iotests/070 | 2 +- tests/qemu-iotests/071 | 2 +- tests/qemu-iotests/072 | 2 +- tests/qemu-iotests/073 | 2 +- tests/qemu-iotests/074 | 2 +- tests/qemu-iotests/075 | 2 +- tests/qemu-iotests/076 | 2 +- tests/qemu-iotests/077 | 2 +- tests/qemu-iotests/078 | 2 +- tests/qemu-iotests/079 | 2 +- tests/qemu-iotests/080 | 2 +- tests/qemu-iotests/081 | 2 +- tests/qemu-iotests/082 | 2 +- tests/qemu-iotests/083 | 2 +- tests/qemu-iotests/084 | 2 +- tests/qemu-iotests/085 | 2 +- tests/qemu-iotests/086 | 2 +- tests/qemu-iotests/087 | 2 +- tests/qemu-iotests/088 | 2 +- tests/qemu-iotests/089 | 2 +- tests/qemu-iotests/090 | 2 +- tests/qemu-iotests/091 | 2 +- tests/qemu-iotests/092 | 2 +- tests/qemu-iotests/094 | 2 +- tests/qemu-iotests/095 | 2 +- tests/qemu-iotests/097 | 2 +- tests/qemu-iotests/098 | 2 +- tests/qemu-iotests/099 | 2 +- tests/qemu-iotests/101 | 2 +- tests/qemu-iotests/102 | 2 +- tests/qemu-iotests/103 | 2 +- tests/qemu-iotests/104 | 2 +- tests/qemu-iotests/105 | 2 +- tests/qemu-iotests/106 | 2 +- tests/qemu-iotests/107 | 2 +- tests/qemu-iotests/108 | 2 +- tests/qemu-iotests/109 | 2 +- tests/qemu-iotests/110 | 2 +- tests/qemu-iotests/111 | 2 +- tests/qemu-iotests/112 | 2 +- tests/qemu-iotests/113 | 2 +- tests/qemu-iotests/114 | 2 +- tests/qemu-iotests/115 | 2 +- tests/qemu-iotests/116 | 2 +- tests/qemu-iotests/117 | 2 +- tests/qemu-iotests/119 | 2 +- tests/qemu-iotests/120 | 2 +- tests/qemu-iotests/121 | 2 +- tests/qemu-iotests/122 | 2 +- tests/qemu-iotests/123 | 2 +- tests/qemu-iotests/125 | 2 +- tests/qemu-iotests/126 | 2 +- tests/qemu-iotests/127 | 2 +- tests/qemu-iotests/128 | 2 +- tests/qemu-iotests/130 | 2 +- tests/qemu-iotests/131 | 2 +- tests/qemu-iotests/133 | 2 +- tests/qemu-iotests/134 | 2 +- tests/qemu-iotests/135 | 2 +- tests/qemu-iotests/137 | 2 +- tests/qemu-iotests/138 | 2 +- tests/qemu-iotests/140 | 2 +- tests/qemu-iotests/141 | 2 +- tests/qemu-iotests/142 | 2 +- tests/qemu-iotests/143 | 2 +- tests/qemu-iotests/144 | 2 +- tests/qemu-iotests/145 | 2 +- tests/qemu-iotests/146 | 2 +- tests/qemu-iotests/150 | 2 +- tests/qemu-iotests/153 | 2 +- tests/qemu-iotests/154 | 2 +- tests/qemu-iotests/156 | 2 +- tests/qemu-iotests/157 | 2 +- tests/qemu-iotests/158 | 2 +- tests/qemu-iotests/159 | 2 +- tests/qemu-iotests/160 | 2 +- tests/qemu-iotests/161 | 2 +- tests/qemu-iotests/162 | 2 +- tests/qemu-iotests/170 | 2 +- tests/qemu-iotests/171 | 2 +- tests/qemu-iotests/172 | 2 +- tests/qemu-iotests/173 | 2 +- tests/qemu-iotests/174 | 2 +- tests/qemu-iotests/175 | 2 +- tests/qemu-iotests/176 | 2 +- tests/qemu-iotests/177 | 2 +- tests/qemu-iotests/178 | 2 +- tests/qemu-iotests/179 | 2 +- tests/qemu-iotests/181 | 2 +- tests/qemu-iotests/182 | 2 +- tests/qemu-iotests/183 | 2 +- tests/qemu-iotests/184 | 2 +- tests/qemu-iotests/185 | 2 +- tests/qemu-iotests/186 | 2 +- tests/qemu-iotests/187 | 2 +- tests/qemu-iotests/188 | 2 +- tests/qemu-iotests/189 | 2 +- tests/qemu-iotests/190 | 2 +- tests/qemu-iotests/191 | 2 +- tests/qemu-iotests/192 | 2 +- tests/qemu-iotests/195 | 2 +- tests/qemu-iotests/197 | 2 +- tests/qemu-iotests/198 | 2 +- tests/qemu-iotests/200 | 2 +- tests/qemu-iotests/201 | 2 +- tests/qemu-iotests/204 | 2 +- tests/qemu-iotests/208 | 1 + tests/qemu-iotests/209 | 1 + tests/qemu-iotests/214 | 2 +- tests/qemu-iotests/215 | 2 +- tests/qemu-iotests/217 | 2 +- tests/qemu-iotests/220 | 2 +- tests/qemu-iotests/221 | 2 +- tests/qemu-iotests/223 | 2 +- tests/qemu-iotests/225 | 2 +- tests/qemu-iotests/226 | 2 +- tests/qemu-iotests/227 | 2 +- tests/qemu-iotests/229 | 2 +- tests/qemu-iotests/231 | 2 +- tests/qemu-iotests/232 | 2 +- tests/qemu-iotests/233 | 2 +- tests/qemu-iotests/236 | 1 + tests/qemu-iotests/238 | 2 ++ tests/qemu-iotests/check | 2 +- tests/qemu-iotests/common.config | 2 +- tests/qemu-iotests/common.filter | 38 ++++++++++++------------- tests/qemu-iotests/common.nbd | 2 +- tests/qemu-iotests/common.pattern | 2 +- tests/qemu-iotests/common.qemu | 2 +- tests/qemu-iotests/common.rc | 14 ++++++++- tests/qemu-iotests/common.tls | 2 +- tests/qemu-iotests/iotests.py | 4 ++- tests/test-iov.c | 8 ++++-- tests/vm/centos | 3 +- tests/vm/freebsd | 3 +- tests/vm/netbsd | 3 +- tests/vm/openbsd | 17 ++++++++--- util/oslib-posix.c | 10 +++++++ 200 files changed, 272 insertions(+), 218 deletions(-)
Signature · 1 line
2.20.1
PATCH v2 1/18 tests/vm: Be verbose while extracting compressed images
Depending of the host hardware, copying and extracting VM images can take up to few minutes. Add verbosity to avoid the user to worry about VMs hanging.
--- tests/vm/centos | 3 ++- tests/vm/freebsd | 3 ++- tests/vm/netbsd | 3 ++- tests/vm/openbsd | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-)
tests/vm/centos +2 -1
@@ -65,8 +65,9 @@ class CentosVM(basevm.BaseVM): def build_image(self, img): cimg = self._download_with_cache("https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1802.qcow2.xz") img_tmp = img + ".tmp" + sys.stderr.write("Extracting the image...\n") subprocess.check_call(["cp", "-f", cimg, img_tmp + ".xz"]) - subprocess.check_call(["xz", "-df", img_tmp + ".xz"]) + subprocess.check_call(["xz", "-dvf", img_tmp + ".xz"]) subprocess.check_call(["qemu-img", "resize", img_tmp, "50G"]) self.boot(img_tmp, extra_args = ["-cdrom", self._gen_cloud_init_iso()]) self.wait_ssh()
tests/vm/freebsd +2 -1
@@ -34,8 +34,9 @@ class FreeBSDVM(basevm.BaseVM): sha256sum='adcb771549b37bc63826c501f05121a206ed3d9f55f49145908f7e1432d65891') img_tmp_xz = img + ".tmp.xz" img_tmp = img + ".tmp" + sys.stderr.write("Extracting the image...\n") subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) - subprocess.check_call(["xz", "-df", img_tmp_xz]) + subprocess.check_call(["xz", "-dvf", img_tmp_xz]) if os.path.exists(img): os.remove(img) os.rename(img_tmp, img)
tests/vm/netbsd +2 -1
@@ -34,8 +34,9 @@ class NetBSDVM(basevm.BaseVM): sha256sum='b633d565b0eac3d02015cd0c81440bd8a7a8df8512615ac1ee05d318be015732') img_tmp_xz = img + ".tmp.xz" img_tmp = img + ".tmp" + sys.stderr.write("Extracting the image...\n") subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) - subprocess.check_call(["xz", "-df", img_tmp_xz]) + subprocess.check_call(["xz", "-dvf", img_tmp_xz]) if os.path.exists(img): os.remove(img) os.rename(img_tmp, img)
tests/vm/openbsd +2 -1
@@ -35,8 +35,9 @@ class OpenBSDVM(basevm.BaseVM): sha256sum='8c6cedc483e602cfee5e04f0406c64eb99138495e8ca580bc0293bcf0640c1bf') img_tmp_xz = img + ".tmp.xz" img_tmp = img + ".tmp" + sys.stderr.write("Extracting the image...\n") subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) - subprocess.check_call(["xz", "-df", img_tmp_xz]) + subprocess.check_call(["xz", "-dvf", img_tmp_xz]) if os.path.exists(img): os.remove(img) os.rename(img_tmp, img)
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v2 01/18] tests/vm: Be verbose while extracting compressed images
Quoted 5 lines · Philippe Mathieu-Daudé
Depending of the host hardware, copying and extracting VM images can take up to few minutes. Add verbosity to avoid the user to worry about VMs hanging.
Quoted 7 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- tests/vm/centos | 3 ++- tests/vm/freebsd | 3 ++- tests/vm/netbsd | 3 ++- tests/vm/openbsd | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-)
thanks
-- PMM
Re: [Qemu-devel] [PATCH v2 01/18] tests/vm: Be verbose while extracting compressed images
In reply to Philippe Mathieu-DaudéHi Alex,
Can you queue this patch?
Quoted 73 lines · Philippe Mathieu-Daudé
Depending of the host hardware, copying and extracting VM images can take up to few minutes. Add verbosity to avoid the user to worry about VMs hanging.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- tests/vm/centos | 3 ++- tests/vm/freebsd | 3 ++- tests/vm/netbsd | 3 ++- tests/vm/openbsd | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-)tests/vm/centos +2
-1@@ -65,8 +65,9 @@ class CentosVM(basevm.BaseVM): def build_image(self, img): cimg = self._download_with_cache("https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1802.qcow2.xz") img_tmp = img + ".tmp" + sys.stderr.write("Extracting the image...\n") subprocess.check_call(["cp", "-f", cimg, img_tmp + ".xz"]) - subprocess.check_call(["xz", "-df", img_tmp + ".xz"]) + subprocess.check_call(["xz", "-dvf", img_tmp + ".xz"]) subprocess.check_call(["qemu-img", "resize", img_tmp, "50G"]) self.boot(img_tmp, extra_args = ["-cdrom", self._gen_cloud_init_iso()]) self.wait_ssh()tests/vm/freebsd +2
-1@@ -34,8 +34,9 @@ class FreeBSDVM(basevm.BaseVM): sha256sum='adcb771549b37bc63826c501f05121a206ed3d9f55f49145908f7e1432d65891') img_tmp_xz = img + ".tmp.xz" img_tmp = img + ".tmp" + sys.stderr.write("Extracting the image...\n") subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) - subprocess.check_call(["xz", "-df", img_tmp_xz]) + subprocess.check_call(["xz", "-dvf", img_tmp_xz]) if os.path.exists(img): os.remove(img) os.rename(img_tmp, img)tests/vm/netbsd +2
-1@@ -34,8 +34,9 @@ class NetBSDVM(basevm.BaseVM): sha256sum='b633d565b0eac3d02015cd0c81440bd8a7a8df8512615ac1ee05d318be015732') img_tmp_xz = img + ".tmp.xz" img_tmp = img + ".tmp" + sys.stderr.write("Extracting the image...\n") subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) - subprocess.check_call(["xz", "-df", img_tmp_xz]) + subprocess.check_call(["xz", "-dvf", img_tmp_xz]) if os.path.exists(img): os.remove(img) os.rename(img_tmp, img)tests/vm/openbsd +2
-1@@ -35,8 +35,9 @@ class OpenBSDVM(basevm.BaseVM): sha256sum='8c6cedc483e602cfee5e04f0406c64eb99138495e8ca580bc0293bcf0640c1bf') img_tmp_xz = img + ".tmp.xz" img_tmp = img + ".tmp" + sys.stderr.write("Extracting the image...\n") subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) - subprocess.check_call(["xz", "-df", img_tmp_xz]) + subprocess.check_call(["xz", "-dvf", img_tmp_xz]) if os.path.exists(img): os.remove(img) os.rename(img_tmp, img)
Re: [Qemu-devel] [PATCH v2 01/18] tests/vm: Be verbose while extracting compressed images
Quoted 3 lines · Philippe Mathieu-Daudé
Hi Alex,
Can you queue this patch?
Done.
Quoted 67 lines · Philippe Mathieu-Daudé
Quoted 65 lines
Depending of the host hardware, copying and extracting VM images can take up to few minutes. Add verbosity to avoid the user to worry about VMs hanging.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- tests/vm/centos | 3 ++- tests/vm/freebsd | 3 ++- tests/vm/netbsd | 3 ++- tests/vm/openbsd | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-)tests/vm/centos +2
-1@@ -65,8 +65,9 @@ class CentosVM(basevm.BaseVM): def build_image(self, img): cimg = self._download_with_cache("https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1802.qcow2.xz") img_tmp = img + ".tmp" + sys.stderr.write("Extracting the image...\n") subprocess.check_call(["cp", "-f", cimg, img_tmp + ".xz"]) - subprocess.check_call(["xz", "-df", img_tmp + ".xz"]) + subprocess.check_call(["xz", "-dvf", img_tmp + ".xz"]) subprocess.check_call(["qemu-img", "resize", img_tmp, "50G"]) self.boot(img_tmp, extra_args = ["-cdrom", self._gen_cloud_init_iso()]) self.wait_ssh()tests/vm/freebsd +2
-1@@ -34,8 +34,9 @@ class FreeBSDVM(basevm.BaseVM): sha256sum='adcb771549b37bc63826c501f05121a206ed3d9f55f49145908f7e1432d65891') img_tmp_xz = img + ".tmp.xz" img_tmp = img + ".tmp" + sys.stderr.write("Extracting the image...\n") subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) - subprocess.check_call(["xz", "-df", img_tmp_xz]) + subprocess.check_call(["xz", "-dvf", img_tmp_xz]) if os.path.exists(img): os.remove(img) os.rename(img_tmp, img)tests/vm/netbsd +2
-1@@ -34,8 +34,9 @@ class NetBSDVM(basevm.BaseVM): sha256sum='b633d565b0eac3d02015cd0c81440bd8a7a8df8512615ac1ee05d318be015732') img_tmp_xz = img + ".tmp.xz" img_tmp = img + ".tmp" + sys.stderr.write("Extracting the image...\n") subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) - subprocess.check_call(["xz", "-df", img_tmp_xz]) + subprocess.check_call(["xz", "-dvf", img_tmp_xz]) if os.path.exists(img): os.remove(img) os.rename(img_tmp, img)tests/vm/openbsd +0
-0@@ -35,8 +35,9 @@ class OpenBSDVM(basevm.BaseVM): sha256sum='8c6cedc483e602cfee5e04f0406c64eb99138495e8ca580bc0293bcf0640c1bf') img_tmp_xz = img + ".tmp.xz" img_tmp = img + ".tmp"
Quoted 8 lines
tests/vm/openbsd class OpenBSDVM(basevm.BaseVM): · line 43
Quoted 8 lines
tests/vm/openbsd +2
-1+ sys.stderr.write("Extracting the image...\n") subprocess.check_call(["cp", "-f", cimg, img_tmp_xz]) - subprocess.check_call(["xz", "-df", img_tmp_xz]) + subprocess.check_call(["xz", "-dvf", img_tmp_xz]) if os.path.exists(img): os.remove(img) os.rename(img_tmp, img)
--
Alex Bennée
PATCH v2 2/18 configure: Disable W^X on OpenBSD
In reply to Philippe Mathieu-DaudéSince OpenBSD 6.0 [1], W^X is enforced by default [2]. TCG requires WX access. Disable W^X if it is available. This fixes:
# lm32-softmmu/qemu-system-lm32 Could not allocate dynamic translator buffer
# sysctl kern.wxabort=1
kern.wxabort: 0 -> 1
# lm32-softmmu/qemu-system-lm32
mmap: Not supported
Abort trap (core dumped)
# gdb -q lm32-softmmu/qemu-system-lm32 qemu-system-lm32.core
(gdb) bt
#0 0x000017e3c156c50a in _thread_sys___syscall () at {standard input}:5
#1 0x000017e3c15e5d7a in *_libc_mmap (addr=Variable "addr" is not available.) at /usr/src/lib/libc/sys/mmap.c:47
#2 0x000017e17d9abc8b in alloc_code_gen_buffer () at /usr/src/qemu/accel/tcg/translate-all.c:1064
#3 0x000017e17d9abd04 in code_gen_alloc (tb_size=0) at /usr/src/qemu/accel/tcg/translate-all.c:1112
#4 0x000017e17d9abe81 in tcg_exec_init (tb_size=0) at /usr/src/qemu/accel/tcg/translate-all.c:1149
#5 0x000017e17d9897e9 in tcg_init (ms=0x17e45e456800) at /usr/src/qemu/accel/tcg/tcg-all.c:66
#6 0x000017e17d9891b8 in accel_init_machine (acc=0x17e3c3f50800, ms=0x17e45e456800) at /usr/src/qemu/accel/accel.c:63
#7 0x000017e17d989312 in configure_accelerator (ms=0x17e45e456800, progname=0x7f7fffff07b0 "lm32-softmmu/qemu-system-lm32") at /usr/src/qemu/accel/accel.c:111
#8 0x000017e17d9d8616 in main (argc=1, argv=0x7f7fffff06b8, envp=0x7f7fffff06c8) at vl.c:4325[1] https://www.openbsd.org/faq/upgrade60.html
[2] https://undeadly.org/cgi?action=article&sid=20160527203200
--- configure | 11 +++++++++++ 1 file changed, 11 insertions(+)
configure +11 -0
@@ -5795,6 +5795,17 @@ if test "$mingw32" = "yes" ; then done fi +# Disable OpenBSD W^X if available +if test "$tcg" = "yes" -a "$targetos" = "OpenBSD"; then + cat > $TMPC <<EOF + int main(void) { return 0; } +EOF + wx_ldflags="-Wl,-z,wxneeded" + if compile_prog "" "$wx_ldflags"; then + QEMU_LDFLAGS="$QEMU_LDFLAGS $wx_ldflags" + fi +fi + qemu_confdir=$sysconfdir$confsuffix qemu_moddir=$libdir$confsuffix qemu_datadir=$datadir$confsuffix
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v2 02/18] configure: Disable W^X on OpenBSD
Quoted 37 lines · Philippe Mathieu-Daudé
Since OpenBSD 6.0 [1], W^X is enforced by default [2]. TCG requires WX access. Disable W^X if it is available. This fixes:
# lm32-softmmu/qemu-system-lm32 Could not allocate dynamic translator buffer# sysctl kern.wxabort=1 kern.wxabort: 0 -> 1 # lm32-softmmu/qemu-system-lm32 mmap: Not supported Abort trap (core dumped) # gdb -q lm32-softmmu/qemu-system-lm32 qemu-system-lm32.core (gdb) bt #0 0x000017e3c156c50a in _thread_sys___syscall () at {standard input}:5 #1 0x000017e3c15e5d7a in *_libc_mmap (addr=Variable "addr" is not available.) at /usr/src/lib/libc/sys/mmap.c:47 #2 0x000017e17d9abc8b in alloc_code_gen_buffer () at /usr/src/qemu/accel/tcg/translate-all.c:1064 #3 0x000017e17d9abd04 in code_gen_alloc (tb_size=0) at /usr/src/qemu/accel/tcg/translate-all.c:1112 #4 0x000017e17d9abe81 in tcg_exec_init (tb_size=0) at /usr/src/qemu/accel/tcg/translate-all.c:1149 #5 0x000017e17d9897e9 in tcg_init (ms=0x17e45e456800) at /usr/src/qemu/accel/tcg/tcg-all.c:66 #6 0x000017e17d9891b8 in accel_init_machine (acc=0x17e3c3f50800, ms=0x17e45e456800) at /usr/src/qemu/accel/accel.c:63 #7 0x000017e17d989312 in configure_accelerator (ms=0x17e45e456800, progname=0x7f7fffff07b0 "lm32-softmmu/qemu-system-lm32") at /usr/src/qemu/accel/accel.c:111 #8 0x000017e17d9d8616 in main (argc=1, argv=0x7f7fffff06b8, envp=0x7f7fffff06c8) at vl.c:4325[1] https://www.openbsd.org/faq/upgrade60.html
[2] https://undeadly.org/cgi?action=article&sid=20160527203200Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- configure | 11 +++++++++++ 1 file changed, 11 insertions(+)configure +0
-0
configure if test "$mingw32" = "yes" ; then · line 5803
Quoted 9 lines
configure +6
-0@@ -5795,6 +5795,17 @@ if test "$mingw32" = "yes" ; then done fi +# Disable OpenBSD W^X if available +if test "$tcg" = "yes" -a "$targetos" = "OpenBSD"; then + cat > $TMPC <<EOF + int main(void) { return 0; } +EOF + wx_ldflags="-Wl,-z,wxneeded"
I told Thomas I'd remove the wx_ldflags but forgot. Anyway this doesn't change the patch correctness.
Quoted 9 lines
configure +5
-0+ if compile_prog "" "$wx_ldflags"; then + QEMU_LDFLAGS="$QEMU_LDFLAGS $wx_ldflags" + fi +fi + qemu_confdir=$sysconfdir$confsuffix qemu_moddir=$libdir$confsuffix qemu_datadir=$datadir$confsuffix
Re: [Qemu-devel] [PATCH v2 02/18] configure: Disable W^X on OpenBSD
In reply to Philippe Mathieu-DaudéQuoted 13 lines · Philippe Mathieu-Daudé
Since OpenBSD 6.0 [1], W^X is enforced by default [2]. TCG requires WX access. Disable W^X if it is available. This fixes:
configure | 11 +++++++++++ 1 file changed, 11 insertions(+)configure +0
-0
configure if test "$mingw32" = "yes" ; then · line 5799
Quoted 5 lines
configure +2
-0@@ -5795,6 +5795,17 @@ if test "$mingw32" = "yes" ; then done fi +# Disable OpenBSD W^X if available +if test "$tcg" = "yes" -a "$targetos" = "OpenBSD"; then
test ... -a ...
is not portable (POSIX permits non-XSI systems to omit support for these operators, but even where they are supported, there are some inherently ambiguous inputs where you CANNOT predict whether the shell will parse -a as a binary operator or as an argument to some other operator). Instead, you should ALWAYS break dual tests into:
test ... && test ...
instead. (Same for '-o' vs '|| test')
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [PATCH v2 02/18] configure: Disable W^X on OpenBSD
Quoted 28 lines · Eric Blake
Quoted 13 lines · Philippe Mathieu-Daudé
Since OpenBSD 6.0 [1], W^X is enforced by default [2]. TCG requires WX access. Disable W^X if it is available. This fixes:
configure | 11 +++++++++++ 1 file changed, 11 insertions(+)configure +0
-0configure if test "$mingw32" = "yes" ; then · line 5799
Quoted 5 lines
configure +2
-0@@ -5795,6 +5795,17 @@ if test "$mingw32" = "yes" ; then done fi +# Disable OpenBSD W^X if available +if test "$tcg" = "yes" -a "$targetos" = "OpenBSD"; thentest ... -a ...
is not portable (POSIX permits non-XSI systems to omit support for these operators, but even where they are supported, there are some inherently ambiguous inputs where you CANNOT predict whether the shell will parse -a as a binary operator or as an argument to some other operator). Instead, you should ALWAYS break dual tests into:
Quoted 3 lines
test ... && test ...
instead. (Same for '-o' vs '|| test')
$ grep 'test.* -a ' configure | wc -l 21 $ grep 'test.* && ' configure | wc -l 16
Looks like we do not really care?
Thomas
Re: [Qemu-devel] [PATCH v2 02/18] configure: Disable W^X on OpenBSD
Quoted 10 lines · Thomas Huth
Quoted 10 lines
test ... -a ...
is not portable (POSIX permits non-XSI systems to omit support for these operators, but even where they are supported, there are some inherently ambiguous inputs where you CANNOT predict whether the shell will parse -a as a binary operator or as an argument to some other operator). Instead, you should ALWAYS break dual tests into:
test ... && test ...
Quoted 8 lines
Quoted 1 line
instead. (Same for '-o' vs '|| test')
$ grep 'test.* -a ' configure | wc -l 21 $ grep 'test.* && ' configure | wc -l 16Looks like we do not really care?
Well, I care. Enough to propose a patch :)
https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg00960.html
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
PATCH v2 3/18 tests/vm/openbsd: Disable the W^X protection on the build partition
In reply to Philippe Mathieu-DaudéSince OpenBSD 6.0 [1], W^X is enforced by default [2]. TCG requires WX access, and QEMU binaries are now built with the WX flag to disable the protection. However, WX allowed binaries need to be run on a WX allowed partition.
To be able to run the QEMU test suite on the VM, mount the partition where QEMU is built/tested as WX allowed.
[1] https://www.openbsd.org/faq/upgrade60.html
[2] https://undeadly.org/cgi?action=article&sid=20160527203200
--- tests/vm/openbsd | 6 ++++++ 1 file changed, 6 insertions(+)
tests/vm/openbsd +6 -0
@@ -41,6 +41,12 @@ class OpenBSDVM(basevm.BaseVM): if os.path.exists(img): os.remove(img) os.rename(img_tmp, img) + self.boot(img) + self.wait_ssh() + sys.stderr.write("Disabling W^X on the build partition...\n") + self.ssh_root_check("sed -E -i 's_(/tmp\ ffs)\ ([^\ ]*)_\\1 \\2,wxallowed_' /etc/fstab") + self.ssh_root("shutdown -p now") + self.wait() if __name__ == "__main__": sys.exit(basevm.main(OpenBSDVM))
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v2 03/18] tests/vm/openbsd: Disable the W^X protection on the build partition
Quoted 20 lines · Philippe Mathieu-Daudé
Since OpenBSD 6.0 [1], W^X is enforced by default [2]. TCG requires WX access, and QEMU binaries are now built with the WX flag to disable the protection. However, WX allowed binaries need to be run on a WX allowed partition.
To be able to run the QEMU test suite on the VM, mount the partition where QEMU is built/tested as WX allowed.[1] https://www.openbsd.org/faq/upgrade60.html
[2] https://undeadly.org/cgi?action=article&sid=20160527203200Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- tests/vm/openbsd | 6 ++++++ 1 file changed, 6 insertions(+)tests/vm/openbsd +0
-0
tests/vm/openbsd class OpenBSDVM(basevm.BaseVM): · line 47
Quoted 7 lines
tests/vm/openbsd +4
-0@@ -41,6 +41,12 @@ class OpenBSDVM(basevm.BaseVM): if os.path.exists(img): os.remove(img) os.rename(img_tmp, img) + self.boot(img) + self.wait_ssh() + sys.stderr.write("Disabling W^X on the build partition...\n") + self.ssh_root_check("sed -E -i 's_(/tmp\ ffs)\ ([^\ ]*)_\\1 \\2,wxallowed_' /etc/fstab")
sed -i is non-POSIX, but it looks like it works in OpenBSD.
Quoted 6 lines
tests/vm/openbsd +2
-0+ self.ssh_root("shutdown -p now") + self.wait() if __name__ == "__main__": sys.exit(basevm.main(OpenBSDVM))
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
PATCH v2 4/18 ahci-test: Add dependency to qemu-img tool
In reply to Philippe Mathieu-DaudéSince the ahci-test uses qemu-img, add a dependency to build it before using it.
This fixes:
$ gmake check-qtest V=1 QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 QTEST_QEMU_IMG=qemu-img tests/ahci-test Failed to execute child process "/tmp/qemu-test.19tMRF/qemu-img" (No such file or directory) ERROR:tests/libqos/libqos.c:192:mkimg: assertion failed: (ret && !err)
---
Slighly related is when vm-tests expect qemu-img available:
https://lists.gnu.org/archive/html/qemu-devel/2018-06/msg08415.html
$ make vm-build-ubuntu.i386
Traceback (most recent call last):
File "source/qemu/tests/vm/basevm.py", line 236, in main
return vm.build_image(args.image)
File "tests/vm/ubuntu.i386", line 67, in build_image
subprocess.check_call(["qemu-img", "resize", img_tmp, "50G"])
OSError: [Errno 2] No such file or directory
tests/vm/Makefile.include:23: recipe for target 'tests/vm/ubuntu.i386.img' failed
make: *** [tests/vm/ubuntu.i386.img] Error 2A better fix would be checking those tools via ./configure...
--- tests/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/Makefile.include +1 -1
@@ -706,7 +706,7 @@ tests/prom-env-test$(EXESUF): tests/prom-env-test.o $(libqos-obj-y) tests/rtas-test$(EXESUF): tests/rtas-test.o $(libqos-spapr-obj-y) tests/fdc-test$(EXESUF): tests/fdc-test.o tests/ide-test$(EXESUF): tests/ide-test.o $(libqos-pc-obj-y) -tests/ahci-test$(EXESUF): tests/ahci-test.o $(libqos-pc-obj-y) +tests/ahci-test$(EXESUF): tests/ahci-test.o $(libqos-pc-obj-y) qemu-img$(EXESUF) tests/ipmi-kcs-test$(EXESUF): tests/ipmi-kcs-test.o tests/ipmi-bt-test$(EXESUF): tests/ipmi-bt-test.o tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o
Signature · 1 line
2.20.1
PATCH v2 5/18 qemu-iotests: Add dependency to qemu-nbd tool
In reply to Philippe Mathieu-DaudéSince a9660664fde, some iotests use qemu-nbd.
Add a dependency to build it before using it.
This fixes:
$ gmake check-block
CHK version_gen.h
GEN qemu-img-cmds.h
CC qemu-img.o
LINK qemu-img
CC qemu-io.o
LINK qemu-io
tests/qemu-iotests-quick.sh
tests/qemu-iotests-quick.sh[6]: ./check: No such file or directory
gmake: *** [/tmp/qemu-test.9GLXBk/tests/Makefile.include:1059: check-tests/qemu-iotests-quick.sh] Error 1---
On Linux, qemu-iotests-quick.sh is a bit less cryptic:
$ gmake check-block
GEN qemu-img-cmds.h
CC qemu-img.o
LINK qemu-img
CC qemu-io.o
LINK qemu-io
CC tests/qemu-iotests/socket_scm_helper.o
LINK tests/qemu-iotests/socket_scm_helper
/home/phil/source/qemu/tests/qemu-iotests-quick.sh
check: qemu-nbd not found
gmake: *** [/home/phil/source/qemu/tests/Makefile.include:1059: check-tests/qemu-iotests-quick.sh] Error 1
---
tests/Makefile.include | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)tests/Makefile.include +1 -1
@@ -1055,7 +1055,7 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES) QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = tests/qemu-iotests/socket_scm_helper$(EXESUF) .PHONY: check-tests/qemu-iotests-quick.sh -check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) qemu-io$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) +check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) $< .PHONY: $(patsubst %, check-%, $(check-qapi-schema-y))
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v2 05/18] qemu-iotests: Add dependency to qemu-nbd tool
Quoted 15 lines · Philippe Mathieu-Daudé
Since
a9660664fde, some iotests use qemu-nbd.
Add a dependency to build it before using it.
This fixes:$ gmake check-block CHK version_gen.h GEN qemu-img-cmds.h CC qemu-img.o LINK qemu-img CC qemu-io.o LINK qemu-io tests/qemu-iotests-quick.sh tests/qemu-iotests-quick.sh[6]: ./check: No such file or directory gmake: *** [/tmp/qemu-test.9GLXBk/tests/Makefile.include:1059: check-tests/qemu-iotests-quick.sh] Error 1
Quoted 2 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
tests/Makefile.include clean-tcg: $(CLEAN_TCG_TARGET_RULES) · line 1058
Quoted 7 lines
+++ b/tests/Makefile.include
tests/Makefile.include +1
-1@@ -1055,7 +1055,7 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES) QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = tests/qemu-iotests/socket_scm_helper$(EXESUF) .PHONY: check-tests/qemu-iotests-quick.sh -check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) qemu-io$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) +check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y)
Worth using backslash-newline to wrap this into a series of shorter lines?
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
PATCH v2 6/18 qemu-iotests: Improve portability by searching bash in the $PATH
In reply to Philippe Mathieu-DaudéBash is not always installed as /bin/bash. In particular on OpenBSD, the package installs it in /usr/local/bin.
Use the 'env' shebang to search bash in the $PATH.
Patch created mechanically by running:
$ git grep -lE '#! ?/bin/bash' -- tests/qemu-iotests | \
while read f; do \
sed -i 's_#!.\?/bin/bash_#! /usr/bin/env bash_' $f; \
done---
Can 'env' be located elsewhere than /usr/bin/env?
--- tests/qemu-iotests/001 | 2 +- tests/qemu-iotests/002 | 2 +- tests/qemu-iotests/003 | 2 +- tests/qemu-iotests/004 | 2 +- tests/qemu-iotests/005 | 2 +- tests/qemu-iotests/007 | 2 +- tests/qemu-iotests/008 | 2 +- tests/qemu-iotests/009 | 2 +- tests/qemu-iotests/010 | 2 +- tests/qemu-iotests/011 | 2 +- tests/qemu-iotests/012 | 2 +- tests/qemu-iotests/013 | 2 +- tests/qemu-iotests/014 | 2 +- tests/qemu-iotests/015 | 2 +- tests/qemu-iotests/017 | 2 +- tests/qemu-iotests/018 | 2 +- tests/qemu-iotests/019 | 2 +- tests/qemu-iotests/020 | 2 +- tests/qemu-iotests/021 | 2 +- tests/qemu-iotests/022 | 2 +- tests/qemu-iotests/023 | 2 +- tests/qemu-iotests/024 | 2 +- tests/qemu-iotests/025 | 2 +- tests/qemu-iotests/026 | 2 +- tests/qemu-iotests/027 | 2 +- tests/qemu-iotests/028 | 2 +- tests/qemu-iotests/029 | 2 +- tests/qemu-iotests/031 | 2 +- tests/qemu-iotests/032 | 2 +- tests/qemu-iotests/033 | 2 +- tests/qemu-iotests/034 | 2 +- tests/qemu-iotests/035 | 2 +- tests/qemu-iotests/036 | 2 +- tests/qemu-iotests/037 | 2 +- tests/qemu-iotests/038 | 2 +- tests/qemu-iotests/039 | 2 +- tests/qemu-iotests/042 | 2 +- tests/qemu-iotests/043 | 2 +- tests/qemu-iotests/046 | 2 +- tests/qemu-iotests/047 | 2 +- tests/qemu-iotests/048 | 2 +- tests/qemu-iotests/049 | 2 +- tests/qemu-iotests/050 | 2 +- tests/qemu-iotests/051 | 2 +- tests/qemu-iotests/052 | 2 +- tests/qemu-iotests/053 | 2 +- tests/qemu-iotests/054 | 2 +- tests/qemu-iotests/058 | 2 +- tests/qemu-iotests/059 | 2 +- tests/qemu-iotests/060 | 2 +- tests/qemu-iotests/061 | 2 +- tests/qemu-iotests/062 | 2 +- tests/qemu-iotests/063 | 2 +- tests/qemu-iotests/064 | 2 +- tests/qemu-iotests/066 | 2 +- tests/qemu-iotests/067 | 2 +- tests/qemu-iotests/068 | 2 +- tests/qemu-iotests/069 | 2 +- tests/qemu-iotests/070 | 2 +- tests/qemu-iotests/071 | 2 +- tests/qemu-iotests/072 | 2 +- tests/qemu-iotests/073 | 2 +- tests/qemu-iotests/074 | 2 +- tests/qemu-iotests/075 | 2 +- tests/qemu-iotests/076 | 2 +- tests/qemu-iotests/077 | 2 +- tests/qemu-iotests/078 | 2 +- tests/qemu-iotests/079 | 2 +- tests/qemu-iotests/080 | 2 +- tests/qemu-iotests/081 | 2 +- tests/qemu-iotests/082 | 2 +- tests/qemu-iotests/083 | 2 +- tests/qemu-iotests/084 | 2 +- tests/qemu-iotests/085 | 2 +- tests/qemu-iotests/086 | 2 +- tests/qemu-iotests/087 | 2 +- tests/qemu-iotests/088 | 2 +- tests/qemu-iotests/089 | 2 +- tests/qemu-iotests/090 | 2 +- tests/qemu-iotests/091 | 2 +- tests/qemu-iotests/092 | 2 +- tests/qemu-iotests/094 | 2 +- tests/qemu-iotests/095 | 2 +- tests/qemu-iotests/097 | 2 +- tests/qemu-iotests/098 | 2 +- tests/qemu-iotests/099 | 2 +- tests/qemu-iotests/101 | 2 +- tests/qemu-iotests/102 | 2 +- tests/qemu-iotests/103 | 2 +- tests/qemu-iotests/104 | 2 +- tests/qemu-iotests/105 | 2 +- tests/qemu-iotests/106 | 2 +- tests/qemu-iotests/107 | 2 +- tests/qemu-iotests/108 | 2 +- tests/qemu-iotests/109 | 2 +- tests/qemu-iotests/110 | 2 +- tests/qemu-iotests/111 | 2 +- tests/qemu-iotests/112 | 2 +- tests/qemu-iotests/113 | 2 +- tests/qemu-iotests/114 | 2 +- tests/qemu-iotests/115 | 2 +- tests/qemu-iotests/116 | 2 +- tests/qemu-iotests/117 | 2 +- tests/qemu-iotests/119 | 2 +- tests/qemu-iotests/120 | 2 +- tests/qemu-iotests/121 | 2 +- tests/qemu-iotests/122 | 2 +- tests/qemu-iotests/123 | 2 +- tests/qemu-iotests/125 | 2 +- tests/qemu-iotests/126 | 2 +- tests/qemu-iotests/127 | 2 +- tests/qemu-iotests/128 | 2 +- tests/qemu-iotests/130 | 2 +- tests/qemu-iotests/131 | 2 +- tests/qemu-iotests/133 | 2 +- tests/qemu-iotests/134 | 2 +- tests/qemu-iotests/135 | 2 +- tests/qemu-iotests/137 | 2 +- tests/qemu-iotests/138 | 2 +- tests/qemu-iotests/140 | 2 +- tests/qemu-iotests/141 | 2 +- tests/qemu-iotests/142 | 2 +- tests/qemu-iotests/143 | 2 +- tests/qemu-iotests/144 | 2 +- tests/qemu-iotests/145 | 2 +- tests/qemu-iotests/146 | 2 +- tests/qemu-iotests/150 | 2 +- tests/qemu-iotests/153 | 2 +- tests/qemu-iotests/154 | 2 +- tests/qemu-iotests/156 | 2 +- tests/qemu-iotests/157 | 2 +- tests/qemu-iotests/158 | 2 +- tests/qemu-iotests/159 | 2 +- tests/qemu-iotests/160 | 2 +- tests/qemu-iotests/161 | 2 +- tests/qemu-iotests/162 | 2 +- tests/qemu-iotests/170 | 2 +- tests/qemu-iotests/171 | 2 +- tests/qemu-iotests/172 | 2 +- tests/qemu-iotests/173 | 2 +- tests/qemu-iotests/174 | 2 +- tests/qemu-iotests/175 | 2 +- tests/qemu-iotests/176 | 2 +- tests/qemu-iotests/177 | 2 +- tests/qemu-iotests/178 | 2 +- tests/qemu-iotests/179 | 2 +- tests/qemu-iotests/181 | 2 +- tests/qemu-iotests/182 | 2 +- tests/qemu-iotests/183 | 2 +- tests/qemu-iotests/184 | 2 +- tests/qemu-iotests/185 | 2 +- tests/qemu-iotests/186 | 2 +- tests/qemu-iotests/187 | 2 +- tests/qemu-iotests/188 | 2 +- tests/qemu-iotests/189 | 2 +- tests/qemu-iotests/190 | 2 +- tests/qemu-iotests/191 | 2 +- tests/qemu-iotests/192 | 2 +- tests/qemu-iotests/195 | 2 +- tests/qemu-iotests/197 | 2 +- tests/qemu-iotests/198 | 2 +- tests/qemu-iotests/200 | 2 +- tests/qemu-iotests/201 | 2 +- tests/qemu-iotests/204 | 2 +- tests/qemu-iotests/214 | 2 +- tests/qemu-iotests/215 | 2 +- tests/qemu-iotests/217 | 2 +- tests/qemu-iotests/220 | 2 +- tests/qemu-iotests/221 | 2 +- tests/qemu-iotests/223 | 2 +- tests/qemu-iotests/225 | 2 +- tests/qemu-iotests/226 | 2 +- tests/qemu-iotests/227 | 2 +- tests/qemu-iotests/229 | 2 +- tests/qemu-iotests/231 | 2 +- tests/qemu-iotests/232 | 2 +- tests/qemu-iotests/233 | 2 +- tests/qemu-iotests/check | 2 +- tests/qemu-iotests/common.config | 2 +- tests/qemu-iotests/common.filter | 2 +- tests/qemu-iotests/common.nbd | 2 +- tests/qemu-iotests/common.pattern | 2 +- tests/qemu-iotests/common.qemu | 2 +- tests/qemu-iotests/common.rc | 2 +- tests/qemu-iotests/common.tls | 2 +- 185 files changed, 185 insertions(+), 185 deletions(-)
tests/qemu-iotests/001 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test simple read/write using plain bdrv_read/bdrv_write #
tests/qemu-iotests/002 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test simple read/write using plain bdrv_pread/bdrv_pwrite #
tests/qemu-iotests/003 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test simple read/write using bdrv_aio_readv/bdrv_aio_writev #
tests/qemu-iotests/004 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Make sure we can't read and write outside of the image size. #
tests/qemu-iotests/005 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Make sure qemu-img can create 5TB images #
tests/qemu-iotests/007 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Check for one possible case of qcow2 refcount corruption. #
tests/qemu-iotests/008 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test simple asynchronous read/write operations. #
tests/qemu-iotests/009 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Nolan I qcow2 corruption - incorrectly reports free clusters #
tests/qemu-iotests/010 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Nolan II qcow2 corruption - wrong used cluster #
tests/qemu-iotests/011 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test for AIO allocation on the same cluster #
tests/qemu-iotests/012 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Make sure we can open read-only images #
tests/qemu-iotests/013 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # qcow2 pattern test, empty and compressed image - 4k cluster patterns #
tests/qemu-iotests/014 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # qcow2 pattern test, complex patterns including compression and snapshots # Using patterns for 4k cluster size.
tests/qemu-iotests/015 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Combined test to grow the refcount table and test snapshots. #
tests/qemu-iotests/017 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Simple backing file reads #
tests/qemu-iotests/018 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Merge backing file into test image when converting the image #
tests/qemu-iotests/019 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # When using a backing file for the output image in qemu-img convert, # the backing file clusters must not copied. The data must still be
tests/qemu-iotests/020 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Commit changes to backing file #
tests/qemu-iotests/021 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test handling of invalid patterns arguments to qemu-io #
tests/qemu-iotests/022 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test bdrv_load/save_vmstate using the usual patterns #
tests/qemu-iotests/023 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # qcow2 pattern test with various cluster sizes #
tests/qemu-iotests/024 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Rebasing COW images #
tests/qemu-iotests/025 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Resizing images #
tests/qemu-iotests/026 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # qcow2 error path testing #
tests/qemu-iotests/027 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test that sub-cluster allocating writes zero the rest of the cluster #
tests/qemu-iotests/028 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test that backing files can be smaller than the image #
tests/qemu-iotests/029 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # qcow2 internal snapshots/VM state tests #
tests/qemu-iotests/031 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test that all qcow2 header extensions survive a header rewrite #
tests/qemu-iotests/032 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test that AIO requests are drained before an image is closed. This used # to segfault because the request coroutine kept running even after the
tests/qemu-iotests/033 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test aligned and misaligned write zeroes operations. #
tests/qemu-iotests/034 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test bdrv_pwrite_zeroes with backing files (see also 154) #
tests/qemu-iotests/035 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Let a few AIO requests run in parallel and have them access different L2 # tables so that the cache has a chance to get used up.
tests/qemu-iotests/036 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test qcow2 feature bits #
tests/qemu-iotests/037 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test COW from backing files #
tests/qemu-iotests/038 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test COW from backing files with AIO #
tests/qemu-iotests/039 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test qcow2 lazy refcounts #
tests/qemu-iotests/042 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test qemu-img operation on zero size images #
tests/qemu-iotests/043 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test that qemu-img info --backing-chain detects infinite loops #
tests/qemu-iotests/046 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test concurrent cluster allocations #
tests/qemu-iotests/047 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Regression test for commit b7ab0fea (which was a corruption fix, # despite the commit message claiming otherwise)
tests/qemu-iotests/048 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash ## ## qemu-img compare test ##
tests/qemu-iotests/049 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Check qemu-img option parsing #
tests/qemu-iotests/050 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test qemu-img rebase with zero clusters #
tests/qemu-iotests/051 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test command line configuration of block devices and driver-specific options #
tests/qemu-iotests/052 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test bdrv_read/bdrv_write using BDRV_O_SNAPSHOT #
tests/qemu-iotests/053 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test qemu-img convert when image length is not a multiple of cluster size #
tests/qemu-iotests/054 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test huge qcow2 images #
tests/qemu-iotests/058 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test export internal snapshot by qemu-nbd, convert it by qemu-img. #
tests/qemu-iotests/059 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for vmdk #
tests/qemu-iotests/060 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for image corruption (overlapping data structures) in qcow2 #
tests/qemu-iotests/061 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for image option amendment in qcow2. #
tests/qemu-iotests/062 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for snapshotting images with unallocated zero clusters in # qcow2
tests/qemu-iotests/063 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # test of qemu-img convert -n - convert without creation #
tests/qemu-iotests/064 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test VHDX read/write from a sample image created with Hyper-V #
tests/qemu-iotests/066 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for preallocated zero clusters in qcow2 #
tests/qemu-iotests/067 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test automatic deletion of BDSes created by -drive/drive_add #
tests/qemu-iotests/068 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for loading a saved VM state from a qcow2 image #
tests/qemu-iotests/069 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for deleting a backing file #
tests/qemu-iotests/070 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test VHDX log replay from an image with a journal that needs to be # replayed
tests/qemu-iotests/071 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for the QMP blkdebug and blkverify interfaces #
tests/qemu-iotests/072 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for nested image formats #
tests/qemu-iotests/073 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test count_contiguous_clusters in qcow2 #
tests/qemu-iotests/074 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash ## ## qemu-img compare test (qcow2 only ones) ##
tests/qemu-iotests/075 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # cloop format input validation tests #
tests/qemu-iotests/076 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # parallels format input validation tests #
tests/qemu-iotests/077 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test concurrent pread/pwrite #
tests/qemu-iotests/078 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # bochs format input validation tests #
tests/qemu-iotests/079 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test qcow2 preallocation with different cluster_sizes #
tests/qemu-iotests/080 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # qcow2 format input validation tests #
tests/qemu-iotests/081 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test Quorum block driver #
tests/qemu-iotests/082 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test qemu-img command line parsing #
tests/qemu-iotests/083 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test NBD client unexpected disconnect #
tests/qemu-iotests/084 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for VDI header corruption; image too large, and too many blocks. # Also simple test for creating dynamic and static VDI images.
tests/qemu-iotests/085 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Live snapshot tests #
tests/qemu-iotests/086 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test qemu-img progress output #
tests/qemu-iotests/087 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test unsupported blockdev-add cases #
tests/qemu-iotests/088 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # vpc (VHD) format input validation tests #
tests/qemu-iotests/089 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for support of JSON filenames #
tests/qemu-iotests/090 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test for discarding compressed clusters on qcow2 images #
tests/qemu-iotests/091 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Live migration test #
tests/qemu-iotests/092 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # qcow1 format input validation tests #
tests/qemu-iotests/094 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for drive-mirror to NBD #
tests/qemu-iotests/095 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test for commit of larger active layer #
tests/qemu-iotests/097 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Commit changes into backing chains and empty the top image if the # backing image is not explicitly specified
tests/qemu-iotests/098 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test qcow2's bdrv_make_empty for images without internal snapshots #
tests/qemu-iotests/099 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test valid filenames for blkdebug and blkverify representatively for # other protocols (such as NBD) when queried
tests/qemu-iotests/101 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test short file I/O #
tests/qemu-iotests/102 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for qemu-io -c map and qemu-img map #
tests/qemu-iotests/103 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for qcow2 metadata cache size specification #
tests/qemu-iotests/104 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test image creation with aligned and unaligned sizes #
tests/qemu-iotests/105 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Create, read, write big image #
tests/qemu-iotests/106 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test preallocated resize of raw images #
tests/qemu-iotests/107 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Tests updates of the qcow2 L1 table #
tests/qemu-iotests/108 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for repairing qcow2 images which cannot be repaired using # the on-disk refcount structures
tests/qemu-iotests/109 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test writing image headers of other formats into raw images #
tests/qemu-iotests/110 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for relative backing file names in complex BDS trees #
tests/qemu-iotests/111 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for non-existing backing file when creating a qcow2 image # and not specifying the size
tests/qemu-iotests/112 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test cases for different refcount_bits values #
tests/qemu-iotests/113 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for accessing creation options on image formats and # protocols not supporting image creation
tests/qemu-iotests/114 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test invalid backing file format in qcow2 images #
tests/qemu-iotests/115 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for non-self-referential qcow2 refcount blocks #
tests/qemu-iotests/116 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test error code paths for invalid QED images #
tests/qemu-iotests/117 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for shared BDS between backend trees #
tests/qemu-iotests/119 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # NBD test case for overriding BDRV_O_PROTOCOL by explicitly specifying # a driver
tests/qemu-iotests/120 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Non-NBD test cases for overriding BDRV_O_PROTOCOL by explicitly # specifying a driver
tests/qemu-iotests/121 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test cases for qcow2 refcount table growth #
tests/qemu-iotests/122 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test some qemu-img convert cases #
tests/qemu-iotests/123 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for qemu-img convert to NBD #
tests/qemu-iotests/125 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test preallocated growth of qcow2 images #
tests/qemu-iotests/126 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Tests handling of colons in filenames (which may be confused with protocol # prefixes)
tests/qemu-iotests/127 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for mirroring with dataplane #
tests/qemu-iotests/128 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test that opening O_DIRECT succeeds when image file I/O produces EIO #
tests/qemu-iotests/130 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test that temporary backing file overrides (on the command line or in # blockdev-add) don't replace the original path stored in the image during
tests/qemu-iotests/131 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # parallels format validation tests (created by QEMU) #
tests/qemu-iotests/133 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test for reopen #
tests/qemu-iotests/134 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test encrypted read/write using plain bdrv_read/bdrv_write #
tests/qemu-iotests/135 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test VPC open of image with large Max Table Entries value. #
tests/qemu-iotests/137 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test qcow2 reopen #
tests/qemu-iotests/138 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # General test case for qcow2's image check #
tests/qemu-iotests/140 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for ejecting a BlockBackend with an NBD server attached to it #
tests/qemu-iotests/141 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for ejecting BDSs with block jobs still running on them #
tests/qemu-iotests/142 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test for configuring cache modes of arbitrary nodes (requires O_DIRECT) #
tests/qemu-iotests/143 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for connecting to a non-existing NBD export name #
tests/qemu-iotests/144 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # Check live snapshot, followed by active commit, and another snapshot. # # This test is to catch the error case of BZ #1300209:
tests/qemu-iotests/145 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test the combination of -incoming and snapshot=on #
tests/qemu-iotests/146 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test VHD image format creator detection and override #
tests/qemu-iotests/150 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test that qemu-img convert -S 0 fully allocates the target image #
tests/qemu-iotests/153 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test image locking #
tests/qemu-iotests/154 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # qcow2 specific bdrv_pwrite_zeroes tests with backing files (complements 034) #
tests/qemu-iotests/156 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Tests oVirt-like storage migration: # - Create snapshot
tests/qemu-iotests/157 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test command line configuration of block devices with qdev #
tests/qemu-iotests/158 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test encrypted read/write using backing files #
tests/qemu-iotests/159 +1 -1
@@ -1,4 +1,4 @@ -#! /bin/bash +#! /usr/bin/env bash # # qemu-img dd test with different block sizes #
tests/qemu-iotests/160 +1 -1
@@ -1,4 +1,4 @@ -#! /bin/bash +#! /usr/bin/env bash # # qemu-img dd test for the skip option #
tests/qemu-iotests/161 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test reopening a backing image after block-stream and block-commit #
tests/qemu-iotests/162 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for specifying runtime options of the wrong type to some # block drivers
tests/qemu-iotests/170 +1 -1
@@ -1,4 +1,4 @@ -#! /bin/bash +#! /usr/bin/env bash # # qemu-img dd test #
tests/qemu-iotests/171 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test 'offset' and 'size' options of the raw driver. Make sure we can't # (or can) read and write outside of the image size.
tests/qemu-iotests/172 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test floppy configuration #
tests/qemu-iotests/173 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test QAPI commands looking up protocol based images with relative # filename backing strings
tests/qemu-iotests/174 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test that qemu-io fail with non-zero exit code #
tests/qemu-iotests/175 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test creating raw image preallocation mode #
tests/qemu-iotests/176 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Commit changes into backing chains and empty the top image if the # backing image is not explicitly specified.
tests/qemu-iotests/177 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test corner cases with unusual block geometries #
tests/qemu-iotests/178 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # qemu-img measure sub-command tests #
tests/qemu-iotests/179 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for write zeroes with unmap #
tests/qemu-iotests/181 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test postcopy live migration with shared storage #
tests/qemu-iotests/182 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test image locking for POSIX locks #
tests/qemu-iotests/183 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test old-style block migration (migrate -b) #
tests/qemu-iotests/184 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test I/O throttle block filter driver interface #
tests/qemu-iotests/185 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test exiting qemu while jobs are still running #
tests/qemu-iotests/186 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test 'info block' with all kinds of configurations #
tests/qemu-iotests/187 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test switching between read-only and read-write #
tests/qemu-iotests/188 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test encrypted read/write using plain bdrv_read/bdrv_write #
tests/qemu-iotests/189 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test encrypted read/write using backing files #
tests/qemu-iotests/190 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # qemu-img measure sub-command tests on huge qcow2 files #
tests/qemu-iotests/191 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test commit block job where top has two parents #
tests/qemu-iotests/192 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test NBD export with -incoming (non-shared storage migration use case from # libvirt)
tests/qemu-iotests/195 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test change-backing-file command #
tests/qemu-iotests/197 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for copy-on-read into qcow2 #
tests/qemu-iotests/198 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test commit of encrypted qcow2 files #
tests/qemu-iotests/200 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Block job co-routine race condition test. #
tests/qemu-iotests/201 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test savevm and loadvm after live migration with postcopy flag #
tests/qemu-iotests/204 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test corner cases with unusual block geometries #
tests/qemu-iotests/214 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test qcow2 image compression #
tests/qemu-iotests/215 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test case for copy-on-read into qcow2, using the COR filter driver #
tests/qemu-iotests/217 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # I/O errors when working with internal qcow2 snapshots, and repairing # the result
tests/qemu-iotests/220 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # max limits on compression in huge qcow2 files #
tests/qemu-iotests/221 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test qemu-img vs. unaligned images #
tests/qemu-iotests/223 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test reading dirty bitmap over NBD #
tests/qemu-iotests/225 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test vmdk backing file correlation #
tests/qemu-iotests/226 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # This test covers expected filetypes for the file, host_cdrom and # host_device drivers.
tests/qemu-iotests/227 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test query-blockstats with different ways to create a BB #
tests/qemu-iotests/229 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test for force canceling a running blockjob that is paused in # an error state.
tests/qemu-iotests/231 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test legacy and modern option parsing for rbd/ceph. This will not # actually connect to a ceph server, but rather looks for the appropriate
tests/qemu-iotests/232 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test for auto-read-only #
tests/qemu-iotests/233 +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Test NBD TLS certificate / authorization integration #
tests/qemu-iotests/check +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Copyright (C) 2009 Red Hat, Inc. # Copyright (c) 2000-2002,2006 Silicon Graphics, Inc. All Rights Reserved.
tests/qemu-iotests/common.config +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Copyright (C) 2009 Red Hat, Inc. # Copyright (c) 2000-2003,2006 Silicon Graphics, Inc. All Rights Reserved.
tests/qemu-iotests/common.filter +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Copyright (C) 2009 Red Hat, Inc. # Copyright (c) 2000-2001 Silicon Graphics, Inc. All Rights Reserved.
tests/qemu-iotests/common.nbd +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # -*- shell-script-mode -*- # # Helpers for NBD server related config
tests/qemu-iotests/common.pattern +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Copyright (C) 2009 Red Hat, Inc. #
tests/qemu-iotests/common.qemu +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # This allows for launching of multiple QEMU instances, with independent # communication possible to each instance.
tests/qemu-iotests/common.rc +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Copyright (C) 2009 Red Hat, Inc. # Copyright (c) 2000-2006 Silicon Graphics, Inc. All Rights Reserved.
tests/qemu-iotests/common.tls +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # # Helpers for TLS related config #
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v2 06/18] qemu-iotests: Improve portability by searching bash in the $PATH
Quoted 9 lines · Philippe Mathieu-Daudé
Bash is not always installed as
/bin/bash. In particular on OpenBSD, the package installs it in/usr/local/bin.
Use the 'env' shebang to search bash in the $PATH.Patch created mechanically by running:
$ git grep -lE '#! ?/bin/bash' -- tests/qemu-iotests | \ while read f; do \ sed -i 's_#!.\?/bin/bash_#! /usr/bin/env bash_' $f; \
I prefer | over _ when writing a sed expression around something with embedded / (why? Because | has to be quoted in shell, but _ does not, and it makes it more likely that I'll notice if I botched quoting or the intended sed command). But for a commit message, pasting what you actually ran is fine.
Why a space between #! and /usr/bin/env? That's not our prevailing style:
$ git grep '^#! /' | wc
13 30 541
$ git grep '^#!/' | wc
337 448 13442Mishandles instances of:
#!/bin/bash -x
or any other case where there is something after /bin/bash (since some platforms permit at most 1 argument to the interpreter, and your conversion would be trying to pass 2 arguments as 1). BSD env (and more recently GNU Coreutils env) added:
#!/usr/bin/env -S /bin/bash -x
to work around platforms with odd shebang limitations (the lone argument "-S /bin/bash -x" is sensibly re-split by env before exec'ing bash with an argument of -x) - but that's not portable yet. Thankfully, it looks like none of your conversions encountered that problem; but I might used an explict end-of-line anchor to make sure, as in:
sed -i 's|^#!.\?/bin/bash$|#!/usr/bin/env bash|' $f
Quoted 5 lines
done
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
Can 'env' be located elsewhere than/usr/bin/env?
Possibly, but #! requires absolute paths on some platforms, so you have a chicken-and-egg problem if it is not, so in practice /usr/bin/env is reliable; and we're already using it elsewhere, so any platform where it does not exist will have a lot more than just this patch to fix up.
Comments are tied to the commit message, but the mechanical conversion itself looks sound, therefore:
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [PATCH v2 06/18] qemu-iotests: Improve portability by searching bash in the $PATH
On 2019-01-29 23:15, Eric Blake wrote:
[...]
Quoted 1 line
Why a space between #! and
/usr/bin/env? That's not our prevailing style
There is an urban legend that this was required on certain old Unix systems, but as far as I know, it's only wrong information:
https://www.in-ulm.de/~mascheck/various/shebang/#blankrequired
Anyway, the blank is certainly not required anymore in the 21st century, so I'd also suggest to remove it in these patches here.
Thomas
PATCH v2 7/18 tests/multiboot: Improve portability by searching bash in the $PATH
In reply to Philippe Mathieu-DaudéBash is not always installed as /bin/bash. In particular on OpenBSD, the package installs it in /usr/local/bin.
Use the 'env' shebang to search bash in the $PATH.
--- tests/multiboot/run_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/multiboot/run_test.sh +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # Copyright (c) 2013 Kevin Wolf <[email protected]> #
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v2 07/18] tests/multiboot: Improve portability by searching bash in the $PATH
Quoted 5 lines · Philippe Mathieu-Daudé
Bash is not always installed as
/bin/bash. In particular on OpenBSD, the package installs it in/usr/local/bin.
Use the 'env' shebang to search bash in the $PATH.Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 15 lines
--- tests/multiboot/run_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/multiboot/run_test.sh +1
-1@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash # Copyright (c) 2013 Kevin Wolf <[email protected]> #
Re: [Qemu-devel] [PATCH v2 07/18] tests/multiboot: Improve portability by searching bash in the $PATH
In reply to Philippe Mathieu-DaudéQuoted 14 lines · Philippe Mathieu-Daudé
Bash is not always installed as
/bin/bash. In particular on OpenBSD, the package installs it in/usr/local/bin.
Use the 'env' shebang to search bash in the $PATH.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- tests/multiboot/run_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/multiboot/run_test.sh +0
-0
tests/multiboot/run_test.sh line 1
Quoted 2 lines
tests/multiboot/run_test.sh +1
-1@@ -1,4 +1,4 @@ -#!/bin/bash +#! /usr/bin/env bash
Again, why the space after #!? Having or omitting it makes no difference, but the prevailing style is to omit it.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
PATCH v2 8/18 tests/bios-tables: Improve portability by searching bash in the $PATH
In reply to Philippe Mathieu-DaudéBash is not always installed as /bin/bash. In particular on OpenBSD, the package installs it in /usr/local/bin.
Use the 'env' shebang to search bash in the $PATH.
--- tests/data/acpi/rebuild-expected-aml.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/data/acpi/rebuild-expected-aml.sh +1 -1
@@ -1,4 +1,4 @@ -#! /bin/bash +#! /usr/bin/env bash # # Rebuild expected AML files for acpi unit-test
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v2 08/18] tests/bios-tables: Improve portability by searching bash in the $PATH
Quoted 5 lines · Philippe Mathieu-Daudé
Bash is not always installed as
/bin/bash. In particular on OpenBSD, the package installs it in/usr/local/bin.
Use the 'env' shebang to search bash in the $PATH.Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 15 lines
--- tests/data/acpi/rebuild-expected-aml.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/data/acpi/rebuild-expected-aml.sh +1
-1@@ -1,4 +1,4 @@ -#! /bin/bash +#! /usr/bin/env bash # # Rebuild expected AML files for acpi unit-test
Re: [Qemu-devel] [PATCH v2 08/18] tests/bios-tables: Improve portability by searching bash in the $PATH
In reply to Philippe Mathieu-DaudéQuoted 5 lines · On Tue, 29 Jan 2019 18:53:53 +0100 Philippe Mathieu-Daudé <[email protected]>…
Bash is not always installed as
/bin/bash. In particular on OpenBSD, the package installs it in/usr/local/bin.
Use the 'env' shebang to search bash in the $PATH.Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 14 lines
--- tests/data/acpi/rebuild-expected-aml.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/data/acpi/rebuild-expected-aml.sh +1
-1@@ -1,4 +1,4 @@ -#! /bin/bash +#! /usr/bin/env bash # # Rebuild expected AML files for acpi unit-test
Re: [Qemu-devel] [PATCH v2 08/18] tests/bios-tables: Improve portability by searching bash in the $PATH
In reply to Philippe Mathieu-DaudéQuoted 5 lines · Philippe Mathieu-Daudé
Bash is not always installed as
/bin/bash. In particular on OpenBSD, the package installs it in/usr/local/bin.
Use the 'env' shebang to search bash in the $PATH.Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 16 lines
--- tests/data/acpi/rebuild-expected-aml.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/data/acpi/rebuild-expected-aml.sh +1
-1@@ -1,4 +1,4 @@ -#! /bin/bash +#! /usr/bin/env bash # # Rebuild expected AML files for acpi unit-testSignature · 1 line
2.20.1
PATCH v2 9/18 tests/vm/openbsd: Install Bash from the ports
In reply to Philippe Mathieu-DaudéVarious iotests scripts (run via 'make check-block') use bash specific extentions. OpenBSD comes with the Korn shell as default. Install bash to be able to run those tests.
--- tests/vm/openbsd | 2 ++ 1 file changed, 2 insertions(+)
tests/vm/openbsd +2 -0
@@ -45,6 +45,8 @@ class OpenBSDVM(basevm.BaseVM): self.wait_ssh() sys.stderr.write("Disabling W^X on the build partition...\n") self.ssh_root_check("sed -E -i 's_(/tmp\ ffs)\ ([^\ ]*)_\\1 \\2,wxallowed_' /etc/fstab") + sys.stderr.write("Installing bash...\n") + self.ssh_root_check("PKG_PATH=https://ftp.openbsd.org/pub/OpenBSD/6.1/packages/amd64 pkg_add bash") self.ssh_root("shutdown -p now") self.wait()
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v2 09/18] tests/vm/openbsd: Install Bash from the ports
Quoted 15 lines · Philippe Mathieu-Daudé
Various iotests scripts (run via 'make check-block') use bash specific extentions. OpenBSD comes with the Korn shell as default. Install bash to be able to run those tests.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- tests/vm/openbsd | 2 ++ 1 file changed, 2 insertions(+)tests/vm/openbsd +0
-0
tests/vm/openbsd class OpenBSDVM(basevm.BaseVM): · line 52
Quoted 8 lines
tests/vm/openbsd +2
-0@@ -45,6 +45,8 @@ class OpenBSDVM(basevm.BaseVM): self.wait_ssh() sys.stderr.write("Disabling W^X on the build partition...\n") self.ssh_root_check("sed -E -i 's_(/tmp\ ffs)\ ([^\ ]*)_\\1 \\2,wxallowed_' /etc/fstab") + sys.stderr.write("Installing bash...\n") + self.ssh_root_check("PKG_PATH=https://ftp.openbsd.org/pub/OpenBSD/6.1/packages/amd64 pkg_add bash") self.ssh_root("shutdown -p now") self.wait()
Wouldn't it make more sense to just update the image to include the necessary package, the same way we do with all QEMU's other build dependencies ?
thanks
-- PMM
Re: [Qemu-devel] [PATCH v2 09/18] tests/vm/openbsd: Install Bash from the ports
Hi Peter,
Quoted 20 lines · Peter Maydell
Quoted 19 lines · Philippe Mathieu-Daudé
Various iotests scripts (run via 'make check-block') use bash specific extentions. OpenBSD comes with the Korn shell as default. Install bash to be able to run those tests.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- tests/vm/openbsd | 2 ++ 1 file changed, 2 insertions(+)tests/vm/openbsd +1
-0@@ -45,6 +45,8 @@ class OpenBSDVM(basevm.BaseVM): self.wait_ssh() sys.stderr.write("Disabling W^X on the build partition...\n") self.ssh_root_check("sed -E -i 's_(/tmp\ ffs)\ ([^\ ]*)_\\1 \\2,wxallowed_' /etc/fstab") + sys.stderr.write("Installing bash...\n")
Quoted 8 lines
tests/vm/openbsd class OpenBSDVM(basevm.BaseVM): · line 52
Quoted 4 lines
tests/vm/openbsd +1
-0+ self.ssh_root_check("PKG_PATH=https://ftp.openbsd.org/pub/OpenBSD/6.1/packages/amd64 pkg_add bash") self.ssh_root("shutdown -p now") self.wait()Wouldn't it make more sense to just update the image to include the necessary package, the same way we do with all QEMU's other build dependencies ?
Instead of updating the image, Daniel asked if we could upgrade this image to a more recent release (to remove SDL1), but IIRC the outcome was there is no manpower for that. Meanwhile, this kludge seems the simplest way.
BTW This command is run once at image creation.
Re: [Qemu-devel] [PATCH v2 09/18] tests/vm/openbsd: Install Bash from the ports
If someone could point me in the right direction as to how the image is created I could look at coming up with something newer. I would prefer that over some of the workarounds I've seen to date.
Quoted 34 lines · Philippe Mathieu-Daudé
Hi Peter,
Quoted 10 lines · Peter Maydell
Quoted 9 lines · Philippe Mathieu-Daudé
Various iotests scripts (run via 'make check-block') use bash specific extentions. OpenBSD comes with the Korn shell as default. Install bash to be able to run those tests.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- tests/vm/openbsd | 2 ++ 1 file changed, 2 insertions(+)Quoted 16 lines
tests/vm/openbsd class OpenBSDVM(basevm.BaseVM): · line 52
Quoted 13 lines
tests/vm/openbsd +2
-0@@ -45,6 +45,8 @@ class OpenBSDVM(basevm.BaseVM): self.wait_ssh() sys.stderr.write("Disabling W^X on the build partition...\n") self.ssh_root_check("sed -E -i 's_(/tmp\ ffs)\ ([^\ ]*)_\\1 \\2,wxallowed_' /etc/fstab") + sys.stderr.write("Installing bash...\n") + self.ssh_root_check("PKG_PATH=https://ftp.openbsd.org/pub/OpenBSD/6.1/packages/amd64 pkg_add bash") self.ssh_root("shutdown -p now") self.wait()Wouldn't it make more sense to just update the image to include the necessary package, the same way we do with all QEMU's other build dependencies ?
Instead of updating the image, Daniel asked if we could upgrade this image to a more recent release (to remove SDL1), but IIRC the outcome was there is no manpower for that. Meanwhile, this kludge seems the simplest way.
BTW This command is run once at image creation.
Re: [Qemu-devel] [PATCH v2 09/18] tests/vm/openbsd: Install Bash from the ports
Hi Brad,
Quoted 5 lines · Brad Smith
If someone could point me in the right direction as to how the image is created
I could look at coming up with something newer. I would prefer that over some
of the workarounds I've seen to date.
I'm not an OpenBSD user, so I'm more than happy if you can help the upstream community to test QEMU codebase on this OS. Testing helps us to avoid code rot.
What we currently use to run tests is the 'tests/vm/openbsd' script. The script itself doesn't document how it was built, but looking at the commit of his introduction fdfaa33291eb we have:
The image is prepared following instructions as in:
https://wiki.qemu.org/Hosts/BSD
Regards,
Phil.
Quoted 39 lines · Philippe Mathieu-Daudé
Quoted 38 lines
Hi Peter,
Quoted 22 lines · Peter Maydell
Quoted 20 lines · Philippe Mathieu-Daudé
Various iotests scripts (run via 'make check-block') use bash specific extentions. OpenBSD comes with the Korn shell as default. Install bash to be able to run those tests.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
tests/vm/openbsd | 2 ++1 file changed, 2 insertions(+)tests/vm/openbsd +2
-0@@ -45,6 +45,8 @@ class OpenBSDVM(basevm.BaseVM): self.wait_ssh() sys.stderr.write("Disabling W^X on the build partition...\n") self.ssh_root_check("sed -E -i 's_(/tmp\ ffs)\ ([^\ ]*)_\\1 \\2,wxallowed_' /etc/fstab") + sys.stderr.write("Installing bash...\n") +Quoted 8 lines
Quoted 5 lines
self.ssh_root_check("PKG_PATH=https://ftp.openbsd.org/pub/OpenBSD/6.1/packages/amd64
pkg_addbash")
self.ssh_root("shutdown -p now")
self.wait()Wouldn't it make more sense to just update the image to include the necessary package, the same way we do with all QEMU's other build dependencies ?
Instead of updating the image, Daniel asked if we could upgrade this image to a more recent release (to remove SDL1), but IIRC the outcome was there is no manpower for that. Meanwhile, this kludge seems the simplest way.
BTW This command is run once at image creation.
Re: [Qemu-devel] [PATCH v2 09/18] tests/vm/openbsd: Install Bash from the ports
Quoted 12 lines · Philippe Mathieu-Daudé
Hi Brad,
Quoted 5 lines · Brad Smith
If someone could point me in the right direction as to how the image is created
I could look at coming up with something newer. I would prefer that over some
of the workarounds I've seen to date.I'm not an OpenBSD user, so I'm more than happy if you can help the upstream community to test QEMU codebase on this OS. Testing helps us to avoid code rot.
Quoted 7 lines
What we currently use to run tests is the 'tests/vm/openbsd' script. The script itself doesn't document how it was built, but looking at the commit of his introduction
fdfaa33291ebwe have:The image is prepared following instructions as in:
Ok, well that brings me to my next question. How do I get access to the Wiki to update the instructions?
Re: [Qemu-devel] [PATCH v2 09/18] tests/vm/openbsd: Install Bash from the ports
Quoted 18 lines · Brad Smith
Quoted 16 lines · Philippe Mathieu-Daudé
Hi Brad,
Quoted 5 lines · Brad Smith
If someone could point me in the right direction as to how the image is created
I could look at coming up with something newer. I would prefer that over some
of the workarounds I've seen to date.I'm not an OpenBSD user, so I'm more than happy if you can help the upstream community to test QEMU codebase on this OS. Testing helps us to avoid code rot.
What we currently use to run tests is the 'tests/vm/openbsd' script. The script itself doesn't document how it was built, but looking at the commit of his introduction
fdfaa33291ebwe have:
Quoted 6 lines
Quoted 3 lines
The image is prepared following instructions as in:
Ok, well that brings me to my next question. How do I get access to the Wiki to update the instructions?
I'll create you an account and send you details offlist.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [Qemu-devel] [PATCH v2 09/18] tests/vm/openbsd: Install Bash from the ports
In reply to Philippe Mathieu-DaudéQuoted 9 lines · Philippe Mathieu-Daudé
Hi Brad,
Quoted 5 lines · Brad Smith
If someone could point me in the right direction as to how the image is created
I could look at coming up with something newer. I would prefer that over some
of the workarounds I've seen to date.
Quoted 7 lines
I'm not an OpenBSD user, so I'm more than happy if you can help the upstream community to test QEMU codebase on this OS. Testing helps us to avoid code rot.
What we currently use to run tests is the 'tests/vm/openbsd' script. The script itself doesn't document how it was built, but looking at the commit of his introduction
fdfaa33291ebwe have:
There also is a patch floating around to auto-install openbsd:
https://patchwork.kernel.org/patch/10749459/
Not fully sure why this wasn't merged yet. One problem is that this patch depends on a new slirp feature (added in the 3.1 devel cycle, needed to serve install.conf via http). Which blocked merge during the 3.1 cycle, because depending on unreleased qemu for test builds isn't a good idea. But 3.1 is released, so maybe we can merge that for 4.0 now?
The openbsd installer trying to fetch install.conf not only via http but also via tftp would also simplify things, maybe implementing that is an option for the next openbsd release?
cheers,
Gerd
Re: [Qemu-devel] [PATCH v2 09/18] tests/vm/openbsd: Install Bash from the ports
Quoted 8 lines · Gerd Hoffmann
There also is a patch floating around to auto-install openbsd:
https://patchwork.kernel.org/patch/10749459/Not fully sure why this wasn't merged yet. One problem is that this patch depends on a new slirp feature (added in the 3.1 devel cycle, needed to serve install.conf via http). Which blocked merge during the 3.1 cycle, because depending on unreleased qemu for test builds isn't a good idea. But 3.1 is released, so maybe we can merge that for 4.0 now?
The feature isn't in the installed QEMU for the Ubuntu box I run the BSD VM tests on, which is what the blocker is -- I don't want to have to keep around and maintain a non-system QEMU to run the VMs that are doing the tests here. It would be preferable to remove the dependency on the bleeding-edge slirp feature.
thanks
-- PMM
Re: [Qemu-devel] [PATCH v2 09/18] tests/vm/openbsd: Install Bash from the ports
In reply to Brad SmithQuoted 3 lines · Brad Smith
If someone could point me in the right direction as to how the image is created I could look at coming up with something newer. I would prefer that over some of the workarounds I've seen to date.
I started creating the image and then wondered what do I set the root password to? The instructions also talk about an SSH key but I don't know how that would work when this image is used for the VM test framework.
I updated the instructions on the Wiki to make use of VirtIO for both the NIC and disk controller.
Re: [Qemu-devel] [PATCH v2 09/18] tests/vm/openbsd: Install Bash from the ports
Quoted 8 lines · Brad Smith
Quoted 5 lines · Brad Smith
If someone could point me in the right direction as to how the image is created
I could look at coming up with something newer. I would prefer that over some
of the workarounds I've seen to date.
Quoted 5 lines
I started creating the image and then wondered what do I set the root password
to? The instructions also talk about an SSH key but I don't know how that would
work when this image is used for the VM test framework.
See tests/keys - basically we have a hard-wired testing key.
Quoted 2 lines
I updated the instructions on the Wiki to make use of VirtIO for both the NIC and disk controller.
Can the OpenBSD kernel use virtio-net-pci and virtio-scsi-pci?
It's not super important for build testing but they are the most capable variants of virtio. The virtio-pci gives nice discover-able hotplug and I believe you need virtio-scsi-pci if you want to use funky options like discard for thin provisioning.
--
Alex Bennée
Re: [Qemu-devel] [PATCH v2 09/18] tests/vm/openbsd: Install Bash from the ports
Quoted 9 lines · Alex Bennée
Quoted 7 lines · Brad Smith
Quoted 5 lines · Brad Smith
If someone could point me in the right direction as to how the image is created
I could look at coming up with something newer. I would prefer that over some
of the workarounds I've seen to date.
Quoted 6 lines
Quoted 5 lines
I started creating the image and then wondered what do I set the root password
to? The instructions also talk about an SSH key but I don't know how that would
work when this image is used for the VM test framework.See tests/keys - basically we have a hard-wired testing key.
So the root password doesn't matter?
Quoted 8 lines
Quoted 2 lines
I updated the instructions on the Wiki to make use of VirtIO for both the NIC and disk controller.
Can the OpenBSD kernel use virtio-net-pci and virtio-scsi-pci?
It's not super important for build testing but they are the most capable variants of virtio. The virtio-pci gives nice discover-able hotplug and I believe you need virtio-scsi-pci if you want to use funky options like discard for thin provisioning.
Yes to both.
Re: [Qemu-devel] [PATCH v2 09/18] tests/vm/openbsd: Install Bash from the ports
Quoted 11 lines · Brad Smith
Quoted 9 lines · Alex Bennée
Quoted 7 lines · Brad Smith
Quoted 5 lines · Brad Smith
If someone could point me in the right direction as to how the image is created
I could look at coming up with something newer. I would prefer that over some
of the workarounds I've seen to date.
Quoted 7 lines
Quoted 6 lines
Quoted 5 lines
I started creating the image and then wondered what do I set the root password
to? The instructions also talk about an SSH key but I don't know how that would
work when this image is used for the VM test framework.See tests/keys - basically we have a hard-wired testing key.
So the root password doesn't matter?
I don't think so. See "Adding new guests" in docs/devel/testing.rst
The Ubuntu and CentOS build_image methods are a bit more elaborate in that they build a cloud-image iso which contains a bunch of metadata for the image to apply on boot-up. The OpenBSD build_image just downloads the data and uncompresses it.
The defaults in BaseIMG are:
GUEST_USER = "qemu"
GUEST_PASS = "qemupass"
ROOT_PASS = "qemupass"
Quoted 10 lines
Quoted 8 lines
Quoted 2 lines
I updated the instructions on the Wiki to make use of VirtIO for both the NIC and disk controller.
Can the OpenBSD kernel use virtio-net-pci and virtio-scsi-pci?
It's not super important for build testing but they are the most capable variants of virtio. The virtio-pci gives nice discover-able hotplug and I believe you need virtio-scsi-pci if you want to use funky options like discard for thin provisioning.
Yes to both.
Cool.
--
Alex Bennée
Re: [Qemu-devel] [PATCH v2 09/18] tests/vm/openbsd: Install Bash from the ports
In reply to Philippe Mathieu-DaudéQuoted 3 lines · Philippe Mathieu-Daudé
Various iotests scripts (run via 'make check-block') use bash specific extentions. OpenBSD comes with the Korn shell as default. Install bash to be able to run those tests.
Hmmm given we use plain POSIX shell for configure portability is there a reason the check-block test scripts use bash? I guess it doesn't get picked up as check-block isn't run normally.
Quoted 11 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- tests/vm/openbsd | 2 ++ 1 file changed, 2 insertions(+)tests/vm/openbsd +0
-0
tests/vm/openbsd class OpenBSDVM(basevm.BaseVM): · line 51
Quoted 7 lines
tests/vm/openbsd +2
-0@@ -45,6 +45,8 @@ class OpenBSDVM(basevm.BaseVM): self.wait_ssh() sys.stderr.write("Disabling W^X on the build partition...\n") self.ssh_root_check("sed -E -i 's_(/tmp\ ffs)\ ([^\ ]*)_\\1 \\2,wxallowed_' /etc/fstab") + sys.stderr.write("Installing bash...\n") + self.ssh_root_check("PKG_PATH=https://ftp.openbsd.org/pub/OpenBSD/6.1/packages/amd64 pkg_add bash") self.ssh_root("shutdown -p now") self.wait()
--
Alex Bennée
Re: [Qemu-devel] [PATCH v2 09/18] tests/vm/openbsd: Install Bash from the ports
Quoted 10 lines · Alex Bennée
Quoted 3 lines · Philippe Mathieu-Daudé
Various iotests scripts (run via 'make check-block') use bash specific extentions. OpenBSD comes with the Korn shell as default. Install bash to be able to run those tests.
Hmmm given we use plain POSIX shell for configure portability is there a reason the check-block test scripts use bash? I guess it doesn't get picked up as check-block isn't run normally.
configure requests any POSIX shell (#!/bin/sh) & aim for portability.
The block iotests though made an explicit choice not to care for POSIX shell portability and so explicitly request bash (#!/bin/bash).
The block iotests are not something we expect every user of QEMU to run, so it is valid to have a more specific requirement for executing them, than is required by configure for general purpose build + unit tests.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
RFC PATCH v2 10/18 qemu-iotests: Ensure GNU sed is used
In reply to Philippe Mathieu-DaudéVarious sed regexp from common.filter use sed GNU extensions. Instead of spending time to write these regex to be POSIX compliant, verify the GNU sed is available and use it.
---
I think the test isn't well placed in common.filter and should be in common.rc, but couldn't get that working.
--- tests/qemu-iotests/common.filter | 36 ++++++++++++++++---------------- tests/qemu-iotests/common.rc | 12 +++++++++++ 2 files changed, 30 insertions(+), 18 deletions(-)
tests/qemu-iotests/common.filter +18 -18
@@ -23,37 +23,37 @@ # _filter_date() { - sed \ + ${SED} \ -e 's/[A-Z][a-z][a-z] [A-z][a-z][a-z] *[0-9][0-9]* [0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9][0-9][0-9][0-9]$/DATE/' } _filter_generated_node_ids() { - sed -re 's/\#block[0-9]{3,}/NODE_NAME/' + ${SED} -re 's/\#block[0-9]{3,}/NODE_NAME/' } _filter_qom_path() { - sed -e 's#\(Attached to: *\) /.*#\1 PATH#' + ${SED} -e 's#\(Attached to: *\) /.*#\1 PATH#' } # replace occurrences of the actual TEST_DIR value with TEST_DIR _filter_testdir() { - sed -e "s#$TEST_DIR/#TEST_DIR/#g" + ${SED} -e "s#$TEST_DIR/#TEST_DIR/#g" } # replace occurrences of the actual IMGFMT value with IMGFMT _filter_imgfmt() { - sed -e "s#$IMGFMT#IMGFMT#g" + ${SED} -e "s#$IMGFMT#IMGFMT#g" } # Replace error message when the format is not supported and delete # the output lines after the first one _filter_qemu_img_check() { - sed -e '/allocated.*fragmented.*compressed clusters/d' \ + ${SED} -e '/allocated.*fragmented.*compressed clusters/d' \ -e 's/qemu-img: This image format does not support checks/No errors were found on the image./' \ -e '/Image end offset: [0-9]\+/d' }
@@ -61,13 +61,13 @@ _filter_qemu_img_check() # Removes \r from messages _filter_win32() { - sed -e 's/\r//g' + ${SED} -e 's/\r//g' } # sanitize qemu-io output _filter_qemu_io() { - _filter_win32 | sed -e "s/[0-9]* ops\; [0-9/:. sec]* ([0-9/.inf]* [EPTGMKiBbytes]*\/sec and [0-9/.inf]* ops\/sec)/X ops\; XX:XX:XX.X (XXX YYY\/sec and XXX ops\/sec)/" \ + _filter_win32 | ${SED} -e "s/[0-9]* ops\; [0-9/:. sec]* ([0-9/.inf]* [EPTGMKiBbytes]*\/sec and [0-9/.inf]* ops\/sec)/X ops\; XX:XX:XX.X (XXX YYY\/sec and XXX ops\/sec)/" \ -e "s/: line [0-9][0-9]*: *[0-9][0-9]*\( Aborted\| Killed\)/:\1/" \ -e "s/qemu-io> //g" }
@@ -75,7 +75,7 @@ _filter_qemu_io() # replace occurrences of QEMU_PROG with "qemu" _filter_qemu() { - sed -e "s#\\(^\\|(qemu) \\)$(basename $QEMU_PROG):#\1QEMU_PROG:#" \ + ${SED} -e "s#\\(^\\|(qemu) \\)$(basename $QEMU_PROG):#\1QEMU_PROG:#" \ -e 's#^QEMU [0-9]\+\.[0-9]\+\.[0-9]\+ monitor#QEMU X.Y.Z monitor#' \ -e $'s#\r##' # QEMU monitor uses \r\n line endings }
@@ -84,7 +84,7 @@ _filter_qemu() _filter_qmp() { _filter_win32 | \ - sed -e 's#\("\(micro\)\?seconds": \)[0-9]\+#\1 TIMESTAMP#g' \ + ${SED} -e 's#\("\(micro\)\?seconds": \)[0-9]\+#\1 TIMESTAMP#g' \ -e 's#^{"QMP":.*}$#QMP_VERSION#' \ -e '/^ "QMP": {\s*$/, /^ }\s*$/ c\' \ -e ' QMP_VERSION'
@@ -93,32 +93,32 @@ _filter_qmp() # readline makes HMP command strings so long that git complains _filter_hmp() { - sed -e $'s/^\\((qemu) \\)\\?.*\e\\[D/\\1/g' \ + ${SED} -e $'s/^\\((qemu) \\)\\?.*\e\\[D/\\1/g' \ -e $'s/\e\\[K//g' } # replace block job offset _filter_block_job_offset() { - sed -e 's/, "offset": [0-9]\+,/, "offset": OFFSET,/' + ${SED} -e 's/, "offset": [0-9]\+,/, "offset": OFFSET,/' } # replace block job len _filter_block_job_len() { - sed -e 's/, "len": [0-9]\+,/, "len": LEN,/g' + ${SED} -e 's/, "len": [0-9]\+,/, "len": LEN,/g' } # replace actual image size (depends on the host filesystem) _filter_actual_image_size() { - sed -s 's/\("actual-size":\s*\)[0-9]\+/\1SIZE/g' + ${SED} -s 's/\("actual-size":\s*\)[0-9]\+/\1SIZE/g' } # replace driver-specific options in the "Formatting..." line _filter_img_create() { - sed -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \ + ${SED} -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \ -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \ -e "s#$TEST_DIR#TEST_DIR#g" \ -e "s#$IMGFMT#IMGFMT#g" \
@@ -154,7 +154,7 @@ _filter_img_info() discard=0 regex_json_spec_start='^ *"format-specific": \{' - sed -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \ + ${SED} -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \ -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \ -e "s#$TEST_DIR#TEST_DIR#g" \ -e "s#$IMGFMT#IMGFMT#g" \
@@ -200,7 +200,7 @@ _filter_img_info() # human and json output _filter_qemu_img_map() { - sed -e 's/\([0-9a-fx]* *[0-9a-fx]* *\)[0-9a-fx]* */\1/g' \ + ${SED} -e 's/\([0-9a-fx]* *[0-9a-fx]* *\)[0-9a-fx]* */\1/g' \ -e 's/"offset": [0-9]\+/"offset": OFFSET/g' \ -e 's/Mapped to *//' | _filter_testdir | _filter_imgfmt }
@@ -212,7 +212,7 @@ _filter_nbd() # receive callbacks sometimes, making them unreliable. # # Filter out the TCP port number since this changes between runs. - sed -e '/nbd\/.*\.c:/d' \ + ${SED} -e '/nbd\/.*\.c:/d' \ -e 's#127\.0\.0\.1:[0-9]*#127.0.0.1:PORT#g' \ -e "s#?socket=$TEST_DIR#?socket=TEST_DIR#g" \ -e 's#\(foo\|PORT/\?\|.sock\): Failed to .*$#\1#'
tests/qemu-iotests/common.rc +12 -0
@@ -17,6 +17,18 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # +for sed in sed gsed; do + (command $sed --version | grep 'GNU sed') > /dev/null 2>&1 + if [ "$?" -eq 0 ]; then + SED=$sed + break + fi +done +if [ -z "$SED" ]; then + echo "$0: GNU sed not found" + exit 1 +fi + dd() { if [ "$HOSTOS" == "Linux" ]
Signature · 1 line
2.20.1
Re: [Qemu-devel] [RFC PATCH v2 10/18] qemu-iotests: Ensure GNU sed is used
Quoted 12 lines · Philippe Mathieu-Daudé
Various sed regexp from common.filter use sed GNU extensions. Instead of spending time to write these regex to be POSIX compliant, verify the GNU sed is available and use it.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
I think the test isn't well placed in common.filter and should be in common.rc, but couldn't get that working.
---+++ b/tests/qemu-iotests/common.filter
tests/qemu-iotests/common.filter line 26
Quoted 5 lines
tests/qemu-iotests/common.filter +1
-1@@ -23,37 +23,37 @@ # _filter_date() { - sed \ + ${SED} \
I might have written $SED instead of ${SED}, but that's merely aesthetics and not a correctness issue.
tests/qemu-iotests/common.rc line 19
Quoted 5 lines
tests/qemu-iotests/common.rc +1
-0+++ b/tests/qemu-iotests/common.rc@@ -17,6 +17,18 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. #
If SED is inherited in the environment prior to this point,...
tests/qemu-iotests/common.rc line 21
Quoted 2 lines
tests/qemu-iotests/common.rc +2
-0+for sed in sed gsed; do + (command $sed --version | grep 'GNU sed') > /dev/null 2>&1
Why do you need command here? (It doesn't hurt, but I also don't see how it helps).
tests/qemu-iotests/common.rc line 26
Quoted 5 lines
tests/qemu-iotests/common.rc +5
-0+ if [ "$?" -eq 0 ]; then + SED=$sed + break + fi +done
...but neither sed nor gsed are GNU sed,
tests/qemu-iotests/common.rc line 30
Quoted 4 lines
tests/qemu-iotests/common.rc +4
-0+if [ -z "$SED" ]; then + echo "$0: GNU sed not found" + exit 1 +fi
...then you fail to diagnose that. Fix it by adding SED= prior to the loop.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [RFC PATCH v2 10/18] qemu-iotests: Ensure GNU sed is used
Quoted 31 lines · Eric Blake
Quoted 12 lines · Philippe Mathieu-Daudé
Various sed regexp from common.filter use sed GNU extensions. Instead of spending time to write these regex to be POSIX compliant, verify the GNU sed is available and use it.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
I think the test isn't well placed in common.filter and should be in common.rc, but couldn't get that working.
---+++ b/tests/qemu-iotests/common.filter
tests/qemu-iotests/common.filter line 26
Quoted 5 lines
tests/qemu-iotests/common.filter +1
-1@@ -23,37 +23,37 @@ # _filter_date() { - sed \ + ${SED} \I might have written $SED instead of ${SED}, but that's merely aesthetics and not a correctness issue.
tests/qemu-iotests/common.rc line 19
Quoted 5 lines
tests/qemu-iotests/common.rc +1
-0+++ b/tests/qemu-iotests/common.rc@@ -17,6 +17,18 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. #If SED is inherited in the environment prior to this point,...
Quoted 5 lines
tests/qemu-iotests/common.rc line 21
Quoted 2 lines
tests/qemu-iotests/common.rc +2
-0+for sed in sed gsed; do + (command $sed --version | grep 'GNU sed') > /dev/null 2>&1Why do you need command here? (It doesn't hurt, but I also don't see how it helps).
I copy/pasted the 'dd' use in the same file :/
Quoted 7 lines
tests/qemu-iotests/common.rc line 26
Quoted 6 lines
tests/qemu-iotests/common.rc +5
-0+ if [ "$?" -eq 0 ]; then + SED=$sed + break + fi +done
Quoted 8 lines
...but neither sed nor gsed are GNU sed,
tests/qemu-iotests/common.rc line 30
Quoted 4 lines
tests/qemu-iotests/common.rc +4
-0+if [ -z "$SED" ]; then + echo "$0: GNU sed not found" + exit 1 +fi...then you fail to diagnose that. Fix it by adding SED= prior to the loop.
Good point, thanks!
Regards,
Phil.
PATCH v2 11/18 tests/vm/openbsd: Install GNU sed from the ports
In reply to Philippe Mathieu-DaudéVarious iotests scripts (run via 'make check-block') require a GNU sed to use the (non-POSIX) GNU extensions. Install GNU sed from the ports to be able to run those tests.
--- tests/vm/openbsd | 2 ++ 1 file changed, 2 insertions(+)
tests/vm/openbsd +2 -0
@@ -47,6 +47,8 @@ class OpenBSDVM(basevm.BaseVM): self.ssh_root_check("sed -E -i 's_(/tmp\ ffs)\ ([^\ ]*)_\\1 \\2,wxallowed_' /etc/fstab") sys.stderr.write("Installing bash...\n") self.ssh_root_check("PKG_PATH=https://ftp.openbsd.org/pub/OpenBSD/6.1/packages/amd64 pkg_add bash") + sys.stderr.write("Installing GNU sed...\n") + self.ssh_root_check("PKG_PATH=https://ftp.openbsd.org/pub/OpenBSD/6.1/packages/amd64 pkg_add gsed") self.ssh_root("shutdown -p now") self.wait()
Signature · 1 line
2.20.1
RFC PATCH v2 12/18 test-iov: Disable iov/io test on OpenBSD
In reply to Philippe Mathieu-DaudéThe iov/io test hangs on OpenBSD. Disable it.
--- tests/test-iov.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
tests/test-iov.c +5 -3
@@ -147,9 +147,11 @@ static void test_to_from_buf(void)static void test_io (void ) { -#ifndef _WIN32 -/* socketpair(PF_UNIX) which does not exist on windows */ - +#if defined(_WIN32) +/* socketpair(PF_UNIX) which does not exist on windows */ +#elif defined(__OpenBSD__) +/* FIXME: this test hangs on OpenBSD */ +#else int sv[2 ];int r;unsigned i, j, k, s, t;
Signature · 1 line
2.20.1
RFC PATCH v2 13/18 oslib-posix: Ignore fcntl("/dev/null", F_SETFL, O_NONBLOCK) failure
In reply to Philippe Mathieu-DaudéPrevious to OpenBSD 6.3 [1], fcntl(F_SETFL) is not permitted on memory devices.
Trying this call sets errno to ENODEV ("not a memory device"):
19 ENODEV Operation not supported by device.
An attempt was made to apply an inappropriate function to a device, for example, trying to read a write-only device such as a printer.
Do not assert fcntl failures in this specific case (errno set to ENODEV) on OpenBSD. This fixes:
$ lm32-softmmu/qemu-system-lm32 assertion "f != -1" failed: file "util/oslib-posix.c", line 247, function "qemu_set_nonblock" Abort trap (core dumped)
[1] The fix seems https://github.com/openbsd/src/commit/c2a35b387f9d3c
"fcntl(F_SETFL) invokes the FIONBIO and FIOASYNC ioctls internally, so the memory devices (/dev/null, /dev/zero, etc) need to permit them."
--- util/oslib-posix.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
util/oslib-posix.c +10 -0
@@ -244,7 +244,17 @@ void qemu_set_nonblock(int fd) f =fcntl (fd,F_GETFL );assert (f !=-1 ); f =fcntl (fd,F_SETFL , f |O_NONBLOCK ); +#ifdef __OpenBSD__ +if (f ==-1 ) { +/* +* Previous to OpenBSD 6.3, fcntl(F_SETFL) is not permitted on +* memory devices and sets errno to ENODEV. +*/ +assert (errno ==ENODEV ); + } +#else assert (f !=-1 ); +#endif }int socket_set_fast_reuse (int fd)
Signature · 1 line
2.20.1
Re: [Qemu-devel] [RFC PATCH v2 13/18] oslib-posix: Ignore fcntl("/dev/null", F_SETFL, O_NONBLOCK) failure
Quoted 34 lines · Philippe Mathieu-Daudé
Previous to OpenBSD 6.3 [1],
fcntl(F_SETFL)is not permitted on memory devices.
Trying this call sets errno to ENODEV ("not a memory device"):19 ENODEV Operation not supported by device.
An attempt was made to apply an inappropriate function to a device, for example, trying to read a write-only device such as a printer.Do not assert fcntl failures in this specific case (errno set to ENODEV) on OpenBSD. This fixes:
$ lm32-softmmu/qemu-system-lm32 assertion "f != -1" failed: file "util/oslib-posix.c", line 247, function "qemu_set_nonblock" Abort trap (core dumped)[1] The fix seems https://github.com/openbsd/src/commit/c2a35b387f9d3c
"fcntl(F_SETFL)invokes the FIONBIO and FIOASYNC ioctls internally, so the memory devices (/dev/null,/dev/zero, etc) need to permit them."Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- util/oslib-posix.c | 10 ++++++++++ 1 file changed, 10 insertions(+)util/oslib-posix.c +1
-0@@ -244,7 +244,17 @@ void qemu_set_nonblock(int fd) f =fcntl (fd,F_GETFL );assert (f !=-1 ); f =fcntl (fd,F_SETFL , f |O_NONBLOCK ); +#ifdef __OpenBSD__
util/oslib-posix.c void qemu_set_nonblock(int fd) · line 257
Quoted 10 lines
util/oslib-posix.c +9
-0+if (f ==-1 ) { +/* +* Previous to OpenBSD 6.3, fcntl(F_SETFL) is not permitted on +* memory devices and sets errno to ENODEV. +*/ +assert (errno ==ENODEV ); + } +#else assert (f !=-1 ); +#endif
You might also add "It's OK if we fail to set O_NONBLOCK on devices like /dev/null, because they will never block anyway."
thanks
-- PMM
Re: [Qemu-devel] [RFC PATCH v2 13/18] oslib-posix: Ignore fcntl("/dev/null", F_SETFL, O_NONBLOCK) failure
Quoted 40 lines · Peter Maydell
Quoted 39 lines · Philippe Mathieu-Daudé
Previous to OpenBSD 6.3 [1],
fcntl(F_SETFL)is not permitted on memory devices.
Trying this call sets errno to ENODEV ("not a memory device"):19 ENODEV Operation not supported by device.
An attempt was made to apply an inappropriate function to a device, for example, trying to read a write-only device such as a printer.Do not assert fcntl failures in this specific case (errno set to ENODEV) on OpenBSD. This fixes:
$ lm32-softmmu/qemu-system-lm32 assertion "f != -1" failed: file "util/oslib-posix.c", line 247, function "qemu_set_nonblock" Abort trap (core dumped)[1] The fix seems https://github.com/openbsd/src/commit/c2a35b387f9d3c
"fcntl(F_SETFL)invokes the FIONBIO and FIOASYNC ioctls internally, so the memory devices (/dev/null,/dev/zero, etc) need to permit them."Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- util/oslib-posix.c | 10 ++++++++++ 1 file changed, 10 insertions(+)util/oslib-posix.c +6
-0@@ -244,7 +244,17 @@ void qemu_set_nonblock(int fd) f =fcntl (fd,F_GETFL );assert (f !=-1 ); f =fcntl (fd,F_SETFL , f |O_NONBLOCK ); +#ifdef __OpenBSD__ +if (f ==-1 ) { +/* +* Previous to OpenBSD 6.3, fcntl(F_SETFL) is not permitted on +* memory devices and sets errno to ENODEV. +*/
Quoted 8 lines
util/oslib-posix.c void qemu_set_nonblock(int fd) · line 257
Quoted 5 lines
util/oslib-posix.c +4
-0+ assert(errno == ENODEV); + } +#else assert (f !=-1 ); +#endif You might also add "It's OK if we fail to set
O_NONBLOCKon devices like/dev/null, because they will never block anyway."
OK!
Quoted 1 line
Reviewed-by Peter Maydell <[email protected]>
Thanks for reviewing this series :)
Quoted 4 lines
thanks
-- PMM
Re: [Qemu-devel] [RFC PATCH v2 13/18] oslib-posix: Ignore fcntl("/dev/null", F_SETFL, O_NONBLOCK) failure
In reply to Philippe Mathieu-DaudéQuoted 15 lines · Philippe Mathieu-Daudé
Previous to OpenBSD 6.3 [1],
fcntl(F_SETFL)is not permitted on memory devices.
Trying this call sets errno to ENODEV ("not a memory device"):19 ENODEV Operation not supported by device.
An attempt was made to apply an inappropriate function to a device, for example, trying to read a write-only device such as a printer.Do not assert fcntl failures in this specific case (errno set to ENODEV) on OpenBSD. This fixes:
$ lm32-softmmu/qemu-system-lm32 assertion "f != -1" failed: file "util/oslib-posix.c", line 247, function "qemu_set_nonblock" Abort trap (core dumped)
Quoted 5 lines
[1] The fix seems https://github.com/openbsd/src/commit/c2a35b387f9d3c
"fcntl(F_SETFL)invokes the FIONBIO and FIOASYNC ioctls internally, so the memory devices (/dev/null,/dev/zero, etc) need to permit them."Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 28 lines
--- util/oslib-posix.c | 10 ++++++++++ 1 file changed, 10 insertions(+)util/oslib-posix.c +10
-0@@ -244,7 +244,17 @@ void qemu_set_nonblock(int fd) f =fcntl (fd,F_GETFL );assert (f !=-1 ); f =fcntl (fd,F_SETFL , f |O_NONBLOCK ); +#ifdef __OpenBSD__ +if (f ==-1 ) { +/* +* Previous to OpenBSD 6.3, fcntl(F_SETFL) is not permitted on +* memory devices and sets errno to ENODEV. +*/ +assert (errno ==ENODEV ); + } +#else assert (f !=-1 ); +#endif }int socket_set_fast_reuse (int fd)Signature · 1 line
2.20.1
PATCH v2 14/18 tests/vm: Run tests on OpenBSD
In reply to Philippe Mathieu-DaudéNow than failing tests are commented out, let's reenable the testing of this OS.
--- tests/vm/openbsd | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
tests/vm/openbsd +1 -3
@@ -25,9 +25,7 @@ class OpenBSDVM(basevm.BaseVM): cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); tar -xf /dev/rsd1c; ./configure --cc=x86_64-unknown-openbsd6.1-gcc-4.9.4 --python=python2.7 {configure_opts}; - gmake --output-sync -j{jobs} {verbose}; - # XXX: "gmake check" seems to always hang or fail - #gmake --output-sync -j{jobs} check {verbose}; + gmake --output-sync -j{jobs} check {verbose}; """ def build_image(self, img):
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v2 14/18] tests/vm: Run tests on OpenBSD
Quoted 25 lines · Philippe Mathieu-Daudé
Now than failing tests are commented out, let's reenable the testing of this OS.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- tests/vm/openbsd | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)tests/vm/openbsd +1
-4@@ -25,9 +25,7 @@ class OpenBSDVM(basevm.BaseVM): cd $(mktemp -d /var/tmp/qemu-test.XXXXXX); tar -xf /dev/rsd1c; ./configure --cc=x86_64-unknown-openbsd6.1-gcc-4.9.4 --python=python2.7 {configure_opts}; - gmake --output-sync -j{jobs} {verbose}; - # XXX: "gmake check" seems to always hang or fail - #gmake --output-sync -j{jobs} check {verbose}; + gmake --output-sync -j{jobs} check {verbose}; """ def build_image(self, img): --
Quoted 1 line
2.20.1
thanks
-- PMM
RFC PATCH v2 15/18 iotests: Let verify_platform() check for unsupported platforms
In reply to Philippe Mathieu-DaudéInstead of checking for a supported platforms, it might be useful to test for the opposite.
--- tests/qemu-iotests/iotests.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tests/qemu-iotests/iotests.py +3 -1
@@ -696,9 +696,11 @@ def verify_protocol(supported=[], unsupported=[]): if not_sup or (imgproto in unsupported): notrun('not suitable for this protocol: %s' % imgproto) -def verify_platform(supported_oses=['linux']): +def verify_platform(supported_oses=['linux'], unsupported_oses=[]): if True not in [sys.platform.startswith(x) for x in supported_oses]: notrun('not suitable for this OS: %s' % sys.platform) + if True in [sys.platform.startswith(x) for x in unsupported_oses]: + notrun('not suitable for this OS: %s' % sys.platform) def verify_cache_mode(supported_cache_modes=[]): if supported_cache_modes and (cachemode not in supported_cache_modes):
Signature · 1 line
2.20.1
RFC PATCH v2 16/18 iotests: Disable 208 on OpenBSD
In reply to Philippe Mathieu-DaudéThis test explodes on OpenBSD:
$ gmake check-block
[...]
208 [14:46:03] [14:46:03] [failed, exit status 1] - output mismatch (see 208.out.bad)
--- /tmp/qemu-test.9cUFe0/tests/qemu-iotests/208.out Tue Jan 29 13:33:43 2019
+++ /tmp/qemu-test.9cUFe0/tests/qemu-iotests/208.out.bad Tue Jan 29 14:46:03 2019
@@ -1,9 +1,23 @@
+WARNING:qemu:qemu received signal 9: /tmp/qemu-test.9cUFe0/tests/qemu-iotests/../../x86_64-softmmu/qemu-system-x86_64 -chardev socket,id=mon,path=/tmp/qemu-iotests-quick-38268/tmpjdovgo/qemu-66480-monitor.sock -mon chardev=mon,mode=control -display none -vga none -qtest unix:path=/tmp/qemu-iotests-quick-38268/qemu-66480-qtest.sock -machine accel=qtest -nodefaults -machine accel=qtest -drive if=none,id=drive0,file=/tmp/qemu-iotests-quick-38268/66480-disk.img,format=qcow2,cache=writeback,node-name=drive0-node
+WARNING:qemu:qemu received signal 9: /tmp/qemu-test.9cUFe0/tests/qemu-iotests/../../x86_64-softmmu/qemu-system-x86_64 -chardev socket,id=mon,path=/tmp/qemu-iotests-quick-38268/tmpjdovgo/qemu-66480-monitor.sock -mon chardev=mon,mode=control -display none -vga none -qtest unix:path=/tmp/qemu-iotests-quick-38268/qemu-66480-qtest.sock -machine accel=qtest -nodefaults -machine accel=qtest -drive if=none,id=drive0,file=/tmp/qemu-iotests-quick-38268/66480-disk.img,format=qcow2,cache=writeback,node-name=drive0-node
Launching VM...
-Starting NBD server...
-{"return": {}}
-Adding NBD export...
-{"return": {}}
-Creating external snapshot...
-{"return": {}}
-Stopping NBD server...
-{"return": {}}
+Traceback (most recent call last):
+ File "208", line 36, in <module>
+ (vm.add_drive(disk_img_path, 'node-name=drive0-node', interface='none')
+ File "/tmp/qemu-test.9cUFe0/tests/qemu-iotests/../../scripts/qemu.py", line 295, in launch
+ self._launch()
+ File "/tmp/qemu-test.9cUFe0/tests/qemu-iotests/../../scripts/qemu.py", line 321, in _launch
+ self._post_launch()
+ File "/tmp/qemu-test.9cUFe0/tests/qemu-iotests/../../scripts/qtest.py", line 100, in _post_launch
+ super(QEMUQtestMachine, self)._post_launch()
+ File "/tmp/qemu-test.9cUFe0/tests/qemu-iotests/../../scripts/qemu.py", line 266, in _post_launch
+ self._qmp.accept()
+ File "/tmp/qemu-test.9cUFe0/tests/qemu-iotests/../../scripts/qmp/qmp.py", line 157, in accept
+ return self.__negotiate_capabilities()
+ File "/tmp/qemu-test.9cUFe0/tests/qemu-iotests/../../scripts/qmp/qmp.py", line 71, in __negotiate_capabilities
+ greeting = self.__json_read()
+ File "/tmp/qemu-test.9cUFe0/tests/qemu-iotests/../../scripts/qmp/qmp.py", line 82, in __json_read
+ data = self.__sockfile.readline()
+ File "/usr/local/lib/python2.7/socket.py", line 451, in readline
+ data = self._sock.recv(self._rbufsize)
+socket.error: [Errno 35] Resource temporarily unavailable--- tests/qemu-iotests/208 | 1 + 1 file changed, 1 insertion(+)
tests/qemu-iotests/208 +1 -0
@@ -23,6 +23,7 @@ import iotests iotests.verify_image_format(supported_fmts=['generic']) +iotests.verify_platform(unsupported_oses=['openbsd']) # FIXME with iotests.FilePath('disk.img') as disk_img_path, \ iotests.FilePath('disk-snapshot.img') as disk_snapshot_img_path, \
Signature · 1 line
2.20.1
RFC PATCH v2 17/18 iotests: Disable 209 on OpenBSD
In reply to Philippe Mathieu-DaudéThis test simply hangs with no information on OpenBSD.
--- tests/qemu-iotests/209 | 1 + 1 file changed, 1 insertion(+)
tests/qemu-iotests/209 +1 -0
@@ -23,6 +23,7 @@ from iotests import qemu_img_create, qemu_io, qemu_img_verbose, qemu_nbd, \ file_path iotests.verify_image_format(supported_fmts=['qcow2']) +iotests.verify_platform(unsupported_oses=['openbsd']) # FIXME disk, nbd_sock = file_path('disk', 'nbd-sock') nbd_uri = 'nbd+unix:///exp?socket=' + nbd_sock
Signature · 1 line
2.20.1
RFC PATCH v2 18/18 iotests: Disable 236 and 238 on OpenBSD
In reply to Philippe Mathieu-DaudéThese tests explode on OpenBSD:
$ gmake check-block
[...]
238 [17:16:09] [17:16:09] [failed, exit status 1] - output mismatch (see 238.out.bad)
--- /tmp/qemu-test.VKNS07/tests/qemu-iotests/238.out Tue Jan 29 17:09:03 2019
+++ /tmp/qemu-test.VKNS07/tests/qemu-iotests/238.out.bad Tue Jan 29 17:16:09 2019
@@ -1,6 +1,14 @@
-{"return": {}}
-{"return": {}}
-{"return": {}}
-{"return": {}}
-{"return": {}}
-{"return": {}}
+Traceback (most recent call last):
+ File "238", line 37, in <module>
+ vm.launch()
+ File "/tmp/qemu-test.VKNS07/tests/qemu-iotests/../../scripts/qemu.py", line 295, in launch
+ self._launch()
+ File "/tmp/qemu-test.VKNS07/tests/qemu-iotests/../../scripts/qemu.py", line 321, in _launch
+ self._post_launch()
+ File "/tmp/qemu-test.VKNS07/tests/qemu-iotests/../../scripts/qemu.py", line 266, in _post_launch
+ self._qmp.accept()
+ File "/tmp/qemu-test.VKNS07/tests/qemu-iotests/../../scripts/qmp/qmp.py", line 157, in accept
+ return self.__negotiate_capabilities()
+ File "/tmp/qemu-test.VKNS07/tests/qemu-iotests/../../scripts/qmp/qmp.py", line 73, in __negotiate_capabilities
+ raise QMPConnectError
+qmp.qmp.QMPConnectError---
This might be due to these tests requiring KVM?... Maybe we need a has_kvm argument to iotests.verify_platform()?
--- tests/qemu-iotests/236 | 1 + tests/qemu-iotests/238 | 2 ++ 2 files changed, 3 insertions(+)
tests/qemu-iotests/236 +1 -0
@@ -23,6 +23,7 @@ import iotests from iotests import log iotests.verify_image_format(supported_fmts=['generic']) +iotests.verify_platform(unsupported_oses=['openbsd']) # FIXME size = 64 * 1024 * 1024 granularity = 64 * 1024
tests/qemu-iotests/238 +2 -0
@@ -23,6 +23,8 @@ import os import iotests from iotests import log +iotests.verify_platform(unsupported_oses=['openbsd']) # FIXME + sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'scripts')) from qemu import QEMUMachine
Signature · 1 line
2.20.1