57 lines
1.8 KiB
Diff
57 lines
1.8 KiB
Diff
From c829c453baad259c1161dcd4bfed4b9a9372e6b2 Mon Sep 17 00:00:00 2001
|
|
From: Michal Privoznik <mprivozn@redhat.com>
|
|
Date: Wed, 26 Jun 2019 15:35:11 +0200
|
|
Subject: [PATCH] qemu: Validate disk against domain def on coldplug
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1692296#c7
|
|
|
|
This is a counterpart for ddc72f99027 and implements the same
|
|
check for coldplug.
|
|
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
Reviewed-by: Erik Skultety <eskultet@redhat.com>
|
|
(cherry-picked from commit 881686d4b15306fd5a5f0592d502ddb33ee6437e)
|
|
Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
|
|
---
|
|
src/qemu/qemu_driver.c | 17 +++++++++++++++++
|
|
1 file changed, 17 insertions(+)
|
|
|
|
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
index 5791c42..f80bdeb 100644
|
|
--- a/src/qemu/qemu_driver.c
|
|
+++ b/src/qemu/qemu_driver.c
|
|
@@ -8078,6 +8078,21 @@ qemuDomainUpdateDeviceLive(virDomainObjPtr vm,
|
|
return ret;
|
|
}
|
|
|
|
+
|
|
+static int
|
|
+qemuCheckDiskConfigAgainstDomain(const virDomainDef *def,
|
|
+ const virDomainDiskDef *disk)
|
|
+{
|
|
+ if (virDomainSCSIDriveAddressIsUsed(def, &disk->info.addr.drive)) {
|
|
+ virReportError(VIR_ERR_OPERATION_INVALID, "%s",
|
|
+ _("Domain already contains a disk with that address"));
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+
|
|
static int
|
|
qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
|
|
virDomainDeviceDefPtr dev,
|
|
@@ -8106,6 +8121,8 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
|
|
return -1;
|
|
if (qemuCheckDiskConfig(disk, NULL) < 0)
|
|
return -1;
|
|
+ if (qemuCheckDiskConfigAgainstDomain(vmdef, disk) < 0)
|
|
+ return -1;
|
|
if (virDomainDiskInsert(vmdef, disk) < 0)
|
|
return -1;
|
|
/* vmdef has the pointer. Generic codes for vmdef will do all jobs */
|
|
--
|
|
2.19.1
|
|
|