From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D318AC433E2 for ; Thu, 3 Sep 2020 08:47:41 +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 8625A2071B for ; Thu, 3 Sep 2020 08:47:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="IdEelA3/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8625A2071B 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDkuC-0006ID-Iq for qemu-devel@archiver.kernel.org; Thu, 03 Sep 2020 04:47:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57536) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDkta-0005gM-Dn for qemu-devel@nongnu.org; Thu, 03 Sep 2020 04:47:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:47006) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDktX-0003df-F9 for qemu-devel@nongnu.org; Thu, 03 Sep 2020 04:47:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599122817; 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=gTdZnnrCdm+PWjXuubvvrI4NjVZkhkXv/8GttBIMfrI=; b=IdEelA3/woLUUSjEPUoJlVr8sfbye9ZVLfnEXEBbfjoBj0WsbAaaAHqdQyILkv7VAuzj+R Nwf2g4psyljZwfIztkwq920uECW+iACNXFhG7Ig4kfj/3R99lj/YHFiz/UA5ih3irxTUgb OyiPu8gsWtflXSqYe2YCZhgA7a/FrCk= 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-374-aZUco--ENbGxQO4GYb2lnw-1; Thu, 03 Sep 2020 04:46:54 -0400 X-MC-Unique: aZUco--ENbGxQO4GYb2lnw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A3C22802B72 for ; Thu, 3 Sep 2020 08:46:53 +0000 (UTC) Received: from [10.36.112.51] (ovpn-112-51.ams2.redhat.com [10.36.112.51]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 80CF760C0F; Thu, 3 Sep 2020 08:46:49 +0000 (UTC) Subject: Re: [PATCH 55/63] vfio: Rename PCI_VFIO to VFIO_PCI To: Eduardo Habkost , qemu-devel@nongnu.org References: <20200902224311.1321159-1-ehabkost@redhat.com> <20200902224311.1321159-56-ehabkost@redhat.com> From: Auger Eric Message-ID: <101f1b13-71ee-cd1c-2e4c-8dbad00282c0@redhat.com> Date: Thu, 3 Sep 2020 10:46:47 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200902224311.1321159-56-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-US Received-SPF: pass client-ip=63.128.21.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/03 04:23:54 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.324, 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: Alex Williamson , berrange@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Eduardo, On 9/3/20 12:43 AM, Eduardo Habkost wrote: > Make the type checking macro name consistent with the TYPE_* > constant. > > Signed-off-by: Eduardo Habkost Reviewed-by: Eric Auger Thanks Eric > --- > Cc: Alex Williamson > Cc: qemu-devel@nongnu.org > --- > hw/vfio/pci.h | 2 +- > hw/vfio/pci.c | 22 +++++++++++----------- > 2 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h > index 846d60e56c..5e53d5b863 100644 > --- a/hw/vfio/pci.h > +++ b/hw/vfio/pci.h > @@ -116,7 +116,7 @@ typedef struct VFIOMSIXInfo { > > #define TYPE_VFIO_PCI "vfio-pci" > typedef struct VFIOPCIDevice VFIOPCIDevice; > -DECLARE_INSTANCE_CHECKER(VFIOPCIDevice, PCI_VFIO, > +DECLARE_INSTANCE_CHECKER(VFIOPCIDevice, VFIO_PCI, > TYPE_VFIO_PCI) > > struct VFIOPCIDevice { > diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c > index 3611dcd38b..0d83eb0e47 100644 > --- a/hw/vfio/pci.c > +++ b/hw/vfio/pci.c > @@ -230,7 +230,7 @@ static void vfio_intx_update(VFIOPCIDevice *vdev, PCIINTxRoute *route) > > static void vfio_intx_routing_notifier(PCIDevice *pdev) > { > - VFIOPCIDevice *vdev = PCI_VFIO(pdev); > + VFIOPCIDevice *vdev = VFIO_PCI(pdev); > PCIINTxRoute route; > > if (vdev->interrupt != VFIO_INT_INTx) { > @@ -456,7 +456,7 @@ static void vfio_update_kvm_msi_virq(VFIOMSIVector *vector, MSIMessage msg, > static int vfio_msix_vector_do_use(PCIDevice *pdev, unsigned int nr, > MSIMessage *msg, IOHandler *handler) > { > - VFIOPCIDevice *vdev = PCI_VFIO(pdev); > + VFIOPCIDevice *vdev = VFIO_PCI(pdev); > VFIOMSIVector *vector; > int ret; > > @@ -541,7 +541,7 @@ static int vfio_msix_vector_use(PCIDevice *pdev, > > static void vfio_msix_vector_release(PCIDevice *pdev, unsigned int nr) > { > - VFIOPCIDevice *vdev = PCI_VFIO(pdev); > + VFIOPCIDevice *vdev = VFIO_PCI(pdev); > VFIOMSIVector *vector = &vdev->msi_vectors[nr]; > > trace_vfio_msix_vector_release(vdev->vbasedev.name, nr); > @@ -1048,7 +1048,7 @@ static const MemoryRegionOps vfio_vga_ops = { > */ > static void vfio_sub_page_bar_update_mapping(PCIDevice *pdev, int bar) > { > - VFIOPCIDevice *vdev = PCI_VFIO(pdev); > + VFIOPCIDevice *vdev = VFIO_PCI(pdev); > VFIORegion *region = &vdev->bars[bar].region; > MemoryRegion *mmap_mr, *region_mr, *base_mr; > PCIIORegion *r; > @@ -1094,7 +1094,7 @@ static void vfio_sub_page_bar_update_mapping(PCIDevice *pdev, int bar) > */ > uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len) > { > - VFIOPCIDevice *vdev = PCI_VFIO(pdev); > + VFIOPCIDevice *vdev = VFIO_PCI(pdev); > uint32_t emu_bits = 0, emu_val = 0, phys_val = 0, val; > > memcpy(&emu_bits, vdev->emulated_config_bits + addr, len); > @@ -1127,7 +1127,7 @@ uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len) > void vfio_pci_write_config(PCIDevice *pdev, > uint32_t addr, uint32_t val, int len) > { > - VFIOPCIDevice *vdev = PCI_VFIO(pdev); > + VFIOPCIDevice *vdev = VFIO_PCI(pdev); > uint32_t val_le = cpu_to_le32(val); > > trace_vfio_pci_write_config(vdev->vbasedev.name, addr, val, len); > @@ -2701,7 +2701,7 @@ static void vfio_unregister_req_notifier(VFIOPCIDevice *vdev) > > static void vfio_realize(PCIDevice *pdev, Error **errp) > { > - VFIOPCIDevice *vdev = PCI_VFIO(pdev); > + VFIOPCIDevice *vdev = VFIO_PCI(pdev); > VFIODevice *vbasedev_iter; > VFIOGroup *group; > char *tmp, *subsys, group_path[PATH_MAX], *group_name; > @@ -3033,7 +3033,7 @@ error: > > static void vfio_instance_finalize(Object *obj) > { > - VFIOPCIDevice *vdev = PCI_VFIO(obj); > + VFIOPCIDevice *vdev = VFIO_PCI(obj); > VFIOGroup *group = vdev->vbasedev.group; > > vfio_display_finalize(vdev); > @@ -3057,7 +3057,7 @@ static void vfio_instance_finalize(Object *obj) > > static void vfio_exitfn(PCIDevice *pdev) > { > - VFIOPCIDevice *vdev = PCI_VFIO(pdev); > + VFIOPCIDevice *vdev = VFIO_PCI(pdev); > > vfio_unregister_req_notifier(vdev); > vfio_unregister_err_notifier(vdev); > @@ -3075,7 +3075,7 @@ static void vfio_exitfn(PCIDevice *pdev) > > static void vfio_pci_reset(DeviceState *dev) > { > - VFIOPCIDevice *vdev = PCI_VFIO(dev); > + VFIOPCIDevice *vdev = VFIO_PCI(dev); > > trace_vfio_pci_reset(vdev->vbasedev.name); > > @@ -3115,7 +3115,7 @@ post_reset: > static void vfio_instance_init(Object *obj) > { > PCIDevice *pci_dev = PCI_DEVICE(obj); > - VFIOPCIDevice *vdev = PCI_VFIO(obj); > + VFIOPCIDevice *vdev = VFIO_PCI(obj); > > device_add_bootindex_property(obj, &vdev->bootindex, > "bootindex", NULL, >