On Tue, 17 Feb 2015 11:05:42 +0100 "Michael S. Tsirkin" <[email protected]> wrote:
> As comment in acpi-build.c notes, RSDP is not really immutable. So it's > really a question of whether it's in RAM, name the variable accordingly. > > Signed-off-by: Michael S. Tsirkin <[email protected]> Reviewed-by: Igor Mammedov <[email protected]> > --- > include/hw/i386/pc.h | 2 +- > hw/i386/acpi-build.c | 2 +- > hw/i386/pc_piix.c | 6 +++--- > hw/i386/pc_q35.c | 6 +++--- > 4 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index b0a80cf..0c595c5 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -104,7 +104,7 @@ struct PcGuestInfo { > int legacy_acpi_table_size; > bool has_acpi_build; > bool has_reserved_memory; > - bool has_immutable_rsdp; > + bool rsdp_in_ram; > }; > > /* parallel.c */ > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index e78d6cb..ffa3f00 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -1556,7 +1556,7 @@ void acpi_setup(PcGuestInfo *guest_info) > fw_cfg_add_file(guest_info->fw_cfg, ACPI_BUILD_TPMLOG_FILE, > tables.tcpalog->data, acpi_data_len(tables.tcpalog)); > > - if (guest_info->has_immutable_rsdp) { > + if (!guest_info->rsdp_in_ram) { > /* > * Keep for compatibility with old machine types. > * Though RSDP is small, its contents isn't immutable, so > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index e586c7b..13ff561 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -60,7 +60,7 @@ static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 > }; > static const int ide_irq[MAX_IDE_BUS] = { 14, 15 }; > > static bool has_acpi_build = true; > -static bool has_immutable_rsdp; > +static bool rsdp_in_ram = true; > static int legacy_acpi_table_size; > static bool smbios_defaults = true; > static bool smbios_legacy_mode; > @@ -169,7 +169,7 @@ static void pc_init1(MachineState *machine, > > guest_info->isapc_ram_fw = !pci_enabled; > guest_info->has_reserved_memory = has_reserved_memory; > - guest_info->has_immutable_rsdp = has_immutable_rsdp; > + guest_info->rsdp_in_ram = rsdp_in_ram; > > if (smbios_defaults) { > MachineClass *mc = MACHINE_GET_CLASS(machine); > @@ -312,7 +312,7 @@ static void pc_init_pci(MachineState *machine) > > static void pc_compat_2_2(MachineState *machine) > { > - has_immutable_rsdp = true; > + rsdp_in_ram = false; > x86_cpu_compat_set_features("kvm64", FEAT_1_EDX, 0, CPUID_VME); > x86_cpu_compat_set_features("kvm32", FEAT_1_EDX, 0, CPUID_VME); > x86_cpu_compat_set_features("Conroe", FEAT_1_EDX, 0, CPUID_VME); > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 6151f2f..c0f21fe 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -50,7 +50,7 @@ > #define MAX_SATA_PORTS 6 > > static bool has_acpi_build = true; > -static bool has_immutable_rsdp; > +static bool rsdp_in_ram = true; > static bool smbios_defaults = true; > static bool smbios_legacy_mode; > static bool smbios_uuid_encoded = true; > @@ -155,7 +155,7 @@ static void pc_q35_init(MachineState *machine) > guest_info->isapc_ram_fw = false; > guest_info->has_acpi_build = has_acpi_build; > guest_info->has_reserved_memory = has_reserved_memory; > - guest_info->has_immutable_rsdp = has_immutable_rsdp; > + guest_info->rsdp_in_ram = rsdp_in_ram; > > /* Migration was not supported in 2.0 for Q35, so do not bother > * with this hack (see hw/i386/acpi-build.c). > @@ -291,7 +291,7 @@ static void pc_q35_init(MachineState *machine) > > static void pc_compat_2_2(MachineState *machine) > { > - has_immutable_rsdp = true; > + rsdp_in_ram = false; > x86_cpu_compat_set_features("kvm64", FEAT_1_EDX, 0, CPUID_VME); > x86_cpu_compat_set_features("kvm32", FEAT_1_EDX, 0, CPUID_VME); > x86_cpu_compat_set_features("Conroe", FEAT_1_EDX, 0, CPUID_VME);
