From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jin Dongming Subject: [PATCH 06/11] kvm, x86: use target_phys_addr_t Date: Thu, 14 Oct 2010 17:48:25 +0900 Message-ID: <4CB6C3D9.2070807@np.css.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Cc: Dean Nelson , Marcelo Tosatti , Avi Kivity , Huang Ying , Hidetoshi Seto , "qemu-devel@nongnu.org" To: KVM list Return-path: Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:48661 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750952Ab0JNIrE (ORCPT ); Thu, 14 Oct 2010 04:47:04 -0400 Received: from m3.gw.fujitsu.co.jp ([10.0.50.73]) by fgwmail5.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id o9E8l20t019624 for (envelope-from jin.dongming@np.css.fujitsu.com); Thu, 14 Oct 2010 17:47:02 +0900 Received: from smail (m3 [127.0.0.1]) by outgoing.m3.gw.fujitsu.co.jp (Postfix) with ESMTP id B080E45DE52 for ; Thu, 14 Oct 2010 17:47:00 +0900 (JST) Received: from s3.gw.fujitsu.co.jp (s3.gw.fujitsu.co.jp [10.0.50.93]) by m3.gw.fujitsu.co.jp (Postfix) with ESMTP id A73A245DE57 for ; Thu, 14 Oct 2010 17:46:59 +0900 (JST) Received: from s3.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s3.gw.fujitsu.co.jp (Postfix) with ESMTP id 5E682E08004 for ; Thu, 14 Oct 2010 17:46:59 +0900 (JST) Received: from m002.s.css.fujitsu.com (m002.s.css.fujitsu.com [10.23.4.32]) by s3.gw.fujitsu.co.jp (Postfix) with ESMTP id CA4DFE08006 for ; Thu, 14 Oct 2010 17:46:58 +0900 (JST) Sender: kvm-owner@vger.kernel.org List-ID: 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 */ -- 1.7.1.1 From mboxrd@z Thu Jan 1 00:00:00 1970 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) Message-ID: <4CB6C3D9.2070807@np.css.fujitsu.com> Date: Thu, 14 Oct 2010 17:48:25 +0900 From: Jin Dongming MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 06/11] kvm, x86: use target_phys_addr_t List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: KVM list Cc: Hidetoshi Seto , Dean Nelson , Marcelo Tosatti , "qemu-devel@nongnu.org" , Avi Kivity , Huang Ying 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 */ -- 1.7.1.1