Initialize security driver after config parsing

This commit is contained in:
Cole Robinson 2009-03-16 17:16:04 +00:00
parent d2c77e06c7
commit 2068f2f5a3
2 changed files with 6 additions and 2 deletions

View File

@ -1,3 +1,7 @@
Mon Mar 16 13:15:11 EDT 2009 Cole Robinson <crobinso@redhat.com>
* src/qemu_driver.c: Initialize security driver after config parsing
Mon Mar 16 13:12:59 EDT 2009 Cole Robinson <crobinso@redhat.com>
* src/test.c: Fix test driver 'save' deadlock

View File

@ -497,11 +497,11 @@ qemudStartup(void) {
if ((qemu_driver->caps = qemudCapsInit()) == NULL)
goto out_of_memory;
if (qemudSecurityInit(qemu_driver) < 0) {
if (qemudLoadDriverConfig(qemu_driver, driverConf) < 0) {
goto error;
}
if (qemudLoadDriverConfig(qemu_driver, driverConf) < 0) {
if (qemudSecurityInit(qemu_driver) < 0) {
goto error;
}