From patchwork Tue Sep 9 07:31:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 37031 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2DDF720491 for ; Tue, 9 Sep 2014 07:31:49 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id va2sf81137850obc.7 for ; Tue, 09 Sep 2014 00:31:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=hHe/Mo5prQp65pEU+fRLsUaWG9NmFTkx0VCI25lV+uM=; b=j8lj1zHULvU0mjjLQpMb6tHG1cjtbIKq0gE7xBTGoCt1Vp4MDYn4bKO5OmeSeaKKCr 6+x3oI2+WzliH9llpoM5gJZhjPEolIEEnbWIRAXbtoGIfHOcZTadnXXv8D1Ht+ZydmLy 8YsdaPJXMgdqJ3PoVnAW0LnPaF2zDsDI4f77+0IFHLjifOJmOpTmkZ6bplTQEAIAA3Gw 0omARaT+JB1xHJYdDbYm6+6lst5JkvAx3kJVwZlkf3oMssJQZ3LCtEIkoRi1YKvpGhe+ NVLhEC38whaT+4aaPpZ4HfU1vYXasXeCMAqBRaj5mtlcMbN7l7UmsaAvB+tslsTt9wd+ W75Q== X-Gm-Message-State: ALoCoQldK16CHOgq5q+KWslhSNQRxDihj2vtTudMubHL8dVrnfc03A5UUmM+1io9yL4GqlBJQN1H X-Received: by 10.42.122.209 with SMTP id o17mr21580553icr.28.1410247908804; Tue, 09 Sep 2014 00:31:48 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.17.47 with SMTP id 44ls2012681qgc.11.gmail; Tue, 09 Sep 2014 00:31:48 -0700 (PDT) X-Received: by 10.220.163.69 with SMTP id z5mr29526406vcx.10.1410247908729; Tue, 09 Sep 2014 00:31:48 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id lr17si5550410vdb.24.2014.09.09.00.31.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:31:48 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id hy10so2919113vcb.3 for ; Tue, 09 Sep 2014 00:31:48 -0700 (PDT) X-Received: by 10.221.23.66 with SMTP id qz2mr4693027vcb.46.1410247908671; Tue, 09 Sep 2014 00:31:48 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp244028vcb; Tue, 9 Sep 2014 00:31:48 -0700 (PDT) X-Received: by 10.194.21.234 with SMTP id y10mr30101632wje.42.1410247907776; Tue, 09 Sep 2014 00:31:47 -0700 (PDT) Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com [74.125.82.41]) by mx.google.com with ESMTPS id bo5si17177379wib.46.2014.09.09.00.31.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:31:47 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.41 as permitted sender) client-ip=74.125.82.41; Received: by mail-wg0-f41.google.com with SMTP id k14so1793798wgh.0 for ; Tue, 09 Sep 2014 00:31:47 -0700 (PDT) X-Received: by 10.194.81.230 with SMTP id d6mr40558586wjy.49.1410247907385; Tue, 09 Sep 2014 00:31:47 -0700 (PDT) Received: from midway01-04-00.lavalab ([88.98.47.97]) by mx.google.com with ESMTPSA id s1sm14513743wiw.6.2014.09.09.00.31.46 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:31:46 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, a.rigo@virtualopensystems.com, kim.phillips@freescale.com, marc.zyngier@arm.com, manish.jaggi@caviumnetworks.com, joel.schopp@amd.com, agraf@suse.de, peter.maydell@linaro.org, pbonzini@redhat.com, afaerber@suse.de Cc: eric.auger@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, will.deacon@arm.com, Bharat.Bhushan@freescale.com, stuart.yoder@freescale.com, a.motakis@virtualopensystems.com, alex.williamson@redhat.com Subject: [PATCH v6 06/16] hw/vfio/pci: rename group_list into vfio_group_list Date: Tue, 9 Sep 2014 08:31:06 +0100 Message-Id: <1410247876-4967-7-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1410247876-4967-1-git-send-email-eric.auger@linaro.org> References: <1410247876-4967-1-git-send-email-eric.auger@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , better fit in the rest of the namespace Signed-off-by: Eric Auger --- hw/vfio/pci.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index d48ca04..5623539 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -283,7 +283,7 @@ static const VFIORomBlacklistEntry romblacklist[] = { #define MSIX_CAP_LENGTH 12 static QLIST_HEAD(, VFIOGroup) - group_list = QLIST_HEAD_INITIALIZER(group_list); + vfio_group_list = QLIST_HEAD_INITIALIZER(vfio_group_list); #ifdef CONFIG_KVM /* @@ -3454,7 +3454,7 @@ static int vfio_pci_hot_reset(VFIOPCIDevice *vdev, bool single) continue; } - QLIST_FOREACH(group, &group_list, next) { + QLIST_FOREACH(group, &vfio_group_list, next) { if (group->groupid == devices[i].group_id) { break; } @@ -3501,7 +3501,7 @@ static int vfio_pci_hot_reset(VFIOPCIDevice *vdev, bool single) /* Determine how many group fds need to be passed */ count = 0; - QLIST_FOREACH(group, &group_list, next) { + QLIST_FOREACH(group, &vfio_group_list, next) { for (i = 0; i < info->count; i++) { if (group->groupid == devices[i].group_id) { count++; @@ -3515,7 +3515,7 @@ static int vfio_pci_hot_reset(VFIOPCIDevice *vdev, bool single) fds = &reset->group_fds[0]; /* Fill in group fds */ - QLIST_FOREACH(group, &group_list, next) { + QLIST_FOREACH(group, &vfio_group_list, next) { for (i = 0; i < info->count; i++) { if (group->groupid == devices[i].group_id) { fds[reset->count++] = group->fd; @@ -3550,7 +3550,7 @@ out: continue; } - QLIST_FOREACH(group, &group_list, next) { + QLIST_FOREACH(group, &vfio_group_list, next) { if (group->groupid == devices[i].group_id) { break; } @@ -3625,13 +3625,13 @@ static void vfio_reset_handler(void *opaque) VFIOGroup *group; VFIODevice *vbasedev; - QLIST_FOREACH(group, &group_list, next) { + QLIST_FOREACH(group, &vfio_group_list, next) { QLIST_FOREACH(vbasedev, &group->device_list, next) { vbasedev->ops->vfio_compute_needs_reset(vbasedev); } } - QLIST_FOREACH(group, &group_list, next) { + QLIST_FOREACH(group, &vfio_group_list, next) { QLIST_FOREACH(vbasedev, &group->device_list, next) { if (vbasedev->needs_reset) { vbasedev->ops->vfio_hot_reset_multi(vbasedev); @@ -3880,7 +3880,7 @@ static VFIOGroup *vfio_get_group(int groupid, AddressSpace *as) char path[32]; struct vfio_group_status status = { .argsz = sizeof(status) }; - QLIST_FOREACH(group, &group_list, next) { + QLIST_FOREACH(group, &vfio_group_list, next) { if (group->groupid == groupid) { /* Found it. Now is it already in the right context? */ if (group->container->space->as == as) { @@ -3922,11 +3922,11 @@ static VFIOGroup *vfio_get_group(int groupid, AddressSpace *as) goto close_fd_exit; } - if (QLIST_EMPTY(&group_list)) { + if (QLIST_EMPTY(&vfio_group_list)) { qemu_register_reset(vfio_reset_handler, NULL); } - QLIST_INSERT_HEAD(&group_list, group, next); + QLIST_INSERT_HEAD(&vfio_group_list, group, next); vfio_kvm_device_add_group(group); @@ -3954,7 +3954,7 @@ static void vfio_put_group(VFIOGroup *group) close(group->fd); g_free(group); - if (QLIST_EMPTY(&group_list)) { + if (QLIST_EMPTY(&vfio_group_list)) { qemu_unregister_reset(vfio_reset_handler, NULL); } }