* [Qemu-devel] [PULL] memory core fix
@ 2011-09-21 12:24 Avi Kivity
2011-09-22 15:58 ` Anthony Liguori
0 siblings, 1 reply; 2+ messages in thread
From: Avi Kivity @ 2011-09-21 12:24 UTC (permalink / raw)
To: Anthony Liguori, qemu-devel
Please pull from
git://github.com/avikivity/qemu.git memory/core
to receive the following fix:
Michael Walle (1):
memory: fix subregion collision warning
memory.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/memory.c b/memory.c
index 101b67c..ba74435 100644
--- a/memory.c
+++ b/memory.c
@@ -1190,16 +1190,19 @@ static void
memory_region_add_subregion_common(MemoryRegion *mr,
if (subregion->may_overlap || other->may_overlap) {
continue;
}
- if (offset >= other->offset + other->size
- || offset + subregion->size <= other->offset) {
+ if (offset >= other->addr + other->size
+ || offset + subregion->size <= other->addr) {
continue;
}
#if 0
- printf("warning: subregion collision %llx/%llx vs %llx/%llx\n",
+ printf("warning: subregion collision %llx/%llx (%s) "
+ "vs %llx/%llx (%s)\n",
(unsigned long long)offset,
(unsigned long long)subregion->size,
- (unsigned long long)other->offset,
- (unsigned long long)other->size);
+ subregion->name,
+ (unsigned long long)other->addr,
+ (unsigned long long)other->size,
+ other->name);
#endif
}
QTAILQ_FOREACH(other, &mr->subregions, subregions_link) {
--
error compiling committee.c: too many arguments to function
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PULL] memory core fix
2011-09-21 12:24 [Qemu-devel] [PULL] memory core fix Avi Kivity
@ 2011-09-22 15:58 ` Anthony Liguori
0 siblings, 0 replies; 2+ messages in thread
From: Anthony Liguori @ 2011-09-22 15:58 UTC (permalink / raw)
To: Avi Kivity; +Cc: qemu-devel
On 09/21/2011 07:24 AM, Avi Kivity wrote:
> Please pull from
>
> git://github.com/avikivity/qemu.git memory/core
Pulled. Thanks.
Regards,
Anthony Liguori
> to receive the following fix:
>
> Michael Walle (1):
> memory: fix subregion collision warning
>
> memory.c | 13 ++++++++-----
> 1 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/memory.c b/memory.c
> index 101b67c..ba74435 100644
> --- a/memory.c
> +++ b/memory.c
> @@ -1190,16 +1190,19 @@ static void
> memory_region_add_subregion_common(MemoryRegion *mr,
> if (subregion->may_overlap || other->may_overlap) {
> continue;
> }
> - if (offset >= other->offset + other->size
> - || offset + subregion->size <= other->offset) {
> + if (offset >= other->addr + other->size
> + || offset + subregion->size <= other->addr) {
> continue;
> }
> #if 0
> - printf("warning: subregion collision %llx/%llx vs %llx/%llx\n",
> + printf("warning: subregion collision %llx/%llx (%s) "
> + "vs %llx/%llx (%s)\n",
> (unsigned long long)offset,
> (unsigned long long)subregion->size,
> - (unsigned long long)other->offset,
> - (unsigned long long)other->size);
> + subregion->name,
> + (unsigned long long)other->addr,
> + (unsigned long long)other->size,
> + other->name);
> #endif
> }
> QTAILQ_FOREACH(other, &mr->subregions, subregions_link) {
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-09-22 15:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-21 12:24 [Qemu-devel] [PULL] memory core fix Avi Kivity
2011-09-22 15:58 ` 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).