Patchwork [14/15] xen: destroy the VM when shutdown is requested

login
register
mail settings
Submitter Stefano Stabellini
Date Aug. 12, 2010, 2:10 p.m.
Message ID <1281622202-3453-14-git-send-email-stefano.stabellini@eu.citrix.com>
Download mbox | patch
Permalink /patch/61604/
State New
Headers show

Comments

Stefano Stabellini - Aug. 12, 2010, 2:10 p.m.
From: Anthony PERARD <anthony.perard@citrix.com>

Handle shutdown and reset requests in helper.c.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
 target-xen/helper.c |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)
Anthony Liguori - Aug. 13, 2010, 6:56 p.m.
On 08/12/2010 09:10 AM, stefano.stabellini@eu.citrix.com wrote:
> From: Anthony PERARD<anthony.perard@citrix.com>
>
> Handle shutdown and reset requests in helper.c.
>
> Signed-off-by: Anthony PERARD<anthony.perard@citrix.com>
> Signed-off-by: Stefano Stabellini<stefano.stabellini@eu.citrix.com>
> ---
>   target-xen/helper.c |   17 +++++++++++++++++
>   1 files changed, 17 insertions(+), 0 deletions(-)
>
> diff --git a/target-xen/helper.c b/target-xen/helper.c
> index 4571ac0..16e628c 100644
> --- a/target-xen/helper.c
> +++ b/target-xen/helper.c
> @@ -397,6 +397,23 @@ static void cpu_handle_ioreq(void *opaque)
>
>           xen_wmb(); /* Update ioreq contents /then/ update state. */
>
> +        /*
> +         * We do this before we send the response so that the tools
> +         * have the opportunity to pick up on the reset before the
> +         * guest resumes and does a hlt with interrupts disabled which
> +         * causes Xen to powerdown the domain.
> +         */
> +        if (vm_running) {
> +            if (qemu_shutdown_requested_get()) {
> +                fprintf(stderr, "shutdown requested in cpu_handle_ioreq\n");
> +                destroy_hvm_domain();
> +            }
>    

The patches should not introduce fprintfs in expected paths.

Regards,

Anthony Liguori

> +            if (qemu_reset_requested_get()) {
> +                fprintf(stderr, "reset requested in cpu_handle_ioreq.\n");
> +                qemu_system_reset();
> +            }
> +        }
> +
>           req->state = STATE_IORESP_READY;
>           xc_evtchn_notify(xce_handle, ioreq_local_port[send_vcpu]);
>       }
>

Patch

diff --git a/target-xen/helper.c b/target-xen/helper.c
index 4571ac0..16e628c 100644
--- a/target-xen/helper.c
+++ b/target-xen/helper.c
@@ -397,6 +397,23 @@  static void cpu_handle_ioreq(void *opaque)
 
         xen_wmb(); /* Update ioreq contents /then/ update state. */
 
+        /*
+         * We do this before we send the response so that the tools
+         * have the opportunity to pick up on the reset before the
+         * guest resumes and does a hlt with interrupts disabled which
+         * causes Xen to powerdown the domain.
+         */
+        if (vm_running) {
+            if (qemu_shutdown_requested_get()) {
+                fprintf(stderr, "shutdown requested in cpu_handle_ioreq\n");
+                destroy_hvm_domain();
+            }
+            if (qemu_reset_requested_get()) {
+                fprintf(stderr, "reset requested in cpu_handle_ioreq.\n");
+                qemu_system_reset();
+            }
+        }
+
         req->state = STATE_IORESP_READY;
         xc_evtchn_notify(xce_handle, ioreq_local_port[send_vcpu]);
     }