From patchwork Thu Oct 14 08:48:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jin Dongming X-Patchwork-Id: 67798 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 7F8821007D3 for ; Thu, 14 Oct 2010 19:54:40 +1100 (EST) Received: from localhost ([127.0.0.1]:34832 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P6Ja9-0004Fv-4u for incoming@patchwork.ozlabs.org; Thu, 14 Oct 2010 04:54:37 -0400 Received: from [140.186.70.92] (port=39120 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P6JSs-0000hk-KC for qemu-devel@nongnu.org; Thu, 14 Oct 2010 04:47:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P6JSq-0003UO-Vm for qemu-devel@nongnu.org; Thu, 14 Oct 2010 04:47:06 -0400 Received: from fgwmail7.fujitsu.co.jp ([192.51.44.37]:41219) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P6JSq-0003UI-Gf for qemu-devel@nongnu.org; Thu, 14 Oct 2010 04:47:04 -0400 Received: from m2.gw.fujitsu.co.jp ([10.0.50.72]) by fgwmail7.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id o9E8l2sQ031860 for (envelope-from jin.dongming@np.css.fujitsu.com); Thu, 14 Oct 2010 17:47:02 +0900 Received: from smail (m2 [127.0.0.1]) by outgoing.m2.gw.fujitsu.co.jp (Postfix) with ESMTP id 7964045DE4E for ; Thu, 14 Oct 2010 17:47:02 +0900 (JST) Received: from s2.gw.fujitsu.co.jp (s2.gw.fujitsu.co.jp [10.0.50.92]) by m2.gw.fujitsu.co.jp (Postfix) with ESMTP id 4A85145DE51 for ; Thu, 14 Oct 2010 17:47:02 +0900 (JST) Received: from s2.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s2.gw.fujitsu.co.jp (Postfix) with ESMTP id 26564E38004 for ; Thu, 14 Oct 2010 17:47:02 +0900 (JST) Received: from m002.s.css.fujitsu.com (m002.s.css.fujitsu.com [10.23.4.32]) by s2.gw.fujitsu.co.jp (Postfix) with ESMTP id C86C61DB803B for ; Thu, 14 Oct 2010 17:46:58 +0900 (JST) Received: from m002.css.fujitsu.com (m002 [127.0.0.1]) by m002.s.css.fujitsu.com (Postfix) with ESMTP id B0A7950EBE3; Thu, 14 Oct 2010 17:46:58 +0900 (JST) Received: from [127.0.0.1] (unknown [10.124.101.76]) by m002.s.css.fujitsu.com (Postfix) with ESMTP id 796C850EBC2; Thu, 14 Oct 2010 17:46:58 +0900 (JST) X-SecurityPolicyCheck: OK by SHieldMailChecker v1.5.1 Message-ID: <4CB6C3D9.2070807@np.css.fujitsu.com> Date: Thu, 14 Oct 2010 17:48:25 +0900 From: Jin Dongming User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; ja; rv:1.9.2.7) Gecko/20100713 Thunderbird/3.1.1 MIME-Version: 1.0 To: KVM list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Hidetoshi Seto , Dean Nelson , Marcelo Tosatti , "qemu-devel@nongnu.org" , Avi Kivity , Huang Ying Subject: [Qemu-devel] [PATCH 06/11] kvm, x86: use target_phys_addr_t 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 Signed-off-by: Hidetoshi Seto Tested-by: Jin Dongming --- qemu-kvm.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qemu-kvm.c b/qemu-kvm.c index 0ba42fc..89ae524 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -1163,7 +1163,7 @@ static void kvm_do_set_mce(CPUState *env, struct kvm_x86_mce *mce, } } -static void kvm_mce_inj_srar_dataload(CPUState *env, unsigned long paddr) +static void kvm_mce_inj_srar_dataload(CPUState *env, target_phys_addr_t paddr) { struct kvm_x86_mce mce = { .bank = 9, @@ -1178,7 +1178,7 @@ static void kvm_mce_inj_srar_dataload(CPUState *env, unsigned long paddr) kvm_do_set_mce(env, &mce, 1); } -static void kvm_mce_inj_srao_memscrub(CPUState *env, unsigned long paddr) +static void kvm_mce_inj_srao_memscrub(CPUState *env, target_phys_addr_t paddr) { struct kvm_x86_mce mce = { .bank = 9, @@ -1193,7 +1193,7 @@ static void kvm_mce_inj_srao_memscrub(CPUState *env, unsigned long paddr) kvm_do_set_mce(env, &mce, 1); } -static void kvm_mce_inj_srao_broadcast(unsigned long paddr) +static void kvm_mce_inj_srao_broadcast(target_phys_addr_t paddr) { struct kvm_x86_mce mce_srao_memscrub = { .bank = 9, @@ -1227,12 +1227,12 @@ static void sigbus_handler(int n, struct qemu_signalfd_siginfo *siginfo, && siginfo->ssi_code == BUS_MCEERR_AO) { void *vaddr; ram_addr_t ram_addr; - unsigned long paddr; + target_phys_addr_t paddr; /* Hope we are lucky for AO MCE */ vaddr = (void *)(intptr_t)siginfo->ssi_addr; if (do_qemu_ram_addr_from_host(vaddr, &ram_addr) || - !kvm_physical_memory_addr_from_ram(kvm_state, ram_addr, (target_phys_addr_t *)&paddr)) { + !kvm_physical_memory_addr_from_ram(kvm_state, ram_addr, &paddr)) { fprintf(stderr, "Hardware memory error for memory used by " "QEMU itself instead of guest system!: %llx\n", (unsigned long long)siginfo->ssi_addr); @@ -1382,7 +1382,7 @@ static void kvm_on_sigbus(CPUState *env, siginfo_t *siginfo) #if defined(KVM_CAP_MCE) && defined(TARGET_I386) void *vaddr; ram_addr_t ram_addr; - unsigned long paddr; + target_phys_addr_t paddr; if ((env->mcg_cap & MCG_SER_P) && siginfo->si_addr && (siginfo->si_code == BUS_MCEERR_AR @@ -1396,7 +1396,7 @@ static void kvm_on_sigbus(CPUState *env, siginfo_t *siginfo) } vaddr = (void *)siginfo->si_addr; if (do_qemu_ram_addr_from_host(vaddr, &ram_addr) || - !kvm_physical_memory_addr_from_ram(kvm_state, ram_addr, (target_phys_addr_t *)&paddr)) { + !kvm_physical_memory_addr_from_ram(kvm_state, ram_addr, &paddr)) { fprintf(stderr, "Hardware memory error for memory used by " "QEMU itself instead of guest system!\n"); /* Hope we are lucky for AO MCE */