From patchwork Mon Feb 16 08:31:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Yang" X-Patchwork-Id: 7432 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n1G8X1DN004750 for ; Mon, 16 Feb 2009 08:33:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753253AbZBPIc7 (ORCPT ); Mon, 16 Feb 2009 03:32:59 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753791AbZBPIc7 (ORCPT ); Mon, 16 Feb 2009 03:32:59 -0500 Received: from mga02.intel.com ([134.134.136.20]:11095 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753076AbZBPIc6 (ORCPT ); Mon, 16 Feb 2009 03:32:58 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 16 Feb 2009 00:28:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.38,215,1233561600"; d="scan'208,223";a="387130958" Received: from unknown (HELO azsmsx001.amr.corp.intel.com) ([10.2.167.98]) by orsmga002.jf.intel.com with ESMTP; 16 Feb 2009 00:41:41 -0800 Received: from pdsmsx602.ccr.corp.intel.com (172.16.12.184) by azsmsx001.amr.corp.intel.com (10.2.167.98) with Microsoft SMTP Server (TLS) id 8.1.311.2; Mon, 16 Feb 2009 01:32:30 -0700 Received: from pdsmsx502.ccr.corp.intel.com ([172.16.12.96]) by pdsmsx602.ccr.corp.intel.com ([172.16.12.184]) with mapi; Mon, 16 Feb 2009 16:32:28 +0800 From: "Zhang, Yang" To: "kvm-ia64@vger.kernel.org" CC: "kvm@vger.kernel.org" , Avi Kivity , "Zhang, Xiantao" Date: Mon, 16 Feb 2009 16:31:26 +0800 Subject: [PATCH]remove some redundant args for ipf Thread-Topic: [PATCH]remove some redundant args for ipf Thread-Index: AcmQEPVbRiBfMvqNShiy8OrcEcfEyQ== Message-ID: <10C63FAD690C13458F0B32BCED571F1406BAB7EB@pdsmsx502.ccr.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Hi This patch remove some redundant args in function pci_vga_init(),isa_vga_init(), rtc_init() in ipf.c Please review it yang From 2a7c4cdf02c992da36f25bfe62ab1e4b0d9e3e91 Mon Sep 17 00:00:00 2001 From: Yang Zhang Date: Mon, 16 Feb 2009 01:17:52 -0600 Subject: [PATCH] kvm : qemu: remove some redundant args of ipf remove redundant args of pci_vga_init(),isa_vga_init(), rtc_init() in ia64. Signed-off-by: Yang Zhang --- kernel/ia64/hack-module.awk | 1 + qemu/hw/ipf.c | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/kernel/ia64/hack-module.awk b/kernel/ia64/hack-module.awk index d0ef130..2e4e05f 100644 --- a/kernel/ia64/hack-module.awk +++ b/kernel/ia64/hack-module.awk @@ -20,6 +20,7 @@ BEGIN { split("INIT_WORK on_each_cpu smp_call_function " \ } /#include / { $0 = "" } +/#include / { $0 = "#include " } { sub(/linux\/mm_types\.h/, "linux/mm.h") } diff --git a/qemu/hw/ipf.c b/qemu/hw/ipf.c index a761d52..eb9aaec 100644 --- a/qemu/hw/ipf.c +++ b/qemu/hw/ipf.c @@ -514,23 +514,23 @@ static void ipf_init1(ram_addr_t ram_size, int vga_ram_size, if (cirrus_vga_enabled) { if (pci_enabled) { - pci_cirrus_vga_init(pci_bus, ds, phys_ram_base + vga_ram_addr, + pci_cirrus_vga_init(pci_bus, phys_ram_base + vga_ram_addr, vga_ram_addr, vga_ram_size); } else { - isa_cirrus_vga_init(ds, phys_ram_base + vga_ram_addr, + isa_cirrus_vga_init(phys_ram_base + vga_ram_addr, vga_ram_addr, vga_ram_size); } } else { if (pci_enabled) { - pci_vga_init(pci_bus, ds, phys_ram_base + vga_ram_addr, + pci_vga_init(pci_bus, phys_ram_base + vga_ram_addr, vga_ram_addr, vga_ram_size, 0, 0); } else { - isa_vga_init(ds, phys_ram_base + vga_ram_addr, + isa_vga_init(phys_ram_base + vga_ram_addr, vga_ram_addr, vga_ram_size); } } - rtc_state = rtc_init(0x70, i8259[8]); + rtc_state = rtc_init(0x70, i8259[8], 2000); if (pci_enabled) { pic_set_alt_irq_func(isa_pic, NULL, NULL);