From patchwork Mon Aug 26 16:43:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 269941 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 161BB2C0097 for ; Tue, 27 Aug 2013 02:46:33 +1000 (EST) Received: from localhost ([::1]:52262 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VDzvy-0008UK-U3 for incoming@patchwork.ozlabs.org; Mon, 26 Aug 2013 12:46:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54275) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VDzrR-00018z-Lj for qemu-devel@nongnu.org; Mon, 26 Aug 2013 12:41:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VDzrL-0003OP-M8 for qemu-devel@nongnu.org; Mon, 26 Aug 2013 12:41:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57410) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VDzrL-0003OJ-DD for qemu-devel@nongnu.org; Mon, 26 Aug 2013 12:41:43 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7QGffN8019512 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 26 Aug 2013 12:41:42 -0400 Received: from redhat.com (vpn1-5-108.ams2.redhat.com [10.36.5.108]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id r7QGfeCi008372; Mon, 26 Aug 2013 12:41:40 -0400 Date: Mon, 26 Aug 2013 19:43:39 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1377535318-30491-14-git-send-email-mst@redhat.com> References: <1377535318-30491-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1377535318-30491-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Eduardo Habkost , Anthony Liguori Subject: [Qemu-devel] [PULL 13/14] pc_piix: Kill pc_init1() memory region args 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 From: Eduardo Habkost 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 Signed-off-by: Michael S. Tsirkin --- hw/i386/pc_piix.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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