summary refs log tree commit diff stats
path: root/tests/test-qmp-input-strict.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-02-13 14:52:06 +0000
committerPeter Maydell <peter.maydell@linaro.org>2014-02-13 14:52:06 +0000
commitf673e70ccc668607620cd6d30fd0b9bc7a54151d (patch)
treea2f5e596d4e2fba948b1d02ecdb689ff8f86e094 /tests/test-qmp-input-strict.c
parent9d74f6fef0801ca2ce5c9d38d59b85bf03c27669 (diff)
parentea81ce06a4d65c62cd8f2a3797953602fb7d7456 (diff)
downloadfocaccia-qemu-f673e70ccc668607620cd6d30fd0b9bc7a54151d.tar.gz
focaccia-qemu-f673e70ccc668607620cd6d30fd0b9bc7a54151d.zip
Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-upstream' into staging
PReP machine and devices

* Cleanups for Raven PCI host bridge
* Removal of PReP machine and devices from qemu-system-ppcemb

# gpg: Signature made Mon 10 Feb 2014 16:19:03 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/prep-for-upstream:
  prep: Drop from ppcemb-softmmu
  raven: Use constant PCI_NUM_PINS instead of 4
  prep: Kill get_system_io() usage

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/test-qmp-input-strict.c')
0 files changed, 0 insertions, 0 deletions