Ia64 build fix

Remove unexisting header inclusion, and set correct phys_ram_size
for ipf machine.

Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>

2 files changed, 3 insertions, 2 deletions

diff --git a/hw/ipf.c b/hw/ipf.c
index a84e34330..b11e328ac 100644
--- a/hw/ipf.c
+++ b/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/target-ia64/machine.c b/target-ia64/machine.c
index ba06d7bb3..4dc5d5e12 100644
--- a/target-ia64/machine.c
+++ b/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"