Commit 3c2a9669 authored by Don Slutz's avatar Don Slutz Committed by Michael S. Tsirkin
Browse files

xen-hvm: Fix xen_hvm_init() to adjust pc memory layout 



This is just below_4g_mem_size and above_4g_mem_size which is used later in QEMU.

Acked-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: default avatarDon Slutz <dslutz@verizon.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 20de98af

hw/i386/pc_piix.c

+16 −15
Original line number Diff line number Diff line
@@ -99,21 +99,6 @@ static void pc_init1(MachineState *machine, 
    FWCfgState *fw_cfg = NULL;

    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);



    pc_cpus_init(machine->cpu_model, icc_bridge);



    if (kvm_enabled() && kvmclock_enabled) {

        kvmclock_create();

    }



    /* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory).

     * If it doesn't, we need to split it in chunks below and above 4G.

     * In any case, try to make sure that guest addresses aligned at
@@ -130,6 +115,22 @@ static void pc_init1(MachineState *machine, 
        below_4g_mem_size = machine->ram_size;

    }



    if (xen_enabled() && xen_hvm_init(&below_4g_mem_size, &above_4g_mem_size,

                                      &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);



    pc_cpus_init(machine->cpu_model, icc_bridge);



    if (kvm_enabled() && kvmclock_enabled) {

        kvmclock_create();

    }



    if (pci_enabled) {

        pci_memory = g_new(MemoryRegion, 1);

        memory_region_init(pci_memory, NULL, "pci", UINT64_MAX);

hw/i386/pc_q35.c

+15 −14
Original line number Diff line number Diff line
@@ -86,20 +86,6 @@ static void pc_q35_init(MachineState *machine) 
    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);



    pc_cpus_init(machine->cpu_model, icc_bridge);

    pc_acpi_init("q35-acpi-dsdt.aml");



    kvmclock_create();



    /* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory

     * and 256 Mbytes for PCI Express Enhanced Configuration Access Mapping

     * also known as MMCFG).
@@ -118,6 +104,21 @@ static void pc_q35_init(MachineState *machine) 
        below_4g_mem_size = machine->ram_size;

    }



    if (xen_enabled() && xen_hvm_init(&below_4g_mem_size, &above_4g_mem_size,

                                      &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);



    pc_cpus_init(machine->cpu_model, icc_bridge);

    pc_acpi_init("q35-acpi-dsdt.aml");



    kvmclock_create();



    /* pci enabled */

    if (pci_enabled) {

        pci_memory = g_new(MemoryRegion, 1);

include/hw/xen/xen.h

+2 −1
Original line number Diff line number Diff line
@@ -37,10 +37,11 @@ void xen_cmos_set_s3_resume(void *opaque, int irq, int level); 
qemu_irq *xen_interrupt_controller_init(void);



int xen_init(MachineClass *mc);

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)

int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,

                 MemoryRegion **ram_memory);

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);

xen-hvm-stub.c

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ void xen_modified_memory(ram_addr_t start, ram_addr_t length) 
{

}



int xen_hvm_init(MemoryRegion **ram_memory)

int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,

                 MemoryRegion **ram_memory)

{

    return 0;

}

xen-hvm.c

+14 −10
Original line number Diff line number Diff line
@@ -155,10 +155,11 @@ qemu_irq *xen_interrupt_controller_init(void) 


/* Memory Ops */



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

static void xen_ram_init(ram_addr_t *below_4g_mem_size,

                         ram_addr_t *above_4g_mem_size,

                         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;

    ram_addr_t block_len;



    block_len = ram_size;
@@ -173,10 +174,11 @@ static void xen_ram_init(ram_addr_t ram_size, MemoryRegion **ram_memory_p) 
    vmstate_register_ram_global(&ram_memory);



    if (ram_size >= HVM_BELOW_4G_RAM_END) {

        above_4g_mem_size = ram_size - HVM_BELOW_4G_RAM_END;

        below_4g_mem_size = HVM_BELOW_4G_RAM_END;

        *above_4g_mem_size = ram_size - HVM_BELOW_4G_RAM_END;

        *below_4g_mem_size = HVM_BELOW_4G_RAM_END;

    } else {

        below_4g_mem_size = ram_size;

        *above_4g_mem_size = 0;

        *below_4g_mem_size = ram_size;

    }



    memory_region_init_alias(&ram_640k, NULL, "xen.ram.640k",
@@ -189,12 +191,13 @@ static void xen_ram_init(ram_addr_t ram_size, MemoryRegion **ram_memory_p) 
     * the Options ROM, so it is registered here as RAM.

     */

    memory_region_init_alias(&ram_lo, NULL, "xen.ram.lo",

                             &ram_memory, 0xc0000, below_4g_mem_size - 0xc0000);

                             &ram_memory, 0xc0000,

                             *below_4g_mem_size - 0xc0000);

    memory_region_add_subregion(sysmem, 0xc0000, &ram_lo);

    if (above_4g_mem_size > 0) {

    if (*above_4g_mem_size > 0) {

        memory_region_init_alias(&ram_hi, NULL, "xen.ram.hi",

                                 &ram_memory, 0x100000000ULL,

                                 above_4g_mem_size);

                                 *above_4g_mem_size);

        memory_region_add_subregion(sysmem, 0x100000000ULL, &ram_hi);

    }

}
@@ -958,7 +961,8 @@ static void xen_wakeup_notifier(Notifier *notifier, void *data) 
    xc_set_hvm_param(xen_xc, xen_domid, HVM_PARAM_ACPI_S_STATE, 0);

}



int xen_hvm_init(MemoryRegion **ram_memory)

int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,

                 MemoryRegion **ram_memory)

{

    int i, rc;

    unsigned long ioreq_pfn;
@@ -1036,7 +1040,7 @@ int xen_hvm_init(MemoryRegion **ram_memory) 


    /* Init RAM management */

    xen_map_cache_init(xen_phys_offset_to_gaddr, state);

    xen_ram_init(ram_size, ram_memory);

    xen_ram_init(below_4g_mem_size, above_4g_mem_size, ram_size, ram_memory);



    qemu_add_vm_change_state_handler(xen_hvm_change_state_handler, state);