* [Qemu-devel] [PULL] Memory API core fix (memory_region_set_readonly())
@ 2011-09-25 12:43 Avi Kivity
2011-09-26 13:28 ` Anthony Liguori
0 siblings, 1 reply; 2+ messages in thread
From: Avi Kivity @ 2011-09-25 12:43 UTC (permalink / raw)
To: Anthony Liguori, qemu-devel
Please pull from
git://github.com/avikivity/qemu.git memory/core
to receive an implementation of memory_region_set_readonly(). It has
been tested on i386 (440FX PAM) and Magnum.
Avi Kivity (1):
memory: implement memory_region_set_readonly()
memory.c | 29 ++++++++++++++++++++++-------
memory.h | 1 +
2 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/memory.c b/memory.c
index ba74435..71e769e 100644
--- a/memory.c
+++ b/memory.c
@@ -126,6 +126,7 @@ struct FlatRange {
AddrRange addr;
uint8_t dirty_log_mask;
bool readable;
+ bool readonly;
};
/* Flattened global view of current active memory hierarchy. Kept in
sorted
@@ -166,7 +167,8 @@ static bool flatrange_equal(FlatRange *a, FlatRange *b)
return a->mr == b->mr
&& addrrange_equal(a->addr, b->addr)
&& a->offset_in_region == b->offset_in_region
- && a->readable == b->readable;
+ && a->readable == b->readable
+ && a->readonly == b->readonly;
}
static void flatview_init(FlatView *view)
@@ -203,7 +205,8 @@ static bool can_merge(FlatRange *r1, FlatRange *r2)
&& r1->mr == r2->mr
&& r1->offset_in_region + r1->addr.size == r2->offset_in_region
&& r1->dirty_log_mask == r2->dirty_log_mask
- && r1->readable == r2->readable;
+ && r1->readable == r2->readable
+ && r1->readonly == r2->readonly;
}
/* Attempt to simplify a view by merging ajacent ranges */
@@ -307,6 +310,10 @@ static void as_memory_range_add(AddressSpace *as,
FlatRange *fr)
phys_offset &= ~TARGET_PAGE_MASK & ~IO_MEM_ROMD;
}
+ if (fr->readonly) {
+ phys_offset |= IO_MEM_ROM;
+ }
+
cpu_register_physical_memory_log(fr->addr.start,
fr->addr.size,
phys_offset,
@@ -484,7 +491,8 @@ static void as_io_ioeventfd_del(AddressSpace *as,
MemoryRegionIoeventfd *fd)
static void render_memory_region(FlatView *view,
MemoryRegion *mr,
target_phys_addr_t base,
- AddrRange clip)
+ AddrRange clip,
+ bool readonly)
{
MemoryRegion *subregion;
unsigned i;
@@ -495,6 +503,7 @@ static void render_memory_region(FlatView *view,
AddrRange tmp;
base += mr->addr;
+ readonly |= mr->readonly;
tmp = addrrange_make(base, mr->size);
@@ -507,13 +516,13 @@ static void render_memory_region(FlatView *view,
if (mr->alias) {
base -= mr->alias->addr;
base -= mr->alias_offset;
- render_memory_region(view, mr->alias, base, clip);
+ render_memory_region(view, mr->alias, base, clip, readonly);
return;
}
/* Render subregions in priority order. */
QTAILQ_FOREACH(subregion, &mr->subregions, subregions_link) {
- render_memory_region(view, subregion, base, clip);
+ render_memory_region(view, subregion, base, clip, readonly);
}
if (!mr->terminates) {
@@ -536,6 +545,7 @@ static void render_memory_region(FlatView *view,
fr.addr = addrrange_make(base, now);
fr.dirty_log_mask = mr->dirty_log_mask;
fr.readable = mr->readable;
+ fr.readonly = readonly;
flatview_insert(view, i, &fr);
++i;
base += now;
@@ -555,6 +565,7 @@ static void render_memory_region(FlatView *view,
fr.addr = addrrange_make(base, remain);
fr.dirty_log_mask = mr->dirty_log_mask;
fr.readable = mr->readable;
+ fr.readonly = readonly;
flatview_insert(view, i, &fr);
}
}
@@ -566,7 +577,7 @@ static FlatView
generate_memory_topology(MemoryRegion *mr)
flatview_init(&view);
- render_memory_region(&view, mr, 0, addrrange_make(0, INT64_MAX));
+ render_memory_region(&view, mr, 0, addrrange_make(0, INT64_MAX),
false);
flatview_simplify(&view);
return view;
@@ -772,6 +783,7 @@ void memory_region_init(MemoryRegion *mr,
mr->offset = 0;
mr->terminates = false;
mr->readable = true;
+ mr->readonly = false;
mr->destructor = memory_region_destructor_none;
mr->priority = 0;
mr->may_overlap = false;
@@ -1035,7 +1047,10 @@ void memory_region_sync_dirty_bitmap(MemoryRegion
*mr)
void memory_region_set_readonly(MemoryRegion *mr, bool readonly)
{
- /* FIXME */
+ if (mr->readonly != readonly) {
+ mr->readonly = readonly;
+ memory_region_update_topology();
+ }
}
void memory_region_rom_device_set_readable(MemoryRegion *mr, bool
readable)
diff --git a/memory.h b/memory.h
index 06b83ae..e93e65a 100644
--- a/memory.h
+++ b/memory.h
@@ -114,6 +114,7 @@ struct MemoryRegion {
IORange iorange;
bool terminates;
bool readable;
+ bool readonly; /* For RAM regions */
MemoryRegion *alias;
target_phys_addr_t alias_offset;
unsigned priority;
--
error compiling committee.c: too many arguments to function
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PULL] Memory API core fix (memory_region_set_readonly())
2011-09-25 12:43 [Qemu-devel] [PULL] Memory API core fix (memory_region_set_readonly()) Avi Kivity
@ 2011-09-26 13:28 ` Anthony Liguori
0 siblings, 0 replies; 2+ messages in thread
From: Anthony Liguori @ 2011-09-26 13:28 UTC (permalink / raw)
To: Avi Kivity; +Cc: qemu-devel
On 09/25/2011 07:43 AM, Avi Kivity wrote:
> Please pull from
>
> git://github.com/avikivity/qemu.git memory/core
>
> to receive an implementation of memory_region_set_readonly(). It has been tested
> on i386 (440FX PAM) and Magnum.
>
> Avi Kivity (1):
> memory: implement memory_region_set_readonly()
Pulled. Thanks.
Regards,
Anthony Liguori
>
> memory.c | 29 ++++++++++++++++++++++-------
> memory.h | 1 +
> 2 files changed, 23 insertions(+), 7 deletions(-)
>
> diff --git a/memory.c b/memory.c
> index ba74435..71e769e 100644
> --- a/memory.c
> +++ b/memory.c
> @@ -126,6 +126,7 @@ struct FlatRange {
> AddrRange addr;
> uint8_t dirty_log_mask;
> bool readable;
> + bool readonly;
> };
>
> /* Flattened global view of current active memory hierarchy. Kept in sorted
> @@ -166,7 +167,8 @@ static bool flatrange_equal(FlatRange *a, FlatRange *b)
> return a->mr == b->mr
> && addrrange_equal(a->addr, b->addr)
> && a->offset_in_region == b->offset_in_region
> - && a->readable == b->readable;
> + && a->readable == b->readable
> + && a->readonly == b->readonly;
> }
>
> static void flatview_init(FlatView *view)
> @@ -203,7 +205,8 @@ static bool can_merge(FlatRange *r1, FlatRange *r2)
> && r1->mr == r2->mr
> && r1->offset_in_region + r1->addr.size == r2->offset_in_region
> && r1->dirty_log_mask == r2->dirty_log_mask
> - && r1->readable == r2->readable;
> + && r1->readable == r2->readable
> + && r1->readonly == r2->readonly;
> }
>
> /* Attempt to simplify a view by merging ajacent ranges */
> @@ -307,6 +310,10 @@ static void as_memory_range_add(AddressSpace *as, FlatRange
> *fr)
> phys_offset &= ~TARGET_PAGE_MASK & ~IO_MEM_ROMD;
> }
>
> + if (fr->readonly) {
> + phys_offset |= IO_MEM_ROM;
> + }
> +
> cpu_register_physical_memory_log(fr->addr.start,
> fr->addr.size,
> phys_offset,
> @@ -484,7 +491,8 @@ static void as_io_ioeventfd_del(AddressSpace *as,
> MemoryRegionIoeventfd *fd)
> static void render_memory_region(FlatView *view,
> MemoryRegion *mr,
> target_phys_addr_t base,
> - AddrRange clip)
> + AddrRange clip,
> + bool readonly)
> {
> MemoryRegion *subregion;
> unsigned i;
> @@ -495,6 +503,7 @@ static void render_memory_region(FlatView *view,
> AddrRange tmp;
>
> base += mr->addr;
> + readonly |= mr->readonly;
>
> tmp = addrrange_make(base, mr->size);
>
> @@ -507,13 +516,13 @@ static void render_memory_region(FlatView *view,
> if (mr->alias) {
> base -= mr->alias->addr;
> base -= mr->alias_offset;
> - render_memory_region(view, mr->alias, base, clip);
> + render_memory_region(view, mr->alias, base, clip, readonly);
> return;
> }
>
> /* Render subregions in priority order. */
> QTAILQ_FOREACH(subregion, &mr->subregions, subregions_link) {
> - render_memory_region(view, subregion, base, clip);
> + render_memory_region(view, subregion, base, clip, readonly);
> }
>
> if (!mr->terminates) {
> @@ -536,6 +545,7 @@ static void render_memory_region(FlatView *view,
> fr.addr = addrrange_make(base, now);
> fr.dirty_log_mask = mr->dirty_log_mask;
> fr.readable = mr->readable;
> + fr.readonly = readonly;
> flatview_insert(view, i, &fr);
> ++i;
> base += now;
> @@ -555,6 +565,7 @@ static void render_memory_region(FlatView *view,
> fr.addr = addrrange_make(base, remain);
> fr.dirty_log_mask = mr->dirty_log_mask;
> fr.readable = mr->readable;
> + fr.readonly = readonly;
> flatview_insert(view, i, &fr);
> }
> }
> @@ -566,7 +577,7 @@ static FlatView generate_memory_topology(MemoryRegion *mr)
>
> flatview_init(&view);
>
> - render_memory_region(&view, mr, 0, addrrange_make(0, INT64_MAX));
> + render_memory_region(&view, mr, 0, addrrange_make(0, INT64_MAX), false);
> flatview_simplify(&view);
>
> return view;
> @@ -772,6 +783,7 @@ void memory_region_init(MemoryRegion *mr,
> mr->offset = 0;
> mr->terminates = false;
> mr->readable = true;
> + mr->readonly = false;
> mr->destructor = memory_region_destructor_none;
> mr->priority = 0;
> mr->may_overlap = false;
> @@ -1035,7 +1047,10 @@ void memory_region_sync_dirty_bitmap(MemoryRegion *mr)
>
> void memory_region_set_readonly(MemoryRegion *mr, bool readonly)
> {
> - /* FIXME */
> + if (mr->readonly != readonly) {
> + mr->readonly = readonly;
> + memory_region_update_topology();
> + }
> }
>
> void memory_region_rom_device_set_readable(MemoryRegion *mr, bool readable)
> diff --git a/memory.h b/memory.h
> index 06b83ae..e93e65a 100644
> --- a/memory.h
> +++ b/memory.h
> @@ -114,6 +114,7 @@ struct MemoryRegion {
> IORange iorange;
> bool terminates;
> bool readable;
> + bool readonly; /* For RAM regions */
> MemoryRegion *alias;
> target_phys_addr_t alias_offset;
> unsigned priority;
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-09-26 13:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-25 12:43 [Qemu-devel] [PULL] Memory API core fix (memory_region_set_readonly()) Avi Kivity
2011-09-26 13:28 ` Anthony Liguori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).