diff --git a/ChangeLog b/ChangeLog index 3ea28d0773455711ccb408ace57fb23258a9b375..7cd1035ec2aad061f052ccd5a0241fbca7e9178e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Mar 2 12:30:08 EST 2009 Cole Robinson + + * src/domain_conf.c src/domain_conf.h src/qemu_driver.c: + Remove redundant monitor watch variable (s/monitor_watch/monitorWatch/) + Mon Mar 2 12:25:58 EST 2009 Cole Robinson * src/network_driver.c src/network_conf.c: Mark 'defined' networks diff --git a/src/domain_conf.c b/src/domain_conf.c index 23618b93df5462b808343f157ae75b5c9205e731..d2f3417297736bdba2e6ddde944fd024a7552c75 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -503,7 +503,7 @@ virDomainObjPtr virDomainAssignDef(virConnectPtr conn, virDomainObjLock(domain); domain->state = VIR_DOMAIN_SHUTOFF; domain->def = def; - domain->monitor_watch = -1; + domain->monitorWatch = -1; domain->monitor = -1; if (VIR_REALLOC_N(doms->objs, doms->count + 1) < 0) { diff --git a/src/domain_conf.h b/src/domain_conf.h index d370b5d0e7bcf4a767fb2003a5f9627622beddbd..8574f65104199638c19bd7a381af1bc677192f0e 100644 --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -474,7 +474,6 @@ struct _virDomainObj { virMutex lock; int monitor; - int monitor_watch; char *monitorpath; int monitorWatch; int logfile; diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 2f75cea395d4011ccd3657bd95eec35662b08a29..3723c524c2e6a27c0758c61967502cbdebc87d9b 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -777,9 +777,9 @@ static int qemudOpenMonitor(virConnectPtr conn, goto error; } - if ((vm->monitor_watch = virEventAddHandle(vm->monitor, 0, - qemudDispatchVMEvent, - driver, NULL)) < 0) + if ((vm->monitorWatch = virEventAddHandle(vm->monitor, 0, + qemudDispatchVMEvent, + driver, NULL)) < 0) goto error; @@ -1331,9 +1331,9 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, _("Failed to send SIGTERM to %s (%d)"), vm->def->name, vm->pid); - if (vm->monitor_watch != -1) { - virEventRemoveHandle(vm->monitor_watch); - vm->monitor_watch = -1; + if (vm->monitorWatch != -1) { + virEventRemoveHandle(vm->monitorWatch); + vm->monitorWatch = -1; } if (close(vm->logfile) < 0) { @@ -1381,7 +1381,7 @@ qemudDispatchVMEvent(int watch, int fd, int events, void *opaque) { virDomainObjPtr tmpvm = driver->domains.objs[i]; virDomainObjLock(tmpvm); if (virDomainIsActive(tmpvm) && - tmpvm->monitor_watch == watch) { + tmpvm->monitorWatch == watch) { vm = tmpvm; break; }