|
From: Zhang, X. <xia...@in...> - 2008-05-08 02:55:47
|
Avi,
Please drop the previous one due to a wrong attachment.
Xiantao
>From a9f479197f0a0efa45a930309fad03fd690cba60 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xia...@in...>
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 <xia...@in...>
---
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
|