]> xenbits.xensource.com Git - libvirt.git/commitdiff
Fix incorrect use of private data in remote driver
authorDaniel P. Berrange <berrange@redhat.com>
Thu, 22 Jul 2010 09:34:21 +0000 (05:34 -0400)
committerDaniel P. Berrange <berrange@redhat.com>
Fri, 23 Jul 2010 09:16:18 +0000 (05:16 -0400)
The remote driver is using the wrong privateData field in
a couple of functions. THis is harmless for stateful
drivers like QEMU/UML/LXC, but will crash with Xen

* src/remote/remote_driver.c: Fix use of privateData field

src/remote/remote_driver.c

index 7052bf12e3c020802a2428b163214a7e92f047fa..c9129b126bcff349e51bdfb688525a68f50f8b17 100644 (file)
@@ -4067,7 +4067,7 @@ remoteNetworkIsActive(virNetworkPtr network)
     int rv = -1;
     remote_network_is_active_args args;
     remote_network_is_active_ret ret;
-    struct private_data *priv = network->conn->privateData;
+    struct private_data *priv = network->conn->networkPrivateData;
 
     remoteDriverLock(priv);
 
@@ -4091,7 +4091,7 @@ remoteNetworkIsPersistent(virNetworkPtr network)
     int rv = -1;
     remote_network_is_persistent_args args;
     remote_network_is_persistent_ret ret;
-    struct private_data *priv = network->conn->privateData;
+    struct private_data *priv = network->conn->networkPrivateData;
 
     remoteDriverLock(priv);
 
@@ -4622,7 +4622,7 @@ remoteInterfaceIsActive(virInterfacePtr iface)
     int rv = -1;
     remote_interface_is_active_args args;
     remote_interface_is_active_ret ret;
-    struct private_data *priv = iface->conn->privateData;
+    struct private_data *priv = iface->conn->interfacePrivateData;
 
     remoteDriverLock(priv);
 
@@ -5127,7 +5127,7 @@ remoteStoragePoolIsActive(virStoragePoolPtr pool)
     int rv = -1;
     remote_storage_pool_is_active_args args;
     remote_storage_pool_is_active_ret ret;
-    struct private_data *priv = pool->conn->privateData;
+    struct private_data *priv = pool->conn->storagePrivateData;
 
     remoteDriverLock(priv);
 
@@ -5151,7 +5151,7 @@ remoteStoragePoolIsPersistent(virStoragePoolPtr pool)
     int rv = -1;
     remote_storage_pool_is_persistent_args args;
     remote_storage_pool_is_persistent_ret ret;
-    struct private_data *priv = pool->conn->privateData;
+    struct private_data *priv = pool->conn->storagePrivateData;
 
     remoteDriverLock(priv);