Re: [libvirt] [PATCH V2 3/3] libxl: support PARAVIRT and ACPI reboot flags

Add support for VIR_DOMAIN_REBOOT_PARAVIRT and VIR_DOMAIN_REBOOT_ACPI_POWER_BTN flags in libxlDomainReboot(). Signed-off-by: Jim Fehlig <jfehlig(a)suse.com&gt; --- src/libxl/libxl_driver.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 28e8512..6c63251 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -938,7 +938,11 @@ libxlDomainReboot(virDomainPtr dom, unsigned int flags) int ret = -1; libxlDomainObjPrivatePtr priv; - virCheckFlags(0, -1); + virCheckFlags(VIR_DOMAIN_REBOOT_ACPI_POWER_BTN | + VIR_DOMAIN_REBOOT_PARAVIRT, -1); + if (flags == 0) + flags = VIR_DOMAIN_REBOOT_PARAVIRT | + VIR_DOMAIN_REBOOT_ACPI_POWER_BTN; if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; @@ -953,13 +957,31 @@ libxlDomainReboot(virDomainPtr dom, unsigned int flags) } priv = vm->privateData; - if (libxl_domain_reboot(priv->ctx, vm->def->id) != 0) { + if (flags & VIR_DOMAIN_REBOOT_PARAVIRT) { + ret = libxl_domain_reboot(priv->ctx, vm->def->id); + if (ret == 0) + goto cleanup; + + if (ret != ERROR_NOPARAVIRT) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to reboot domain '%d' with libxenlight"), + vm->def->id); + ret = -1; + goto cleanup; + } + } + + if (flags & VIR_DOMAIN_REBOOT_ACPI_POWER_BTN) { + ret = libxl_send_trigger(priv->ctx, vm->def->id, + LIBXL_TRIGGER_RESET, 0);

+ if (ret == 0) + goto cleanup; + virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to reboot domain '%d' with libxenlight"), vm->def->id); - goto cleanup; + ret = -1; } - ret = 0; cleanup: if (vm)