[libvirt] [PATCH RFC v2 3/5] conf: add caps to virDomainDefFormat*

[Daniel P. Berrange]

On Thu, Feb 04, 2016 at 12:57:30PM +0000, Joao Martins wrote:
> 
> 
> On 02/04/2016 11:14 AM, Daniel P. Berrange wrote:
> >> diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
> >> index 0141009..6ae2e1b 100644
> >> --- a/src/conf/domain_conf.h
> >> +++ b/src/conf/domain_conf.h
> >> @@ -2733,11 +2733,13 @@ void virDomainIOThreadSchedDelId(virDomainDefPtr def, unsigned int iothread_id);
> >>  unsigned int virDomainDefFormatConvertXMLFlags(unsigned int flags);
> >>  
> >>  char *virDomainDefFormat(virDomainDefPtr def,
> >> +                         virCapsPtr caps,
> >>                           unsigned int flags);
> >>  char *virDomainObjFormat(virDomainXMLOptionPtr xmlopt,
> >>                           virDomainObjPtr obj,
> >>                           unsigned int flags);
> > 
> > Surprised we don't have caps added to this one too, since it
> > will call virDomainDefFormat.
> Ah sorry, this one slipped. It would need changing virDomainSaveStatus to
> include caps (and propagating that change to qemu, lxc, libxl and bhyve too) so
> perhaps in a separate patch?

No prob, I just sent a followup to fix that ommission.


> >> diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
> >> index ea511ec..ffa1bf2 100644
> >> --- a/src/conf/snapshot_conf.c
> >> +++ b/src/conf/snapshot_conf.c
> >> @@ -702,7 +702,7 @@ char *virDomainSnapshotDefFormat(const char *domain_uuid,
> >>          virBufferAddLit(&buf, "</disks>\n");
> >>      }
> >>      if (def->dom) {
> >> -        if (virDomainDefFormatInternal(def->dom, flags, &buf) < 0) {
> >> +        if (virDomainDefFormatInternal(def->dom, NULL, flags, &buf) < 0) {
> >>              virBufferFreeAndReset(&buf);
> >>              return NULL;
> >>          }
> > 
> > Yeah, we'll need to pass caps in here too eventually.
> I could also add it on this series for v3.

If you can coook up a patch for this one too, that'd be great


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 :|