From patchwork Sat Dec 14 15:56:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1209775 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="U6Ysk7CK"; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 47b0Pf3Spxz9sPK for ; Sun, 15 Dec 2019 08:03:34 +1100 (AEDT) Received: from localhost ([::1]:32916 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igEZY-0003rb-56 for incoming@patchwork.ozlabs.org; Sat, 14 Dec 2019 16:03:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55371) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igEWC-0000NY-Ip for qemu-devel@nongnu.org; Sat, 14 Dec 2019 16:00:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1igEWB-0001Zl-CC for qemu-devel@nongnu.org; Sat, 14 Dec 2019 16:00:04 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:36222 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1igEWB-0001Wb-4G for qemu-devel@nongnu.org; Sat, 14 Dec 2019 16:00:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576357202; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LRDNXmBjVfes+8mRt7KTS+s8kaJK3nwCAodGqedjxW4=; b=U6Ysk7CKH3hnQSV3zJWl3yLKj3sVtG733qDWXIrnk5CmeawZKj+Ke3NPwIgCXuidUG11wi +sjo6L+vbJ0OmgBoKIAewndNW6tONejicWCHSBGPdXbwckM+7qrOxJ+Cmvvwu9OFZa2q6m WDFxvQE8rq1L1yGj+ZCv+DeSQYGqWzY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-271-InHhu3ggMleXW3tOq5yXNw-1; Sat, 14 Dec 2019 10:57:59 -0500 X-MC-Unique: InHhu3ggMleXW3tOq5yXNw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C1EA11852E2D; Sat, 14 Dec 2019 15:57:56 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-147.brq.redhat.com [10.40.205.147]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 88D2B5D6A7; Sat, 14 Dec 2019 15:57:42 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 6/8] hw/vfio/pci: Use memory_region_add_subregion() when priority is 0 Date: Sat, 14 Dec 2019 16:56:12 +0100 Message-Id: <20191214155614.19004-7-philmd@redhat.com> In-Reply-To: <20191214155614.19004-1-philmd@redhat.com> References: <20191214155614.19004-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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 , Alistair Francis , Paul Burton , Eduardo Habkost , kvm@vger.kernel.org, "Michael S. Tsirkin" , Marcelo Tosatti , Andrew Baumann , Alex Williamson , qemu-arm@nongnu.org, Joel Stanley , Aleksandar Markovic , Paolo Bonzini , "Edgar E. Iglesias" , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It is pointless to overlap a memory subregion with priority 0. Use the simpler memory_region_add_subregion() function. This patch was produced with the following spatch script: @@ expression region; expression offset; expression subregion; @@ -memory_region_add_subregion_overlap(region, offset, subregion, 0) +memory_region_add_subregion(region, offset, subregion) Signed-off-by: Philippe Mathieu-Daudé --- hw/vfio/pci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 2d40b396f2..74b1eb7ddc 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -1095,8 +1095,7 @@ static void vfio_sub_page_bar_update_mapping(PCIDevice *pdev, int bar) memory_region_set_size(mmap_mr, size); if (size != vdev->bars[bar].size && memory_region_is_mapped(base_mr)) { memory_region_del_subregion(r->address_space, base_mr); - memory_region_add_subregion_overlap(r->address_space, - bar_addr, base_mr, 0); + memory_region_add_subregion(r->address_space, bar_addr, base_mr); } memory_region_transaction_commit();