From: Alexander Graf <agraf@suse.de>
Date: Mon, 22 Apr 2013 19:12:54 +0000 (+0200)
Subject: S390: CCW: Use new, working firmware by default
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ba747cc8f31a1de7e0a20e7f0cf97965be338e70;p=qmiga%2Fqemu.git

S390: CCW: Use new, working firmware by default

Since we now have working firmware for s390-ccw in the tree, we can
default to it on our s390-ccw machine, rendering it more useful.

Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 8ea193e244..eb774d90e0 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -83,7 +83,7 @@ static void ccw_init(QEMUMachineInitArgs *args)
     css_bus = virtual_css_bus_init();
     s390_sclp_init();
     s390_init_ipl_dev(args->kernel_filename, args->kernel_cmdline,
-                      args->initrd_filename, "s390-zipl.rom");
+                      args->initrd_filename, "s390-ccw.img");
 
     /* register hypercalls */
     virtio_ccw_register_hcalls();