From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57247) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SROR3-0001kz-4c for qemu-devel@nongnu.org; Mon, 07 May 2012 09:57:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SROR1-0004sy-8H for qemu-devel@nongnu.org; Mon, 07 May 2012 09:57:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42766) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SROR1-0004st-0M for qemu-devel@nongnu.org; Mon, 07 May 2012 09:57:07 -0400 From: Luiz Capitulino Date: Mon, 7 May 2012 10:56:55 -0300 Message-Id: <1336399015-11269-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1336399015-11269-1-git-send-email-lcapitulino@redhat.com> References: <1336399015-11269-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] vl: drop is_suspended variable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, kraxel@redhat.com, mdroth@linux.vnet.ibm.com Check for the RUN_STATE_SUSPENDED state instead. Signed-off-by: Luiz Capitulino --- vl.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/vl.c b/vl.c index a7afc79..5e0080b 100644 --- a/vl.c +++ b/vl.c @@ -1293,7 +1293,6 @@ static pid_t shutdown_pid; static int powerdown_requested; static int debug_requested; static int suspend_requested; -static bool is_suspended; static NotifierList suspend_notifiers = NOTIFIER_LIST_INITIALIZER(suspend_notifiers); static NotifierList wakeup_notifiers = @@ -1427,12 +1426,11 @@ static void qemu_system_suspend(void) notifier_list_notify(&suspend_notifiers, NULL); runstate_set(RUN_STATE_SUSPENDED); monitor_protocol_event(QEVENT_SUSPEND, NULL); - is_suspended = true; } void qemu_system_suspend_request(void) { - if (is_suspended) { + if (runstate_check(RUN_STATE_SUSPENDED)) { return; } suspend_requested = 1; @@ -1447,7 +1445,7 @@ void qemu_register_suspend_notifier(Notifier *notifier) void qemu_system_wakeup_request(WakeupReason reason) { - if (!is_suspended) { + if (!runstate_check(RUN_STATE_SUSPENDED)) { return; } if (!(wakeup_reason_mask & (1 << reason))) { @@ -1458,7 +1456,6 @@ void qemu_system_wakeup_request(WakeupReason reason) notifier_list_notify(&wakeup_notifiers, &reason); reset_requested = 1; qemu_notify_event(); - is_suspended = false; } void qemu_system_wakeup_enable(WakeupReason reason, bool enabled) -- 1.7.9.2.384.g4a92a