Merge remote-tracking branch 'qemu-kvm/memory/core' into staging
This commit is contained in:
commit
6e23063c46
4
memory.c
4
memory.c
@ -396,7 +396,7 @@ static void memory_region_iorange_read(IORange *iorange,
|
|||||||
|
|
||||||
*data = ((uint64_t)1 << (width * 8)) - 1;
|
*data = ((uint64_t)1 << (width * 8)) - 1;
|
||||||
if (mrp) {
|
if (mrp) {
|
||||||
*data = mrp->read(mr->opaque, offset - mrp->offset);
|
*data = mrp->read(mr->opaque, offset);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -418,7 +418,7 @@ static void memory_region_iorange_write(IORange *iorange,
|
|||||||
const MemoryRegionPortio *mrp = find_portio(mr, offset, width, true);
|
const MemoryRegionPortio *mrp = find_portio(mr, offset, width, true);
|
||||||
|
|
||||||
if (mrp) {
|
if (mrp) {
|
||||||
mrp->write(mr->opaque, offset - mrp->offset, data);
|
mrp->write(mr->opaque, offset, data);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user