diff --git a/ChangeLog b/ChangeLog
index b450e39e70..bc654cc3e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct  6 17:39:12 CEST 2008 Daniel Veillard <veillard@redhat.com>
+
+	* src/lxc_driver.c src/qemu_driver.c src/remote_internal.c
+	  src/storage_driver.c: use C99 initializers for virState (Guido
+	  Gunther)
+
 Mon Oct  6 11:23:40 BST 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	* qemud/Makefile.am: Fix VPATH build (Guido Gunther)
diff --git a/src/lxc_driver.c b/src/lxc_driver.c
index 0f4925afde..e3e40abdb7 100644
--- a/src/lxc_driver.c
+++ b/src/lxc_driver.c
@@ -1214,11 +1214,9 @@ static virDriver lxcDriver = {
 
 
 static virStateDriver lxcStateDriver = {
-    lxcStartup,
-    lxcShutdown,
-    NULL, /* reload */
-    lxcActive,
-    NULL,
+    .initialize = lxcStartup,
+    .cleanup = lxcShutdown,
+    .active = lxcActive,
 };
 
 int lxcRegister(void)
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index a1e7285a54..b003b00a24 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -4104,11 +4104,10 @@ static virNetworkDriver qemuNetworkDriver = {
 
 #ifdef WITH_LIBVIRTD
 static virStateDriver qemuStateDriver = {
-    qemudStartup,
-    qemudShutdown,
-    qemudReload,
-    qemudActive,
-    NULL
+    .initialize = qemudStartup,
+    .cleanup = qemudShutdown,
+    .reload = qemudReload,
+    .active = qemudActive,
 };
 #endif
 
diff --git a/src/remote_internal.c b/src/remote_internal.c
index 66de9d56aa..da1ced62cb 100644
--- a/src/remote_internal.c
+++ b/src/remote_internal.c
@@ -4937,11 +4937,7 @@ static virStorageDriver storage_driver = {
 
 #ifdef WITH_LIBVIRTD
 static virStateDriver state_driver = {
-    remoteStartup,
-    NULL,
-    NULL,
-    NULL,
-    NULL
+    .initialize = remoteStartup,
 };
 #endif
 
diff --git a/src/storage_driver.c b/src/storage_driver.c
index 84b4bc6970..221bdecbf4 100644
--- a/src/storage_driver.c
+++ b/src/storage_driver.c
@@ -1267,11 +1267,10 @@ static virStorageDriver storageDriver = {
 
 
 static virStateDriver stateDriver = {
-    storageDriverStartup,
-    storageDriverShutdown,
-    storageDriverReload,
-    storageDriverActive,
-    NULL
+    .initialize = storageDriverStartup,
+    .cleanup = storageDriverShutdown,
+    .reload = storageDriverReload,
+    .active = storageDriverActive,
 };
 
 int storageRegister(void) {