openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix security driver configuration 

The security driver was mistakenly initialized before the QEMU
config file was loaded. This prevents it being turned off again.
The capabilities XML was also getting the wrong security driver
name, due to the stacked driver arrangement.

* src/qemu/qemu_driver.c: Fix initialization order and capabilities
  model name
This commit is contained in:
Daniel P. Berrange 2010-02-09 13:17:39 +00:00
parent 658952a38a
commit d47ef780f2
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/qemu/qemu_driver.c
View File

@ -933,7 +933,7 @@ qemudSecurityInit(struct qemud_driver *qemud_drv)
static virCapsPtr static virCapsPtr
qemuCreateCapabilities(virCapsPtr oldcaps, qemuCreateCapabilities(virCapsPtr oldcaps,
virSecurityDriverPtr secDriver) struct qemud_driver *driver)
{ {
virCapsPtr caps; virCapsPtr caps;
@ -951,11 +951,11 @@ qemuCreateCapabilities(virCapsPtr oldcaps,
/* Security driver data */ /* Security driver data */
if (secDriver) { if (driver->securityPrimaryDriver) {
const char *doi, *model; const char *doi, *model;
doi = virSecurityDriverGetDOI(secDriver); doi = virSecurityDriverGetDOI(driver->securityPrimaryDriver);
model = virSecurityDriverGetModel(secDriver); model = virSecurityDriverGetModel(driver->securityPrimaryDriver);
if (!(caps->host.secModel.model = strdup(model))) if (!(caps->host.secModel.model = strdup(model)))
goto no_memory; goto no_memory;
@ -1098,20 +1098,20 @@ qemudStartup(int privileged) {
virStrerror(-rc, buf, sizeof(buf))); virStrerror(-rc, buf, sizeof(buf)));
} }
if (qemudLoadDriverConfig(qemu_driver, driverConf) < 0) {
goto error;
}
if (qemudSecurityInit(qemu_driver) < 0) if (qemudSecurityInit(qemu_driver) < 0)
goto error; goto error;
if ((qemu_driver->caps = qemuCreateCapabilities(NULL, if ((qemu_driver->caps = qemuCreateCapabilities(NULL,
qemu_driver->securityDriver)) == NULL) qemu_driver)) == NULL)
goto error; goto error;
if ((qemu_driver->activePciHostdevs = pciDeviceListNew()) == NULL) if ((qemu_driver->activePciHostdevs = pciDeviceListNew()) == NULL)
goto error; goto error;
if (qemudLoadDriverConfig(qemu_driver, driverConf) < 0) {
goto error;
}
if (privileged) { if (privileged) {
if (chown(qemu_driver->libDir, qemu_driver->user, qemu_driver->group) < 0) { if (chown(qemu_driver->libDir, qemu_driver->user, qemu_driver->group) < 0) {
virReportSystemError(errno, virReportSystemError(errno,
@ -3065,7 +3065,7 @@ static char *qemudGetCapabilities(virConnectPtr conn) {
qemuDriverLock(driver); qemuDriverLock(driver);
if ((caps = qemuCreateCapabilities(qemu_driver->caps, if ((caps = qemuCreateCapabilities(qemu_driver->caps,
qemu_driver->securityDriver)) == NULL) { qemu_driver)) == NULL) {
virCapabilitiesFree(caps); virCapabilitiesFree(caps);
goto cleanup; goto cleanup;
} }