summaryrefslogtreecommitdiffstats
path: root/hw/arm/collie.c
diff options
context:
space:
mode:
authorPeter Maydell2019-03-08 15:05:17 +0100
committerPeter Maydell2019-03-08 15:05:17 +0100
commit06a1564fcc2f2452b2e2434b6a7770504a2f5183 (patch)
tree1245061010186021e9b9f9673d06e2163546c950 /hw/arm/collie.c
parentMerge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into sta... (diff)
parentqos-test: megasas test node (diff)
downloadqemu-06a1564fcc2f2452b2e2434b6a7770504a2f5183.tar.gz
qemu-06a1564fcc2f2452b2e2434b6a7770504a2f5183.tar.xz
qemu-06a1564fcc2f2452b2e2434b6a7770504a2f5183.zip
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream-qgraph' into staging
qgraph project from GSoC 2018 # gpg: Signature made Thu 07 Mar 2019 16:29:17 GMT # gpg: using RSA key BFFBD25F78C7AE83 # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full] # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full] # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini/tags/for-upstream-qgraph: (57 commits) qos-test: megasas test node qos-test: e1000 test node qos-test: eepro100 test node qos-test: es1370 test node qos-test: vmxnet3 test node qos-test: usb-hcd-ohci test node qos-test: spapr-phb test node qos-test: pcnet test node qos-test: nvme test node qos-test: ne2k_pci test node qos-test: ipoctal232 test node qos-test: tpci200 test node qos-test: ac97 test node tests: move virtio entirely to qos-test tests/libqos: remove pre-qgraph QVirtioPCIDevice API qos-test: virtio-scsi test node tests/libqos: virtio-scsi driver and interface nodes qos-test: vhost-user test node vhost-user-test: always use 256 MiB of guest memory tests/libqos: support multiqueue for virtio-net ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/collie.c')
0 files changed, 0 insertions, 0 deletions