diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-09-03 14:33:03 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-09-03 14:33:03 +0100 |
| commit | 550e66ea4cce7b6664d6caf7e651814cc2d30421 (patch) | |
| tree | b612676510a6a260306786f93552d88d7a645189 /MAINTAINERS | |
| parent | 561578c2a82292ddf55737791d2838b797f49f35 (diff) | |
| parent | 9ef40173fbe99c0562d227980779a73613788782 (diff) | |
| download | qemu-550e66ea4cce7b6664d6caf7e651814cc2d30421.zip | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20150903' into staging
First batch of s390x patches for 2.5:
- introduce 2.5 compat machine
- support for migration of storage keys
# gpg: Signature made Thu 03 Sep 2015 11:28:06 BST using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
* remotes/cohuck/tags/s390x-20150903:
s390x: Disable storage key migration on old machine type
s390x: Migrate guest storage keys (initial memory only)
s390x: Info skeys sub-command
s390x: Dump-skeys hmp support
s390x: Dump storage keys qmp command
s390x: Enable new s390-storage-keys device
s390x: Create QOM device for s390 storage keys
s390x: add 2.5 compat s390-ccw-virtio machine
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a4ea7c39ed..688979bc10 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -569,6 +569,7 @@ F: hw/s390x/css.[hc] F: hw/s390x/sclp*.[hc] F: hw/s390x/ipl*.[hc] F: hw/s390x/*pci*.[hc] +F: hw/s390x/s390-skeys*.c F: include/hw/s390x/ F: pc-bios/s390-ccw/ T: git git://github.com/cohuck/qemu virtio-ccw-upstr |