External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-26 18:41:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix HAL driver restart thread safety

Browse Source
This commit is contained in:
Daniel P. Berrange 2009-06-03 11:24:21 +00:00
parent c0d74ed43b
commit 1b28a99d14
3 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Wed Jun 3 12:19:52 BST 2009 Daniel P. Berrange <berrange@redhat.com>
Fix HAL driver restart thread safety
* src/node_device_hal.c: Only clear & recreate device objects,
not entire driver struct.
* src/node_device.c: Remove overly verbose logging of mutex
operations.
Wed Jun 3 12:03:52 BST 2009 Daniel P. Berrange <berrange@redhat.com> Wed Jun 3 12:03:52 BST 2009 Daniel P. Berrange <berrange@redhat.com>
Support networking in UML driver Support networking in UML driver

2
src/node_device.c
View File

@ -51,12 +51,10 @@ static int dev_has_cap(const virNodeDeviceObjPtr dev, const char *cap)
void nodeDeviceLock(virDeviceMonitorStatePtr driver) void nodeDeviceLock(virDeviceMonitorStatePtr driver)
{ {
DEBUG("LOCK node %p", driver);
virMutexLock(&driver->lock); virMutexLock(&driver->lock);
} }
void nodeDeviceUnlock(virDeviceMonitorStatePtr driver) void nodeDeviceUnlock(virDeviceMonitorStatePtr driver)
{ {
DEBUG("UNLOCK node %p", driver);
virMutexUnlock(&driver->lock); virMutexUnlock(&driver->lock);
} }

31
src/node_device_hal.c
View File

@ -800,10 +800,33 @@ static int halDeviceMonitorShutdown(void)
static int halDeviceMonitorReload(void) static int halDeviceMonitorReload(void)
{ {
/* XXX This isn't thread safe because its free'ing the thing DBusError err;
* we're locking */ char **udi = NULL;
(void)halDeviceMonitorShutdown(); int num_devs, i;
return halDeviceMonitorStartup(); LibHalContext *hal_ctx;
VIR_INFO0("Reloading HAL device state");
nodeDeviceLock(driverState);
VIR_INFO0("Removing existing objects");
virNodeDeviceObjListFree(&driverState->devs);
nodeDeviceUnlock(driverState);
hal_ctx = DRV_STATE_HAL_CTX(driverState);
VIR_INFO0("Creating new objects");
dbus_error_init(&err);
udi = libhal_get_all_devices(hal_ctx, &num_devs, &err);
if (udi == NULL) {
fprintf(stderr, "%s: libhal_get_all_devices failed\n", __FUNCTION__);
return -1;
}
for (i = 0; i < num_devs; i++) {
dev_create(udi[i]);
VIR_FREE(udi[i]);
}
VIR_FREE(udi);
VIR_INFO0("HAL device reload complete");
return 0;
} }