From patchwork Mon Feb 6 17:17:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 139775 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C051EB7274 for ; Tue, 7 Feb 2012 04:18:01 +1100 (EST) Received: from localhost ([::1]:47547 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RuSCT-0007MN-Nj for incoming@patchwork.ozlabs.org; Mon, 06 Feb 2012 12:17:57 -0500 Received: from eggs.gnu.org ([140.186.70.92]:57998) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RuSCG-0007Li-8P for qemu-devel@nongnu.org; Mon, 06 Feb 2012 12:17:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RuSCB-0003TB-3t for qemu-devel@nongnu.org; Mon, 06 Feb 2012 12:17:44 -0500 Received: from cpe-70-123-132-139.austin.res.rr.com ([70.123.132.139]:51703 helo=localhost6.localdomain6) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RuSCA-0003T4-PA for qemu-devel@nongnu.org; Mon, 06 Feb 2012 12:17:39 -0500 Received: from localhost6.localdomain6 (localhost.localdomain [127.0.0.1]) by localhost6.localdomain6 (8.14.4/8.14.4/Debian-2ubuntu1) with ESMTP id q16HHaxH010679; Mon, 6 Feb 2012 11:17:36 -0600 Received: (from anthony@localhost) by localhost6.localdomain6 (8.14.4/8.14.4/Submit) id q16HHa7p010678; Mon, 6 Feb 2012 11:17:36 -0600 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Mon, 6 Feb 2012 11:17:36 -0600 Message-Id: <1328548656-10587-1-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.4.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 70.123.132.139 Cc: Anthony Liguori Subject: [Qemu-devel] [PATCH] s390x: fix qom-ification fall-out 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 Tested-by: Andreas Faerber Signed-off-by: Anthony Liguori --- hw/s390-virtio-bus.c | 1 + vl.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c index b66ef68..49140f8 100644 --- a/hw/s390-virtio-bus.c +++ b/hw/s390-virtio-bus.c @@ -429,6 +429,7 @@ static TypeInfo virtio_s390_device_info = { .parent = TYPE_DEVICE, .instance_size = sizeof(VirtIOS390Device), .class_init = virtio_s390_device_class_init, + .class_size = sizeof(VirtIOS390DeviceClass), .abstract = true, }; diff --git a/vl.c b/vl.c index 2d464cf..63dd725 100644 --- a/vl.c +++ b/vl.c @@ -1947,7 +1947,11 @@ static int virtcon_parse(const char *devname) } bus_opts = qemu_opts_create(device, NULL, 0); - qemu_opt_set(bus_opts, "driver", "virtio-serial"); + if (arch_type == QEMU_ARCH_S390X) { + qemu_opt_set(bus_opts, "driver", "virtio-serial-s390"); + } else { + qemu_opt_set(bus_opts, "driver", "virtio-serial-pci"); + } dev_opts = qemu_opts_create(device, NULL, 0); qemu_opt_set(dev_opts, "driver", "virtconsole");