External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-29 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant monitor watch variable (s/monitor_watch/monitorWatch/)

Browse Source
This commit is contained in:
Cole Robinson 2009-03-02 17:33:39 +00:00
parent 895247b76b
commit adecc8fc9e
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Mar 2 12:30:08 EST 2009 Cole Robinson <crobinso@redhat.com>
* 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 <crobinso@redhat.com> Mon Mar 2 12:25:58 EST 2009 Cole Robinson <crobinso@redhat.com>
* src/network_driver.c src/network_conf.c: Mark 'defined' networks * src/network_driver.c src/network_conf.c: Mark 'defined' networks

2
src/domain_conf.c
View File

@ -503,7 +503,7 @@ virDomainObjPtr virDomainAssignDef(virConnectPtr conn,
virDomainObjLock(domain); virDomainObjLock(domain);
domain->state = VIR_DOMAIN_SHUTOFF; domain->state = VIR_DOMAIN_SHUTOFF;
domain->def = def; domain->def = def;
domain->monitor_watch = -1; domain->monitorWatch = -1;
domain->monitor = -1; domain->monitor = -1;
if (VIR_REALLOC_N(doms->objs, doms->count + 1) < 0) { if (VIR_REALLOC_N(doms->objs, doms->count + 1) < 0) {

1
src/domain_conf.h
View File

@ -474,7 +474,6 @@ struct _virDomainObj {
virMutex lock; virMutex lock;
int monitor; int monitor;
int monitor_watch;
char *monitorpath; char *monitorpath;
int monitorWatch; int monitorWatch;
int logfile; int logfile;

10
src/qemu_driver.c
View File

@ -777,7 +777,7 @@ static int qemudOpenMonitor(virConnectPtr conn,
goto error; goto error;
} }
if ((vm->monitor_watch = virEventAddHandle(vm->monitor, 0, if ((vm->monitorWatch = virEventAddHandle(vm->monitor, 0,
qemudDispatchVMEvent, qemudDispatchVMEvent,
driver, NULL)) < 0) driver, NULL)) < 0)
goto error; goto error;
@ -1331,9 +1331,9 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED,
_("Failed to send SIGTERM to %s (%d)"), _("Failed to send SIGTERM to %s (%d)"),
vm->def->name, vm->pid); vm->def->name, vm->pid);
if (vm->monitor_watch != -1) { if (vm->monitorWatch != -1) {
virEventRemoveHandle(vm->monitor_watch); virEventRemoveHandle(vm->monitorWatch);
vm->monitor_watch = -1; vm->monitorWatch = -1;
} }
if (close(vm->logfile) < 0) { if (close(vm->logfile) < 0) {
@ -1381,7 +1381,7 @@ qemudDispatchVMEvent(int watch, int fd, int events, void *opaque) {
virDomainObjPtr tmpvm = driver->domains.objs[i]; virDomainObjPtr tmpvm = driver->domains.objs[i];
virDomainObjLock(tmpvm); virDomainObjLock(tmpvm);
if (virDomainIsActive(tmpvm) && if (virDomainIsActive(tmpvm) &&
tmpvm->monitor_watch == watch) { tmpvm->monitorWatch == watch) {
vm = tmpvm; vm = tmpvm;
break; break;
} }