SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hvf: Remove use of hv_uvaddr_t and hv_gpaddr_t

Browse Source 
The ARM version of Hypervisor.framework no longer defines these two
types, so let's just revert to standard ones.

Signed-off-by: Alexander Graf <agraf@csgraf.de>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20210519202253.76782-7-agraf@csgraf.de
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Alexander Graf 2021-06-03 14:09:32 +01:00 committed by Peter Maydell
parent 3f965ef4e0
commit 6e19f86a80
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
accel/hvf/hvf-accel-ops.c
View File

@ -109,7 +109,7 @@ static int do_hvf_set_memory(hvf_slot *slot, hv_memory_flags_t flags)
macslot->present = 1; macslot->present = 1;
macslot->gpa_start = slot->start; macslot->gpa_start = slot->start;
macslot->size = slot->size; macslot->size = slot->size;
ret = hv_vm_map((hv_uvaddr_t)slot->mem, slot->start, slot->size, flags); ret = hv_vm_map(slot->mem, slot->start, slot->size, flags);
assert_hvf_ok(ret); assert_hvf_ok(ret);
return 0; return 0;
} }
@ -253,12 +253,12 @@ static void hvf_set_dirty_tracking(MemoryRegionSection *section, bool on)
/* protect region against writes; begin tracking it */ /* protect region against writes; begin tracking it */
if (on) { if (on) {
slot->flags |= HVF_SLOT_LOG; slot->flags |= HVF_SLOT_LOG;
hv_vm_protect((hv_gpaddr_t)slot->start, (size_t)slot->size, hv_vm_protect((uintptr_t)slot->start, (size_t)slot->size,
HV_MEMORY_READ); HV_MEMORY_READ);
/* stop tracking region*/ /* stop tracking region*/
} else { } else {
slot->flags &= ~HVF_SLOT_LOG; slot->flags &= ~HVF_SLOT_LOG;
hv_vm_protect((hv_gpaddr_t)slot->start, (size_t)slot->size, hv_vm_protect((uintptr_t)slot->start, (size_t)slot->size,
HV_MEMORY_READ | HV_MEMORY_WRITE); HV_MEMORY_READ | HV_MEMORY_WRITE);
} }
} }