xenfbfront headers

Adding xenfb_* functions to qemu-xen.h and importing this header
wherever the xenfbfront functions are used (xenstore.c and cirrus_vga.c)

(Most of these changes were originally written by Samuel for an older
 version of qemu-remote.)

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index c03a5a6eb149b911364483fa178d33abc39f35a8..8e1bbc391ed3fddf336fc413fd23410a58dedbdc 100644 (file)
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -31,6 +31,7 @@
 #include "pci.h"
 #include "console.h"
 #include "vga_int.h"
+#include "qemu-xen.h"
 
 #include "exec-all.h"
 

diff --git a/qemu-xen.h b/qemu-xen.h
index 2598c15151018d860cfd270594fe5b2bc2aa30d5..536b5838c4d6a2d33d747f910b4eece4bba6640a 100644 (file)
--- a/qemu-xen.h
+++ b/qemu-xen.h
@@ -72,4 +72,10 @@ int xenstore_unsubscribe_from_hotplug_status(struct xs_handle *handle,
 int xenstore_vm_write(int domid, char *key, char *val);
 char *xenstore_vm_read(int domid, char *key, unsigned int *len);
 
+/* xenfbfront.c */
+int xenfb_pv_display_init(DisplayState *ds);
+int xenfb_pv_display_start(void *vram_start);
+int xenfb_connect_vkbd(const char *path);
+int xenfb_connect_vfb(const char *path);
+
 #endif /*QEMU_XEN_H*/

diff --git a/xenstore.c b/xenstore.c
index 99792c421e7618fc87a3283165101a3a43e80678..0d5727ef0952378d34ec7eb6d2777a35a4ca068b 100644 (file)
--- a/xenstore.c
+++ b/xenstore.c
@@ -28,6 +28,7 @@
 #include "hw.h"
 #include "pci.h"
 #include "qemu-timer.h"
+#include "qemu-xen.h"
 
 struct xs_handle *xsh = NULL;
 static char *media_filename[MAX_DRIVES+1];