diff mbox

[5/5] Cleanup unused global var qemu_system_powerdown

Message ID 1346879185-19299-6-git-send-email-imammedo@redhat.com
State New
Headers show

Commit Message

Igor Mammedov Sept. 5, 2012, 9:06 p.m. UTC 
All deps that used global qemu_system_powerdown var are now converted
to notifiers, so remove it.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
v2:
  - removed hunk with #include "hw/irq.h", for patch not to depend on
    cpu_as_device series.
  - reuse name of removed qemu_system_powerdown var as a function name
    for initiating system powerdown, by uninling monitor and notifiers
    call in it at the last commit to fix bisectability of series.
    Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
---
 sysemu.h |  1 -
 vl.c     | 12 +++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)
diff mbox

Patch

diff --git a/sysemu.h b/sysemu.h
index 803c858..1093046 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -62,7 +62,6 @@  int qemu_reset_requested(void);
 int qemu_powerdown_requested(void);
 void qemu_system_killed(int signal, pid_t pid);
 void qemu_kill_report(void);
-extern qemu_irq qemu_system_powerdown;
 void qemu_devices_reset(void);
 void qemu_system_reset(bool report);
 
diff --git a/vl.c b/vl.c
index 4893192..e0d1295 100644
--- a/vl.c
+++ b/vl.c
@@ -1565,6 +1565,12 @@  void qemu_system_shutdown_request(void)
     qemu_notify_event();
 }
 
+static void qemu_system_powerdown(void)
+{
+    monitor_protocol_event(QEVENT_POWERDOWN, NULL);
+    notifier_list_notify(&powerdown_notifiers, NULL);
+}
+
 void qemu_system_powerdown_request(void)
 {
     powerdown_requested = 1;
@@ -1588,8 +1594,6 @@  void qemu_system_vmstop_request(RunState state)
     qemu_notify_event();
 }
 
-qemu_irq qemu_system_powerdown;
-
 static bool main_loop_should_exit(void)
 {
     RunState r;
@@ -1626,9 +1630,7 @@  static bool main_loop_should_exit(void)
         monitor_protocol_event(QEVENT_WAKEUP, NULL);
     }
     if (qemu_powerdown_requested()) {
-        monitor_protocol_event(QEVENT_POWERDOWN, NULL);
-        notifier_list_notify(&powerdown_notifiers, NULL);
-        qemu_irq_raise(qemu_system_powerdown);
+        qemu_system_powerdown();
     }
     if (qemu_vmstop_requested(&r)) {
         vm_stop(r);