From 00e394a2c5ed19d40c216019e70d9e062a9cb6c2 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 23 Mar 2018 14:08:36 +0100 Subject: [PATCH] qemu: domain: Forbid storage type 'cow' in qemu QEMU does not support it so save us the hassle and forbid it right away. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 23 ++++++++++++++++ tests/qemuxml2argvdata/disk-drive-fmt-cow.xml | 27 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 51 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-drive-fmt-cow.xml diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f3e95cb2ca..635bdda78b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4108,9 +4108,24 @@ qemuDomainDeviceDefValidateVideo(const virDomainVideoDef *video) } +static int +qemuDomainValidateStorageSource(virStorageSourcePtr src) +{ + if (src->format == VIR_STORAGE_FILE_COW) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'cow' storage format is not supported")); + return -1; + } + + return 0; +} + + static int qemuDomainDeviceDefValidateDisk(const virDomainDiskDef *disk) { + virStorageSourcePtr n; + if (disk->src->shared && !disk->src->readonly) { if (disk->src->format <= VIR_STORAGE_FILE_AUTO) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -4127,6 +4142,11 @@ qemuDomainDeviceDefValidateDisk(const virDomainDiskDef *disk) } } + for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) { + if (qemuDomainValidateStorageSource(n) < 0) + return -1; + } + return 0; } @@ -11837,6 +11857,9 @@ qemuDomainPrepareDiskSourceChain(virDomainDiskDefPtr disk, n->debug = true; n->debugLevel = cfg->glusterDebugLevel; } + + if (qemuDomainValidateStorageSource(n) < 0) + return -1; } return 0; diff --git a/tests/qemuxml2argvdata/disk-drive-fmt-cow.xml b/tests/qemuxml2argvdata/disk-drive-fmt-cow.xml new file mode 100644 index 0000000000..91c62ea055 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-fmt-cow.xml @@ -0,0 +1,27 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + + /usr/bin/qemu-system-i686 + + + + +
+ + + + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 308d71f725..5d7f2e15ba 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -912,6 +912,7 @@ mymain(void) QEMU_CAPS_NODEFCONFIG); DO_TEST("disk-drive-fmt-qcow", QEMU_CAPS_DRIVE_BOOT); + DO_TEST_PARSE_ERROR("disk-drive-fmt-cow", QEMU_CAPS_DRIVE_BOOT); DO_TEST("disk-drive-shared", QEMU_CAPS_DRIVE_SERIAL); DO_TEST_PARSE_ERROR("disk-drive-shared-qcow", NONE); -- GitLab