From: Xiantao Zhang <[EMAIL PROTECTED]>
Remove unexisting header inclusion, and set correct phys_ram_size
for ipf machine.
Signed-off-by: Xiantao Zhang <[EMAIL PROTECTED]>
Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>
diff --git a/qemu/hw/ipf.c b/qemu/hw/ipf.c
index a84e343..b11e328 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"
-------------------------------------------------------------------------
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-commits mailing list
kvm-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-commits
