From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43759) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKpBg-00012p-Um for qemu-devel@nongnu.org; Mon, 09 Feb 2015 09:19:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YKpBd-0001qo-LN for qemu-devel@nongnu.org; Mon, 09 Feb 2015 09:19:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33662) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKpBd-0001kc-Ds for qemu-devel@nongnu.org; Mon, 09 Feb 2015 09:19:41 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t19EJdqu017923 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 9 Feb 2015 09:19:40 -0500 Message-ID: <54D8C1F9.4090802@redhat.com> Date: Mon, 09 Feb 2015 16:19:37 +0200 From: Marcel Apfelbaum MIME-Version: 1.0 References: <1423490395-22054-1-git-send-email-imammedo@redhat.com> <1423490395-22054-4-git-send-email-imammedo@redhat.com> In-Reply-To: <1423490395-22054-4-git-send-email-imammedo@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 3/3] pc: acpi-build: migrate RSDP table List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov , qemu-devel@nongnu.org Cc: mst@redhat.com, marcel.a@redhat.com On 02/09/2015 03:59 PM, Igor Mammedov wrote: > Makes sure that RSDP stays the same > /i.e. matches ACPI tables blob in source/ > if guest is migrated during RSDP reading or > has been already shadowed by firmware. > > Fix applies only to new machine types starting > from 2.3, so it won't break migration for old > machine types. > > Signed-off-by: Igor Mammedov > --- > hw/i386/acpi-build.c | 24 +++++++++++++++--------- > hw/i386/pc_piix.c | 3 +++ > hw/i386/pc_q35.c | 3 +++ > include/hw/i386/pc.h | 1 + > 4 files changed, 22 insertions(+), 9 deletions(-) > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 21ea3db..1583cca 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -1810,15 +1810,21 @@ 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)); > > - /* > - * Though RSDP is small, its contents isn't immutable, so > - * update it along with the rest of tables on guest access. > - */ > - fw_cfg_add_file_callback(guest_info->fw_cfg, ACPI_BUILD_RSDP_FILE, > - acpi_build_update, build_state, > - tables.rsdp->data, acpi_data_len(tables.rsdp)); > - > - build_state->rsdp = tables.rsdp->data; > + if (guest_info->has_immutable_rsdp) { > + /* > + * Keep for compatibility with old machine types. > + * Though RSDP is small, its contents isn't immutable, so > + * update it along with the rest of tables on guest access. > + */ > + fw_cfg_add_file_callback(guest_info->fw_cfg, ACPI_BUILD_RSDP_FILE, > + acpi_build_update, build_state, > + tables.rsdp->data, acpi_data_len(tables.rsdp)); > + build_state->rsdp = tables.rsdp->data; > + } else { > + build_state->rsdp = qemu_get_ram_ptr( > + acpi_add_rom_blob(build_state, tables.rsdp, ACPI_BUILD_RSDP_FILE, 0) > + ); > + } > > qemu_register_reset(acpi_build_reset, build_state); > acpi_build_reset(build_state); > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 38b42b0..e586c7b 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -60,6 +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 int legacy_acpi_table_size; > static bool smbios_defaults = true; > static bool smbios_legacy_mode; > @@ -168,6 +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; > > if (smbios_defaults) { > MachineClass *mc = MACHINE_GET_CLASS(machine); > @@ -310,6 +312,7 @@ static void pc_init_pci(MachineState *machine) > > static void pc_compat_2_2(MachineState *machine) > { > + has_immutable_rsdp = true; > 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 63027ee..6151f2f 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -50,6 +50,7 @@ > #define MAX_SATA_PORTS 6 > > static bool has_acpi_build = true; > +static bool has_immutable_rsdp; > static bool smbios_defaults = true; > static bool smbios_legacy_mode; > static bool smbios_uuid_encoded = true; > @@ -154,6 +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; > > /* Migration was not supported in 2.0 for Q35, so do not bother > * with this hack (see hw/i386/acpi-build.c). > @@ -289,6 +291,7 @@ static void pc_q35_init(MachineState *machine) > > static void pc_compat_2_2(MachineState *machine) > { > + has_immutable_rsdp = true; > 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/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 69d9cf8..b0a80cf 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -104,6 +104,7 @@ struct PcGuestInfo { > int legacy_acpi_table_size; > bool has_acpi_build; > bool has_reserved_memory; > + bool has_immutable_rsdp; > }; > > /* parallel.c */ > Reviewed-by: Marcel Apfelbaum