84 lines
2.7 KiB
Diff
84 lines
2.7 KiB
Diff
From 0f6878d5529718216809846dd05b988134cb32d8 Mon Sep 17 00:00:00 2001
|
|
From: Paul Durrant <paul.durrant@citrix.com>
|
|
Date: Tue, 7 Mar 2017 10:55:31 +0000
|
|
Subject: [PATCH 2/6] xen: rename xen_modified_memory() to
|
|
xen_hvm_modified_memory()
|
|
|
|
This patch is a purely cosmetic change that avoids a name collision in
|
|
a subsequent patch.
|
|
|
|
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
|
|
Reviewed-by: Anthony Perard <anthony.perard@citrix.com>
|
|
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
|
|
---
|
|
include/exec/ram_addr.h | 4 ++--
|
|
include/hw/xen/xen.h | 2 +-
|
|
xen-hvm-stub.c | 2 +-
|
|
xen-hvm.c | 2 +-
|
|
4 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
|
|
index b05dc84ab9..29647303b0 100644
|
|
--- a/include/exec/ram_addr.h
|
|
+++ b/include/exec/ram_addr.h
|
|
@@ -260,7 +260,7 @@ static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start,
|
|
|
|
rcu_read_unlock();
|
|
|
|
- xen_modified_memory(start, length);
|
|
+ xen_hvm_modified_memory(start, length);
|
|
}
|
|
|
|
#if !defined(_WIN32)
|
|
@@ -314,7 +314,7 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
|
|
|
|
rcu_read_unlock();
|
|
|
|
- xen_modified_memory(start, pages << TARGET_PAGE_BITS);
|
|
+ xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS);
|
|
} else {
|
|
uint8_t clients = tcg_enabled() ? DIRTY_CLIENTS_ALL : DIRTY_CLIENTS_NOCODE;
|
|
/*
|
|
diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h
|
|
index 09c2ce5170..2b1733b747 100644
|
|
--- a/include/hw/xen/xen.h
|
|
+++ b/include/hw/xen/xen.h
|
|
@@ -43,7 +43,7 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory);
|
|
|
|
void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size,
|
|
struct MemoryRegion *mr, Error **errp);
|
|
-void xen_modified_memory(ram_addr_t start, ram_addr_t length);
|
|
+void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length);
|
|
|
|
void xen_register_framebuffer(struct MemoryRegion *mr);
|
|
|
|
diff --git a/xen-hvm-stub.c b/xen-hvm-stub.c
|
|
index c5003251cb..3ca6c51b21 100644
|
|
--- a/xen-hvm-stub.c
|
|
+++ b/xen-hvm-stub.c
|
|
@@ -50,7 +50,7 @@ void xen_register_framebuffer(MemoryRegion *mr)
|
|
{
|
|
}
|
|
|
|
-void xen_modified_memory(ram_addr_t start, ram_addr_t length)
|
|
+void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length)
|
|
{
|
|
}
|
|
|
|
diff --git a/xen-hvm.c b/xen-hvm.c
|
|
index dbb8c66dd3..edf4983702 100644
|
|
--- a/xen-hvm.c
|
|
+++ b/xen-hvm.c
|
|
@@ -1391,7 +1391,7 @@ void xen_shutdown_fatal_error(const char *fmt, ...)
|
|
qemu_system_shutdown_request();
|
|
}
|
|
|
|
-void xen_modified_memory(ram_addr_t start, ram_addr_t length)
|
|
+void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length)
|
|
{
|
|
if (unlikely(xen_in_migration)) {
|
|
int rc;
|
|
--
|
|
2.13.0
|
|
|