← Back to branch summary

~ubuntu-branches/ubuntu/trusty/qemu/trusty

« back to all changes in this revision

Viewing changes to hw/usb/dev-hid.c

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2013-10-22 22:47:07 UTC
  • mfrom: (1.8.3) (10.1.42 sid)
  • Revision ID: package-import@ubuntu.com-20131022224707-1lya34fw3k3f24tv
Tags: 1.6.0+dfsg-2ubuntu1
http://bugs.debian.org/709241
* Merge 1.6.0~rc0+dfsg-2exp from debian experimental.  Remaining changes:
  - debian/control
    * update maintainer
    * remove libiscsi, usb-redir, vde, vnc-jpeg, and libssh2-1-dev
      from build-deps
    * enable rbd
    * add qemu-system and qemu-common B/R to qemu-keymaps
    * add D:udev, R:qemu, R:qemu-common and B:qemu-common to
      qemu-system-common
    * qemu-system-arm, qemu-system-ppc, qemu-system-sparc:
      - add qemu-kvm to Provides
      - add qemu-common, qemu-kvm, kvm to B/R
      - remove openbios-sparc from qemu-system-sparc D
      - drop openbios-ppc and openhackware Depends to Suggests (for now)
    * qemu-system-x86:
      - add qemu-common to Breaks/Replaces.
      - add cpu-checker to Recommends.
    * qemu-user: add B/R:qemu-kvm
    * qemu-kvm:
      - add armhf armel powerpc sparc to Architecture
      - C/R/P: qemu-kvm-spice
    * add qemu-common package
    * drop qemu-slof which is not packaged in ubuntu
  - add qemu-system-common.links for tap ifup/down scripts and OVMF link.
  - qemu-system-x86.links:
    * remove pxe rom links which are in kvm-ipxe
    * add symlink for kvm.1 manpage
  - debian/rules
    * add kvm-spice symlink to qemu-kvm
    * call dh_installmodules for qemu-system-x86
    * update dh_installinit to install upstart script
    * run dh_installman (Closes: #709241) (cherrypicked from 1.5.0+dfsg-2)
  - Add qemu-utils.links for kvm-* symlinks.
  - Add qemu-system-x86.qemu-kvm.upstart and .default
  - Add qemu-system-x86.modprobe to set nesting=1
  - Add qemu-system-common.preinst to add kvm group
  - qemu-system-common.postinst: remove bad group acl if there, then have
    udev relabel /dev/kvm.
  - New linaro patches from qemu-linaro rebasing branch
  - Dropped patches:
    * xen-simplify-xen_enabled.patch
    * sparc-linux-user-fix-missing-symbols-in-.rel-.rela.plt-sections.patch
    * main_loop-do-not-set-nonblocking-if-xen_enabled.patch
    * xen_machine_pv-do-not-create-a-dummy-CPU-in-machine-.patch
    * virtio-rng-fix-crash
  - Kept patches:
    * expose_vms_qemu64cpu.patch - updated
    * linaro arm patches from qemu-linaro rebasing branch
  - New patches:
    * fix-pci-add: change CONFIG variable in ifdef to make sure that
      pci_add is defined.
* Add linaro patches
* Add experimental mach-virt patches for arm virtualization.
* qemu-system-common.install: add debian/tmp/usr/lib to install the
  qemu-bridge-helper

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/usb/dev-hid.c
560
560
{
561
561
    USBHIDState *us = DO_UPCAST(USBHIDState, dev, dev);
562
562
 
 
563
    if (dev->serial) {
 
564
        usb_desc_set_string(dev, STR_SERIALNUMBER, dev->serial);
 
565
    }
563
566
    usb_desc_init(dev);
564
567
    us->intr = usb_ep_get(dev, USB_TOKEN_IN, 1);
565
568
    hid_init(&us->hid, kind, usb_hid_changed);
655
658
    uc->product_desc   = "QEMU USB Tablet";
656
659
    dc->vmsd = &vmstate_usb_ptr;
657
660
    dc->props = usb_tablet_properties;
 
661
    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
658
662
}
659
663
 
660
664
static const TypeInfo usb_tablet_info = {
674
678
    uc->product_desc   = "QEMU USB Mouse";
675
679
    uc->usb_desc       = &desc_mouse;
676
680
    dc->vmsd = &vmstate_usb_ptr;
 
681
    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
677
682
}
678
683
 
679
684
static const TypeInfo usb_mouse_info = {
693
698
    uc->product_desc   = "QEMU USB Keyboard";
694
699
    uc->usb_desc       = &desc_keyboard;
695
700
    dc->vmsd = &vmstate_usb_kbd;
 
701
    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
696
702
}
697
703
 
698
704
static const TypeInfo usb_keyboard_info = {