From patchwork Sun Jun 9 19:12:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 250080 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0A5122C02B4 for ; Mon, 10 Jun 2013 05:14:30 +1000 (EST) Received: from localhost ([::1]:54527 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ull4N-0007t3-Hm for incoming@patchwork.ozlabs.org; Sun, 09 Jun 2013 15:14:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ull3l-0007mh-4x for qemu-devel@nongnu.org; Sun, 09 Jun 2013 15:13:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ull3j-0000Md-5l for qemu-devel@nongnu.org; Sun, 09 Jun 2013 15:13:49 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44346 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ull3i-0000MU-V2 for qemu-devel@nongnu.org; Sun, 09 Jun 2013 15:13:47 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 8D60AA51CB for ; Sun, 9 Jun 2013 21:13:46 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sun, 9 Jun 2013 21:12:32 +0200 Message-Id: <1370805206-26574-6-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1370805206-26574-1-git-send-email-afaerber@suse.de> References: <1370805206-26574-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH qom-cpu 05/59] cpus: Simplify pause_all_vcpus() 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 Use new qemu_for_each_cpu() to pause, stop and kick CPUs. Signed-off-by: Andreas Färber Reviewed-by: liguang --- cpus.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/cpus.c b/cpus.c index 85b35f6..ad5edfe 100644 --- a/cpus.c +++ b/cpus.c @@ -962,39 +962,39 @@ static int all_vcpus_paused(void) return 1; } -void pause_all_vcpus(void) +static void pause_one_vcpu(CPUState *cpu, void *data) { - CPUArchState *penv = first_cpu; + cpu->stop = true; + qemu_cpu_kick(cpu); +} +static void stop_one_vcpu(CPUState *cpu, void *data) +{ + cpu->stop = false; + cpu->stopped = true; +} + +static void kick_one_vcpu(CPUState *cpu, void *data) +{ + qemu_cpu_kick(cpu); +} + +void pause_all_vcpus(void) +{ qemu_clock_enable(vm_clock, false); - while (penv) { - CPUState *pcpu = ENV_GET_CPU(penv); - pcpu->stop = true; - qemu_cpu_kick(pcpu); - penv = penv->next_cpu; - } + qemu_for_each_cpu(pause_one_vcpu, NULL); if (qemu_in_vcpu_thread()) { cpu_stop_current(); if (!kvm_enabled()) { - penv = first_cpu; - while (penv) { - CPUState *pcpu = ENV_GET_CPU(penv); - pcpu->stop = false; - pcpu->stopped = true; - penv = penv->next_cpu; - } + qemu_for_each_cpu(stop_one_vcpu, NULL); return; } } while (!all_vcpus_paused()) { qemu_cond_wait(&qemu_pause_cond, &qemu_global_mutex); - penv = first_cpu; - while (penv) { - qemu_cpu_kick(ENV_GET_CPU(penv)); - penv = penv->next_cpu; - } + qemu_for_each_cpu(kick_one_vcpu, NULL); } }