Header file and argument order fixups for xen_machine_{fv,pv}.c

Includes copying some declarations from vl.h in xen-unstable
from c/s 17737:c93a913c221f.

diff --git a/hw/xen_console.h b/hw/xen_console.h
index ece35776dfec62802fa1bf43964b3fb52e832331..bbea61047be954c5cc969b95860bfcf71bb24ff1 100644 (file)
--- a/hw/xen_console.h
+++ b/hw/xen_console.h
@@ -20,6 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "vl.h"
+#include "hw.h"
+#include "qemu-xen.h"
 
 extern int xencons_init(int domid, CharDriverState *chr);

diff --git a/hw/xen_machine_fv.c b/hw/xen_machine_fv.c
index 01a9c42e9d4780ebd6d84ff79acf4de2525580ea..b428d25525a412734964d4acf4693d92b1b3b413 100644 (file)
--- a/hw/xen_machine_fv.c
+++ b/hw/xen_machine_fv.c
@@ -24,6 +24,9 @@
  */
 
 #include "hw.h"
+#include "boards.h"
+#include "exec-all.h"
+#include "qemu-xen.h"
 
 #include <xen/hvm/params.h>
 #include <sys/mman.h>
@@ -180,12 +183,10 @@ void qemu_invalidate_map_cache(void)
 #endif /* defined(MAPCACHE) */
 
 
-static void xen_init_fv(uint64_t ram_size, int vga_ram_size, char *boot_device,
-                        DisplayState *ds, const char **fd_filename,
-                        int snapshot,
-                        const char *kernel_filename,
-                        const char *kernel_cmdline,
-                        const char *initrd_filename,
+static void xen_init_fv(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)
 {
     unsigned long ioreq_pfn;
@@ -272,9 +273,9 @@ static void xen_init_fv(uint64_t ram_size, int vga_ram_size, char *boot_device,
     timeoffset_get();
 
 
-    pc_machine.init(ram_size, vga_ram_size, boot_device, ds, fd_filename,
-                    snapshot, kernel_filename, kernel_cmdline, initrd_filename,
-                    direct_pci);
+    pc_machine.init(ram_size, vga_ram_size, boot_device, ds,
+                   kernel_filename, kernel_cmdline, initrd_filename,
+                   cpu_model, direct_pci);
 }
 
 QEMUMachine xenfv_machine = {

diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c
index 5cf5a695d48bd27031c6488c302b1c43b3cbc4f4..35335c54bdf77cfab4b10351854690176a137fc3 100644 (file)
--- a/hw/xen_machine_pv.c
+++ b/hw/xen_machine_pv.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "vl.h"
+#include "hw.h"
 #include "xen_console.h"
 #include "xenfb.h"
 

diff --git a/hw/xenfb.h b/hw/xenfb.h
index 2f6ef2b4bb86cb4502fc7002ad9adc0c5b27f0bd..d782aa9abc08a12eda7c54069323d6df514d2757 100644 (file)
--- a/hw/xenfb.h
+++ b/hw/xenfb.h
@@ -1,7 +1,7 @@
 #ifndef _XENFB_H_
 #define _XENFB_H_
 
-#include "vl.h"
+#include "hw.h"
 #include <stdbool.h>
 #include <sys/types.h>
 

diff --git a/qemu-xen.h b/qemu-xen.h
new file mode 100644 (file)
index 0000000..aff4a41
--- /dev/null
+++ b/qemu-xen.h
@@ -0,0 +1,26 @@
+#ifndef QEMU_XEN_H
+#define QEMU_XEN_H
+
+/* xen_machine_fv.c */
+
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(QEMU_TOOL)
+#define MAPCACHE
+uint8_t *qemu_map_cache(target_phys_addr_t phys_addr);
+void     qemu_invalidate_map_cache(void);
+#else 
+#define qemu_invalidate_map_cache() ((void)0)
+#endif
+
+#define mapcache_lock()   ((void)0)
+#define mapcache_unlock() ((void)0)
+
+/* helper2.c */
+extern long time_offset;
+void timeoffset_get(void);
+
+/* xen_platform.c */
+#ifndef QEMU_TOOL
+void pci_xen_platform_init(PCIBus *bus);
+#endif
+
+#endif /*QEMU_XEN_H*/