On Wed, Nov 14, 2012 at 01:12:39AM +0100, Zeeshan Ali (Khattak) wrote: > On Tue, Nov 13, 2012 at 8:06 PM, Christophe Fergeau <cfergeau@xxxxxxxxxx> wrote: > > On Tue, Nov 13, 2012 at 07:22:35PM +0100, Zeeshan Ali (Khattak) wrote: > >> On Tue, Nov 13, 2012 at 7:10 PM, Alexander Larsson <alexl@xxxxxxxxxx> wrote: > >> > This is a wrapper for virDomainUpdateDeviceFlags. > >> > >> Looks good. ACK. > >> > >> > diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym > >> > index 3a40a8a..2034e89 100644 > >> > --- a/libvirt-gobject/libvirt-gobject.sym > >> > +++ b/libvirt-gobject/libvirt-gobject.sym > >> > @@ -204,4 +204,11 @@ LIBVIRT_GOBJECT_0.1.3 { > >> > gvir_domain_wakeup_finish; > >> > } LIBVIRT_GOBJECT_0.1.2; > >> > > >> > +LIBVIRT_GOBJECT_0.1.4 { > >> > + global: > >> > + gvir_domain_update_device_flags_get_type; > >> > + gvir_domain_update_device; > >> > +} LIBVIRT_GOBJECT_0.1.3; > >> > >> I guess you need to rebase this on current git master? > > > > This looks good with respect to current git master, this part will indeed > > conflict with some of the patches that are up for review on the mailing > > list, maybe you have some of those applied? > > git tells me that origin/master is on 99e3677b836a86d24ea1f851 > (gconfig: Add API to set domain/pm tree). Isn't that the case? It is, but the commit you refer to changes libvirt-gconfig/ while Alex's patch changes libvirt-gobject/, so no conflict there. Anyway, patch ACK'ed and pushed. Christophe
Attachment:
pgp5wTclIehkT.pgp
Description: PGP signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list