More complication and #include fixes.

Including some more ia64-specific stuff copies from xen-unstable
tip 17737:c93a913c221f

diff --git a/hw/xen_console.c b/hw/xen_console.c
index fbd33f07fc9b751ac48282361b0f2b9f0e8a63ff..14c2c8794e9b7bf36d938383d7b7df5897cd5272 100644 (file)
--- a/hw/xen_console.c
+++ b/hw/xen_console.c
@@ -20,6 +20,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "hw.h"
+#include "sysemu.h"
+#include "exec-all.h"
+#include "qemu-char.h"
+
 #include <malloc.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -34,8 +39,6 @@
 #include <xen/io/console.h>
 #include <xenctrl.h>
 
-#include "vl.h"
-
 #include "xen_console.h"
 
 #define dolog(val, fmt, ...) fprintf(stderr, fmt "\n", ## __VA_ARGS__)

diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c
index 35335c54bdf77cfab4b10351854690176a137fc3..0fec0aaeb63f1e939c00c2cab7ef66bf8cd43446 100644 (file)
--- a/hw/xen_machine_pv.c
+++ b/hw/xen_machine_pv.c
@@ -25,6 +25,8 @@
 #include "hw.h"
 #include "xen_console.h"
 #include "xenfb.h"
+#include "sysemu.h"
+#include "boards.h"
 
 extern void init_blktap(void);
 
@@ -33,12 +35,12 @@ extern void init_blktap(void);
  *   - a virtual framebuffer
  *   - ....
  */
-static void xen_init_pv(uint64_t ram_size, int vga_ram_size, char *boot_device,
-                       DisplayState *ds, const char **fd_filename,
-                       int snapshot,
+static void xen_init_pv(ram_addr_t ram_size, int vga_ram_size,
+                       const char *boot_device, DisplayState *ds,
                        const char *kernel_filename,
                        const char *kernel_cmdline,
                        const char *initrd_filename,
+                       const char *cpu_model,
                        const char *direct_pci)
 {
     struct xenfb *xenfb;

diff --git a/hw/xenfb.c b/hw/xenfb.c
index d1f34c4562dd50f9cacaeb7f0b72fe72a7c21a95..5a42ba32be673cc51ddd1b4f2979e8be6afd4133 100644 (file)
--- a/hw/xenfb.c
+++ b/hw/xenfb.c
@@ -1,3 +1,5 @@
+#include "hw.h"
+
 #include <stdarg.h>
 #include <stdlib.h>
 #include <sys/types.h>

diff --git a/i386-dm/helper2.c b/i386-dm/helper2.c
index b6d6a8db32ad48cf94676c59d023c825ddc9ebec..491b94a89ba9a749eb032d368e87663e2b4c3bb6 100644 (file)
--- a/i386-dm/helper2.c
+++ b/i386-dm/helper2.c
@@ -67,7 +67,7 @@ _syscall3(int, modify_ldt, int, func, void *, ptr, unsigned long, bytecount)
 #endif
 #endif /* USE_CODE_COPY */
 
-#include "vl.h"
+#include "hw.h"
 
 int domid = -1;
 int vcpus = 1;
@@ -95,7 +95,7 @@ int send_vcpu = 0;
 #define NR_CPUS 32
 evtchn_port_t ioreq_local_port[NR_CPUS];
 
-CPUX86State *cpu_x86_init(void)
+CPUX86State *cpu_x86_init(const char *cpu_model)
 {
     CPUX86State *env;
     static int inited;

diff --git a/qemu-xen.h b/qemu-xen.h
index aff4a417d9830e6795800cd8c4049de933f0bb3a..428d4b2cf7fe3b253d3705d2a2ebedf2b0f49eba 100644 (file)
--- a/qemu-xen.h
+++ b/qemu-xen.h
@@ -23,4 +23,15 @@ void timeoffset_get(void);
 void pci_xen_platform_init(PCIBus *bus);
 #endif
 
+#ifdef __ia64__
+static inline void xc_domain_shutdown_hook(int xc_handle, uint32_t domid)
+{
+        xc_ia64_save_to_nvram(xc_handle, domid);
+}
+void handle_buffered_pio(void);
+#else
+#define xc_domain_shutdown_hook(xc_handle, domid)       do {} while (0)
+#define handle_buffered_pio()                           do {} while (0)
+#endif
+
 #endif /*QEMU_XEN_H*/