From patchwork Tue Sep 27 16:31:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 116635 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6D80DB6F7E for ; Wed, 28 Sep 2011 03:00:09 +1000 (EST) Received: from localhost ([::1]:37165 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8aaU-0002Tz-Jz for incoming@patchwork.ozlabs.org; Tue, 27 Sep 2011 12:32:54 -0400 Received: from eggs.gnu.org ([140.186.70.92]:42463) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8aa0-0001Z4-Je for qemu-devel@nongnu.org; Tue, 27 Sep 2011 12:32:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R8aZw-0002TZ-BJ for qemu-devel@nongnu.org; Tue, 27 Sep 2011 12:32:24 -0400 Received: from mail-bw0-f45.google.com ([209.85.214.45]:54831) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8aZv-0002Pn-RU for qemu-devel@nongnu.org; Tue, 27 Sep 2011 12:32:20 -0400 Received: by mail-bw0-f45.google.com with SMTP id zv15so7356430bkb.4 for ; Tue, 27 Sep 2011 09:32:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=WbJWZabkoeIDvyFiSt3nwLrev6pMPqJAGqzWbOTsThA=; b=fw9oveJ0Euq6Nssfc6RQWGs7i44fqTSfEpUnxwgZNclqoc4tZ5gwhqr1wT/iIJlbid Xwv5ykSmjjlbz65r0ulG1vD4ZbnJKZtCijlOGxtFoE1e9ACd93z8k8A9SxsxAjvkmcJX YUTnxym4VdaTNUy7vQYJRQ0Fiz3XmynvjSD4Y= Received: by 10.204.148.69 with SMTP id o5mr1358260bkv.72.1317141139298; Tue, 27 Sep 2011 09:32:19 -0700 (PDT) Received: from localhost.localdomain (93-34-218-143.ip51.fastwebnet.it. [93.34.218.143]) by mx.google.com with ESMTPS id d1sm25178167bku.1.2011.09.27.09.32.18 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 27 Sep 2011 09:32:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 27 Sep 2011 18:31:51 +0200 Message-Id: <1317141111-27701-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1317141111-27701-1-git-send-email-pbonzini@redhat.com> References: <1317141111-27701-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.45 Subject: [Qemu-devel] [PATCH 12/12] simplify main loop functions 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 Provide a clean example of how to use the main loop in the tools. Signed-off-by: Paolo Bonzini --- cpus.c | 5 ---- cpus.h | 1 - vl.c | 80 +++++++++++++++++++++++++++++++++------------------------------ 3 files changed, 42 insertions(+), 44 deletions(-) diff --git a/cpus.c b/cpus.c index 826c88b..d1e2817 100644 --- a/cpus.c +++ b/cpus.c @@ -628,11 +628,6 @@ void qemu_init_cpu_loop(void) qemu_thread_get_self(&io_thread); } -void qemu_main_loop_start(void) -{ - resume_all_vcpus(); -} - void run_on_cpu(CPUState *env, void (*func)(void *data), void *data) { struct qemu_work_item wi; diff --git a/cpus.h b/cpus.h index 7422584..3525375 100644 --- a/cpus.h +++ b/cpus.h @@ -3,7 +3,6 @@ /* cpus.c */ void qemu_init_cpu_loop(void); -void qemu_main_loop_start(void); void resume_all_vcpus(void); void pause_all_vcpus(void); void cpu_stop_current(void); diff --git a/vl.c b/vl.c index 530afeb..3efeb1a 100644 --- a/vl.c +++ b/vl.c @@ -1439,18 +1439,50 @@ void qemu_system_vmstop_request(RunState state) qemu_irq qemu_system_powerdown; +static bool main_loop_should_exit(void) +{ + int r; + if (qemu_debug_requested()) { + vm_stop(RSTATE_DEBUG); + } + if (qemu_shutdown_requested()) { + qemu_kill_report(); + monitor_protocol_event(QEVENT_SHUTDOWN, NULL); + if (no_shutdown) { + vm_stop(RSTATE_SHUTDOWN); + } else { + return true; + } + } + if (qemu_reset_requested()) { + pause_all_vcpus(); + cpu_synchronize_all_states(); + qemu_system_reset(VMRESET_REPORT); + resume_all_vcpus(); + if (runstate_check(RSTATE_PANICKED) || + runstate_check(RSTATE_SHUTDOWN)) { + runstate_set(RSTATE_PAUSED); + } + } + if (qemu_powerdown_requested()) { + monitor_protocol_event(QEVENT_POWERDOWN, NULL); + qemu_irq_raise(qemu_system_powerdown); + } + r = qemu_vmstop_requested(); + if (r) { + vm_stop(r); + } + return false; +} + static void main_loop(void) { bool nonblocking; - int last_io __attribute__ ((unused)) = 0; + int last_io = 0; #ifdef CONFIG_PROFILER int64_t ti; #endif - int r; - - qemu_main_loop_start(); - - for (;;) { + do { nonblocking = !kvm_enabled() && last_io > 0; #ifdef CONFIG_PROFILER ti = profile_getclock(); @@ -1459,38 +1491,7 @@ static void main_loop(void) #ifdef CONFIG_PROFILER dev_time += profile_getclock() - ti; #endif - - if (qemu_debug_requested()) { - vm_stop(RSTATE_DEBUG); - } - if (qemu_shutdown_requested()) { - qemu_kill_report(); - monitor_protocol_event(QEVENT_SHUTDOWN, NULL); - if (no_shutdown) { - vm_stop(RSTATE_SHUTDOWN); - } else - break; - } - if (qemu_reset_requested()) { - pause_all_vcpus(); - cpu_synchronize_all_states(); - qemu_system_reset(VMRESET_REPORT); - resume_all_vcpus(); - if (runstate_check(RSTATE_PANICKED) || - runstate_check(RSTATE_SHUTDOWN)) { - runstate_set(RSTATE_PAUSED); - } - } - if (qemu_powerdown_requested()) { - monitor_protocol_event(QEVENT_POWERDOWN, NULL); - qemu_irq_raise(qemu_system_powerdown); - } - if ((r = qemu_vmstop_requested())) { - vm_stop(r); - } - } - bdrv_close_all(); - pause_all_vcpus(); + } while (!main_loop_should_exit()); } static void version(void) @@ -3452,7 +3453,10 @@ int main(int argc, char **argv, char **envp) os_setup_post(); + resume_all_vcpus(); main_loop(); + bdrv_close_all(); + pause_all_vcpus(); net_cleanup(); res_free();