* [PATCH]remove some redundant args for ipf
@ 2009-02-16 8:31 Zhang, Yang
2009-02-17 1:50 ` Zhang, Xiantao
2009-02-24 10:12 ` Avi Kivity
0 siblings, 2 replies; 3+ messages in thread
From: Zhang, Yang @ 2009-02-16 8:31 UTC (permalink / raw)
To: kvm-ia64@vger.kernel.org; +Cc: kvm@vger.kernel.org, Avi Kivity, Zhang, Xiantao
[-- Attachment #1: Type: text/plain, Size: 2387 bytes --]
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 <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 <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 <linux\/compiler.h>/ { $0 = "" }
+/#include <linux\/types.h>/ { $0 = "#include <asm/types.h>" }
{ 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);
--
1.6.0.rc1
[-- Attachment #2: 0001-kvm-qemu-remove-some-redundant-args.patch --]
[-- Type: application/octet-stream, Size: 2186 bytes --]
From 2a7c4cdf02c992da36f25bfe62ab1e4b0d9e3e91 Mon Sep 17 00:00:00 2001
From: Yang Zhang <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 <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 <linux\/compiler.h>/ { $0 = "" }
+/#include <linux\/types.h>/ { $0 = "#include <asm/types.h>" }
{ 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);
--
1.6.0.rc1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCH]remove some redundant args for ipf
2009-02-16 8:31 [PATCH]remove some redundant args for ipf Zhang, Yang
@ 2009-02-17 1:50 ` Zhang, Xiantao
2009-02-24 10:12 ` Avi Kivity
1 sibling, 0 replies; 3+ messages in thread
From: Zhang, Xiantao @ 2009-02-17 1:50 UTC (permalink / raw)
To: Zhang, Yang, kvm-ia64@vger.kernel.org; +Cc: kvm@vger.kernel.org, Avi Kivity
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 <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 <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 <linux\/compiler.h>/ { $0 = "" }
+/#include <linux\/types.h>/ { $0 = "#include <asm/types.h>" }
{ 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);
--
1.6.0.rc1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH]remove some redundant args for ipf
2009-02-16 8:31 [PATCH]remove some redundant args for ipf Zhang, Yang
2009-02-17 1:50 ` Zhang, Xiantao
@ 2009-02-24 10:12 ` Avi Kivity
1 sibling, 0 replies; 3+ messages in thread
From: Avi Kivity @ 2009-02-24 10:12 UTC (permalink / raw)
To: Zhang, Yang; +Cc: kvm-ia64@vger.kernel.org, kvm@vger.kernel.org, Zhang, Xiantao
Zhang, Yang wrote:
> Hi
> This patch remove some redundant args in function pci_vga_init(),isa_vga_init(),
> rtc_init() in ipf.c
>
>
Applied, thanks.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-02-24 10:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-16 8:31 [PATCH]remove some redundant args for ipf Zhang, Yang
2009-02-17 1:50 ` Zhang, Xiantao
2009-02-24 10:12 ` Avi Kivity
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox