You need to sign in or sign up before continuing.
  • P
    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · d8e3b729
    Peter Maydell 提交于
    pc, acpi, virtio
    
    Most notably this includes virtio 1 patches
    Still not all devices converted, and not fully spec compliant,
    so disabled by default.
    Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
    
    # gpg: Signature made Thu Jun 11 12:53:08 2015 BST using RSA key ID D28D5469
    # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
    # gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
    
    * remotes/mst/tags/for_upstream: (42 commits)
      i386/acpi-build: fix PXB workarounds for unsupported BIOSes
      i386/acpi-build: more traditional _UID and _HID for PXB root buses
      vhost-scsi: move qdev properties into vhost-scsi.c
      virtio-9p-device: move qdev properties into virtio-9p-device.c
      virtio-serial-bus: move qdev properties into virtio-serial-bus.c
      virtio-rng: move qdev properties into virtio-rng.c
      virtio-scsi: move qdev properties into virtio-scsi.c
      virtio-net.h: Remove unsed DEFINE_VIRTIO_NET_PROPERTIES
      virtio-net: move qdev properties into virtio-net.c
      virtio-input: emulated devices [pci]
      virtio-input: core code & base class [pci]
      pci: add PCI_CLASS_INPUT_*
      virtio-pci: fill VirtIOPCIRegions early.
      virtio-pci: drop identical virtio_pci_cap
      virtio-pci: move cap type to VirtIOPCIRegion
      virtio-pci: move virtio_pci_add_mem_cap call to virtio_pci_modern_region_map
      virtio-pci: add virtio_pci_modern_region_map()
      virtio-pci: add virtio_pci_modern_regions_init()
      virtio-pci: add struct VirtIOPCIRegion for virtio-1 regions
      virtio-balloon: switch to virtio_add_feature
      ...
    Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
    d8e3b729
vring.c 13.8 KB