shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-04 21:47:16 +03:00
Code Releases Activity

Ensure driver lock is released when entering QEMU monitor

Browse Source 
The qemudStartVMDaemon() and several functions it calls use
the QEMU monitor. The QEMU driver is locked while this function
is executing, so it is rquired to release the driver lock and
reacquire it either side of issuing a monitor command. It
failed todo so, leading to deadlock

* qemu/qemu_driver.c: Release driver when in qemudStartVMDaemon
  and things it calls
This commit is contained in:
Daniel P. Berrange 2009-11-18 15:58:32 +00:00
parent bbf20165cc
commit 278e947890
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/qemu/qemu_driver.c
View File

@ -118,6 +118,7 @@ static void qemudShutdownVMDaemon(virConnectPtr conn,
static int qemudDomainGetMaxVcpus(virDomainPtr dom); static int qemudDomainGetMaxVcpus(virDomainPtr dom);
static int qemuDetectVcpuPIDs(virConnectPtr conn, static int qemuDetectVcpuPIDs(virConnectPtr conn,
struct qemud_driver *driver,
virDomainObjPtr vm); virDomainObjPtr vm);
static int qemuUpdateActivePciHostdevs(struct qemud_driver *driver, static int qemuUpdateActivePciHostdevs(struct qemud_driver *driver,
@ -1314,6 +1315,7 @@ qemudWaitForMonitor(virConnectPtr conn,
static int static int
qemuDetectVcpuPIDs(virConnectPtr conn, qemuDetectVcpuPIDs(virConnectPtr conn,
struct qemud_driver *driver,
virDomainObjPtr vm) { virDomainObjPtr vm) {
pid_t *cpupids = NULL; pid_t *cpupids = NULL;
int ncpupids; int ncpupids;
@ -1331,12 +1333,12 @@ qemuDetectVcpuPIDs(virConnectPtr conn,
/* What follows is now all KVM specific */ /* What follows is now all KVM specific */
qemuDomainObjEnterMonitor(vm); qemuDomainObjEnterMonitorWithDriver(driver, vm);
if ((ncpupids = qemuMonitorGetCPUInfo(priv->mon, &cpupids)) < 0) { if ((ncpupids = qemuMonitorGetCPUInfo(priv->mon, &cpupids)) < 0) {
qemuDomainObjExitMonitor(vm); qemuDomainObjExitMonitorWithDriver(driver, vm);
return -1; return -1;
} }
qemuDomainObjExitMonitor(vm); qemuDomainObjExitMonitorWithDriver(driver, vm);
/* Treat failure to get VCPU<->PID mapping as non-fatal */ /* Treat failure to get VCPU<->PID mapping as non-fatal */
if (ncpupids == 0) if (ncpupids == 0)
@ -1357,6 +1359,7 @@ qemuDetectVcpuPIDs(virConnectPtr conn,
static int static int
qemudInitCpus(virConnectPtr conn, qemudInitCpus(virConnectPtr conn,
struct qemud_driver *driver,
virDomainObjPtr vm, virDomainObjPtr vm,
const char *migrateFrom) { const char *migrateFrom) {
#if HAVE_SCHED_GETAFFINITY #if HAVE_SCHED_GETAFFINITY
@ -1397,15 +1400,15 @@ qemudInitCpus(virConnectPtr conn,
/* XXX This resume doesn't really belong here. Move it up to caller */ /* XXX This resume doesn't really belong here. Move it up to caller */
if (migrateFrom == NULL) { if (migrateFrom == NULL) {
/* Allow the CPUS to start executing */ /* Allow the CPUS to start executing */
qemuDomainObjEnterMonitor(vm); qemuDomainObjEnterMonitorWithDriver(driver, vm);
if (qemuMonitorStartCPUs(priv->mon, conn) < 0) { if (qemuMonitorStartCPUs(priv->mon, conn) < 0) {
if (virGetLastError() == NULL) if (virGetLastError() == NULL)
qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
"%s", _("resume operation failed")); "%s", _("resume operation failed"));
qemuDomainObjExitMonitor(vm); qemuDomainObjExitMonitorWithDriver(driver, vm);
return -1; return -1;
} }
qemuDomainObjExitMonitor(vm); qemuDomainObjExitMonitorWithDriver(driver, vm);
} }
return 0; return 0;
@ -1422,12 +1425,12 @@ qemuInitPasswords(struct qemud_driver *driver,
vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
(vm->def->graphics[0]->data.vnc.passwd || driver->vncPassword)) { (vm->def->graphics[0]->data.vnc.passwd || driver->vncPassword)) {
qemuDomainObjEnterMonitor(vm); qemuDomainObjEnterMonitorWithDriver(driver, vm);
ret = qemuMonitorSetVNCPassword(priv->mon, ret = qemuMonitorSetVNCPassword(priv->mon,
vm->def->graphics[0]->data.vnc.passwd ? vm->def->graphics[0]->data.vnc.passwd ?
vm->def->graphics[0]->data.vnc.passwd : vm->def->graphics[0]->data.vnc.passwd :
driver->vncPassword); driver->vncPassword);
qemuDomainObjExitMonitor(vm); qemuDomainObjExitMonitorWithDriver(driver, vm);
} }
return ret; return ret;
@ -2294,21 +2297,21 @@ static int qemudStartVMDaemon(virConnectPtr conn,
if (qemudWaitForMonitor(conn, driver, vm, pos) < 0) if (qemudWaitForMonitor(conn, driver, vm, pos) < 0)
goto abort; goto abort;
if (qemuDetectVcpuPIDs(conn, vm) < 0) if (qemuDetectVcpuPIDs(conn, driver, vm) < 0)
goto abort; goto abort;
if (qemudInitCpus(conn, vm, migrateFrom) < 0) if (qemudInitCpus(conn, driver, vm, migrateFrom) < 0)
goto abort; goto abort;
if (qemuInitPasswords(driver, vm) < 0) if (qemuInitPasswords(driver, vm) < 0)
goto abort; goto abort;
qemuDomainObjEnterMonitor(vm); qemuDomainObjEnterMonitorWithDriver(driver, vm);
if (qemuMonitorSetBalloon(priv->mon, vm->def->memory) < 0) { if (qemuMonitorSetBalloon(priv->mon, vm->def->memory) < 0) {
qemuDomainObjExitMonitor(vm); qemuDomainObjExitMonitorWithDriver(driver, vm);
goto abort; goto abort;
} }
qemuDomainObjExitMonitor(vm); qemuDomainObjExitMonitorWithDriver(driver, vm);
if (virDomainSaveStatus(conn, driver->stateDir, vm) < 0) if (virDomainSaveStatus(conn, driver->stateDir, vm) < 0)
goto abort; goto abort;