[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] pc: reserve more memory for ACPI for new machin
From: |
Serge E. Hallyn |
Subject: |
Re: [Qemu-devel] [PATCH] pc: reserve more memory for ACPI for new machine types |
Date: |
Fri, 22 Aug 2014 21:37:57 +0200 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
Quoting Michael S. Tsirkin (address@hidden):
> commit 868270f23d8db2cce83e4f082fe75e8625a5fbf9
> acpi-build: tweak acpi migration limits
> broke kernel loading with -kernel/-initrd: it doubled
> the size of ACPI tables but did not reserve
> enough memory.
>
> As a result, issues on boot and halt are observed.
>
> Fix this up by doubling reserved memory for new machine types.
>
> Cc: address@hidden
> Reported-by: Stefan Hajnoczi <address@hidden>
Thanks, this fixes it for me.
Tested-by: Serge Hallyn <address@hidden>
> Signed-off-by: Michael S. Tsirkin <address@hidden>
> ---
> include/hw/i386/pc.h | 2 ++
> hw/i386/pc.c | 12 +++++++++---
> hw/i386/pc_piix.c | 1 +
> hw/i386/pc_q35.c | 1 +
> 4 files changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index aedc312..84caed8 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -176,6 +176,8 @@ void pc_acpi_init(const char *default_dsdt);
> PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size,
> ram_addr_t above_4g_mem_size);
>
> +void pc_set_legacy_acpi_data_size(void);
> +
> #define PCI_HOST_PROP_PCI_HOLE_START "pci-hole-start"
> #define PCI_HOST_PROP_PCI_HOLE_END "pci-hole-end"
> #define PCI_HOST_PROP_PCI_HOLE64_START "pci-hole64-start"
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 8fa8d2f..0ca4deb 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -73,7 +73,12 @@
> #endif
>
> /* Leave a chunk of memory at the top of RAM for the BIOS ACPI tables. */
> -#define ACPI_DATA_SIZE 0x10000
> +unsigned acpi_data_size = 0x20000;
> +void pc_set_legacy_acpi_data_size(void)
> +{
> + acpi_data_size = 0x10000;
> +}
> +
> #define BIOS_CFG_IOPORT 0x510
> #define FW_CFG_ACPI_TABLES (FW_CFG_ARCH_LOCAL + 0)
> #define FW_CFG_SMBIOS_ENTRIES (FW_CFG_ARCH_LOCAL + 1)
> @@ -811,8 +816,9 @@ static void load_linux(FWCfgState *fw_cfg,
> initrd_max = 0x37ffffff;
> }
>
> - if (initrd_max >= max_ram_size-ACPI_DATA_SIZE)
> - initrd_max = max_ram_size-ACPI_DATA_SIZE-1;
> + if (initrd_max >= max_ram_size - acpi_data_size) {
> + initrd_max = max_ram_size - acpi_data_size - 1;
> + }
>
> fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_ADDR, cmdline_addr);
> fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE, strlen(kernel_cmdline)+1);
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 7710724..744b331 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -337,6 +337,7 @@ static void pc_compat_2_0(MachineState *machine)
> legacy_acpi_table_size = 6652;
> smbios_legacy_mode = true;
> has_reserved_memory = false;
> + pc_set_legacy_acpi_data_size();
> }
>
> static void pc_compat_1_7(MachineState *machine)
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 4b5a274..d4a907c 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -280,6 +280,7 @@ static void pc_compat_2_0(MachineState *machine)
> {
> smbios_legacy_mode = true;
> has_reserved_memory = false;
> + pc_set_legacy_acpi_data_size();
> }
>
> static void pc_compat_1_7(MachineState *machine)
> --
> MST