From nobody Mon Feb 9 17:59:15 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600442599; cv=none; d=zohomail.com; s=zohoarc; b=gyBvf9cJfULFKwycpFqy0o44AAiGozBUZjkTeJtXTK9sSNXNHqZR1yEaVClSxQBJzsvmy42Qq6CP8F2qNYYREc5yEkrYNhdeWwijtcjTIoavWpU8IeKIh8ldmpISKCghWfeQRcFcLrwoLyh60WTmJ8KtMYpLgFuvv0gFOkeHJDw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600442599; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QGEKUXK8Ua+eb00vBAjJ3dQj8Co+dbRWsNgAI1iqUvA=; b=WGMBhRlZTmy/eda0RcqW1rYnh8ZW9op/xywSZBQ2MJEcpatEgp4pU5pA67l/lkFqRJ9sw1AFwIv7jHMOOp3FHUgMWna40g5W4+/9SmfVfD0SsSmgnQJ8DPUr3GUqYzcq92jO27gytXGMzuv4xMvNHM4zxFYZ7l9u8+IRjxL4zRQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16004425998201013.4293800537429; Fri, 18 Sep 2020 08:23:19 -0700 (PDT) Received: from localhost ([::1]:44278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJIEI-00005t-FX for importer@patchew.org; Fri, 18 Sep 2020 11:23:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJHyD-0006fv-Dl for qemu-devel@nongnu.org; Fri, 18 Sep 2020 11:06:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:51484) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kJHyA-0000ah-NI for qemu-devel@nongnu.org; Fri, 18 Sep 2020 11:06:41 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-38-bm7ZJQf7POyMs3VSJQNITQ-1; Fri, 18 Sep 2020 11:06:34 -0400 Received: by mail-wm1-f71.google.com with SMTP id a7so2171438wmc.2 for ; Fri, 18 Sep 2020 08:06:33 -0700 (PDT) Received: from redhat.com (bzq-109-65-116-225.red.bezeqint.net. [109.65.116.225]) by smtp.gmail.com with ESMTPSA id i16sm5638753wrq.73.2020.09.18.08.06.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2020 08:06:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600441596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=QGEKUXK8Ua+eb00vBAjJ3dQj8Co+dbRWsNgAI1iqUvA=; b=NeZVnsIrpnP/XQWRYJ1xHWrZXKpZH+so6cYyMl2fZ+1txseg1Wo3gsDVcKjS+CKR7O/u+2 Tb1OBaoP11LSn3dFN6HFfU+qwrgCkELxEHmsaPj88kXJpUIGC3A3Uct/4gxGzkrh2sg4Ie WA0A7OCGp12WCpX5yyTii3KqpJqlWIw= X-MC-Unique: bm7ZJQf7POyMs3VSJQNITQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=QGEKUXK8Ua+eb00vBAjJ3dQj8Co+dbRWsNgAI1iqUvA=; b=rlyvz7IMz3zcCRXBTOO+eANg0IEIRycBWwEkH8ilIzDvEsCxJh/TivzB30TX5mkCRt Dap6ay7BPS8FWn9y6M3hnVQYl3/3kDV7oorVzemiAcGprCGrcNiautnAzVioYhiDOBZm sdD7dpcaCwoZU0TTwSefYl3cLg0O3RNacy4diqu5MPzEGPMrOGhU4tguajaIp/p8D5fI TpuHSxIc27ixb4TbdhFctm6KHH8g5O48U0+vSLNMuvTBA+UpxEkK/cQKJas8gBvoTV2K NKSYy31VBR25tS+9nHi9dVGUdrPXnhFiXkTEgDnb5LOwbKo/u/EA3u4OWk7/x1kPhhu8 4A7w== X-Gm-Message-State: AOAM530fHkUrRlg1ed8bAxAZainGSru3edxwWKV/yk0ETRewiCv2pjbN 2rspDyeBJJJwFpuTJaiuP0D5KYLlsinSdKa2ZTn1IainySnp0hOcnzMj+25EMPGlodn3YzHEZj6 d3SKDprWFO/9Lw/0= X-Received: by 2002:a1c:c2c6:: with SMTP id s189mr16051077wmf.146.1600441592404; Fri, 18 Sep 2020 08:06:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzAEOS/BBEWrJMYQOiz2DkCRKhUo5RxBL81EK1YAj3GfFxLw58Rgfxlr9Xapd149ErFZQ6SJw== X-Received: by 2002:a1c:c2c6:: with SMTP id s189mr16051058wmf.146.1600441592234; Fri, 18 Sep 2020 08:06:32 -0700 (PDT) Date: Fri, 18 Sep 2020 11:06:30 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 15/15] virtio-iommu-pci: force virtio version 1 Message-ID: <20200918150506.286890-16-mst@redhat.com> References: <20200918150506.286890-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200918150506.286890-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/18 00:20:40 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Cornelia Huck , qemu-stable@nongnu.org, Eric Auger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Eric Auger Commit 9b3a35ec82 ("virtio: verify that legacy support is not accidentally on") added a safety check that requires to set 'disable-legacy=3Don' on virtio-iommu-pci: qemu-system-aarch64: -device virtio-iommu-pci: device is modern-only, use disable-legacy=3Don virtio-iommu was introduced after the release of VIRTIO 1.0 specifications, so it should be 'modern-only'. This patch forces virtio version 1 and removes the 'transitional_name' property removing the need to specify 'disable-legacy=3Don' on virtio-iommu-pci device. Cc: qemu-stable@nongnu.org Signed-off-by: Eric Auger Reviewed-by: Cornelia Huck Message-Id: <20200908193309.20569-3-eric.auger@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/virtio-iommu-pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/virtio/virtio-iommu-pci.c b/hw/virtio/virtio-iommu-pci.c index 76540e57b1..378f63b210 100644 --- a/hw/virtio/virtio-iommu-pci.c +++ b/hw/virtio/virtio-iommu-pci.c @@ -69,6 +69,7 @@ static void virtio_iommu_pci_realize(VirtIOPCIProxy *vpci= _dev, Error **errp) object_property_set_link(OBJECT(dev), "primary-bus", OBJECT(pci_get_bus(&vpci_dev->pci_dev)), &error_abort); + virtio_pci_force_virtio_1(vpci_dev); qdev_realize(vdev, BUS(&vpci_dev->bus), errp); } =20 @@ -98,7 +99,6 @@ static void virtio_iommu_pci_instance_init(Object *obj) static const VirtioPCIDeviceTypeInfo virtio_iommu_pci_info =3D { .base_name =3D TYPE_VIRTIO_IOMMU_PCI, .generic_name =3D "virtio-iommu-pci", - .transitional_name =3D "virtio-iommu-pci-transitional", .non_transitional_name =3D "virtio-iommu-pci-non-transitional", .instance_size =3D sizeof(VirtIOIOMMUPCI), .instance_init =3D virtio_iommu_pci_instance_init, --=20 MST