提交 1e099556 编写于 作者: E Eduardo Habkost 提交者: Michael S. Tsirkin

pc_piix: Kill pc_init1() memory region args

All callers always use the same values (get_system_memory(),
get_system_io()), so the parameters are pointless.

If one day we decide to eliminate get_system_memory() and
get_system_io(), we will be able to do that more easily by adding the
values to struct QEMUMachineInitArgs.
Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
上级 396f79f4
...@@ -62,11 +62,11 @@ static bool has_pci_info = true; ...@@ -62,11 +62,11 @@ static bool has_pci_info = true;
/* PC hardware initialisation */ /* PC hardware initialisation */
static void pc_init1(QEMUMachineInitArgs *args, static void pc_init1(QEMUMachineInitArgs *args,
MemoryRegion *system_memory,
MemoryRegion *system_io,
int pci_enabled, int pci_enabled,
int kvmclock_enabled) int kvmclock_enabled)
{ {
MemoryRegion *system_memory = get_system_memory();
MemoryRegion *system_io = get_system_io();
int i; int i;
ram_addr_t below_4g_mem_size, above_4g_mem_size; ram_addr_t below_4g_mem_size, above_4g_mem_size;
PCIBus *pci_bus; PCIBus *pci_bus;
...@@ -233,7 +233,7 @@ static void pc_init1(QEMUMachineInitArgs *args, ...@@ -233,7 +233,7 @@ static void pc_init1(QEMUMachineInitArgs *args,
static void pc_init_pci(QEMUMachineInitArgs *args) static void pc_init_pci(QEMUMachineInitArgs *args)
{ {
pc_init1(args, get_system_memory(), get_system_io(), 1, 1); pc_init1(args, 1, 1);
} }
static void pc_compat_1_6(QEMUMachineInitArgs *args) static void pc_compat_1_6(QEMUMachineInitArgs *args)
...@@ -306,7 +306,7 @@ static void pc_init_pci_no_kvmclock(QEMUMachineInitArgs *args) ...@@ -306,7 +306,7 @@ static void pc_init_pci_no_kvmclock(QEMUMachineInitArgs *args)
has_pci_info = false; has_pci_info = false;
disable_kvm_pv_eoi(); disable_kvm_pv_eoi();
enable_compat_apic_id_mode(); enable_compat_apic_id_mode();
pc_init1(args, get_system_memory(), get_system_io(), 1, 0); pc_init1(args, 1, 0);
} }
static void pc_init_isa(QEMUMachineInitArgs *args) static void pc_init_isa(QEMUMachineInitArgs *args)
...@@ -317,7 +317,7 @@ static void pc_init_isa(QEMUMachineInitArgs *args) ...@@ -317,7 +317,7 @@ static void pc_init_isa(QEMUMachineInitArgs *args)
} }
disable_kvm_pv_eoi(); disable_kvm_pv_eoi();
enable_compat_apic_id_mode(); enable_compat_apic_id_mode();
pc_init1(args, get_system_memory(), get_system_io(), 0, 1); pc_init1(args, 0, 1);
} }
#ifdef CONFIG_XEN #ifdef CONFIG_XEN
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册