On Wed, Dec 14, 2011 at 11:26:57AM -0700, Eric Blake wrote: > On 12/14/2011 11:17 AM, Eric Blake wrote: > > On 12/13/2011 05:38 PM, Daniel P. Berrange wrote: > >> From: "Daniel P. Berrange" <berrange@xxxxxxxxxx> > >> > >> The Xen & VBox drivers deal with callbacks & dispatching of > >> events directly. All the other drivers use a timer to dispatch > >> events from a clean stack state, rather than deep inside the > >> drivers. Convert Xen & VBox over to virDomainEventState so > >> that they match behaviour of other drivers > >> > >> * src/conf/domain_event.c: Return count of remaining > >> callbacks when unregistering event callback > > > > Does this part of the commit message belong with 2/8? > > > >> * src/vbox/vbox_tmpl.c, src/xen/xen_driver.c, > >> src/xen/xen_driver.h: Convert to virDomainEventState > >> --- > >> src/conf/domain_event.c | 58 ++++++++++++++++-- > >> src/conf/domain_event.h | 6 +- > > > > The rename of virDomainEventStateDeregisterAny to > > virDomainEventStateDeregisterID wasn't mentioned in the commit message. > > Did you rebase things incorrectly? That said, these changes look > > useful, even if they were meant for a separate commit. > > Actually, compiling this patch fails: > > test/test_driver.c: In function 'testDomainEventDeregisterAny': > test/test_driver.c:5462:5: error: implicit declaration of function > 'virDomainEventStateDeregisterAny' [-Werror=implicit-function-declaration] > > > > >> src/vbox/vbox_tmpl.c | 146 +++++++++++++++++++++++++---------------------- > >> src/xen/xen_driver.c | 68 ++++++++++------------ > >> src/xen/xen_driver.h | 4 +- > >> 5 files changed, 164 insertions(+), 118 deletions(-) > > > > ACK. > > Can you resubmit with that fixed? This isn't as bad as it seems. The rename of 's/Any/ID/' in domain_event.[ch] simply needed to move into patch 2 and all the problems go away. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list