mirror of
https://github.com/qemu/qemu.git
synced 2024-11-24 11:23:43 +08:00
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. Changed in v2: - use qemu_free instead of free; Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
parent
5e6b701aba
commit
37cdfcf194
19
hw/xenfb.c
19
hw/xenfb.c
@ -347,13 +347,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;
|
||||
}
|
||||
@ -367,6 +360,18 @@ static int input_connect(struct XenDevice *xendev)
|
||||
&in->abs_pointer_wanted) == -1)
|
||||
in->abs_pointer_wanted = 0;
|
||||
|
||||
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 {
|
||||
qemu_free(vfb);
|
||||
xen_be_printf(xendev, 1, "ds not set (yet)\n");
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
rc = common_bind(&in->c);
|
||||
if (rc != 0)
|
||||
return rc;
|
||||
|
Loading…
Reference in New Issue
Block a user