From patchwork Thu Feb 25 13:45:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 46237 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B82D0B7080 for ; Fri, 26 Feb 2010 00:55:23 +1100 (EST) Received: from localhost ([127.0.0.1]:54584 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nke7X-0008Gg-6v for incoming@patchwork.ozlabs.org; Thu, 25 Feb 2010 08:51:15 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nke3G-0007ZC-At for qemu-devel@nongnu.org; Thu, 25 Feb 2010 08:46:50 -0500 Received: from [199.232.76.173] (port=48905 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nke3F-0007Ys-VK for qemu-devel@nongnu.org; Thu, 25 Feb 2010 08:46:49 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nke3E-0000ut-RK for qemu-devel@nongnu.org; Thu, 25 Feb 2010 08:46:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:24700) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nke3E-0000uj-Dn for qemu-devel@nongnu.org; Thu, 25 Feb 2010 08:46:48 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o1PDklVK012145 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 25 Feb 2010 08:46:47 -0500 Received: from localhost (vpn-233-100.phx2.redhat.com [10.3.233.100]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o1PDkjdT010331; Thu, 25 Feb 2010 08:46:46 -0500 From: Amit Shah To: qemu-devel@nongnu.org Date: Thu, 25 Feb 2010 19:15:20 +0530 Message-Id: <1267105520-25457-4-git-send-email-amit.shah@redhat.com> In-Reply-To: <1267105520-25457-3-git-send-email-amit.shah@redhat.com> References: <1267105520-25457-1-git-send-email-amit.shah@redhat.com> <1267105520-25457-2-git-send-email-amit.shah@redhat.com> <1267105520-25457-3-git-send-email-amit.shah@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Amit Shah , agraf@suse.de Subject: [Qemu-devel] [PATCH 3/3] s390-virtio: Disable new virtio-serial features for 0.12 machine type X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Disable the MULTIPORT feature and MSI vectors for the 0.12 machine types; those features are added only for 0.13 onwards. Signed-off-by: Amit Shah --- hw/s390-virtio.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c index a3cbfb6..f027521 100644 --- a/hw/s390-virtio.c +++ b/hw/s390-virtio.c @@ -263,6 +263,18 @@ static QEMUMachine s390_machine_v0_12 = { .use_virtcon = 1, .no_vga = 1, .max_cpus = 255, + .compat_props = (GlobalProperty[]) { + { + .driver = "virtio-serial-s390", + .property = "max_nr_ports", + .value = stringify(1), + },{ + .driver = "virtio-serial-s390", + .property = "vectors", + .value = stringify(0), + }, + { /* end of list */ } + }, }; static void s390_machine_init(void)