Patchwork [19/23] pc: move global memory map out of pc_init1() and into its callers

login
register
mail settings
Submitter Avi Kivity
Date July 25, 2011, 2:03 p.m.
Message ID <1311602584-23409-20-git-send-email-avi@redhat.com>
Download mbox | patch
Permalink /patch/106692/
State New
Headers show

Comments

Avi Kivity - July 25, 2011, 2:03 p.m.
Signed-off-by: Avi Kivity <avi@redhat.com>
---
 hw/pc_piix.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)
Anthony Liguori - July 25, 2011, 8:02 p.m.
On 07/25/2011 09:03 AM, Avi Kivity wrote:
> Signed-off-by: Avi Kivity<avi@redhat.com>

What's the rationale here?

Regards,

Anthony Liguori

> ---
>   hw/pc_piix.c |   15 ++++++++-------
>   1 files changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/hw/pc_piix.c b/hw/pc_piix.c
> index d83854c..f2d0476 100644
> --- a/hw/pc_piix.c
> +++ b/hw/pc_piix.c
> @@ -68,7 +68,8 @@ static void ioapic_init(IsaIrqState *isa_irq_state)
>   }
>
>   /* PC hardware initialisation */
> -static void pc_init1(ram_addr_t ram_size,
> +static void pc_init1(MemoryRegion *system_memory,
> +                     ram_addr_t ram_size,
>                        const char *boot_device,
>                        const char *kernel_filename,
>                        const char *kernel_cmdline,
> @@ -91,9 +92,6 @@ static void pc_init1(ram_addr_t ram_size,
>       DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
>       BusState *idebus[MAX_IDE_BUS];
>       ISADevice *rtc_state;
> -    MemoryRegion *system_memory;
> -
> -    system_memory = get_system_memory();
>
>       pc_cpus_init(cpu_model);
>
> @@ -214,7 +212,8 @@ static void pc_init_pci(ram_addr_t ram_size,
>                           const char *initrd_filename,
>                           const char *cpu_model)
>   {
> -    pc_init1(ram_size, boot_device,
> +    pc_init1(get_system_memory(),
> +             ram_size, boot_device,
>                kernel_filename, kernel_cmdline,
>                initrd_filename, cpu_model, 1, 1);
>   }
> @@ -226,7 +225,8 @@ static void pc_init_pci_no_kvmclock(ram_addr_t ram_size,
>                                       const char *initrd_filename,
>                                       const char *cpu_model)
>   {
> -    pc_init1(ram_size, boot_device,
> +    pc_init1(get_system_memory(),
> +             ram_size, boot_device,
>                kernel_filename, kernel_cmdline,
>                initrd_filename, cpu_model, 1, 0);
>   }
> @@ -240,7 +240,8 @@ static void pc_init_isa(ram_addr_t ram_size,
>   {
>       if (cpu_model == NULL)
>           cpu_model = "486";
> -    pc_init1(ram_size, boot_device,
> +    pc_init1(get_system_memory(),
> +             ram_size, boot_device,
>                kernel_filename, kernel_cmdline,
>                initrd_filename, cpu_model, 0, 1);
>   }
Avi Kivity - July 26, 2011, 11:02 a.m.
On 07/25/2011 11:02 PM, Anthony Liguori wrote:
> On 07/25/2011 09:03 AM, Avi Kivity wrote:
>> Signed-off-by: Avi Kivity<avi@redhat.com>
>
> What's the rationale here?

Removing globals and making dependencies explicit.

Patch

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index d83854c..f2d0476 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -68,7 +68,8 @@  static void ioapic_init(IsaIrqState *isa_irq_state)
 }
 
 /* PC hardware initialisation */
-static void pc_init1(ram_addr_t ram_size,
+static void pc_init1(MemoryRegion *system_memory,
+                     ram_addr_t ram_size,
                      const char *boot_device,
                      const char *kernel_filename,
                      const char *kernel_cmdline,
@@ -91,9 +92,6 @@  static void pc_init1(ram_addr_t ram_size,
     DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
     BusState *idebus[MAX_IDE_BUS];
     ISADevice *rtc_state;
-    MemoryRegion *system_memory;
-
-    system_memory = get_system_memory();
 
     pc_cpus_init(cpu_model);
 
@@ -214,7 +212,8 @@  static void pc_init_pci(ram_addr_t ram_size,
                         const char *initrd_filename,
                         const char *cpu_model)
 {
-    pc_init1(ram_size, boot_device,
+    pc_init1(get_system_memory(),
+             ram_size, boot_device,
              kernel_filename, kernel_cmdline,
              initrd_filename, cpu_model, 1, 1);
 }
@@ -226,7 +225,8 @@  static void pc_init_pci_no_kvmclock(ram_addr_t ram_size,
                                     const char *initrd_filename,
                                     const char *cpu_model)
 {
-    pc_init1(ram_size, boot_device,
+    pc_init1(get_system_memory(),
+             ram_size, boot_device,
              kernel_filename, kernel_cmdline,
              initrd_filename, cpu_model, 1, 0);
 }
@@ -240,7 +240,8 @@  static void pc_init_isa(ram_addr_t ram_size,
 {
     if (cpu_model == NULL)
         cpu_model = "486";
-    pc_init1(ram_size, boot_device,
+    pc_init1(get_system_memory(),
+             ram_size, boot_device,
              kernel_filename, kernel_cmdline,
              initrd_filename, cpu_model, 0, 1);
 }