2 files changed, 26 insertions, 5 deletions

diff --git a/include/xen/interface/io/fbif.h b/include/xen/interface/io/fbif.h
index 5a934dd7796d..974a51ed9165 100644
--- a/include/xen/interface/io/fbif.h
+++ b/include/xen/interface/io/fbif.h
@@ -49,11 +49,27 @@ struct xenfb_update {
         int32_t height;         /* rect height */
 };
 
+/*
+ * Framebuffer resize notification event
+ * Capable backend sets feature-resize in xenstore.
+ */
+#define XENFB_TYPE_RESIZE 3
+
+struct xenfb_resize {
+        uint8_t type;           /* XENFB_TYPE_RESIZE */
+        int32_t width;          /* width in pixels */
+        int32_t height;         /* height in pixels */
+        int32_t stride;         /* stride in bytes */
+        int32_t depth;          /* depth in bits */
+        int32_t offset;         /* start offset within framebuffer */
+};
+
 #define XENFB_OUT_EVENT_SIZE 40
 
 union xenfb_out_event {
         uint8_t type;
         struct xenfb_update update;
+        struct xenfb_resize resize;
         char pad[XENFB_OUT_EVENT_SIZE];
 };
 
@@ -105,15 +121,18 @@ struct xenfb_page {
          * Each directory page holds PAGE_SIZE / sizeof(*pd)
          * framebuffer pages, and can thus map up to PAGE_SIZE *
          * PAGE_SIZE / sizeof(*pd) bytes.  With PAGE_SIZE == 4096 and
-         * sizeof(unsigned long) == 4, that's 4 Megs.  Two directory
-         * pages should be enough for a while.
+         * sizeof(unsigned long) == 4/8, that's 4 Megs 32 bit and 2
+         * Megs 64 bit.  256 directories give enough room for a 512
+         * Meg framebuffer with a max resolution of 12,800x10,240.
+         * Should be enough for a while with room leftover for
+         * expansion.
          */
-        unsigned long pd[2];
+        unsigned long pd[256];
 };
 
 /*
- * Wart: xenkbd needs to know resolution.  Put it here until a better
- * solution is found, but don't leak it to the backend.
+ * Wart: xenkbd needs to know default resolution.  Put it here until a
+ * better solution is found, but don't leak it to the backend.
  */
 #ifdef __KERNEL__
 #define XENFB_WIDTH 800
diff --git a/include/xen/interface/io/kbdif.h b/include/xen/interface/io/kbdif.h
index fb97f4284ffd..8066c7849fbe 100644
--- a/include/xen/interface/io/kbdif.h
+++ b/include/xen/interface/io/kbdif.h
@@ -49,6 +49,7 @@ struct xenkbd_motion {
         uint8_t type;           /* XENKBD_TYPE_MOTION */
         int32_t rel_x;          /* relative X motion */
         int32_t rel_y;          /* relative Y motion */
+        int32_t rel_z;          /* relative Z motion (wheel) */
 };
 
 struct xenkbd_key {
@@ -61,6 +62,7 @@ struct xenkbd_position {
         uint8_t type;           /* XENKBD_TYPE_POS */
         int32_t abs_x;          /* absolute X position (in FB pixels) */
         int32_t abs_y;          /* absolute Y position (in FB pixels) */
+        int32_t rel_z;          /* relative Z motion (wheel) */
 };
 
 #define XENKBD_IN_EVENT_SIZE 40