[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/11] kvm, x86: use target_phys_addr_t
From: |
Jin Dongming |
Subject: |
[Qemu-devel] [PATCH 06/11] kvm, x86: use target_phys_addr_t |
Date: |
Thu, 14 Oct 2010 17:48:25 +0900 |
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 6.1; ja; rv:1.9.2.7) Gecko/20100713 Thunderbird/3.1.1 |
Signed-off-by: Hidetoshi Seto <address@hidden>
Tested-by: Jin Dongming <address@hidden>
---
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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [PATCH 06/11] kvm, x86: use target_phys_addr_t,
Jin Dongming <=