From: "Zhang, Yang" <yang.zhang@intel.com>
To: "kvm-ia64@vger.kernel.org" <kvm-ia64@vger.kernel.org>
Cc: "kvm@vger.kernel.org" <kvm@vger.kernel.org>,
Avi Kivity <avi@redhat.com>,
"Zhang, Xiantao" <xiantao.zhang@intel.com>
Subject: [PATCH]remove some redundant args for ipf
Date: Mon, 16 Feb 2009 16:31:26 +0800 [thread overview]
Message-ID: <10C63FAD690C13458F0B32BCED571F1406BAB7EB@pdsmsx502.ccr.corp.intel.com> (raw)
[-- 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
WARNING: multiple messages have this Message-ID (diff)
From: "Zhang, Yang" <yang.zhang@intel.com>
To: kvm-ia64@vger.kernel.org
Subject: [PATCH]remove some redundant args for ipf
Date: Mon, 16 Feb 2009 08:31:26 +0000 [thread overview]
Message-ID: <10C63FAD690C13458F0B32BCED571F1406BAB7EB@pdsmsx502.ccr.corp.intel.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 2386 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
next reply other threads:[~2009-02-16 8:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-16 8:31 Zhang, Yang [this message]
2009-02-16 8:31 ` [PATCH]remove some redundant args for ipf Zhang, Yang
2009-02-17 1:50 ` Zhang, Xiantao
2009-02-17 1:50 ` Zhang, Xiantao
2009-02-24 10:12 ` Avi Kivity
2009-02-24 10:12 ` Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=10C63FAD690C13458F0B32BCED571F1406BAB7EB@pdsmsx502.ccr.corp.intel.com \
--to=yang.zhang@intel.com \
--cc=avi@redhat.com \
--cc=kvm-ia64@vger.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=xiantao.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.