On Mon, Dec 09, 2019 at 02:58:51PM -0500, Cole Robinson wrote:
> Adjust virLXCDriverGetCapabilities to fill in driver->caps if it is
> empty, regardless of the passed 'refresh' value. This matches the
> pattern used in virQEMUDriverGetCapabilities
>
> This fixes LXC XML startup parsing for me
>
> Signed-off-by: Cole Robinson <crobinso@xxxxxxxxxx>
> ---
> v2:
> Use the virQEMUDriverGetCapabilities like danpb suggested
>
> src/lxc/lxc_conf.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
Reviewed-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
> diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
> index 2df1537b22..adf7a0b66c 100644
> --- a/src/lxc/lxc_conf.c
> +++ b/src/lxc/lxc_conf.c
> @@ -196,6 +196,14 @@ virCapsPtr virLXCDriverGetCapabilities(virLXCDriverPtr driver,
> driver->caps = caps;
> } else {
> lxcDriverLock(driver);
> +
> + if (driver->caps == NULL ||
> + driver->caps->nguests == 0) {
nitpick: nguests will never be zero in LXC since we hardcode the
set of guests, so you can drop that part of the condition when pushing.
> + VIR_DEBUG("Capabilities didn't detect any guests. Forcing a "
> + "refresh.");
> + lxcDriverUnlock(driver);
> + return virLXCDriverGetCapabilities(driver, true);
> + }
> }
>
> ret = virObjectRef(driver->caps);
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
