ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pc: Get rid of pci-info leftovers 

pc_fw_cfg_guest_info() never does anything, because has_pci_info is
always false.

Introduced in commit f8c457b "pc: pass PCI hole ranges to Guests",
disabled in commit 9604f70 "pc: disable pci-info for 1.6", and hasn't
been enabled since.  Obviously a dead end.  Get of it.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Markus Armbruster 2014-08-12 16:40:17 +02:00 committed by Michael S. Tsirkin
parent 9616c29045
commit 260cb1c409
4 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/i386/pc.c
View File

@ -1066,35 +1066,6 @@ typedef struct PcRomPciInfo {
uint64_t w64_max; uint64_t w64_max;
} PcRomPciInfo; } PcRomPciInfo;
static void pc_fw_cfg_guest_info(PcGuestInfo *guest_info)
{
PcRomPciInfo *info;
Object *pci_info;
bool ambiguous = false;
if (!guest_info->has_pci_info || !guest_info->fw_cfg) {
return;
}
pci_info = object_resolve_path_type("", TYPE_PCI_HOST_BRIDGE, &ambiguous);
g_assert(!ambiguous);
if (!pci_info) {
return;
}
info = g_malloc(sizeof *info);
info->w32_min = cpu_to_le64(object_property_get_int(pci_info,
PCI_HOST_PROP_PCI_HOLE_START, NULL));
info->w32_max = cpu_to_le64(object_property_get_int(pci_info,
PCI_HOST_PROP_PCI_HOLE_END, NULL));
info->w64_min = cpu_to_le64(object_property_get_int(pci_info,
PCI_HOST_PROP_PCI_HOLE64_START, NULL));
info->w64_max = cpu_to_le64(object_property_get_int(pci_info,
PCI_HOST_PROP_PCI_HOLE64_END, NULL));
/* Pass PCI hole info to guest via a side channel.
* Required so guest PCI enumeration does the right thing. */
fw_cfg_add_file(guest_info->fw_cfg, "etc/pci-info", info, sizeof *info);
}
typedef struct PcGuestInfoState { typedef struct PcGuestInfoState {
PcGuestInfo info; PcGuestInfo info;
Notifier machine_done; Notifier machine_done;
@ -1106,7 +1077,6 @@ void pc_guest_info_machine_done(Notifier *notifier, void *data)
PcGuestInfoState *guest_info_state = container_of(notifier, PcGuestInfoState *guest_info_state = container_of(notifier,
PcGuestInfoState, PcGuestInfoState,
machine_done); machine_done);
pc_fw_cfg_guest_info(&guest_info_state->info);
acpi_setup(&guest_info_state->info); acpi_setup(&guest_info_state->info);
} }

4
hw/i386/pc_piix.c
View File

@ -59,7 +59,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_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };
static const int ide_irq[MAX_IDE_BUS] = { 14, 15 }; static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
static bool has_pci_info;
static bool has_acpi_build = true; static bool has_acpi_build = true;
static int legacy_acpi_table_size; static int legacy_acpi_table_size;
static bool smbios_defaults = true; static bool smbios_defaults = true;
@ -166,7 +165,6 @@ static void pc_init1(MachineState *machine,
guest_info->has_acpi_build = has_acpi_build; guest_info->has_acpi_build = has_acpi_build;
guest_info->legacy_acpi_table_size = legacy_acpi_table_size; guest_info->legacy_acpi_table_size = legacy_acpi_table_size;
guest_info->has_pci_info = has_pci_info;
guest_info->isapc_ram_fw = !pci_enabled; guest_info->isapc_ram_fw = !pci_enabled;
guest_info->has_reserved_memory = has_reserved_memory; guest_info->has_reserved_memory = has_reserved_memory;
@ -340,7 +338,6 @@ static void pc_compat_1_7(MachineState *machine)
static void pc_compat_1_6(MachineState *machine) static void pc_compat_1_6(MachineState *machine)
{ {
pc_compat_1_7(machine); pc_compat_1_7(machine);
has_pci_info = false;
rom_file_has_mr = false; rom_file_has_mr = false;
has_acpi_build = false; has_acpi_build = false;
} }
@ -422,7 +419,6 @@ static void pc_init_pci_no_kvmclock(MachineState *machine)
static void pc_init_isa(MachineState *machine) static void pc_init_isa(MachineState *machine)
{ {
has_pci_info = false;
has_acpi_build = false; has_acpi_build = false;
smbios_defaults = false; smbios_defaults = false;
gigabyte_align = false; gigabyte_align = false;

3
hw/i386/pc_q35.c
View File

@ -49,7 +49,6 @@
/* ICH9 AHCI has 6 ports */ /* ICH9 AHCI has 6 ports */
#define MAX_SATA_PORTS 6 #define MAX_SATA_PORTS 6
static bool has_pci_info;
static bool has_acpi_build = true; static bool has_acpi_build = true;
static bool smbios_defaults = true; static bool smbios_defaults = true;
static bool smbios_legacy_mode; static bool smbios_legacy_mode;
@ -150,7 +149,6 @@ static void pc_q35_init(MachineState *machine)
} }
guest_info = pc_guest_info_init(below_4g_mem_size, above_4g_mem_size); guest_info = pc_guest_info_init(below_4g_mem_size, above_4g_mem_size);
guest_info->has_pci_info = has_pci_info;
guest_info->isapc_ram_fw = false; guest_info->isapc_ram_fw = false;
guest_info->has_acpi_build = has_acpi_build; guest_info->has_acpi_build = has_acpi_build;
guest_info->has_reserved_memory = has_reserved_memory; guest_info->has_reserved_memory = has_reserved_memory;
@ -296,7 +294,6 @@ static void pc_compat_1_7(MachineState *machine)
static void pc_compat_1_6(MachineState *machine) static void pc_compat_1_6(MachineState *machine)
{ {
pc_compat_1_7(machine); pc_compat_1_7(machine);
has_pci_info = false;
rom_file_has_mr = false; rom_file_has_mr = false;
has_acpi_build = false; has_acpi_build = false;
} }

1
include/hw/i386/pc.h
View File

@ -85,7 +85,6 @@ typedef struct PcPciInfo {
#define ACPI_PM_PROP_GPE0_BLK_LEN "gpe0_blk_len" #define ACPI_PM_PROP_GPE0_BLK_LEN "gpe0_blk_len"
struct PcGuestInfo { struct PcGuestInfo {
bool has_pci_info;
bool isapc_ram_fw; bool isapc_ram_fw;
hwaddr ram_size, ram_size_below_4g; hwaddr ram_size, ram_size_below_4g;
unsigned apic_id_limit; unsigned apic_id_limit;