From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:52534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlfmX-0000ny-2m for qemu-devel@nongnu.org; Tue, 26 Jul 2011 07:26:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QlfmP-0008Hh-Sj for qemu-devel@nongnu.org; Tue, 26 Jul 2011 07:26:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54919) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlfmP-0008Gi-It for qemu-devel@nongnu.org; Tue, 26 Jul 2011 07:26:29 -0400 From: Avi Kivity Date: Tue, 26 Jul 2011 14:26:18 +0300 Message-Id: <1311679582-11211-20-git-send-email-avi@redhat.com> In-Reply-To: <1311679582-11211-1-git-send-email-avi@redhat.com> References: <1311679582-11211-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH v2 19/23] pc: move global memory map out of pc_init1() and into its callers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori , qemu-devel@nongnu.org Cc: kvm@vger.kernel.org Signed-off-by: Avi Kivity --- 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); } -- 1.7.5.3