External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 05:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add newDomain parameter to qemuDomainAssignAddresses

Browse Source 
Pass 'true' if we are not dealing with a migration.
This commit is contained in:
Ján Tomko 2016-06-16 17:15:53 +02:00
parent b3ee621e94
commit 8b04ce598d
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qemu/qemu_domain.c
View File

@ -2436,12 +2436,13 @@ qemuDomainDefAssignAddresses(virDomainDef *def,
virQEMUDriverPtr driver = opaque; virQEMUDriverPtr driver = opaque;
virQEMUCapsPtr qemuCaps = NULL; virQEMUCapsPtr qemuCaps = NULL;
int ret = -1; int ret = -1;
bool newDomain = parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE;
if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache,
def->emulator))) def->emulator)))
goto cleanup; goto cleanup;
if (qemuDomainAssignAddresses(def, qemuCaps, NULL) < 0) if (qemuDomainAssignAddresses(def, qemuCaps, NULL, newDomain) < 0)
goto cleanup; goto cleanup;
ret = 0; ret = 0;

3
src/qemu/qemu_domain_address.c
View File

@ -1628,7 +1628,8 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
int int
qemuDomainAssignAddresses(virDomainDefPtr def, qemuDomainAssignAddresses(virDomainDefPtr def,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
virDomainObjPtr obj) virDomainObjPtr obj,
bool newDomain ATTRIBUTE_UNUSED)
{ {
if (qemuDomainAssignVirtioSerialAddresses(def, obj) < 0) if (qemuDomainAssignVirtioSerialAddresses(def, obj) < 0)
return -1; return -1;

3
src/qemu/qemu_domain_address.h
View File

@ -33,7 +33,8 @@ int qemuDomainSetSCSIControllerModel(const virDomainDef *def,
int qemuDomainAssignAddresses(virDomainDefPtr def, int qemuDomainAssignAddresses(virDomainDefPtr def,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
virDomainObjPtr obj) virDomainObjPtr obj,
bool newDomain)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
void qemuDomainReleaseDeviceAddress(virDomainObjPtr vm, void qemuDomainReleaseDeviceAddress(virDomainObjPtr vm,

7
src/qemu/qemu_process.c
View File

@ -3291,7 +3291,7 @@ qemuProcessReconnect(void *opaque)
goto cleanup; goto cleanup;
} }
if ((qemuDomainAssignAddresses(obj->def, priv->qemuCaps, obj)) < 0) if ((qemuDomainAssignAddresses(obj->def, priv->qemuCaps, obj, false)) < 0)
goto error; goto error;
/* if domain requests security driver we haven't loaded, report error, but /* if domain requests security driver we haven't loaded, report error, but
@ -4878,7 +4878,8 @@ qemuProcessPrepareDomain(virConnectPtr conn,
* use in hotplug * use in hotplug
*/ */
VIR_DEBUG("Assigning domain PCI addresses"); VIR_DEBUG("Assigning domain PCI addresses");
if ((qemuDomainAssignAddresses(vm->def, priv->qemuCaps, vm)) < 0) if ((qemuDomainAssignAddresses(vm->def, priv->qemuCaps, vm,
!!(flags & VIR_QEMU_PROCESS_START_NEW))) < 0)
goto cleanup; goto cleanup;
if (qemuAssignDeviceAliases(vm->def, priv->qemuCaps) < 0) if (qemuAssignDeviceAliases(vm->def, priv->qemuCaps) < 0)
@ -6066,7 +6067,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED,
* use in hotplug * use in hotplug
*/ */
VIR_DEBUG("Assigning domain PCI addresses"); VIR_DEBUG("Assigning domain PCI addresses");
if ((qemuDomainAssignAddresses(vm->def, priv->qemuCaps, vm)) < 0) if ((qemuDomainAssignAddresses(vm->def, priv->qemuCaps, vm, false)) < 0)
goto error; goto error;
if ((timestamp = virTimeStringNow()) == NULL) if ((timestamp = virTimeStringNow()) == NULL)

2
tests/qemuhotplugtest.c
View File

@ -86,7 +86,7 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt,
VIR_DOMAIN_DEF_PARSE_INACTIVE))) VIR_DOMAIN_DEF_PARSE_INACTIVE)))
goto cleanup; goto cleanup;
if (qemuDomainAssignAddresses((*vm)->def, priv->qemuCaps, *vm) < 0) if (qemuDomainAssignAddresses((*vm)->def, priv->qemuCaps, *vm, true) < 0)
goto cleanup; goto cleanup;
if (qemuAssignDeviceAliases((*vm)->def, priv->qemuCaps) < 0) if (qemuAssignDeviceAliases((*vm)->def, priv->qemuCaps) < 0)