From patchwork Sun Nov 30 18:35:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 41732 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f70.google.com (mail-ee0-f70.google.com [74.125.83.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6D10224001 for ; Sun, 30 Nov 2014 18:35:54 +0000 (UTC) Received: by mail-ee0-f70.google.com with SMTP id b57sf5855168eek.9 for ; Sun, 30 Nov 2014 10:35:53 -0800 (PST) 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=tTb05dfdMsS+WrFD37Ngm1s1h0bWsSXmksX4qAxcrfY=; b=UI1hbBR4WUXD0KsIz1y+mMjbnfEHiidUY0oV2yQjMh5z5RrKJNzDH0a4g8Dd4N8K+0 6WE5iaGz70AeARjyqReTLmmWVZp6IYArFDojUsl6vE0ahak8eXEppUJA6OS51C7kCcTf omKdUywoIBzbnPgBVXeEhVMSeg2ALCukcLrY7XKJTtXWMvmmwp6pAhCmUCJpTNdNFB9z 4jjmLipFI9XxLOQG3dE8bmgOh5mwVIXNsKyke7ziWHiQL36J4mL3vznojq6LFPSGpy7m +/xbqL0wM9gPo3eESBWU1MCIf5QEajVdm+1aUNbzpa9dEVrS9J8VWQ+ODeERYFkg4VLZ VIQg== X-Gm-Message-State: ALoCoQl89VNU2qiqjgLJpQGei2vwnWH84Ny1I7h1/FZicSlkHNXbzOXuin5MHbKCziQUR3lIEUzx X-Received: by 10.181.13.147 with SMTP id ey19mr12655802wid.2.1417372553580; Sun, 30 Nov 2014 10:35:53 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.40 with SMTP id n8ls755076laj.73.gmail; Sun, 30 Nov 2014 10:35:53 -0800 (PST) X-Received: by 10.112.199.138 with SMTP id jk10mr8121417lbc.86.1417372553389; Sun, 30 Nov 2014 10:35:53 -0800 (PST) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id t10si15635392lat.82.2014.11.30.10.35.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 30 Nov 2014 10:35:53 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by mail-la0-f51.google.com with SMTP id ms9so7643111lab.10 for ; Sun, 30 Nov 2014 10:35:53 -0800 (PST) X-Received: by 10.152.43.103 with SMTP id v7mr29859371lal.29.1417372553311; Sun, 30 Nov 2014 10:35:53 -0800 (PST) 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.112.184.201 with SMTP id ew9csp172690lbc; Sun, 30 Nov 2014 10:35:52 -0800 (PST) X-Received: by 10.180.228.37 with SMTP id sf5mr79025346wic.35.1417372552630; Sun, 30 Nov 2014 10:35:52 -0800 (PST) Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com. [209.85.212.173]) by mx.google.com with ESMTPS id gp6si27859422wib.41.2014.11.30.10.35.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 30 Nov 2014 10:35:52 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 209.85.212.173 as permitted sender) client-ip=209.85.212.173; Received: by mail-wi0-f173.google.com with SMTP id r20so22536876wiv.6 for ; Sun, 30 Nov 2014 10:35:52 -0800 (PST) X-Received: by 10.194.185.68 with SMTP id fa4mr85084702wjc.83.1417372552421; Sun, 30 Nov 2014 10:35:52 -0800 (PST) Received: from midway01-04-00.lavalab ([81.128.185.50]) by mx.google.com with ESMTPSA id z7sm38794058wia.22.2014.11.30.10.35.51 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 30 Nov 2014 10:35:51 -0800 (PST) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, agraf@suse.de, pbonzini@redhat.com, kim.phillips@freescale.com, a.rigo@virtualopensystems.com, manish.jaggi@caviumnetworks.com, joel.schopp@amd.com, zhaoshenglong@huawei.com, ard.biesheuvel@linaro.org Cc: eric.auger@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, alex.williamson@redhat.com, peter.maydell@linaro.org, will.deacon@arm.com, Bharat.Bhushan@freescale.com, stuart.yoder@freescale.com, a.motakis@virtualopensystems.com Subject: [PATCH v8 09/19] hw/vfio/pci: rename group_list into vfio_group_list Date: Sun, 30 Nov 2014 18:35:14 +0000 Message-Id: <1417372524-12936-10-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1417372524-12936-1-git-send-email-eric.auger@linaro.org> References: <1417372524-12936-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.215.51 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 60ff22b..d4a0e0f 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -282,7 +282,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; } @@ -3624,13 +3624,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); @@ -3879,7 +3879,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) { @@ -3921,11 +3921,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); @@ -3953,7 +3953,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); } }