From mboxrd@z Thu Jan  1 00:00:00 1970
From: Anthony Liguori <anthony@codemonkey.ws>
Subject: Re: [Qemu-devel] [PATCH 19/23] pc: move global memory map out of
 pc_init1() and into its callers
Date: Mon, 25 Jul 2011 15:02:41 -0500
Message-ID: <4E2DCBE1.8030209@codemonkey.ws>
References: <1311602584-23409-1-git-send-email-avi@redhat.com> <1311602584-23409-20-git-send-email-avi@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org
To: Avi Kivity <avi@redhat.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mail-yx0-f174.google.com ([209.85.213.174]:34308 "EHLO
	mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751214Ab1GYUCo (ORCPT <rfc822;kvm@vger.kernel.org>);
	Mon, 25 Jul 2011 16:02:44 -0400
Received: by yxi11 with SMTP id 11so2474747yxi.19
        for <kvm@vger.kernel.org>; Mon, 25 Jul 2011 13:02:43 -0700 (PDT)
In-Reply-To: <1311602584-23409-20-git-send-email-avi@redhat.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

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);
>   }