diff options
author | Alexander Graf | 2015-06-16 23:06:33 +0200 |
---|---|---|
committer | Alexander Graf | 2015-06-17 12:40:52 +0200 |
commit | 1f68f1d36c3af09ed31a529ad69c3d09880d10fd (patch) | |
tree | d2cd05b326650223c788f4373b4e0acfa454de3a /hw/s390x | |
parent | target-s390x: PER: add Breaking-Event-Address register (diff) | |
download | qemu-1f68f1d36c3af09ed31a529ad69c3d09880d10fd.tar.gz qemu-1f68f1d36c3af09ed31a529ad69c3d09880d10fd.tar.xz qemu-1f68f1d36c3af09ed31a529ad69c3d09880d10fd.zip |
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 'hw/s390x')
-rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 1 | ||||
-rw-r--r-- | hw/s390x/s390-virtio.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 8a565f657a..c574988c36 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -216,6 +216,7 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) mc->no_sdcard = 1; mc->use_sclp = 1; mc->max_cpus = 255; + mc->is_default = 1; nc->nmi_monitor_handler = s390_nmi; } diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index 59750dbfcd..00ea793651 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -345,7 +345,6 @@ static void s390_machine_class_init(ObjectClass *oc, void *data) mc->no_floppy = 1; mc->no_cdrom = 1; mc->no_sdcard = 1; - mc->is_default = 1; nc->nmi_monitor_handler = s390_nmi; } |