From fb2cd32c9a3535e52a1129f7fe2aebf317ad5a65 Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Tue, 6 Dec 2016 15:30:13 +0100 Subject: [PATCH] qemu: qemuDomainDiskChangeSupported: Add missing 'address' check Disk->info is not live updatable so add a check for this. Otherwise libvirt reports success even though no data was updated. Signed-off-by: Marc Hartmayer Reviewed-by: Bjoern Walk Reviewed-by: Boris Fiuczynski --- src/qemu/qemu_domain.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ecf72a84db..acfa69589b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5291,6 +5291,19 @@ qemuDomainDiskChangeSupported(virDomainDiskDefPtr disk, /* "snapshot" is a libvirt internal field and thus can be changed */ /* startupPolicy is allowed to be updated. Therefore not checked here. */ CHECK_EQ(transient, "transient", true); + + /* Note: For some address types the address auto generation for + * @disk has still not happened at this point (e.g. driver + * specific addresses) therefore we can't catch these possible + * address modifications here. */ + if (disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + !virDomainDeviceInfoAddressIsEqual(&disk->info, &orig_disk->info)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("cannot modify field '%s' of the disk"), + "address"); + return false; + } + CHECK_EQ(info.bootIndex, "boot order", true); CHECK_EQ(rawio, "rawio", true); CHECK_EQ(sgio, "sgio", true);