diff -rup libvirt-0.6.3/src/remote_internal.c libvirt-0.6.3.new/src/remote_internal.c --- libvirt-0.6.3/src/remote_internal.c 2009-06-09 18:04:34.000000000 +0100 +++ libvirt-0.6.3.new/src/remote_internal.c 2009-06-09 18:04:00.000000000 +0100 @@ -4922,6 +4922,8 @@ remoteNodeDeviceDettach (virNodeDevicePt { int rv = -1; remote_node_device_dettach_args args; + /* This method is unusual in that it uses the HV driver, not the devMon driver + * hence its use of privateData, instead of devMonPrivateData */ struct private_data *priv = dev->conn->privateData; remoteDriverLock(priv); @@ -4945,6 +4947,8 @@ remoteNodeDeviceReAttach (virNodeDeviceP { int rv = -1; remote_node_device_re_attach_args args; + /* This method is unusual in that it uses the HV driver, not the devMon driver + * hence its use of privateData, instead of devMonPrivateData */ struct private_data *priv = dev->conn->privateData; remoteDriverLock(priv); @@ -4968,6 +4972,8 @@ remoteNodeDeviceReset (virNodeDevicePtr { int rv = -1; remote_node_device_reset_args args; + /* This method is unusual in that it uses the HV driver, not the devMon driver + * hence its use of privateData, instead of devMonPrivateData */ struct private_data *priv = dev->conn->privateData; remoteDriverLock(priv); @@ -4995,7 +5001,7 @@ remoteNodeDeviceCreateXML(virConnectPtr remote_node_device_create_xml_args args; remote_node_device_create_xml_ret ret; virNodeDevicePtr dev = NULL; - struct private_data *priv = conn->privateData; + struct private_data *priv = conn->devMonPrivateData; remoteDriverLock(priv); @@ -5021,7 +5027,7 @@ remoteNodeDeviceDestroy(virNodeDevicePtr { int rv = -1; remote_node_device_destroy_args args; - struct private_data *priv = dev->conn->privateData; + struct private_data *priv = dev->conn->devMonPrivateData; remoteDriverLock(priv);