From patchwork Sun Jun 9 21:13:39 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: 250148 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 ABFBD2C02A9 for ; Mon, 10 Jun 2013 07:14:12 +1000 (EST) Received: from localhost ([::1]:39107 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UlmwE-0007w4-Mh for incoming@patchwork.ozlabs.org; Sun, 09 Jun 2013 17:14:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55143) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ulmvv-0007vz-4D for qemu-devel@nongnu.org; Sun, 09 Jun 2013 17:13:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ulmvu-0001Cd-5I for qemu-devel@nongnu.org; Sun, 09 Jun 2013 17:13:51 -0400 Received: from cantor2.suse.de ([195.135.220.15]:47810 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ulmvt-0001CZ-Nn; Sun, 09 Jun 2013 17:13:49 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id DD175A41E0; Sun, 9 Jun 2013 23:13:46 +0200 (CEST) Message-ID: <51B4F003.9070005@suse.de> Date: Sun, 09 Jun 2013 23:13:39 +0200 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= Organization: SUSE LINUX Products GmbH User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-Version: 1.0 To: qemu-devel@nongnu.org, Alexander Graf References: <1370805206-26574-1-git-send-email-afaerber@suse.de> <1370805206-26574-58-git-send-email-afaerber@suse.de> In-Reply-To: <1370805206-26574-58-git-send-email-afaerber@suse.de> X-Enigmail-Version: 1.6a1pre X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Peter Maydell , Anthony Liguori , Riku Voipio , Igor Mitsyanko , Mark Langsdorf , Evgeny Voevodin , Marcelo Tosatti , Gleb Natapov , Peter Crosthwaite , Dmitry Solodkiy , qemu-ppc , Paul Brook , KVM , "Edgar E. Iglesias" , Maksim Kozlov , Aurelien Jarno , David Gibson Subject: Re: [Qemu-devel] [PATCH qom-cpu 57/59] cpu: Make first_cpu and next_cpu CPUState (WIP) 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 Am 09.06.2013 21:13, schrieb Andreas Färber: > cpus.c | 15 +++++++++------ > exec.c | 27 ++++++++++++++------------- > gdbstub.c | 15 ++++++++------- > hw/arm/boot.c | 10 +++++----- > hw/arm/exynos4_boards.c | 4 ++-- > hw/arm/highbank.c | 2 +- > hw/arm/realview.c | 2 +- > hw/arm/vexpress.c | 2 +- > hw/arm/xilinx_zynq.c | 2 +- > hw/i386/kvm/clock.c | 6 ++++-- > hw/i386/kvmvapic.c | 5 +++-- > hw/i386/pc.c | 11 ++++++----- > hw/i386/pc_piix.c | 3 +-- > hw/intc/sh_intc.c | 5 ++--- > hw/isa/lpc_ich9.c | 2 +- > hw/mips/mips_malta.c | 3 ++- > hw/ppc/prep.c | 6 ++++-- > hw/ppc/spapr.c | 12 ++++++------ > include/exec/cpu-all.h | 2 +- > include/exec/cpu-defs.h | 1 - > include/qom/cpu.h | 2 ++ > linux-user/main.c | 4 ++-- > linux-user/syscall.c | 9 ++++++--- > target-i386/arch_dump.c | 7 +++++-- > target-i386/kvm.c | 8 +++++--- > target-i386/misc_helper.c | 2 +- > 26 files changed, 93 insertions(+), 74 deletions(-) Found one unconverted first_cpu occurrence, breaking the ppc build: Fixed on qom-cpu-10 branch. Andreas diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 3ab2946..87f25ea 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -1574,7 +1574,7 @@ uint64_t kvmppc_rma_size(uint64_t current_size, unsigned int hash_shift) /* Find the largest hardware supported page size that's less than * or equal to the (logical) backing page size of guest RAM */ - kvm_get_smmu_info(ppc_env_get_cpu(first_cpu), &info); + kvm_get_smmu_info(POWERPC_CPU(first_cpu), &info); rampagesize = getrampagesize(); best_page_shift = 0;