summaryrefslogtreecommitdiffstats
path: root/hw/pci
diff options
context:
space:
mode:
authorPeter Maydell2017-04-04 17:25:30 +0200
committerPeter Maydell2017-04-04 17:25:30 +0200
commitfa902c8ca0f3b83e0e3dda1e9e00f0b1d28e718a (patch)
tree67715e0711b5019dae8169317e7af0061ef0c0cd /hw/pci
parentMerge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff)
parentio: fix FD socket handling in DNS lookup (diff)
downloadqemu-fa902c8ca0f3b83e0e3dda1e9e00f0b1d28e718a.tar.gz
qemu-fa902c8ca0f3b83e0e3dda1e9e00f0b1d28e718a.tar.xz
qemu-fa902c8ca0f3b83e0e3dda1e9e00f0b1d28e718a.zip
Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2017-04-04-1' into staging
Merge qio 2017/04/04 v1 # gpg: Signature made Tue 04 Apr 2017 16:17:56 BST # gpg: using RSA key 0xBE86EBB415104FDF # gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" # gpg: aka "Daniel P. Berrange <berrange@redhat.com>" # Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF * remotes/berrange/tags/pull-qio-2017-04-04-1: io: fix FD socket handling in DNS lookup io: fix incoming client socket initialization Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/pci')
0 files changed, 0 insertions, 0 deletions