From patchwork Mon Aug 30 07:49:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 63004 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 71EC3B7107 for ; Mon, 30 Aug 2010 17:39:47 +1000 (EST) Received: from localhost ([127.0.0.1]:60541 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Opyxz-0005dg-2P for incoming@patchwork.ozlabs.org; Mon, 30 Aug 2010 03:39:43 -0400 Received: from [140.186.70.92] (port=46280 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Opyw1-0005cS-6d for qemu-devel@nongnu.org; Mon, 30 Aug 2010 03:37:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Opyvz-0005PP-16 for qemu-devel@nongnu.org; Mon, 30 Aug 2010 03:37:41 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:56002) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Opyvy-0005Oa-MW for qemu-devel@nongnu.org; Mon, 30 Aug 2010 03:37:38 -0400 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id E0852107A6E; Mon, 30 Aug 2010 16:37:35 +0900 (JST) Received: (nullmailer pid 7209 invoked by uid 1000); Mon, 30 Aug 2010 07:49:27 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Mon, 30 Aug 2010 16:49:25 +0900 Message-Id: X-Mailer: git-send-email 1.7.1.1 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: glommer@redhat.com, blauwirbel@gmail.com, yamahata@valinux.co.jp, alex.williamson@redhat.com, avi@redhat.com Subject: [Qemu-devel] [PATCH 3/5] vl.c: consolidate qemu_system_xxx_request() logic. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org don't repeat same logic in qemu_system_xxx_request() logic. Signed-off-by: Isaku Yamahata --- vl.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/vl.c b/vl.c index aba3786..2a89f4f 100644 --- a/vl.c +++ b/vl.c @@ -1195,26 +1195,33 @@ static void qemu_system_reset(void) cpu_synchronize_all_post_reset(); } -void qemu_system_reset_request(void) +static void qemu_system_request(int *requested) +{ + *requested = 1; + qemu_notify_event(); +} + +static void qemu_system_request_reboot_check(int *requested) { if (no_reboot) { - shutdown_requested = 1; - } else { - reset_requested = 1; + requested = &shutdown_requested; } - qemu_notify_event(); + qemu_system_request(requested); +} + +void qemu_system_reset_request(void) +{ + qemu_system_request_reboot_check(&reset_requested); } void qemu_system_shutdown_request(void) { - shutdown_requested = 1; - qemu_notify_event(); + qemu_system_request(&shutdown_requested); } void qemu_system_powerdown_request(void) { - powerdown_requested = 1; - qemu_notify_event(); + qemu_system_request(&powerdown_requested); } void main_loop_wait(int nonblocking)