External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Move assignment of default emulator to the basic post parse callback

Browse Source
This commit is contained in:
Peter Krempa 2017-08-15 15:16:20 +02:00
parent 2f19c9325e
commit 03132bf487
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/qemu/qemu_domain.c
View File

@ -2924,9 +2924,23 @@ qemuDomainDefVerifyFeatures(const virDomainDef *def)
} }
static int
qemuDomainDefPostParseBasic(virDomainDefPtr def,
virCapsPtr caps,
void *opaque ATTRIBUTE_UNUSED)
{
/* check for emulator and create a default one if needed */
if (!def->emulator &&
!(def->emulator = virDomainDefGetDefaultEmulator(def, caps)))
return -1;
return 0;
}
static int static int
qemuDomainDefPostParse(virDomainDefPtr def, qemuDomainDefPostParse(virDomainDefPtr def,
virCapsPtr caps, virCapsPtr caps ATTRIBUTE_UNUSED,
unsigned int parseFlags, unsigned int parseFlags,
void *opaque, void *opaque,
void *parseOpaque) void *parseOpaque)
@ -2957,11 +2971,6 @@ qemuDomainDefPostParse(virDomainDefPtr def,
goto cleanup; goto cleanup;
} }
/* check for emulator and create a default one if needed */
if (!def->emulator &&
!(def->emulator = virDomainDefGetDefaultEmulator(def, caps)))
goto cleanup;
if (qemuCaps) { if (qemuCaps) {
virObjectRef(qemuCaps); virObjectRef(qemuCaps);
} else { } else {
@ -3716,6 +3725,7 @@ qemuDomainDefAssignAddresses(virDomainDef *def,
virDomainDefParserConfig virQEMUDriverDomainDefParserConfig = { virDomainDefParserConfig virQEMUDriverDomainDefParserConfig = {
.domainPostParseBasicCallback = qemuDomainDefPostParseBasic,
.devicesPostParseCallback = qemuDomainDeviceDefPostParse, .devicesPostParseCallback = qemuDomainDeviceDefPostParse,
.domainPostParseCallback = qemuDomainDefPostParse, .domainPostParseCallback = qemuDomainDefPostParse,
.assignAddressesCallback = qemuDomainDefAssignAddresses, .assignAddressesCallback = qemuDomainDefAssignAddresses,