From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvXQ0-0006Yw-CQ for qemu-devel@nongnu.org; Fri, 13 Jun 2014 15:45:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WvXPt-0006l5-SH for qemu-devel@nongnu.org; Fri, 13 Jun 2014 15:45:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47924) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvXPt-0006kv-Im for qemu-devel@nongnu.org; Fri, 13 Jun 2014 15:45:37 -0400 From: Eduardo Habkost Date: Fri, 13 Jun 2014 16:44:02 -0300 Message-Id: <1402688658-22333-24-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> Subject: [Qemu-devel] [RFC v2 23/39] pc: Move has_pci_info to PCMachineClass List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, "Michael S. Tsirkin" Cc: Marcel Apfelbaum , Alexander Graf , Don Slutz , Anthony Liguori , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Interestingly, no existing code sets has_pci_info=true at all. Signed-off-by: Eduardo Habkost --- hw/i386/pc_piix.c | 6 +----- hw/i386/pc_q35.c | 4 +--- include/hw/i386/pc.h | 1 + 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 89e4ca9..769982d 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -58,7 +58,6 @@ static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 }; static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 }; static const int ide_irq[MAX_IDE_BUS] = { 14, 15 }; -static bool has_pci_info; /* 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. @@ -141,7 +140,7 @@ static void pc_init1(MachineState *machine) guest_info->has_acpi_build = pcmc->has_acpi_build; - guest_info->has_pci_info = has_pci_info; + guest_info->has_pci_info = pcmc->has_pci_info; guest_info->isapc_ram_fw = !pci_enabled; guest_info->has_reserved_memory = has_reserved_memory; @@ -290,7 +289,6 @@ static void pc_compat_1_7(MachineState *machine) static void pc_compat_1_6(MachineState *machine) { pc_compat_1_7(machine); - has_pci_info = false; rom_file_has_mr = false; } @@ -365,7 +363,6 @@ static void pc_init_pci_1_2(MachineState *machine) /* PC init function for pc-0.10 to pc-0.13, and reused by xenfv */ static void pc_init_pci_no_kvmclock(MachineState *machine) { - has_pci_info = false; x86_cpu_compat_disable_kvm_features(FEAT_KVM, KVM_FEATURE_PV_EOI); enable_compat_apic_id_mode(); pc_init1(machine); @@ -373,7 +370,6 @@ static void pc_init_pci_no_kvmclock(MachineState *machine) static void pc_init_isa(MachineState *machine) { - has_pci_info = false; if (!machine->cpu_model) { machine->cpu_model = "486"; } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 129b0bb..c8164d7 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -48,7 +48,6 @@ /* ICH9 AHCI has 6 ports */ #define MAX_SATA_PORTS 6 -static bool has_pci_info; /* 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. @@ -127,7 +126,7 @@ static void pc_q35_init(MachineState *machine) } guest_info = pc_guest_info_init(below_4g_mem_size, above_4g_mem_size); - guest_info->has_pci_info = has_pci_info; + guest_info->has_pci_info = pcmc->has_pci_info; guest_info->isapc_ram_fw = false; guest_info->has_acpi_build = pcmc->has_acpi_build; guest_info->has_reserved_memory = has_reserved_memory; @@ -268,7 +267,6 @@ static void pc_compat_1_7(MachineState *machine) static void pc_compat_1_6(MachineState *machine) { pc_compat_1_7(machine); - has_pci_info = false; rom_file_has_mr = false; } diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 84ba9af..37d91b2 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -54,6 +54,7 @@ struct PCMachineClass { bool smbios_legacy_mode; bool smbios_defaults; bool has_acpi_build; + bool has_pci_info; }; typedef struct PCMachineState PCMachineState; -- 1.9.0