From patchwork Fri Jun 13 19:44:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 359608 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0D3D1140093 for ; Sat, 14 Jun 2014 05:51:04 +1000 (EST) Received: from localhost ([::1]:32863 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvXV7-0004TK-Gn for incoming@patchwork.ozlabs.org; Fri, 13 Jun 2014 15:51:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38484) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvXPu-0006Yr-VM for qemu-devel@nongnu.org; Fri, 13 Jun 2014 15:45:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WvXPo-0006jz-Ig for qemu-devel@nongnu.org; Fri, 13 Jun 2014 15:45:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10096) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvXPo-0006jv-BC for qemu-devel@nongnu.org; Fri, 13 Jun 2014 15:45:32 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5DJjVR5026055 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 Jun 2014 15:45:31 -0400 Received: from localhost (ovpn-113-83.phx2.redhat.com [10.3.113.83]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s5DJjTxL001393; Fri, 13 Jun 2014 15:45:30 -0400 From: Eduardo Habkost To: qemu-devel@nongnu.org, "Michael S. Tsirkin" Date: Fri, 13 Jun 2014 16:44:00 -0300 Message-Id: <1402688658-22333-22-git-send-email-ehabkost@redhat.com> In-Reply-To: <1402688658-22333-1-git-send-email-ehabkost@redhat.com> References: <1402688658-22333-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Marcel Apfelbaum , Alexander Graf , Don Slutz , Anthony Liguori , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [RFC v2 21/39] pc: Move smbios_defaults to PCMachineClass X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Eduardo Habkost --- hw/i386/pc.c | 1 + hw/i386/pc_piix.c | 12 ++++++------ hw/i386/pc_q35.c | 7 +++---- include/hw/i386/pc.h | 1 + 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 4d2e4bf..820532a 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1617,6 +1617,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) pcmc->get_hotplug_handler = mc->get_hotplug_handler; pcmc->kvmclock_enabled = true; + pcmc->smbios_defaults = true; mc->get_hotplug_handler = pc_get_hotpug_handler; mc->default_boot_order = "cad"; mc->hot_add_cpu = pc_hot_add_cpu; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 422656e..b521121 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -60,7 +60,6 @@ static const int ide_irq[MAX_IDE_BUS] = { 14, 15 }; static bool has_pci_info; static bool has_acpi_build = true; -static bool smbios_defaults = true; /* Make sure that guest addresses aligned at 1Gbyte boundaries get mapped to * host addresses aligned at 1Gbyte boundaries. This way we can use 1GByte * pages in the host. @@ -147,9 +146,8 @@ static void pc_init1(MachineState *machine) guest_info->isapc_ram_fw = !pci_enabled; guest_info->has_reserved_memory = has_reserved_memory; - if (smbios_defaults) { + if (pcmc->smbios_defaults) { MachineClass *mc = MACHINE_GET_CLASS(machine); - PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(mc); /* These values are guest ABI, do not change */ smbios_set_defaults("QEMU", "Standard PC (i440FX + PIIX, 1996)", mc->name, pcmc->smbios_legacy_mode); @@ -285,7 +283,6 @@ static void pc_compat_2_0(MachineState *machine) static void pc_compat_1_7(MachineState *machine) { pc_compat_2_0(machine); - smbios_defaults = false; gigabyte_align = false; option_rom_has_mr = true; x86_cpu_compat_disable_kvm_features(FEAT_1_ECX, CPUID_EXT_X2APIC); @@ -372,7 +369,6 @@ static void pc_init_pci_no_kvmclock(MachineState *machine) { has_pci_info = false; has_acpi_build = false; - smbios_defaults = false; x86_cpu_compat_disable_kvm_features(FEAT_KVM, KVM_FEATURE_PV_EOI); enable_compat_apic_id_mode(); pc_init1(machine); @@ -382,7 +378,6 @@ static void pc_init_isa(MachineState *machine) { has_pci_info = false; has_acpi_build = false; - smbios_defaults = false; if (!machine->cpu_model) { machine->cpu_model = "486"; } @@ -465,6 +460,7 @@ static TypeInfo pc_i440fx_machine_v2_0_type_info = { static void pc_i440fx_machine_v1_7_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); + PCMachineClass *pcmc = PC_MACHINE_CLASS(oc); static GlobalProperty compat_props[] = { PC_COMPAT_1_7, { /* end of list */ } @@ -474,6 +470,7 @@ static void pc_i440fx_machine_v1_7_class_init(ObjectClass *oc, void *data) mc->init = pc_init_pci_1_7; mc->name = "pc-i440fx-1.7"; machine_class_add_compat_props(mc, compat_props); + pcmc->smbios_defaults = false; } static TypeInfo pc_i440fx_machine_v1_7_type_info = { @@ -939,6 +936,8 @@ static TypeInfo pc_machine_v0_10_type_info = { static void isapc_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); + PCMachineClass *pcmc = PC_MACHINE_CLASS(oc); + static GlobalProperty compat_props[] = { { /* end of list */ } }; @@ -948,6 +947,7 @@ static void isapc_machine_class_init(ObjectClass *oc, void *data) mc->hot_add_cpu = NULL; mc->name = "isapc"; machine_class_add_compat_props(mc, compat_props); + pcmc->smbios_defaults = false; } static TypeInfo isapc_machine_type_info = { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 65e4cc4..7f991e4 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -50,7 +50,6 @@ static bool has_pci_info; static bool has_acpi_build = true; -static bool smbios_defaults = true; /* Make sure that guest addresses aligned at 1Gbyte boundaries get mapped to * host addresses aligned at 1Gbyte boundaries. This way we can use 1GByte * pages in the host. @@ -134,9 +133,8 @@ static void pc_q35_init(MachineState *machine) guest_info->has_acpi_build = has_acpi_build; guest_info->has_reserved_memory = has_reserved_memory; - if (smbios_defaults) { + if (pcmc->smbios_defaults) { MachineClass *mc = MACHINE_GET_CLASS(machine); - PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(machine); /* These values are guest ABI, do not change */ smbios_set_defaults("QEMU", "Standard PC (Q35 + ICH9, 2009)", mc->name, pcmc->smbios_legacy_mode); @@ -263,7 +261,6 @@ static void pc_compat_2_0(MachineState *machine) static void pc_compat_1_7(MachineState *machine) { pc_compat_2_0(machine); - smbios_defaults = false; gigabyte_align = false; option_rom_has_mr = true; x86_cpu_compat_disable_kvm_features(FEAT_1_ECX, CPUID_EXT_X2APIC); @@ -377,6 +374,7 @@ static TypeInfo pc_q35_machine_v2_0_type_info = { static void pc_q35_machine_v1_7_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); + PCMachineClass *pcmc = PC_MACHINE_CLASS(oc); static GlobalProperty compat_props[] = { PC_Q35_COMPAT_1_7, { /* end of list */ } @@ -386,6 +384,7 @@ static void pc_q35_machine_v1_7_class_init(ObjectClass *oc, void *data) mc->init = pc_q35_init_1_7; machine_class_add_compat_props(mc, compat_props); mc->name = "pc-q35-1.7"; + pcmc->smbios_defaults = false; } static TypeInfo pc_q35_machine_v1_7_type_info = { diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index b767b79..2c38cdd 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -52,6 +52,7 @@ struct PCMachineClass { bool pci_enabled; bool kvmclock_enabled; bool smbios_legacy_mode; + bool smbios_defaults; }; typedef struct PCMachineState PCMachineState;