From 755ec4ca0f92188458ad7ca549a75161cbdcf6ff Mon Sep 17 00:00:00 2001

From: Anthony PERARD <anthony.perard@citrix.com>

Date: Mon, 9 Sep 2013 16:15:52 +0000

Subject: [PATCH] pc: Initializing ram_memory under Xen.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

Acked-by: Michael S. Tsirkin <mst@redhat.com>

CC: qemu-stable@nongnu.org

(cherry picked from commit 04d7bad8a4fb23e6d9af9d06ce3ddc28a251d94d)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

---

 hw/i386/pc_piix.c    | 2 +-

 include/hw/xen/xen.h | 4 +---

 xen-all.c            | 7 ++++---

 xen-stub.c           | 2 +-

 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c

index 6e1e654..3df2ff9 100644

--- a/hw/i386/pc_piix.c

+++ b/hw/i386/pc_piix.c

@@ -93,7 +93,7 @@ static void pc_init1(MemoryRegion *system_memory,

     FWCfgState *fw_cfg = NULL;

     PcGuestInfo *guest_info;

-    if (xen_enabled() && xen_hvm_init() != 0) {

+    if (xen_enabled() && xen_hvm_init(&ram_memory) != 0) {

         fprintf(stderr, "xen hardware virtual machine initialisation failed\n");

         exit(1);

     }

diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h

index 6d42dd1..e1f88bf 100644

--- a/include/hw/xen/xen.h

+++ b/include/hw/xen/xen.h

@@ -37,17 +37,15 @@ void xen_cmos_set_s3_resume(void *opaque, int irq, int level);

 qemu_irq *xen_interrupt_controller_init(void);

 int xen_init(void);

-int xen_hvm_init(void);

+int xen_hvm_init(MemoryRegion **ram_memory);

 void xenstore_store_pv_console_info(int i, struct CharDriverState *chr);

 #if defined(NEED_CPU_H) && !defined(CONFIG_USER_ONLY)

-struct MemoryRegion;

 void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size,

                    struct MemoryRegion *mr);

 void xen_modified_memory(ram_addr_t start, ram_addr_t length);

 #endif

-struct MemoryRegion;

 void xen_register_framebuffer(struct MemoryRegion *mr);

 #if defined(CONFIG_XEN) && CONFIG_XEN_CTRL_INTERFACE_VERSION < 400

diff --git a/xen-all.c b/xen-all.c

index 21246e0..e1d0694 100644

--- a/xen-all.c

+++ b/xen-all.c

@@ -154,7 +154,7 @@ qemu_irq *xen_interrupt_controller_init(void)

 /* Memory Ops */

-static void xen_ram_init(ram_addr_t ram_size)

+static void xen_ram_init(ram_addr_t ram_size, MemoryRegion **ram_memory_p)

 {

     MemoryRegion *sysmem = get_system_memory();

     ram_addr_t below_4g_mem_size, above_4g_mem_size = 0;

@@ -168,6 +168,7 @@ static void xen_ram_init(ram_addr_t ram_size)

         block_len += HVM_BELOW_4G_MMIO_LENGTH;

     }

     memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len);

+    *ram_memory_p = &ram_memory;

     vmstate_register_ram_global(&ram_memory);

     if (ram_size >= HVM_BELOW_4G_RAM_END) {

@@ -1059,7 +1060,7 @@ static void xen_read_physmap(XenIOState *state)

     free(entries);

 }

-int xen_hvm_init(void)

+int xen_hvm_init(MemoryRegion **ram_memory)

 {

     int i, rc;

     unsigned long ioreq_pfn;

@@ -1134,7 +1135,7 @@ int xen_hvm_init(void)

     /* Init RAM management */

     xen_map_cache_init(xen_phys_offset_to_gaddr, state);

-    xen_ram_init(ram_size);

+    xen_ram_init(ram_size, ram_memory);

     qemu_add_vm_change_state_handler(xen_hvm_change_state_handler, state);

diff --git a/xen-stub.c b/xen-stub.c

index 47c8e73..ad189a6 100644

--- a/xen-stub.c

+++ b/xen-stub.c

@@ -64,7 +64,7 @@ void xen_modified_memory(ram_addr_t start, ram_addr_t length)

 {

 }

-int xen_hvm_init(void)

+int xen_hvm_init(MemoryRegion **ram_memory)

 {

     return 0;

 }