libxl: Fix xl shutdown for HVM without PV drivers

[Xen-devel] [PATCH v1] libxl: Fix xl shutdown for HVM without PV drivers

Posted by Olaf Hering 4 years, 1 month ago

A return value of zero means no PV drivers. Restore a hunk which was removed.

Fixes commit b183e180bce93037d3ef385a8c2338bbfb7f23d9

Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
 tools/libxl/libxl_domain.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/libxl/libxl_domain.c b/tools/libxl/libxl_domain.c
index 41d08394f3..fef2cd4e13 100644
--- a/tools/libxl/libxl_domain.c
+++ b/tools/libxl/libxl_domain.c
@@ -774,6 +774,9 @@ int libxl__domain_pvcontrol(libxl__egc *egc, libxl__xswait_state *pvcontrol,
     if (rc < 0)
         return rc;
 
+    if (!rc)
+        return ERROR_NOPARAVIRT;
+
     shutdown_path = libxl__domain_pvcontrol_xspath(gc, domid);
     if (!shutdown_path)
         return ERROR_FAIL;

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [PATCH v1] libxl: Fix xl shutdown for HVM without PV drivers

Posted by Wei Liu 4 years, 1 month ago

On Wed, Mar 18, 2020 at 05:51:51PM +0100, Olaf Hering wrote:
> A return value of zero means no PV drivers. Restore a hunk which was removed.
> 
> Fixes commit b183e180bce93037d3ef385a8c2338bbfb7f23d9
> 
> Signed-off-by: Olaf Hering <olaf@aepfle.de>

Acked-by: Wei Liu <wl@xen.org>

And applied.

> ---
>  tools/libxl/libxl_domain.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/tools/libxl/libxl_domain.c b/tools/libxl/libxl_domain.c
> index 41d08394f3..fef2cd4e13 100644
> --- a/tools/libxl/libxl_domain.c
> +++ b/tools/libxl/libxl_domain.c
> @@ -774,6 +774,9 @@ int libxl__domain_pvcontrol(libxl__egc *egc, libxl__xswait_state *pvcontrol,
>      if (rc < 0)
>          return rc;
>  
> +    if (!rc)
> +        return ERROR_NOPARAVIRT;
> +
>      shutdown_path = libxl__domain_pvcontrol_xspath(gc, domid);
>      if (!shutdown_path)
>          return ERROR_FAIL;

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel