From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NLF7a-0006Yy-5i for qemu-devel@nongnu.org; Thu, 17 Dec 2009 07:06:18 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NLF7U-0006SR-Au for qemu-devel@nongnu.org; Thu, 17 Dec 2009 07:06:16 -0500 Received: from [199.232.76.173] (port=34397 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NLF7U-0006SA-5c for qemu-devel@nongnu.org; Thu, 17 Dec 2009 07:06:12 -0500 Received: from cantor2.suse.de ([195.135.220.15]:41010 helo=mx2.suse.de) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NLF7S-0004yn-Tl for qemu-devel@nongnu.org; Thu, 17 Dec 2009 07:06:11 -0500 From: Alexander Graf Date: Thu, 17 Dec 2009 13:06:07 +0100 Message-Id: <1261051569-7503-2-git-send-email-agraf@suse.de> In-Reply-To: <1261051569-7503-1-git-send-email-agraf@suse.de> References: <1261051569-7503-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 1/3] S390: Loop through virtio console devices List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aurelien@aurel32.net We used to always create one single virtio console device. This breaks when either zero of multiple virtio console devices are requested, so let's use the same code as on x86. Signed-off-by: Alexander Graf --- hw/s390-virtio.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c index b57fa9c..e54ef0e 100644 --- a/hw/s390-virtio.c +++ b/hw/s390-virtio.c @@ -201,7 +201,11 @@ static void s390_init(ram_addr_t ram_size, } /* Create VirtIO console */ - qdev_init_nofail(qdev_create((BusState *)s390_bus, "virtio-console-s390")); + for(i = 0; i < MAX_VIRTIO_CONSOLES; i++) { + if (virtcon_hds[i]) { + qdev_init_nofail(qdev_create((BusState *)s390_bus, "virtio-console-s390")); + } + } /* Create VirtIO network adapters */ for(i = 0; i < nb_nics; i++) { -- 1.6.0.2