[PATCH 6/7] qemu: Support add bootindex = 0 to boothash when its bootIndexSpecified is true
Support add bootindex = 0 to boothash and return 0 if duplicated bootindex = 0 is set.
It is nessary to add bootindex = 0 into boothash, otherwise libvirt will auto set boot
dev,
which will cause bootindex unchangable. Meanwhile, bootindex = 0 means disable bootindex,
so it should be allowed to set duplicated bootindex = 0.
Signed-off-by: Jiang Jiacheng <jiangjiacheng(a)huawei.com>
---
src/conf/domain_postparse.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/conf/domain_postparse.c b/src/conf/domain_postparse.c
index 9a3e8f494c..2ba3186561 100644
--- a/src/conf/domain_postparse.c
+++ b/src/conf/domain_postparse.c
@@ -1031,7 +1031,7 @@ virDomainDefCollectBootOrder(virDomainDef *def G_GNUC_UNUSED,
GHashTable *bootHash = data;
g_autofree char *order = NULL;
- if (info->bootIndex == 0)
+ if (info->bootIndex == 0 && !info->bootIndexSpecified)
return 0;
if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV &&
@@ -1045,6 +1045,12 @@ virDomainDefCollectBootOrder(virDomainDef *def G_GNUC_UNUSED,
order = g_strdup_printf("%u", info->bootIndex);
if (virHashLookup(bootHash, order)) {
+ /* 0 in the bootHash means cancel the bootIndex specified in
+ * XML, so it allowed to make more than one device use 0 with
+ * its bootIndexSpecified = true.
+ */
+ if (info->bootIndex == 0)
+ return 0;
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("boot order '%s' used for more than one
device"),
order);
--
2.33.0