External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 06:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Call virDomainDefPostParse via CONFIG hotplug

Browse Source 
hotplug APIs with the AFFECT_CONFIG flag are essentially replicating
'insert <device> into XML document, and redefine XML'. Thinking of
it this way, it's natural that we call virDomainDefPostParse after
manually editing the XML here.

Not only does doing so allow us to drop a bunch of open coded calls
to qemuDomainAssignAddresses, but it also means we are going through
the standard channels for XML validation and potentially catching
errors in user submitted XML.
This commit is contained in:
Cole Robinson 2016-05-14 15:14:44 -04:00
parent 5d7314bbcf
commit 383833e230
1 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/qemu/qemu_driver.c
View File

@ -7775,10 +7775,12 @@ qemuDomainUpdateDeviceLive(virConnectPtr conn,
} }
static int static int
qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps, qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
virDomainDefPtr vmdef,
virDomainDeviceDefPtr dev, virDomainDeviceDefPtr dev,
virConnectPtr conn) virConnectPtr conn,
virCapsPtr caps,
unsigned int parse_flags,
virDomainXMLOptionPtr xmlopt)
{ {
virDomainDiskDefPtr disk; virDomainDiskDefPtr disk;
virDomainNetDefPtr net; virDomainNetDefPtr net;
@ -7803,11 +7805,6 @@ qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps,
return -1; return -1;
/* vmdef has the pointer. Generic codes for vmdef will do all jobs */ /* vmdef has the pointer. Generic codes for vmdef will do all jobs */
dev->data.disk = NULL; dev->data.disk = NULL;
if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO)
if (virDomainDefAddImplicitDevices(vmdef) < 0)
return -1;
if (qemuDomainAssignAddresses(vmdef, qemuCaps, NULL) < 0)
return -1;
break; break;
case VIR_DOMAIN_DEVICE_NET: case VIR_DOMAIN_DEVICE_NET:
@ -7815,8 +7812,6 @@ qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps,
if (virDomainNetInsert(vmdef, net)) if (virDomainNetInsert(vmdef, net))
return -1; return -1;
dev->data.net = NULL; dev->data.net = NULL;
if (qemuDomainAssignAddresses(vmdef, qemuCaps, NULL) < 0)
return -1;
break; break;
case VIR_DOMAIN_DEVICE_HOSTDEV: case VIR_DOMAIN_DEVICE_HOSTDEV:
@ -7829,10 +7824,6 @@ qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps,
if (virDomainHostdevInsert(vmdef, hostdev)) if (virDomainHostdevInsert(vmdef, hostdev))
return -1; return -1;
dev->data.hostdev = NULL; dev->data.hostdev = NULL;
if (virDomainDefAddImplicitDevices(vmdef) < 0)
return -1;
if (qemuDomainAssignAddresses(vmdef, qemuCaps, NULL) < 0)
return -1;
break; break;
case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_LEASE:
@ -7863,18 +7854,12 @@ qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps,
return -1; return -1;
dev->data.controller = NULL; dev->data.controller = NULL;
if (qemuDomainAssignAddresses(vmdef, qemuCaps, NULL) < 0)
return -1;
break; break;
case VIR_DOMAIN_DEVICE_CHR: case VIR_DOMAIN_DEVICE_CHR:
if (qemuDomainChrInsert(vmdef, dev->data.chr) < 0) if (qemuDomainChrInsert(vmdef, dev->data.chr) < 0)
return -1; return -1;
dev->data.chr = NULL; dev->data.chr = NULL;
if (virDomainDefAddImplicitDevices(vmdef) < 0)
return -1;
if (qemuDomainAssignAddresses(vmdef, qemuCaps, NULL) < 0)
return -1;
break; break;
case VIR_DOMAIN_DEVICE_FS: case VIR_DOMAIN_DEVICE_FS:
@ -7902,8 +7887,6 @@ qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps,
return -1; return -1;
dev->data.rng = NULL; dev->data.rng = NULL;
if (qemuDomainAssignAddresses(vmdef, qemuCaps, NULL) < 0)
return -1;
break; break;
case VIR_DOMAIN_DEVICE_MEMORY: case VIR_DOMAIN_DEVICE_MEMORY:
@ -7941,13 +7924,20 @@ qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps,
virDomainDeviceTypeToString(dev->type)); virDomainDeviceTypeToString(dev->type));
return -1; return -1;
} }
if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt) < 0)
return -1;
return 0; return 0;
} }
static int static int
qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef,
virDomainDeviceDefPtr dev) virDomainDeviceDefPtr dev,
virCapsPtr caps,
unsigned int parse_flags,
virDomainXMLOptionPtr xmlopt)
{ {
virDomainDiskDefPtr disk, det_disk; virDomainDiskDefPtr disk, det_disk;
virDomainNetDefPtr net; virDomainNetDefPtr net;
@ -8077,13 +8067,19 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef,
virDomainDeviceTypeToString(dev->type)); virDomainDeviceTypeToString(dev->type));
return -1; return -1;
} }
if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt) < 0)
return -1;
return 0; return 0;
} }
static int static int
qemuDomainUpdateDeviceConfig(virQEMUCapsPtr qemuCaps, qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef,
virDomainDefPtr vmdef, virDomainDeviceDefPtr dev,
virDomainDeviceDefPtr dev) virCapsPtr caps,
unsigned int parse_flags,
virDomainXMLOptionPtr xmlopt)
{ {
virDomainDiskDefPtr orig, disk; virDomainDiskDefPtr orig, disk;
virDomainGraphicsDefPtr newGraphics; virDomainGraphicsDefPtr newGraphics;
@ -8141,9 +8137,6 @@ qemuDomainUpdateDeviceConfig(virQEMUCapsPtr qemuCaps,
vmdef->nets[pos] = net; vmdef->nets[pos] = net;
dev->data.net = NULL; dev->data.net = NULL;
if (qemuDomainAssignAddresses(vmdef, qemuCaps, NULL) < 0)
return -1;
break; break;
case VIR_DOMAIN_DEVICE_FS: case VIR_DOMAIN_DEVICE_FS:
@ -8172,6 +8165,10 @@ qemuDomainUpdateDeviceConfig(virQEMUCapsPtr qemuCaps,
virDomainDeviceTypeToString(dev->type)); virDomainDeviceTypeToString(dev->type));
return -1; return -1;
} }
if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt) < 0)
return -1;
return 0; return 0;
} }
@ -8247,8 +8244,9 @@ static int qemuDomainAttachDeviceFlags(virDomainPtr dom, const char *xml,
VIR_DOMAIN_DEVICE_ACTION_ATTACH) < 0) VIR_DOMAIN_DEVICE_ACTION_ATTACH) < 0)
goto endjob; goto endjob;
if ((ret = qemuDomainAttachDeviceConfig(qemuCaps, vmdef, dev, if ((ret = qemuDomainAttachDeviceConfig(vmdef, dev, dom->conn, caps,
dom->conn)) < 0) parse_flags,
driver->xmlopt)) < 0)
goto endjob; goto endjob;
} }
@ -8316,6 +8314,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom,
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
virQEMUDriverConfigPtr cfg = NULL; virQEMUDriverConfigPtr cfg = NULL;
virCapsPtr caps = NULL; virCapsPtr caps = NULL;
unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
VIR_DOMAIN_AFFECT_CONFIG | VIR_DOMAIN_AFFECT_CONFIG |
@ -8341,7 +8340,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom,
dev = dev_copy = virDomainDeviceDefParse(xml, vm->def, dev = dev_copy = virDomainDeviceDefParse(xml, vm->def,
caps, driver->xmlopt, caps, driver->xmlopt,
VIR_DOMAIN_DEF_PARSE_INACTIVE); parse_flags);
if (dev == NULL) if (dev == NULL)
goto endjob; goto endjob;
@ -8374,7 +8373,9 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom,
VIR_DOMAIN_DEVICE_ACTION_UPDATE) < 0) VIR_DOMAIN_DEVICE_ACTION_UPDATE) < 0)
goto endjob; goto endjob;
if ((ret = qemuDomainUpdateDeviceConfig(qemuCaps, vmdef, dev)) < 0) if ((ret = qemuDomainUpdateDeviceConfig(vmdef, dev, caps,
parse_flags,
driver->xmlopt)) < 0)
goto endjob; goto endjob;
} }
@ -8494,7 +8495,9 @@ static int qemuDomainDetachDeviceFlags(virDomainPtr dom, const char *xml,
VIR_DOMAIN_DEVICE_ACTION_DETACH) < 0) VIR_DOMAIN_DEVICE_ACTION_DETACH) < 0)
goto endjob; goto endjob;
if ((ret = qemuDomainDetachDeviceConfig(vmdef, dev)) < 0) if ((ret = qemuDomainDetachDeviceConfig(vmdef, dev, caps,
parse_flags,
driver->xmlopt)) < 0)
goto endjob; goto endjob;
} }