From patchwork Fri Apr 27 20:40:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 155596 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8E073B7156 for ; Sat, 28 Apr 2012 07:03:29 +1000 (EST) Received: from localhost ([::1]:54183 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SNryK-0007rK-BU for incoming@patchwork.ozlabs.org; Fri, 27 Apr 2012 16:40:56 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51981) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SNrxn-0006pF-GP for qemu-devel@nongnu.org; Fri, 27 Apr 2012 16:40:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SNrxk-0000Oj-V2 for qemu-devel@nongnu.org; Fri, 27 Apr 2012 16:40:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32735) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SNrxk-0000Nt-N3 for qemu-devel@nongnu.org; Fri, 27 Apr 2012 16:40:20 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q3RKeHTA027759 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 27 Apr 2012 16:40:17 -0400 Received: from localhost (ovpn-116-78.ams2.redhat.com [10.36.116.78]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q3RKeFC5013789; Fri, 27 Apr 2012 16:40:16 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 27 Apr 2012 17:40:16 -0300 Message-Id: <1335559216-13849-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1335559216-13849-1-git-send-email-lcapitulino@redhat.com> References: <1335559216-13849-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kraxel@redhat.com, mdroth@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 3/3] vl: Drop is_suspended variable X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 2d828c8..43c696d 100644 --- a/vl.c +++ b/vl.c @@ -1292,7 +1292,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 = @@ -1426,12 +1425,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; @@ -1446,7 +1444,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))) { @@ -1457,7 +1455,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)