|
 |
9ae3a8 |
From 11b9b3f7b11d113e5789877dec1ab41be838c007 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Juan Quintela <quintela@redhat.com>
|
|
|
9ae3a8 |
Date: Tue, 14 Jan 2014 15:07:25 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 14/40] memory: make sure that client is always inside range
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Juan Quintela <quintela@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1389712071-23303-15-git-send-email-quintela@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56669
|
|
|
9ae3a8 |
O-Subject: [RHEL7 qemu-kvm PATCH 14/40] memory: make sure that client is always inside range
|
|
|
9ae3a8 |
Bugzilla: 997559
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Orit Wasserman <owasserm@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 7a5b558c9d061814f34d9b95d70d17ef75037937)
|
|
|
9ae3a8 |
Signed-off-by: Juan Quintela <quintela@trasno.org>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
include/exec/memory-internal.h | 4 ++++
|
|
|
9ae3a8 |
1 file changed, 4 insertions(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
include/exec/memory-internal.h | 4 ++++
|
|
|
9ae3a8 |
1 files changed, 4 insertions(+), 0 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h
|
|
|
9ae3a8 |
index fbcd384..ef5de3e 100644
|
|
|
9ae3a8 |
--- a/include/exec/memory-internal.h
|
|
|
9ae3a8 |
+++ b/include/exec/memory-internal.h
|
|
|
9ae3a8 |
@@ -52,6 +52,7 @@ void qemu_ram_free_from_ptr(ram_addr_t addr);
|
|
|
9ae3a8 |
static inline bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr,
|
|
|
9ae3a8 |
unsigned client)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
+ assert(client < DIRTY_MEMORY_NUM);
|
|
|
9ae3a8 |
return ram_list.phys_dirty[addr >> TARGET_PAGE_BITS] & (1 << client);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@@ -83,6 +84,7 @@ static inline int cpu_physical_memory_get_dirty(ram_addr_t start,
|
|
|
9ae3a8 |
static inline void cpu_physical_memory_set_dirty_flag(ram_addr_t addr,
|
|
|
9ae3a8 |
unsigned client)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
+ assert(client < DIRTY_MEMORY_NUM);
|
|
|
9ae3a8 |
ram_list.phys_dirty[addr >> TARGET_PAGE_BITS] |= (1 << client);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@@ -98,6 +100,8 @@ static inline int cpu_physical_memory_clear_dirty_flag(ram_addr_t addr,
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
int mask = ~(1 << client);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+ assert(client < DIRTY_MEMORY_NUM);
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
return ram_list.phys_dirty[addr >> TARGET_PAGE_BITS] &= mask;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|