diff options
| author | Alexander Graf <agraf@suse.de> | 2015-06-16 23:06:33 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2015-06-17 12:40:52 +0200 |
| commit | 1f68f1d36c3af09ed31a529ad69c3d09880d10fd (patch) | |
| tree | d2cd05b326650223c788f4373b4e0acfa454de3a /qdev-monitor.c | |
| parent | 3da0ab35292fe93640cfdd95aa8bedec8f145d2c (diff) | |
| download | qemu-1f68f1d36c3af09ed31a529ad69c3d09880d10fd.zip qemu-1f68f1d36c3af09ed31a529ad69c3d09880d10fd.tar.gz qemu-1f68f1d36c3af09ed31a529ad69c3d09880d10fd.tar.bz2 | |
s390x: Switch to s390-ccw machine as default
We now finally have TCG support for the basic set of instructions necessary
to run the s390-ccw machine. That means in any aspect possible that machine
type is now superior to the legacy s390-virtio machine.
Switch over to the ccw machine as default. That way people don't get a halfway
broken machine with the s390x target.
Signed-off-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'qdev-monitor.c')
| -rw-r--r-- | qdev-monitor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qdev-monitor.c b/qdev-monitor.c index 7dd62dd..d71d1ee 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -42,9 +42,9 @@ static const QDevAlias qdev_alias_table[] = { { "virtio-serial-pci", "virtio-serial", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, { "virtio-balloon-pci", "virtio-balloon", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, - { "virtio-blk-s390", "virtio-blk", QEMU_ARCH_S390X }, - { "virtio-net-s390", "virtio-net", QEMU_ARCH_S390X }, - { "virtio-serial-s390", "virtio-serial", QEMU_ARCH_S390X }, + { "virtio-blk-ccw", "virtio-blk", QEMU_ARCH_S390X }, + { "virtio-net-ccw", "virtio-net", QEMU_ARCH_S390X }, + { "virtio-serial-ccw", "virtio-serial", QEMU_ARCH_S390X }, { "lsi53c895a", "lsi" }, { "ich9-ahci", "ahci" }, { "kvm-pci-assign", "pci-assign" }, |