Merge remote-tracking branch 'ehabkost/tags/machine-pull-request' into staging
authorStefan Hajnoczi <stefanha@redhat.com>
Tue, 15 Nov 2016 19:02:08 +0000 (19:02 +0000)
committerStefan Hajnoczi <stefanha@redhat.com>
Tue, 15 Nov 2016 19:02:09 +0000 (19:02 +0000)
commit60c5a47a16aa227155877b1436b4467a106587d6
tree69182f85a6441c016be005394f9488111fde2f3c
parent82e6e5ef0ec0e55e2be215153219f0ca8b3bee84
parent00b8702581f312aa46f797a8b3153d9b2892d967
Merge remote-tracking branch 'ehabkost/tags/machine-pull-request' into staging

qdev: Fix assert in PCI address property when used by vfio-pci

# gpg: Signature made Tue 15 Nov 2016 06:27:18 PM GMT
# gpg:                using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* ehabkost/tags/machine-pull-request:
  qdev: Fix assert in PCI address property when used by vfio-pci

Message-id: 1479234540-3192-1-git-send-email-ehabkost@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>