MAINTAINERS: Replace net maintainer Mark McLoughlin with Stefan Hajnoczi

[qemu.git] / xen-all.c

diff --git a/xen-all.c b/xen-all.c
index bdf9c0fc79886b09e18447e1ae369adcd2658710..61def2ec8f48e615b2818150cd4c0a5f425b9315 100644 (file)
--- a/xen-all.c
+++ b/xen-all.c
@@ -560,13 +560,15 @@ static void xen_log_global_stop(MemoryListener *listener)
 
 static void xen_eventfd_add(MemoryListener *listener,
                             MemoryRegionSection *section,
 
 static void xen_eventfd_add(MemoryListener *listener,
                             MemoryRegionSection *section,

-                            bool match_data, uint64_t data, int fd)
+                            bool match_data, uint64_t data,
+                            EventNotifier *e)

 {
 }
 
 static void xen_eventfd_del(MemoryListener *listener,
                             MemoryRegionSection *section,
 {
 }
 
 static void xen_eventfd_del(MemoryListener *listener,
                             MemoryRegionSection *section,

-                            bool match_data, uint64_t data, int fd)
+                            bool match_data, uint64_t data,
+                            EventNotifier *e)

 {
 }
 
 {
 }
 


@@ -603,6 +605,10 @@ void xen_vcpu_init(void)
         qemu_register_reset(xen_reset_vcpu, first_cpu);
         xen_reset_vcpu(first_cpu);
     }
         qemu_register_reset(xen_reset_vcpu, first_cpu);
         xen_reset_vcpu(first_cpu);
     }

+    /* if rtc_clock is left to default (host_clock), disable it */
+    if (rtc_clock == host_clock) {
+        qemu_clock_enable(rtc_clock, false);
+    }

 }
 
 /* get the ioreq packets from share mem */
 }
 
 /* get the ioreq packets from share mem */


@@ -856,7 +862,7 @@ static void cpu_handle_ioreq(void *opaque)
                     "data: %"PRIx64", count: %" FMT_ioreq_size ", size: %" FMT_ioreq_size "\n",
                     req->state, req->data_is_ptr, req->addr,
                     req->data, req->count, req->size);
                     "data: %"PRIx64", count: %" FMT_ioreq_size ", size: %" FMT_ioreq_size "\n",
                     req->state, req->data_is_ptr, req->addr,
                     req->data, req->count, req->size);

-            destroy_hvm_domain();
+            destroy_hvm_domain(false);

             return;
         }
 
             return;
         }
 


@@ -870,10 +876,11 @@ static void cpu_handle_ioreq(void *opaque)
          */
         if (runstate_is_running()) {
             if (qemu_shutdown_requested_get()) {
          */
         if (runstate_is_running()) {
             if (qemu_shutdown_requested_get()) {

-                destroy_hvm_domain();
+                destroy_hvm_domain(false);

             }
             if (qemu_reset_requested_get()) {
                 qemu_system_reset(VMRESET_REPORT);
             }
             if (qemu_reset_requested_get()) {
                 qemu_system_reset(VMRESET_REPORT);

+                destroy_hvm_domain(true);

             }
         }
 
             }
         }
 


@@ -1159,7 +1166,7 @@ int xen_hvm_init(void)
     return 0;
 }
 
     return 0;
 }
 

-void destroy_hvm_domain(void)
+void destroy_hvm_domain(bool reboot)

 {
     XenXC xc_handle;
     int sts;
 {
     XenXC xc_handle;
     int sts;


@@ -1168,12 +1175,15 @@ void destroy_hvm_domain(void)
     if (xc_handle == XC_HANDLER_INITIAL_VALUE) {
         fprintf(stderr, "Cannot acquire xenctrl handle\n");
     } else {
     if (xc_handle == XC_HANDLER_INITIAL_VALUE) {
         fprintf(stderr, "Cannot acquire xenctrl handle\n");
     } else {

-        sts = xc_domain_shutdown(xc_handle, xen_domid, SHUTDOWN_poweroff);
+        sts = xc_domain_shutdown(xc_handle, xen_domid,
+                                 reboot ? SHUTDOWN_reboot : SHUTDOWN_poweroff);

         if (sts != 0) {
         if (sts != 0) {

-            fprintf(stderr, "? xc_domain_shutdown failed to issue poweroff, "
-                    "sts %d, %s\n", sts, strerror(errno));
+            fprintf(stderr, "xc_domain_shutdown failed to issue %s, "
+                    "sts %d, %s\n", reboot ? "reboot" : "poweroff",
+                    sts, strerror(errno));

         } else {
         } else {

-            fprintf(stderr, "Issued domain %d poweroff\n", xen_domid);
+            fprintf(stderr, "Issued domain %d %s\n", xen_domid,
+                    reboot ? "reboot" : "poweroff");

         }
         xc_interface_close(xc_handle);
     }
         }
         xc_interface_close(xc_handle);
     }


@@ -1183,3 +1193,15 @@ void xen_register_framebuffer(MemoryRegion *mr)
 {
     framebuffer = mr;
 }
 {
     framebuffer = mr;
 }

+
+void xen_shutdown_fatal_error(const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    vfprintf(stderr, fmt, ap);
+    va_end(ap);
+    fprintf(stderr, "Will destroy the domain.\n");
+    /* destroy the domain */
+    qemu_system_shutdown_request();
+}