From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Fri, 6 Jun 2008 17:02:31 +0000 (+0100)
Subject: Compile xenfb.c for DM.
X-Git-Tag: xen-3.3.0-rc1~89
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7171024da1a6d212b4ff547c07bc08fe871d4514;p=qemu-xen-unstable.git

Compile xenfb.c for DM.
---

diff --git a/hw/xenfb.c b/hw/xenfb.c
index ca1ab65c64..2917d5c98b 100644
--- a/hw/xenfb.c
+++ b/hw/xenfb.c
@@ -1,4 +1,7 @@
+#include <stdbool.h>
+
 #include "hw.h"
+#include "console.h"
 
 #include <stdarg.h>
 #include <stdlib.h>
@@ -20,6 +23,8 @@
 #include <xs.h>
 
 #include "xenfb.h"
+#include "qemu-common.h"
+#include "config.h"
 
 #ifdef CONFIG_STUBDOM
 #include <semaphore.h>
@@ -671,6 +676,7 @@ static int xenfb_on_state_change(struct xenfb_device *dev)
 		break;
 	case XenbusStateClosed:
 		xenfb_switch_state(dev, state);
+	default:; /* hope this isn't important */
 	}
 	return 0;
 }
@@ -1325,6 +1331,7 @@ static int xenfb_register_console(struct xenfb *xenfb) {
 			     xenfb_update,
 			     xenfb_invalidate,
 			     xenfb_screen_dump,
+			     NULL,
 			     xenfb);
         if (xenfb->ds->dpy_resize_shared)
             dpy_resize_shared(xenfb->ds, xenfb->width, xenfb->height, xenfb->depth, xenfb->row_stride, xenfb->pixels + xenfb->offset);
diff --git a/xen-config-host.h b/xen-config-host.h
index e6b02fefe4..f51a6a59fc 100644
--- a/xen-config-host.h
+++ b/xen-config-host.h
@@ -3,11 +3,19 @@ extern int domid;
 
 #include <errno.h>
 
-#define bool xen_bool
+#ifdef bool
+# define XEN_CONFIG_HOST_BOOL_WAS_DEFINED 1
+#else
+# define bool xen_bool
+#endif
+
 #include "xenctrl.h"
 #include "xs.h"
 #include "blktaplib.h"
-#undef bool
+
+#ifndef XEN_CONFIG_HOST_BOOL_WAS_DEFINED
+# undef bool
+#endif
 
 #undef CONFIG_GDBSTUB
 
diff --git a/xen-hooks.mak b/xen-hooks.mak
index 94c031e48f..9a4a51fa69 100644
--- a/xen-hooks.mak
+++ b/xen-hooks.mak
@@ -24,7 +24,7 @@ OBJS += piix4acpi.o
 OBJS += xen_platform.o
 OBJS += xen_machine_fv.o
 OBJS += xen_machine_pv.o
-#OBJS += xenfb.o
+OBJS += xenfb.o
 OBJS += xen_console.o
 OBJS += xen_machine_fv.o
 OBJS += xen_blktap.o