mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-09-08 16:54:49 +00:00
qemuDomainDefAssignAddresses: Fetch caps from domain object
Just like we did two commits ago, don't try to fetch capabilities for non-existing binary. Re-use the ones we have for running domain. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
1e501043f7
commit
4172ae371b
@ -2774,17 +2774,21 @@ qemuDomainDefAssignAddresses(virDomainDef *def,
|
|||||||
virCapsPtr caps,
|
virCapsPtr caps,
|
||||||
unsigned int parseFlags ATTRIBUTE_UNUSED,
|
unsigned int parseFlags ATTRIBUTE_UNUSED,
|
||||||
void *opaque,
|
void *opaque,
|
||||||
void *parseOpaque ATTRIBUTE_UNUSED)
|
void *parseOpaque)
|
||||||
{
|
{
|
||||||
virQEMUDriverPtr driver = opaque;
|
virQEMUDriverPtr driver = opaque;
|
||||||
virQEMUCapsPtr qemuCaps = NULL;
|
virQEMUCapsPtr qemuCaps = parseOpaque;
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
bool newDomain = parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE;
|
bool newDomain = parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE;
|
||||||
|
|
||||||
if (!(qemuCaps = virQEMUCapsCacheLookup(caps,
|
if (qemuCaps) {
|
||||||
driver->qemuCapsCache,
|
virObjectRef(qemuCaps);
|
||||||
def->emulator)))
|
} else {
|
||||||
goto cleanup;
|
if (!(qemuCaps = virQEMUCapsCacheLookup(caps,
|
||||||
|
driver->qemuCapsCache,
|
||||||
|
def->emulator)))
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
if (qemuDomainAssignAddresses(def, qemuCaps, NULL, newDomain) < 0)
|
if (qemuDomainAssignAddresses(def, qemuCaps, NULL, newDomain) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
Loading…
Reference in New Issue
Block a user