[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH memory v3 1/9] memory: Simplify mr_add_subregion() i
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH memory v3 1/9] memory: Simplify mr_add_subregion() if-else |
Date: |
Sun, 1 Jun 2014 21:14:34 -0700 |
This if else is not needed. The previous call to memory_region_add
(whether _overlap or not) will always set priority and may_overlap
to desired values. And its not possible to get here without having
called memory_region_add_subregion due to the null guard on parent.
So we can just directly call memory_region_add_subregion_common.
Signed-off-by: Peter Crosthwaite <address@hidden>
---
memory.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/memory.c b/memory.c
index 3f1df23..1352881 100644
--- a/memory.c
+++ b/memory.c
@@ -1501,8 +1501,6 @@ void memory_region_set_enabled(MemoryRegion *mr, bool
enabled)
void memory_region_set_address(MemoryRegion *mr, hwaddr addr)
{
MemoryRegion *parent = mr->parent;
- int priority = mr->priority;
- bool may_overlap = mr->may_overlap;
if (addr == mr->addr || !parent) {
mr->addr = addr;
@@ -1512,11 +1510,7 @@ void memory_region_set_address(MemoryRegion *mr, hwaddr
addr)
memory_region_transaction_begin();
memory_region_ref(mr);
memory_region_del_subregion(parent, mr);
- if (may_overlap) {
- memory_region_add_subregion_overlap(parent, addr, mr, priority);
- } else {
- memory_region_add_subregion(parent, addr, mr);
- }
+ memory_region_add_subregion_common(parent, addr, mr);
memory_region_unref(mr);
memory_region_transaction_commit();
}
--
2.0.0
- [Qemu-devel] [PATCH memory v3 0/9] Memory Region QOMification, Peter Crosthwaite, 2014/06/02
- [Qemu-devel] [PATCH memory v3 1/9] memory: Simplify mr_add_subregion() if-else,
Peter Crosthwaite <=
- [Qemu-devel] [PATCH memory v3 2/9] qom: object: Ignore refs/unrefs of NULL, Peter Crosthwaite, 2014/06/02
- [Qemu-devel] [PATCH memory v3 3/9] qom: Publish object_resolve_link, Peter Crosthwaite, 2014/06/02
- [Qemu-devel] [PATCH memory v3 4/9] memory: Coreify subregion add functionality, Peter Crosthwaite, 2014/06/02
- [Qemu-devel] [PATCH memory v3 5/9] memory: MemoryRegion: factor out memory region re-adder, Peter Crosthwaite, 2014/06/02
- [Qemu-devel] [PATCH memory v3 6/9] memory: MemoryRegion: QOMify, Peter Crosthwaite, 2014/06/02
- [Qemu-devel] [PATCH memory v3 7/9] memory: MemoryRegion: Add container and addr props, Peter Crosthwaite, 2014/06/02
- [Qemu-devel] [PATCH memory v3 8/9] memory: MemoryRegion: Add may-overlap and priority props, Peter Crosthwaite, 2014/06/02
- [Qemu-devel] [PATCH memory v3 9/9] memory: MemoryRegion: Add size property, Peter Crosthwaite, 2014/06/02