From: Igor Mammedov <imammedo@redhat.com>
To: peter.maydell@linaro.org, qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com, mst@redhat.com, jan.kiszka@siemens.com,
lcapitulino@redhat.com, blauwirbel@gmail.com,
alex.williamson@redhat.com, kraxel@redhat.com,
pbonzini@redhat.com
Subject: [Qemu-devel] [PATCH 5/5] Cleanup unused global var qemu_system_powerdown
Date: Wed, 5 Sep 2012 23:06:25 +0200 [thread overview]
Message-ID: <1346879185-19299-6-git-send-email-imammedo@redhat.com> (raw)
In-Reply-To: <1346879185-19299-1-git-send-email-imammedo@redhat.com>
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 --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);
--
1.7.11.4
next prev parent reply other threads:[~2012-09-05 21:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-05 21:06 [Qemu-devel] [PATCH 0/5 v3] convert system_powerdown command to notifiers Igor Mammedov
2012-09-05 21:06 ` [Qemu-devel] [PATCH 1/5] Introduce powerdown_notifiers Igor Mammedov
2012-09-05 21:06 ` [Qemu-devel] [PATCH 2/5] acpi: use notifier for signaling guest system_powerdown command Igor Mammedov
2012-09-05 21:06 ` [Qemu-devel] [PATCH 3/5] target-arm: " Igor Mammedov
2012-09-18 16:13 ` Peter Maydell
2012-09-05 21:06 ` [Qemu-devel] [PATCH 4/5] target-sparc: " Igor Mammedov
2012-09-05 21:06 ` Igor Mammedov [this message]
2012-09-06 6:57 ` [Qemu-devel] [PATCH 0/5 v3] convert system_powerdown command to notifiers Paolo Bonzini
2012-09-18 15:58 ` Igor Mammedov
2012-09-22 16:18 ` [Qemu-devel] [Qemu-trivial] " Stefan Hajnoczi
2012-09-26 12:38 ` [Qemu-devel] " Anthony Liguori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1346879185-19299-6-git-send-email-imammedo@redhat.com \
--to=imammedo@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=aliguori@us.ibm.com \
--cc=blauwirbel@gmail.com \
--cc=jan.kiszka@siemens.com \
--cc=kraxel@redhat.com \
--cc=lcapitulino@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).