|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH v2 1/4] xen-all: Fix xen_hvm_init() to adjust pc memory layout.
On Tue, 11 Mar 2014, Don Slutz wrote:
> This is just below_4g_mem_size and above_4g_mem_size which is used later in
> QEMU.
>
> Signed-off-by: Don Slutz <dslutz@xxxxxxxxxxx>
Acked-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
> hw/i386/pc_piix.c | 31 ++++++++++++++++---------------
> hw/i386/pc_q35.c | 29 +++++++++++++++--------------
> include/hw/xen/xen.h | 3 ++-
> xen-all.c | 24 ++++++++++++++----------
> xen-stub.c | 3 ++-
> 5 files changed, 49 insertions(+), 41 deletions(-)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index ae1699d..8f07f0b 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -96,21 +96,6 @@ static void pc_init1(QEMUMachineInitArgs *args,
> 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(args->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
> @@ -127,6 +112,22 @@ static void pc_init1(QEMUMachineInitArgs *args,
> below_4g_mem_size = args->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(args->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);
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index a7f6260..5d017ee 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -83,20 +83,6 @@ 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);
> -
> - pc_cpus_init(args->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).
> @@ -115,6 +101,21 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
> below_4g_mem_size = args->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(args->cpu_model, icc_bridge);
> + pc_acpi_init("q35-acpi-dsdt.aml");
> +
> + kvmclock_create();
> +
> /* pci enabled */
> if (pci_enabled) {
> pci_memory = g_new(MemoryRegion, 1);
> diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h
> index e181821..0769db2 100644
> --- a/include/hw/xen/xen.h
> +++ b/include/hw/xen/xen.h
> @@ -38,10 +38,11 @@ void xen_cmos_set_s3_resume(void *opaque, int irq, int
> level);
> qemu_irq *xen_interrupt_controller_init(void);
>
> int xen_init(QEMUMachine *machine);
> -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);
> diff --git a/xen-all.c b/xen-all.c
> index ba34739..c64300c 100644
> --- a/xen-all.c
> +++ b/xen-all.c
> @@ -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);
> }
> }
> @@ -1066,7 +1069,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;
> @@ -1144,7 +1148,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);
>
> diff --git a/xen-stub.c b/xen-stub.c
> index 59927cb..0302dff 100644
> --- a/xen-stub.c
> +++ b/xen-stub.c
> @@ -64,7 +64,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;
> }
> --
> 1.8.4
>
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |