From bdd33eb517798d9d8ebe12b4b7f629abebabceea Mon Sep 17 00:00:00 2001
Message-Id: <bdd33eb517798d9d8ebe12b4b7f629abebabceea.1288197060.git.jdenemar@redhat.com>
From: Daniel P. Berrange <berrange@redhat.com>
Date: Thu, 22 Jul 2010 05:34:21 -0400
Subject: [PATCH] Fix incorrect use of private data in remote driver

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=646717

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
(cherry picked from commit 8d4f02422142ebdd63fb568d9def462c68358623)
---
 src/remote/remote_driver.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 96cdb23..a0a91e2 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -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);
 
-- 
1.7.3.2