summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2013-08-21 15:14:45 -0300
committerMichael S. Tsirkin <mst@redhat.com>2013-08-21 23:30:22 +0300
commit1e0995561959645e218bb5e4afb6ad3d47b33396 (patch)
tree180a36b39447d13623c56c51235a15e03844dafb /hw
parent396f79f45ea75bd1c421522f29b4f91d490df7cc (diff)
downloadqemu-1e0995561959645e218bb5e4afb6ad3d47b33396.tar.gz
qemu-1e0995561959645e218bb5e4afb6ad3d47b33396.tar.bz2
qemu-1e0995561959645e218bb5e4afb6ad3d47b33396.zip
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: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/i386/pc_piix.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index d3d48934ca..3c36a2a1c3 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -62,11 +62,11 @@ static bool has_pci_info = true;
/* PC hardware initialisation */
static void pc_init1(QEMUMachineInitArgs *args,
- MemoryRegion *system_memory,
- MemoryRegion *system_io,
int pci_enabled,
int kvmclock_enabled)
{
+ MemoryRegion *system_memory = get_system_memory();
+ MemoryRegion *system_io = get_system_io();
int i;
ram_addr_t below_4g_mem_size, above_4g_mem_size;
PCIBus *pci_bus;
@@ -233,7 +233,7 @@ static void pc_init1(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)
@@ -306,7 +306,7 @@ static void pc_init_pci_no_kvmclock(QEMUMachineInitArgs *args)
has_pci_info = false;
disable_kvm_pv_eoi();
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)
@@ -317,7 +317,7 @@ static void pc_init_isa(QEMUMachineInitArgs *args)
}
disable_kvm_pv_eoi();
enable_compat_apic_id_mode();
- pc_init1(args, get_system_memory(), get_system_io(), 0, 1);
+ pc_init1(args, 0, 1);
}
#ifdef CONFIG_XEN