Patchwork [PULL,13/14] pc_piix: Kill pc_init1() memory region args

login
register
mail settings
Submitter Michael S. Tsirkin
Date Aug. 26, 2013, 4:43 p.m.
Message ID <1377535318-30491-14-git-send-email-mst@redhat.com>
Download mbox | patch
Permalink /patch/269941/
State New
Headers show

Comments

Michael S. Tsirkin - Aug. 26, 2013, 4:43 p.m.
From: Eduardo Habkost <ehabkost@redhat.com>

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>
---
 hw/i386/pc_piix.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Patch

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index d3d4893..3c36a2a 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