From 2068f2f5a3e53fd3030c6e330fcef6063634b47c Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Mon, 16 Mar 2009 17:16:04 +0000 Subject: [PATCH] Initialize security driver after config parsing --- ChangeLog | 4 ++++ src/qemu_driver.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b6fcd1344e..e3ac8b9d32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Mar 16 13:15:11 EDT 2009 Cole Robinson + + * src/qemu_driver.c: Initialize security driver after config parsing + Mon Mar 16 13:12:59 EDT 2009 Cole Robinson * src/test.c: Fix test driver 'save' deadlock diff --git a/src/qemu_driver.c b/src/qemu_driver.c index fa31e06015..fb04834f87 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -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; }