From patchwork Mon Jan 29 16:52:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 867208 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zVbGs1bkrz9s7s for ; Tue, 30 Jan 2018 03:55:17 +1100 (AEDT) Received: from localhost ([::1]:50423 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egCiB-0003d0-Ar for incoming@patchwork.ozlabs.org; Mon, 29 Jan 2018 11:55:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egCfO-0001hN-GE for qemu-devel@nongnu.org; Mon, 29 Jan 2018 11:52:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egCfN-0006Rn-Ee for qemu-devel@nongnu.org; Mon, 29 Jan 2018 11:52:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38950) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1egCfN-0006RF-8o; Mon, 29 Jan 2018 11:52:21 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 570E681DE4; Mon, 29 Jan 2018 16:52:20 +0000 (UTC) Received: from localhost (dhcp-192-222.str.redhat.com [10.33.192.222]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 260C818AB0; Mon, 29 Jan 2018 16:52:18 +0000 (UTC) From: Cornelia Huck To: qemu-s390x@nongnu.org, qemu-devel@nongnu.org Date: Mon, 29 Jan 2018 17:52:10 +0100 Message-Id: <20180129165210.21086-3-cohuck@redhat.com> In-Reply-To: <20180129165210.21086-1-cohuck@redhat.com> References: <20180129165210.21086-1-cohuck@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 29 Jan 2018 16:52:20 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH RFC 2/2] s390x/cpumodel: allow zpci features in qemu model X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cornelia Huck , david@redhat.com, agraf@suse.de, rth@twiddle.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" AEN can be provided unconditionally, ZPCI has to be turned on manually (it should really depend on CONFIG_PCI). With -cpu qemu,zpci=on, a 4.15 guest kernel can now successfully detect virtio-pci devices under tcg. Signed-off-by: Cornelia Huck --- target/s390x/gen-features.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index 0570f597ec..db7ac965a0 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -574,6 +574,7 @@ static uint16_t qemu_LATEST[] = { S390_FEAT_INTERLOCKED_ACCESS_2, S390_FEAT_MSA_EXT_4, S390_FEAT_MSA_EXT_3, + S390_FEAT_ADAPTER_EVENT_NOTIFICATION, }; /* add all new definitions before this point */ @@ -582,6 +583,8 @@ static uint16_t qemu_MAX[] = { S390_FEAT_STFLE_53, /* generates a dependency warning, leave it out for now */ S390_FEAT_MSA_EXT_5, + /* should be conditional on CONFIG_PCI */ + S390_FEAT_ZPCI, }; /****** END FEATURE DEFS ******/