From patchwork Tue Feb 17 01:50:28 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Xiantao" X-Patchwork-Id: 7533 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 n1H1oavP008582 for ; Tue, 17 Feb 2009 01:50:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751518AbZBQBud (ORCPT ); Mon, 16 Feb 2009 20:50:33 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751536AbZBQBud (ORCPT ); Mon, 16 Feb 2009 20:50:33 -0500 Received: from mga11.intel.com ([192.55.52.93]:37896 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751516AbZBQBuc convert rfc822-to-8bit (ORCPT ); Mon, 16 Feb 2009 20:50:32 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 16 Feb 2009 17:48:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.38,219,1233561600"; d="scan'208";a="431476737" Received: from azsmsx602.amr.corp.intel.com ([10.2.121.201]) by fmsmga002.fm.intel.com with ESMTP; 16 Feb 2009 17:46:33 -0800 Received: from pdsmsx602.ccr.corp.intel.com (172.16.12.184) by azsmsx602.amr.corp.intel.com (10.2.121.201) with Microsoft SMTP Server (TLS) id 8.1.311.2; Mon, 16 Feb 2009 18:50:31 -0700 Received: from pdsmsx503.ccr.corp.intel.com ([172.16.12.95]) by pdsmsx602.ccr.corp.intel.com ([172.16.12.184]) with mapi; Tue, 17 Feb 2009 09:50:30 +0800 From: "Zhang, Xiantao" To: "Zhang, Yang" , "kvm-ia64@vger.kernel.org" CC: "kvm@vger.kernel.org" , Avi Kivity Date: Tue, 17 Feb 2009 09:50:28 +0800 Subject: RE: [PATCH]remove some redundant args for ipf Thread-Topic: [PATCH]remove some redundant args for ipf Thread-Index: AcmQEPVbRiBfMvqNShiy8OrcEcfEyQAkRCJA Message-ID: <706158FABBBA044BAD4FE898A02E4BC2241A3460@pdsmsx503.ccr.corp.intel.com> References: <10C63FAD690C13458F0B32BCED571F1406BAB7EB@pdsmsx502.ccr.corp.intel.com> In-Reply-To: <10C63FAD690C13458F0B32BCED571F1406BAB7EB@pdsmsx502.ccr.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: 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 Avi, Please help to check-in this patch, and it breaks ia64's build. Xiantao -----Original Message----- From: Zhang, Yang Sent: Monday, February 16, 2009 4:31 PM To: kvm-ia64@vger.kernel.org Cc: kvm@vger.kernel.org; Avi Kivity; Zhang, Xiantao Subject: [PATCH]remove some redundant args for ipf 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);