From patchwork Mon Apr 22 19:18:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 238658 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E3F472C013C for ; Tue, 23 Apr 2013 05:38:48 +1000 (EST) Received: from localhost ([::1]:57519 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUMJV-0007eP-Ab for incoming@patchwork.ozlabs.org; Mon, 22 Apr 2013 15:22:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUMGd-0003PP-P9 for qemu-devel@nongnu.org; Mon, 22 Apr 2013 15:19:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UUMGX-0001Kw-V0 for qemu-devel@nongnu.org; Mon, 22 Apr 2013 15:19:11 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44199 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUMGX-0001KS-Oz for qemu-devel@nongnu.org; Mon, 22 Apr 2013 15:19:05 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 506EAA538D; Mon, 22 Apr 2013 21:18:19 +0200 (CEST) From: Alexander Graf To: qemu-devel@nongnu.org Date: Mon, 22 Apr 2013 21:18:18 +0200 Message-Id: <1366658298-9275-13-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1366658298-9275-1-git-send-email-agraf@suse.de> References: <1366658298-9275-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Christian Borntraeger , Dominik Dingel Subject: [Qemu-devel] [PATCH 12/12] S390: CCW: Use new, working firmware by default X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- hw/s390x/s390-virtio-ccw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 89670f2..0e8a0b5 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -80,7 +80,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();