From patchwork Wed Oct 24 17:49:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 193923 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0A7D12C008B for ; Thu, 25 Oct 2012 06:18:58 +1100 (EST) Received: from localhost ([::1]:40448 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR5B9-00075E-DV for incoming@patchwork.ozlabs.org; Wed, 24 Oct 2012 13:55:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR5A7-0004Zf-Vc for qemu-devel@nongnu.org; Wed, 24 Oct 2012 13:54:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TR5A4-00055F-Ad for qemu-devel@nongnu.org; Wed, 24 Oct 2012 13:54:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41954) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR5A4-00054n-1W for qemu-devel@nongnu.org; Wed, 24 Oct 2012 13:54:36 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9OHsYOF030774 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 24 Oct 2012 13:54:35 -0400 Received: from blackpad.lan.raisama.net (vpn1-4-109.gru2.redhat.com [10.97.4.109]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q9OHmcO5010760; Wed, 24 Oct 2012 13:48:38 -0400 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id AB0AC2033D5; Wed, 24 Oct 2012 15:50:08 -0200 (BRST) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Wed, 24 Oct 2012 15:49:44 -0200 Message-Id: <1351101001-14589-11-git-send-email-ehabkost@redhat.com> In-Reply-To: <1351101001-14589-1-git-send-email-ehabkost@redhat.com> References: <1351101001-14589-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paolo Bonzini Subject: [Qemu-devel] [PATCH 10/27] pc: create PCInitArgs struct X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Instead of changing pc_init1() arguments every time some additional machine-type-specific behavior has to be introduced, create a struct that will carry all the information needed by the PC initialization functions. Signed-off-by: Eduardo Habkost --- hw/pc.h | 8 ++++++++ hw/pc_piix.c | 41 ++++++++++++++++++++++++++++------------- 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/hw/pc.h b/hw/pc.h index e7993ca..04051ca 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -9,6 +9,7 @@ #include "net.h" #include "memory.h" #include "ioapic.h" +#include "boards.h" /* PC-style peripherals (also used by other machines). */ @@ -75,6 +76,13 @@ void i8042_setup_a20_line(ISADevice *dev, qemu_irq *a20_out); /* pc.c */ extern int fd_bootchk; +/* Initialization parameters for the PC init functions */ +typedef struct PCInitArgs { + QEMUMachineInitArgs *qemu_args; + bool pci_enabled; + bool kvmclock_enabled; +} PCInitArgs; + void pc_register_ferr_irq(qemu_irq irq); void pc_acpi_smi_interrupt(void *opaque, int irq, int level); diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 3eaed60..058fd43 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -118,9 +118,7 @@ static void ioapic_init(GSIState *gsi_state) } /* PC hardware initialisation */ -static void pc_init1(QEMUMachineInitArgs *args, - int pci_enabled, - int kvmclock_enabled) +static void pc_init1(PCInitArgs *pc_args) { int i; ram_addr_t below_4g_mem_size, above_4g_mem_size; @@ -143,16 +141,18 @@ static void pc_init1(QEMUMachineInitArgs *args, MemoryRegion *system_memory = get_system_memory(); MemoryRegion *system_io = get_system_io(); void *fw_cfg = NULL; - ram_addr_t ram_size = args->ram_size; - const char *cpu_model = args->cpu_model; - const char *kernel_filename = args->kernel_filename; - const char *kernel_cmdline = args->kernel_cmdline; - const char *initrd_filename = args->initrd_filename; - const char *boot_device = args->boot_device; + QEMUMachineInitArgs *qemu_args = pc_args->qemu_args; + ram_addr_t ram_size = qemu_args->ram_size; + const char *cpu_model = qemu_args->cpu_model; + const char *kernel_filename = qemu_args->kernel_filename; + const char *kernel_cmdline = qemu_args->kernel_cmdline; + const char *initrd_filename = qemu_args->initrd_filename; + const char *boot_device = qemu_args->boot_device; + bool pci_enabled = pc_args->pci_enabled; pc_cpus_init(cpu_model); - if (kvmclock_enabled) { + if (pc_args->kvmclock_enabled) { kvmclock_create(); } @@ -290,19 +290,34 @@ static void pc_init1(QEMUMachineInitArgs *args, static void pc_init_pci(QEMUMachineInitArgs *args) { - pc_init1(args, 1, 1); + PCInitArgs pc_args = { + .qemu_args = args, + .pci_enabled = true, + .kvmclock_enabled = true, + }; + pc_init1(&pc_args); } static void pc_init_pci_no_kvmclock(QEMUMachineInitArgs *args) { - pc_init1(args, 1, 0); + PCInitArgs pc_args = { + .qemu_args = args, + .pci_enabled = true, + .kvmclock_enabled = false, + }; + pc_init1(&pc_args); } static void pc_init_isa(QEMUMachineInitArgs *args) { + PCInitArgs pc_args = { + .qemu_args = args, + .pci_enabled = false, + .kvmclock_enabled = false, + }; if (args->cpu_model == NULL) args->cpu_model = "486"; - pc_init1(args, 0, 1); + pc_init1(&pc_args); } #ifdef CONFIG_XEN