From: Peter Krempa Date: Thu, 23 Nov 2023 19:42:54 +0000 (+0100) Subject: virstoragetest: Add test cases for QCOW2 files with a protocol name as backing file... X-Git-Tag: v9.10.0-rc1~19 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fe9e356108bf6d300077fa3fe639dcaeecb4270;p=thirdparty%2Flibvirt.git virstoragetest: Add test cases for QCOW2 files with a protocol name as backing file format QEMU allows and in cases where you omit the not-strictly-needed 'raw' driver on top of raw images automatically uses the protocol name inside of the 'backing file format' field of the qcow2 image. Libvirt expects only format names in that field. Add example images showing this scenario, which will be fixed later. The qcow2 image files in this commit were formatted as: qemu-img create -f qcow2 -F nbd -b nbd+tcp://example.org:6000/blah -u qcow2-protocol-backing-nbd.qcow2 10M and qemu-img create -f qcow2 -F file -b raw qcow2-protocol-backing-file.qcow2 thus using 'nbd' and 'file' as backing format respectively. (note that '-b raw' refers to the file in the example image folder) To satisfy the test, note that the NBD image is also rejected as we can't probe it, thus such configuration would not work. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index c28a23e332..53533d5885 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -478,6 +478,14 @@ mymain(void) abs_srcdir "/virstoragetestdata/images/qcow2_qcow2-auto.qcow2", VIR_STORAGE_FILE_QCOW2, EXP_PASS); + /* QCOW2 with protocol recorded inside the 'backing file format field */ + TEST_CHAIN("qcow2-protocol-backing-file", + abs_srcdir "/virstoragetestdata/images/qcow2-protocol-backing-file.qcow2", + VIR_STORAGE_FILE_QCOW2, EXP_PASS); + TEST_CHAIN("qcow2-protocol-backing-nbd", + abs_srcdir "/virstoragetestdata/images/qcow2-protocol-backing-nbd.qcow2", + VIR_STORAGE_FILE_QCOW2, EXP_FAIL); + /* Qcow2 file with missing backing file but specified type */ TEST_CHAIN("qcow2-qcow2_missing", abs_srcdir "/virstoragetestdata/images/qcow2_qcow2-missing.qcow2", diff --git a/tests/virstoragetestdata/images/qcow2-protocol-backing-file.qcow2 b/tests/virstoragetestdata/images/qcow2-protocol-backing-file.qcow2 new file mode 100644 index 0000000000..b3fe320f0f Binary files /dev/null and b/tests/virstoragetestdata/images/qcow2-protocol-backing-file.qcow2 differ diff --git a/tests/virstoragetestdata/images/qcow2-protocol-backing-nbd.qcow2 b/tests/virstoragetestdata/images/qcow2-protocol-backing-nbd.qcow2 new file mode 100644 index 0000000000..0ae422d8f5 Binary files /dev/null and b/tests/virstoragetestdata/images/qcow2-protocol-backing-nbd.qcow2 differ diff --git a/tests/virstoragetestdata/out/qcow2-protocol-backing-file b/tests/virstoragetestdata/out/qcow2-protocol-backing-file new file mode 100644 index 0000000000..b565bdba77 --- /dev/null +++ b/tests/virstoragetestdata/out/qcow2-protocol-backing-file @@ -0,0 +1,21 @@ +path:ABS_SRCDIR/virstoragetestdata/images/qcow2-protocol-backing-file.qcow2 +backingStoreRaw: raw +backingStoreRawFormat: (-1) +capacity: 1024 +encryption: 0 +relPath: +type:file +format:qcow2 +protocol:none +hostname: + +path:ABS_SRCDIR/virstoragetestdata/images/raw +backingStoreRaw: +backingStoreRawFormat: none(0) +capacity: 0 +encryption: 0 +relPath:raw +type:file +format:raw +protocol:none +hostname: