From patchwork Mon Sep 21 11:30:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 11789463 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D3E016CA for ; Mon, 21 Sep 2020 11:35:27 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9319C20874 for ; Mon, 21 Sep 2020 11:35:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RYUZl4qn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9319C20874 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:40202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kKK6Q-0000sQ-KY for patchwork-qemu-devel@patchwork.kernel.org; Mon, 21 Sep 2020 07:35:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kKK1c-0003Z5-J0 for qemu-devel@nongnu.org; Mon, 21 Sep 2020 07:30:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:60369) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kKK1a-0000s5-Fo for qemu-devel@nongnu.org; Mon, 21 Sep 2020 07:30:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600687825; 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=RYUZl4qn7uwWEuqj1H82Ry63Bp6+ZpqmRMf9aXI5aODUQRqSTt3pg2HJiPbfuH7iLeZpGw dFW0fe/RgdSsV0hoRlHNPUl8pZsd/fEpny5uAJxTElULP4He43ma+Bda7nQriUTiy36TzH sS6XngTonHQ1FKscCMC40Ahk7rm/Spw= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-338-ZrNVeUYWNwSnFTAqunqWTw-1; Mon, 21 Sep 2020 07:30:22 -0400 X-MC-Unique: ZrNVeUYWNwSnFTAqunqWTw-1 Received: by mail-wr1-f71.google.com with SMTP id v5so5690095wrs.17 for ; Mon, 21 Sep 2020 04:30:22 -0700 (PDT) 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=WIgUILovj8uOdH0yHNxGGEMskn4eSVh4RVHLwBI7Z/3n1ZiPuQw6kzfN+IpkpkmRIe H3sK1Qguu39fZyPIvjLGuhbvy2Y6a8FW9hRkaUPyWIB7JDOOaq0/46OmL/Bgu09U2m/E vTj1UtzuQEuShB48voijhP6b4l5p1tEoU7Qhr47q2dki6FqFumR4u8pErX8htQJc3jps NpDqa4gNZEj1ji/tszkQTPVsBvI0kMrMcsKuNNOoTZl/lOZbyofQTNdeTthjfhNTCyAz rARq088MJUM0EsTiQQbRFDD8h9CMaDRgAEXGvGCz4FSvk6sGNCHnM/g6wmUqItxw/uDW gPnQ== X-Gm-Message-State: AOAM530OykzGgA73Yzh4xd3y9toF7L473eJX26nYVvfFNtCOU0UzrUeY 6Yg4D3RsEd4qVZ2zZ8KbXi1G+aaFL2/uuofyfKaxN7hXUGHjG9E/ToorPs9r6Db44+ZW45Xi884 onE2JPNgskbr6eLg= X-Received: by 2002:a5d:4710:: with SMTP id y16mr53663001wrq.203.1600687820841; Mon, 21 Sep 2020 04:30:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyv7S7M+jDpJ6fHP1jEept0BRI/xhsbyO/Nh5eVzfMEwLcCqKXFojmbRuBrL3nttLieRzkEXg== X-Received: by 2002:a5d:4710:: with SMTP id y16mr53662991wrq.203.1600687820696; Mon, 21 Sep 2020 04:30:20 -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 y6sm20479084wrn.41.2020.09.21.04.30.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2020 04:30:20 -0700 (PDT) Date: Mon, 21 Sep 2020 07:30:18 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL v3 15/15] virtio-iommu-pci: force virtio version 1 Message-ID: <20200921112913.555392-16-mst@redhat.com> References: <20200921112913.555392-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200921112913.555392-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 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/21 01:44:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.455, 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=unavailable 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Eric Auger Commit 9b3a35ec82 ("virtio: verify that legacy support is not accidentally on") added a safety check that requires to set 'disable-legacy=on' on virtio-iommu-pci: qemu-system-aarch64: -device virtio-iommu-pci: device is modern-only, use disable-legacy=on 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=on' 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); } @@ -98,7 +99,6 @@ static void virtio_iommu_pci_instance_init(Object *obj) static const VirtioPCIDeviceTypeInfo virtio_iommu_pci_info = { .base_name = TYPE_VIRTIO_IOMMU_PCI, .generic_name = "virtio-iommu-pci", - .transitional_name = "virtio-iommu-pci-transitional", .non_transitional_name = "virtio-iommu-pci-non-transitional", .instance_size = sizeof(VirtIOIOMMUPCI), .instance_init = virtio_iommu_pci_instance_init,