summary refs log tree commit diff stats
path: root/scripts/qapi.py
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-03-16 11:05:47 +0000
committerPeter Maydell <peter.maydell@linaro.org>2017-03-16 11:05:47 +0000
commit3716fba3f58de0eea32b8da29976c902549cc836 (patch)
treeed8a5bcc724035d18419f2c8b5f23ba49cb4de7f /scripts/qapi.py
parent7c756380281504900aa77af3233463cf3d37ad8f (diff)
parentbdf4c4ec53f293ea1baa7ce7c31fe0301887b513 (diff)
downloadfocaccia-qemu-3716fba3f58de0eea32b8da29976c902549cc836.tar.gz
focaccia-qemu-3716fba3f58de0eea32b8da29976c902549cc836.zip
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio, pci: fixes

More fixes missed in the previous pull request.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Thu 16 Mar 2017 02:29:49 GMT
# gpg:                using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  virtio-serial-bus: Delete timer from list before free it
  hw/virtio: fix Power Management Control Register for PCI Express virtio devices
  hw/virtio: fix Link Control Register for PCI Express virtio devices
  hw/virtio: fix error enabling flags in Device Control register
  hw/pcie: fix Extended Configuration Space for devices with no Extended Capabilities

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qapi.py')
0 files changed, 0 insertions, 0 deletions