Failed in applying to current master (
apply log)
Maintainers: "Hongren (Zenithal) Zheng" <i@zenithal.me>, "Canokeys.org" <contact@canokeys.org>, Gerd Hoffmann <kraxel@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, Stefano Stabellini <sstabellini@kernel.org>, Anthony Perard <anthony.perard@citrix.com>, Paul Durrant <paul@xen.org>, Alex Williamson <alex.williamson@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, Akihiko Odaki <akihiko.odaki@gmail.com>
meson_options.txt | 2 +
hw/usb/canokey.h | 69 +++++++
include/hw/virtio/virtio-gpu.h | 1 +
include/ui/console.h | 4 +-
include/ui/gtk.h | 2 +-
hw/display/virtio-gpu-base.c | 7 +-
hw/display/virtio-gpu.c | 4 +
hw/display/virtio-vga.c | 5 +-
hw/display/xenfb.c | 14 +-
hw/usb/canokey.c | 313 +++++++++++++++++++++++++++++++
hw/usb/hcd-ehci.c | 5 +-
hw/usb/redirect.c | 3 +-
hw/vfio/display.c | 8 +-
ui/console.c | 6 -
ui/gtk-egl.c | 4 +-
ui/gtk-gl-area.c | 42 ++++-
ui/gtk.c | 45 +++--
MAINTAINERS | 8 +
docs/system/device-emulation.rst | 1 +
docs/system/devices/canokey.rst | 168 +++++++++++++++++
docs/system/devices/usb.rst | 4 +
hw/usb/Kconfig | 5 +
hw/usb/meson.build | 5 +
hw/usb/trace-events | 16 ++
meson.build | 6 +
scripts/meson-buildoptions.sh | 3 +
ui/cocoa.m | 6 +-
ui/trace-events | 2 +
28 files changed, 707 insertions(+), 51 deletions(-)
create mode 100644 hw/usb/canokey.h
create mode 100644 hw/usb/canokey.c
create mode 100644 docs/system/devices/canokey.rst