[Xen-changelog] [qemu-xen-unstable] qemu-xen: add vkbd support for PV on HVM guests

[patchbot@xxxxxxx]

commit 9b33a3e5603ecd3ceca482a72c6ff8e951afb6d2
Author: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Date:   Tue Nov 22 16:12:40 2011 +0000

    qemu-xen: add vkbd support for PV on HVM guests
    
    Register the vkbd backend even when running as device emulator for HVM
    guests: it is useful because it doesn't need a frequent timer like usb.
    
    Check whether the XenInput DisplayState has been set in the initialise
    state, rather than the input state.
    In case the DisplayState hasn't been set and there is no vfb for this
    domain, then set the XenInput DisplayState to the default one.
    
    An equivalent patch has already been committed in upstream qemu.
    
    Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
---
 hw/xen_machine_fv.c |    1 +
 hw/xenfb.c          |   19 ++++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/hw/xen_machine_fv.c b/hw/xen_machine_fv.c
index 603a508..fdad42a 100644
--- a/hw/xen_machine_fv.c
+++ b/hw/xen_machine_fv.c
@@ -368,6 +368,7 @@ static void xen_init_fv(ram_addr_t ram_size, int 
vga_ram_size,
         exit(1);
     }
     xen_be_register("console", &xen_console_ops);
+    xen_be_register("vkbd", &xen_kbdmouse_ops);
 #ifndef CONFIG_STUBDOM
     xen_be_register("qdisk", &xen_blkdev_ops);
 #endif
diff --git a/hw/xenfb.c b/hw/xenfb.c
index 05c51cc..96c2a6f 100644
--- a/hw/xenfb.c
+++ b/hw/xenfb.c
@@ -350,13 +350,6 @@ static void xenfb_mouse_event(void *opaque,
 
 static int input_init(struct XenDevice *xendev)
 {
-    struct XenInput *in = container_of(xendev, struct XenInput, c.xendev);
-
-    if (!in->c.ds) {
-        xen_be_printf(xendev, 1, "ds not set (yet)\n");
-       return -1;
-    }
-
     xenstore_write_be_int(xendev, "feature-abs-pointer", 1);
     return 0;
 }
@@ -366,6 +359,18 @@ static int input_initialise(struct XenDevice *xendev)
     struct XenInput *in = container_of(xendev, struct XenInput, c.xendev);
     int rc;
 
+    if (!in->c.ds) {
+        char *vfb = xenstore_read_str(NULL, "device/vfb");
+        if (vfb == NULL) {
+            /* there is no vfb, run vkbd on its own */
+            in->c.ds = get_displaystate();
+        } else {
+            free(vfb);
+            xen_be_printf(xendev, 1, "ds not set (yet)\n");
+            return -1;
+        }
+    }
+
     rc = common_bind(&in->c);
     if (rc != 0)
        return rc;
--
generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog