[Xen-changelog] [qemu-xen master] Merge remote-tracking branch 'ehabkost/tags/machine-pull-request' into staging

[patchbot@xxxxxxx]

commit 60c5a47a16aa227155877b1436b4467a106587d6
Merge: 82e6e5ef0ec0e55e2be215153219f0ca8b3bee84 
00b8702581f312aa46f797a8b3153d9b2892d967
Author:     Stefan Hajnoczi <stefanha@xxxxxxxxxx>
AuthorDate: Tue Nov 15 19:02:08 2016 +0000
Commit:     Stefan Hajnoczi <stefanha@xxxxxxxxxx>
CommitDate: Tue Nov 15 19:02:09 2016 +0000

    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@xxxxxxxxxx>"
    # 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@xxxxxxxxxx
    Signed-off-by: Stefan Hajnoczi <stefanha@xxxxxxxxxx>

 hw/core/qdev-properties.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog