External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Pass qemuCaps to qemuDomainDefCopy

Browse Source 
Since qemuDomainDefPostParse callback requires qemuCaps, we need to make
sure it gets the capabilities stored in the domain's private data if the
domain is running. Passing NULL may cause QEMU capabilities probing to
be triggered in case QEMU binary changed in the meantime. When this
happens while a running domain object is locked, QMP event delivered to
the domain before QEMU capabilities probing finishes will deadlock the
event loop.

This patch fixes all paths leading to qemuDomainDefCopy.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Jiri Denemark 2019-08-02 17:36:56 +02:00
parent 0dc84c347a
commit a42f889591
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_domain.c
View File

@ -8361,6 +8361,7 @@ qemuDomainObjExitRemote(virDomainObjPtr obj,
static virDomainDefPtr static virDomainDefPtr
qemuDomainDefFromXML(virQEMUDriverPtr driver, qemuDomainDefFromXML(virQEMUDriverPtr driver,
virQEMUCapsPtr qemuCaps,
const char *xml) const char *xml)
{ {
virCapsPtr caps; virCapsPtr caps;
@ -8369,7 +8370,7 @@ qemuDomainDefFromXML(virQEMUDriverPtr driver,
if (!(caps = virQEMUDriverGetCapabilities(driver, false))) if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
return NULL; return NULL;
def = virDomainDefParseString(xml, caps, driver->xmlopt, NULL, def = virDomainDefParseString(xml, caps, driver->xmlopt, qemuCaps,
VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_INACTIVE |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE); VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE);
@ -8380,6 +8381,7 @@ qemuDomainDefFromXML(virQEMUDriverPtr driver,
virDomainDefPtr virDomainDefPtr
qemuDomainDefCopy(virQEMUDriverPtr driver, qemuDomainDefCopy(virQEMUDriverPtr driver,
virQEMUCapsPtr qemuCaps,
virDomainDefPtr src, virDomainDefPtr src,
unsigned int flags) unsigned int flags)
{ {
@ -8389,7 +8391,7 @@ qemuDomainDefCopy(virQEMUDriverPtr driver,
if (!(xml = qemuDomainDefFormatXML(driver, src, flags))) if (!(xml = qemuDomainDefFormatXML(driver, src, flags)))
return NULL; return NULL;
ret = qemuDomainDefFromXML(driver, xml); ret = qemuDomainDefFromXML(driver, qemuCaps, xml);
VIR_FREE(xml); VIR_FREE(xml);
return ret; return ret;
@ -10616,6 +10618,7 @@ qemuDomainMigratableDefCheckABIStability(virQEMUDriverPtr driver,
bool bool
qemuDomainDefCheckABIStability(virQEMUDriverPtr driver, qemuDomainDefCheckABIStability(virQEMUDriverPtr driver,
virQEMUCapsPtr qemuCaps,
virDomainDefPtr src, virDomainDefPtr src,
virDomainDefPtr dst) virDomainDefPtr dst)
{ {
@ -10623,8 +10626,8 @@ qemuDomainDefCheckABIStability(virQEMUDriverPtr driver,
virDomainDefPtr migratableDefDst = NULL; virDomainDefPtr migratableDefDst = NULL;
bool ret = false; bool ret = false;
if (!(migratableDefSrc = qemuDomainDefCopy(driver, src, COPY_FLAGS)) || if (!(migratableDefSrc = qemuDomainDefCopy(driver, qemuCaps, src, COPY_FLAGS)) ||
!(migratableDefDst = qemuDomainDefCopy(driver, dst, COPY_FLAGS))) !(migratableDefDst = qemuDomainDefCopy(driver, qemuCaps, dst, COPY_FLAGS)))
goto cleanup; goto cleanup;
ret = qemuDomainMigratableDefCheckABIStability(driver, ret = qemuDomainMigratableDefCheckABIStability(driver,
@ -10643,14 +10646,15 @@ qemuDomainCheckABIStability(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainDefPtr dst) virDomainDefPtr dst)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData;
virDomainDefPtr migratableSrc = NULL; virDomainDefPtr migratableSrc = NULL;
virDomainDefPtr migratableDst = NULL; virDomainDefPtr migratableDst = NULL;
char *xml = NULL; char *xml = NULL;
bool ret = false; bool ret = false;
if (!(xml = qemuDomainFormatXML(driver, vm, COPY_FLAGS)) || if (!(xml = qemuDomainFormatXML(driver, vm, COPY_FLAGS)) ||
!(migratableSrc = qemuDomainDefFromXML(driver, xml)) || !(migratableSrc = qemuDomainDefFromXML(driver, priv->qemuCaps, xml)) ||
!(migratableDst = qemuDomainDefCopy(driver, dst, COPY_FLAGS))) !(migratableDst = qemuDomainDefCopy(driver, priv->qemuCaps, dst, COPY_FLAGS)))
goto cleanup; goto cleanup;
ret = qemuDomainMigratableDefCheckABIStability(driver, ret = qemuDomainMigratableDefCheckABIStability(driver,

2
src/qemu/qemu_domain.h
View File

@ -649,6 +649,7 @@ int qemuDomainObjExitRemote(virDomainObjPtr obj,
ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
virDomainDefPtr qemuDomainDefCopy(virQEMUDriverPtr driver, virDomainDefPtr qemuDomainDefCopy(virQEMUDriverPtr driver,
virQEMUCapsPtr qemuCaps,
virDomainDefPtr src, virDomainDefPtr src,
unsigned int flags); unsigned int flags);
@ -863,6 +864,7 @@ int qemuDomainUpdateMemoryDeviceInfo(virQEMUDriverPtr driver,
int asyncJob); int asyncJob);
bool qemuDomainDefCheckABIStability(virQEMUDriverPtr driver, bool qemuDomainDefCheckABIStability(virQEMUDriverPtr driver,
virQEMUCapsPtr qemuCaps,
virDomainDefPtr src, virDomainDefPtr src,
virDomainDefPtr dst); virDomainDefPtr dst);

9
src/qemu/qemu_driver.c
View File

@ -6764,7 +6764,7 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver,
VIR_DOMAIN_DEF_PARSE_INACTIVE))) VIR_DOMAIN_DEF_PARSE_INACTIVE)))
goto cleanup; goto cleanup;
if (!(newdef_migr = qemuDomainDefCopy(driver, if (!(newdef_migr = qemuDomainDefCopy(driver, NULL,
newdef, newdef,
QEMU_DOMAIN_FORMAT_LIVE_FLAGS | QEMU_DOMAIN_FORMAT_LIVE_FLAGS |
VIR_DOMAIN_XML_MIGRATABLE))) VIR_DOMAIN_XML_MIGRATABLE)))
@ -16553,7 +16553,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
switch ((virDomainSnapshotState) snapdef->state) { switch ((virDomainSnapshotState) snapdef->state) {
case VIR_DOMAIN_SNAPSHOT_RUNNING: case VIR_DOMAIN_SNAPSHOT_RUNNING:
case VIR_DOMAIN_SNAPSHOT_PAUSED: case VIR_DOMAIN_SNAPSHOT_PAUSED:
priv = vm->privateData;
start_flags |= VIR_QEMU_PROCESS_START_PAUSED; start_flags |= VIR_QEMU_PROCESS_START_PAUSED;
/* Transitions 2, 3, 5, 6, 8, 9 */ /* Transitions 2, 3, 5, 6, 8, 9 */
@ -16580,7 +16580,9 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
if (!(config->cpu = virCPUDefCopy(cookie->cpu))) if (!(config->cpu = virCPUDefCopy(cookie->cpu)))
goto endjob; goto endjob;
compatible = qemuDomainDefCheckABIStability(driver, vm->def, compatible = qemuDomainDefCheckABIStability(driver,
priv->qemuCaps,
vm->def,
config); config);
} else { } else {
compatible = qemuDomainCheckABIStability(driver, vm, config); compatible = qemuDomainCheckABIStability(driver, vm, config);
@ -16624,7 +16626,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
} }
} }
priv = vm->privateData;
if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) {
/* Transitions 5, 6 */ /* Transitions 5, 6 */
if (qemuProcessStopCPUs(driver, vm, if (qemuProcessStopCPUs(driver, vm,

4
src/qemu/qemu_migration.c
View File

@ -2381,7 +2381,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver,
if (!newdef) if (!newdef)
goto cleanup; goto cleanup;
if (!qemuDomainDefCheckABIStability(driver, *def, newdef)) { if (!qemuDomainDefCheckABIStability(driver, NULL, *def, newdef)) {
virDomainDefFree(newdef); virDomainDefFree(newdef);
goto cleanup; goto cleanup;
} }
@ -3427,7 +3427,7 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
goto error; goto error;
} else { } else {
virDomainDefPtr def = vm->newDef ? vm->newDef : vm->def; virDomainDefPtr def = vm->newDef ? vm->newDef : vm->def;
if (!(persistDef = qemuDomainDefCopy(driver, def, if (!(persistDef = qemuDomainDefCopy(driver, priv->qemuCaps, def,
VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_SECURE |
VIR_DOMAIN_XML_MIGRATABLE))) VIR_DOMAIN_XML_MIGRATABLE)))
goto error; goto error;