mirrors/unicorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

restore MemoryRegion.enabled & delete io_mem_watch

Browse Source
This commit is contained in:
Nguyen Anh Quynh 2020-06-22 17:09:12 +08:00
parent 3db98ac1be
commit acc0d6cc9b
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/uc_priv.h
View File

@ -178,7 +178,6 @@ struct uc_struct {
MemoryRegion io_mem_rom; // qemu/exec.c
MemoryRegion io_mem_notdirty; // qemu/exec.c
MemoryRegion io_mem_unassigned; // qemu/exec.c
MemoryRegion io_mem_watch; // qemu/exec.c
RAMList ram_list; // qemu/exec.c
BounceBuffer bounce; // qemu/cpu-exec.c
volatile sig_atomic_t exit_request; // qemu/cpu-exec.c

5
qemu/exec.c
View File

@ -271,8 +271,7 @@ static MemoryRegionSection *phys_page_find(PhysPageEntry lp, hwaddr addr,
bool memory_region_is_unassigned(struct uc_struct* uc, MemoryRegion *mr)
{
return mr != &uc->io_mem_rom && mr != &uc->io_mem_notdirty &&
mr != &uc->io_mem_watch;
return mr != &uc->io_mem_rom && mr != &uc->io_mem_notdirty;
}
static MemoryRegionSection *address_space_lookup_region(AddressSpaceDispatch *d,
@ -1195,8 +1194,6 @@ static void mem_begin(MemoryListener *listener)
assert(n == PHYS_SECTION_NOTDIRTY);
n = dummy_section(&d->map, as, &uc->io_mem_rom);
assert(n == PHYS_SECTION_ROM);
// n = dummy_section(&d->map, as, &uc->io_mem_watch);
// assert(n == PHYS_SECTION_WATCH);
d->phys_map = ppe;
d->as = as;

1
qemu/include/exec/memory.h
View File

@ -97,6 +97,7 @@ struct MemoryRegion {
bool terminates;
bool ram;
bool readonly; /* For RAM regions */
bool enabled;
int32_t priority;
bool may_overlap;
QTAILQ_HEAD(subregions, MemoryRegion) subregions;