[PATCH] KVM: Qemu: Build fix for kvm/ia64

[PATCH] KVM: Qemu: Build fix for kvm/ia64

[Zhang, Xiantao]

[-- Attachment #1: Type: text/plain, Size: 1430 bytes --]

>From a9f479197f0a0efa45a930309fad03fd690cba60 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Thu, 8 May 2008 10:16:05 +0800
Subject: [PATCH] KVM: Qemu : IA-64 build fix.

Remove unexisting header inclusion, and set correct phys_ram_size
for ipf machine.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 qemu/hw/ipf.c              |    4 +++-
 qemu/target-ia64/machine.c |    1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/qemu/hw/ipf.c b/qemu/hw/ipf.c
index a84e343..54eaca0 100644
--- a/qemu/hw/ipf.c
+++ b/qemu/hw/ipf.c
@@ -535,7 +535,8 @@ static void ipf_init1(ram_addr_t ram_size, int
vga_ram_size,
 
     for(i = 0; i < MAX_SERIAL_PORTS; i++) {
         if (serial_hds[i]) {
-            serial_init(serial_io[i], i8259[serial_irq[i]],
serial_hds[i]);
+            serial_init(serial_io[i], i8259[serial_irq[i]], 115200, 
+					serial_hds[i]);
         }
     }
 
@@ -669,4 +670,5 @@ QEMUMachine ipf_machine = {
     "itanium",
     "Itanium Platform",
     ipf_init_pci,
+    VGA_RAM_SIZE + VGA_RAM_SIZE,
 };
diff --git a/qemu/target-ia64/machine.c b/qemu/target-ia64/machine.c
index ba06d7b..4dc5d5e 100644
--- a/qemu/target-ia64/machine.c
+++ b/qemu/target-ia64/machine.c
@@ -1,6 +1,5 @@
 #include "hw/hw.h"
 #include "hw/boards.h"
-#include "hw/ipf.h"
 
 #include "exec-all.h"
 #include "qemu-kvm.h"
-- 
1.5.2

[-- Attachment #2: 0001-KVM-Qemu-IA-64-build-fix.patch --]
[-- Type: application/octet-stream, Size: 1382 bytes --]

From a9f479197f0a0efa45a930309fad03fd690cba60 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Thu, 8 May 2008 10:16:05 +0800
Subject: [PATCH] KVM: Qemu : IA-64 build fix.

Remove unexisting header inclusion, and set correct phys_ram_size
for ipf machine.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 qemu/hw/ipf.c              |    4 +++-
 qemu/target-ia64/machine.c |    1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/qemu/hw/ipf.c b/qemu/hw/ipf.c
index a84e343..54eaca0 100644
--- a/qemu/hw/ipf.c
+++ b/qemu/hw/ipf.c
@@ -535,7 +535,8 @@ static void ipf_init1(ram_addr_t ram_size, int vga_ram_size,
 
     for(i = 0; i < MAX_SERIAL_PORTS; i++) {
         if (serial_hds[i]) {
-            serial_init(serial_io[i], i8259[serial_irq[i]], serial_hds[i]);
+            serial_init(serial_io[i], i8259[serial_irq[i]], 115200, 
+					serial_hds[i]);
         }
     }
 
@@ -669,4 +670,5 @@ QEMUMachine ipf_machine = {
     "itanium",
     "Itanium Platform",
     ipf_init_pci,
+    VGA_RAM_SIZE + VGA_RAM_SIZE,
 };
diff --git a/qemu/target-ia64/machine.c b/qemu/target-ia64/machine.c
index ba06d7b..4dc5d5e 100644
--- a/qemu/target-ia64/machine.c
+++ b/qemu/target-ia64/machine.c
@@ -1,6 +1,5 @@
 #include "hw/hw.h"
 #include "hw/boards.h"
-#include "hw/ipf.h"
 
 #include "exec-all.h"
 #include "qemu-kvm.h"
-- 
1.5.2


[-- Attachment #3: Type: text/plain, Size: 320 bytes --]

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone

[-- Attachment #4: Type: text/plain, Size: 158 bytes --]

_______________________________________________
kvm-devel mailing list
kvm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-devel

Re: [kvm-ia64-devel] [PATCH] KVM: Qemu: Build fix for kvm/ia64

[Zhang, Xiantao]

[-- Attachment #1: Type: text/plain, Size: 1503 bytes --]

Avi, 
	Please drop the previous one due to a wrong attachment. 
Xiantao

>From a9f479197f0a0efa45a930309fad03fd690cba60 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Thu, 8 May 2008 10:16:05 +0800
Subject: [PATCH] KVM: Qemu : IA-64 build fix.

Remove unexisting header inclusion, and set correct phys_ram_size
for ipf machine.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 qemu/hw/ipf.c              |    4 +++-
 qemu/target-ia64/machine.c |    1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/qemu/hw/ipf.c b/qemu/hw/ipf.c
index a84e343..54eaca0 100644
--- a/qemu/hw/ipf.c
+++ b/qemu/hw/ipf.c
@@ -535,7 +535,8 @@ static void ipf_init1(ram_addr_t ram_size, int
vga_ram_size,
 
     for(i = 0; i < MAX_SERIAL_PORTS; i++) {
         if (serial_hds[i]) {
-            serial_init(serial_io[i], i8259[serial_irq[i]],
serial_hds[i]);
+            serial_init(serial_io[i], i8259[serial_irq[i]], 115200, 
+					serial_hds[i]);
         }
     }
 
@@ -669,4 +670,5 @@ QEMUMachine ipf_machine = {
     "itanium",
     "Itanium Platform",
     ipf_init_pci,
+    VGA_RAM_SIZE + GFW_SIZE,
 };
diff --git a/qemu/target-ia64/machine.c b/qemu/target-ia64/machine.c
index ba06d7b..4dc5d5e 100644
--- a/qemu/target-ia64/machine.c
+++ b/qemu/target-ia64/machine.c
@@ -1,6 +1,5 @@
 #include "hw/hw.h"
 #include "hw/boards.h"
-#include "hw/ipf.h"
 
 #include "exec-all.h"
 #include "qemu-kvm.h"
-- 
1.5.2

[-- Attachment #2: 0001-KVM-Qemu-IA-64-build-fix.patch --]
[-- Type: application/octet-stream, Size: 1425 bytes --]

From a9f479197f0a0efa45a930309fad03fd690cba60 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Thu, 8 May 2008 10:16:05 +0800
Subject: [PATCH] KVM: Qemu : IA-64 build fix.

Remove unexisting header inclusion, and set correct phys_ram_size
for ipf machine.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 qemu/hw/ipf.c              |    4 +++-
 qemu/target-ia64/machine.c |    1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/qemu/hw/ipf.c b/qemu/hw/ipf.c
index a84e343..54eaca0 100644
--- a/qemu/hw/ipf.c
+++ b/qemu/hw/ipf.c
@@ -535,7 +535,8 @@ static void ipf_init1(ram_addr_t ram_size, int vga_ram_size,
 
     for(i = 0; i < MAX_SERIAL_PORTS; i++) {
         if (serial_hds[i]) {
-            serial_init(serial_io[i], i8259[serial_irq[i]], serial_hds[i]);
+            serial_init(serial_io[i], i8259[serial_irq[i]], 115200, 
+					serial_hds[i]);
         }
     }
 
@@ -669,4 +670,5 @@ QEMUMachine ipf_machine = {
     "itanium",
     "Itanium Platform",
     ipf_init_pci,
+    VGA_RAM_SIZE + GFW_SIZE,
 };
diff --git a/qemu/target-ia64/machine.c b/qemu/target-ia64/machine.c
index ba06d7b..4dc5d5e 100644
--- a/qemu/target-ia64/machine.c
+++ b/qemu/target-ia64/machine.c
@@ -1,6 +1,5 @@
 #include "hw/hw.h"
 #include "hw/boards.h"
-#include "hw/ipf.h"
 
 #include "exec-all.h"
 #include "qemu-kvm.h"
-- 
1.5.2


[-- Attachment #3: Type: text/plain, Size: 320 bytes --]

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone

[-- Attachment #4: Type: text/plain, Size: 158 bytes --]

_______________________________________________
kvm-devel mailing list
kvm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-devel

Re: [kvm-ia64-devel] [PATCH] KVM: Qemu: Build fix for kvm/ia64

[Avi Kivity]

Zhang, Xiantao wrote:
> Avi, 
> 	Please drop the previous one due to a wrong attachment. 
> Xiantao
>
> From a9f479197f0a0efa45a930309fad03fd690cba60 Mon Sep 17 00:00:00 2001
> From: Xiantao Zhang <xiantao.zhang@intel.com>
> Date: Thu, 8 May 2008 10:16:05 +0800
> Subject: [PATCH] KVM: Qemu : IA-64 build fix.
>
> Remove unexisting header inclusion, and set correct phys_ram_size
> for ipf machine.
>   

Patch doesn't apply.  Can you recheck?


-- 
Do not meddle in the internals of kernels, for they are subtle and quick to panic.


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone

Re: [kvm-ia64-devel] [PATCH] KVM: Qemu: Build fix for kvm/ia64

[Zhang, Xiantao]

[-- Attachment #1: Type: text/plain, Size: 1445 bytes --]

 Could you help to try the attached one. 
Xiantao

-----Original Message-----
From: kvm-ia64-devel-bounces@lists.sourceforge.net [mailto:kvm-ia64-devel-bounces@lists.sourceforge.net] On Behalf Of Avi Kivity
Sent: 2008年5月9日 23:56
To: Zhang, Xiantao
Cc: kvm-devel@lists.sourceforge.net; kvm-ia64-devel@lists.sourceforge.net
Subject: Re: [kvm-ia64-devel] [PATCH] KVM: Qemu: Build fix for kvm/ia64

Zhang, Xiantao wrote:
> Avi, 
> 	Please drop the previous one due to a wrong attachment. 
> Xiantao
>
> From a9f479197f0a0efa45a930309fad03fd690cba60 Mon Sep 17 00:00:00 2001
> From: Xiantao Zhang <xiantao.zhang@intel.com>
> Date: Thu, 8 May 2008 10:16:05 +0800
> Subject: [PATCH] KVM: Qemu : IA-64 build fix.
>
> Remove unexisting header inclusion, and set correct phys_ram_size
> for ipf machine.
>   

Patch doesn't apply.  Can you recheck?


-- 
Do not meddle in the internals of kernels, for they are subtle and quick to panic.


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
kvm-ia64-devel mailing list
kvm-ia64-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-ia64-devel

[-- Attachment #2: 0001-KVM-Qemu-IA-64-build-fix.patch --]
[-- Type: application/octet-stream, Size: 1382 bytes --]

From a9f479197f0a0efa45a930309fad03fd690cba60 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Thu, 8 May 2008 10:16:05 +0800
Subject: [PATCH] KVM: Qemu : IA-64 build fix.

Remove unexisting header inclusion, and set correct phys_ram_size
for ipf machine.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 qemu/hw/ipf.c              |    4 +++-
 qemu/target-ia64/machine.c |    1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/qemu/hw/ipf.c b/qemu/hw/ipf.c
index a84e343..54eaca0 100644
--- a/qemu/hw/ipf.c
+++ b/qemu/hw/ipf.c
@@ -535,7 +535,8 @@ static void ipf_init1(ram_addr_t ram_size, int vga_ram_size,
 
     for(i = 0; i < MAX_SERIAL_PORTS; i++) {
         if (serial_hds[i]) {
-            serial_init(serial_io[i], i8259[serial_irq[i]], serial_hds[i]);
+            serial_init(serial_io[i], i8259[serial_irq[i]], 115200, 
+					serial_hds[i]);
         }
     }
 
@@ -669,4 +670,5 @@ QEMUMachine ipf_machine = {
     "itanium",
     "Itanium Platform",
     ipf_init_pci,
+    VGA_RAM_SIZE + VGA_RAM_SIZE,
 };
diff --git a/qemu/target-ia64/machine.c b/qemu/target-ia64/machine.c
index ba06d7b..4dc5d5e 100644
--- a/qemu/target-ia64/machine.c
+++ b/qemu/target-ia64/machine.c
@@ -1,6 +1,5 @@
 #include "hw/hw.h"
 #include "hw/boards.h"
-#include "hw/ipf.h"
 
 #include "exec-all.h"
 #include "qemu-kvm.h"
-- 
1.5.2


[-- Attachment #3: Type: text/plain, Size: 320 bytes --]

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone

[-- Attachment #4: Type: text/plain, Size: 158 bytes --]

_______________________________________________
kvm-devel mailing list
kvm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-devel

Re: [kvm-ia64-devel] [PATCH] KVM: Qemu: Build fix for kvm/ia64

[Avi Kivity]

Zhang, Xiantao wrote:
>  Could you help to try the attached one. 
>   

Sure, applied, thanks.

-- 
error compiling committee.c: too many arguments to function


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone