Commit 97fdb941 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'sstabellini/xen-2013-09-09' into staging 



# By Anthony PERARD
# Via Stefano Stabellini
* sstabellini/xen-2013-09-09:
  pc_q35: Initialize Xen.
  pc: Initializing ram_memory under Xen.

Message-id: alpine.DEB.2.02.1309091718030.6397@kaball.uk.xensource.com
Signed-off-by: default avatarAnthony Liguori <anthony@codemonkey.ws>
parents 964737ea 254c1282

hw/i386/pc_piix.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static void pc_init1(QEMUMachineInitArgs *args, 
    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);

    }

hw/i386/pc_q35.c

+5 −0
Original line number Diff line number Diff line
@@ -76,6 +76,11 @@ static void pc_q35_init(QEMUMachineInitArgs *args) 
    DeviceState *icc_bridge;

    PcGuestInfo *guest_info;



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

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

        exit(1);

    }



    icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE);

    object_property_add_child(qdev_get_machine(), "icc-bridge",

                              OBJECT(icc_bridge), NULL);

include/hw/xen/xen.h

+1 −3
Original line number Diff line number Diff line
@@ -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

xen-all.c

+4 −3
Original line number Diff line number Diff line
@@ -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);

xen-stub.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}