[libvirt] [PATCH] Remove redundant monitorWatch

For some reason there are two VMDef members being used to keep track of monitor event handles: monitor_watch and monitorWatch. Remove the latter. Thanks, Cole

On Mon, Feb 16, 2009 at 06:42:11PM -0500, Cole Robinson wrote:
For some reason there are two VMDef members being used to keep track of monitor event handles: monitor_watch and monitorWatch. Remove the latter.
Can you remove the 'monitor_watch' instead - all the other variables in the domain_conf.h structs use leading capital letters for separating words, and not underscores. Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

Daniel P. Berrange wrote:
On Mon, Feb 16, 2009 at 06:42:11PM -0500, Cole Robinson wrote:
For some reason there are two VMDef members being used to keep track of monitor event handles: monitor_watch and monitorWatch. Remove the latter.
Can you remove the 'monitor_watch' instead - all the other variables in the domain_conf.h structs use leading capital letters for separating words, and not underscores.
Yup, sorry for not noticing that before. Updated patch attached. Thanks, Cole

Cole Robinson wrote:
Daniel P. Berrange wrote:
On Mon, Feb 16, 2009 at 06:42:11PM -0500, Cole Robinson wrote:
For some reason there are two VMDef members being used to keep track of monitor event handles: monitor_watch and monitorWatch. Remove the latter.
Can you remove the 'monitor_watch' instead - all the other variables in the domain_conf.h structs use leading capital letters for separating words, and not underscores.
Yup, sorry for not noticing that before.
Updated patch attached. ... Remove redundant monitor watch variable (s/monitor_watch/monitorWatch/)
diff --git a/src/domain_conf.c b/src/domain_conf.c index 622665c..603b87b 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;
Looks fine and obviously safe. ACK

On Fri, Feb 27, 2009 at 10:38:45AM -0500, Cole Robinson wrote:
Daniel P. Berrange wrote:
On Mon, Feb 16, 2009 at 06:42:11PM -0500, Cole Robinson wrote:
For some reason there are two VMDef members being used to keep track of monitor event handles: monitor_watch and monitorWatch. Remove the latter.
Can you remove the 'monitor_watch' instead - all the other variables in the domain_conf.h structs use leading capital letters for separating words, and not underscores.
Yup, sorry for not noticing that before.
Updated patch attached.
ACK Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

Cole Robinson wrote:
Daniel P. Berrange wrote:
On Mon, Feb 16, 2009 at 06:42:11PM -0500, Cole Robinson wrote:
For some reason there are two VMDef members being used to keep track of monitor event handles: monitor_watch and monitorWatch. Remove the latter. Can you remove the 'monitor_watch' instead - all the other variables in the domain_conf.h structs use leading capital letters for separating words, and not underscores.
Yup, sorry for not noticing that before.
Updated patch attached.
Committed now. Thanks, Cole
participants (3)
-
Cole Robinson
-
Daniel P. Berrange
-
Jim Meyering