[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/14] hw/vfio/pci: rename group_list into vfio_group
From: |
Alex Williamson |
Subject: |
[Qemu-devel] [PULL 11/14] hw/vfio/pci: rename group_list into vfio_group_list |
Date: |
Mon, 22 Dec 2014 13:44:15 -0700 |
User-agent: |
StGit/0.17-dirty |
From: Eric Auger <address@hidden>
better fit in the rest of the namespace
Signed-off-by: Eric Auger <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>
---
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 e965f3e..48387bc 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);
}
}
- [Qemu-devel] [PULL 00/14] QEMU: VFIO updates, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 01/14] vfio: migration to trace points, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 02/14] vfio: fix adding memory listener to the right address space, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 04/14] hw/vfio/pci: Rename VFIODevice into VFIOPCIDevice, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 05/14] hw/vfio/pci: generalize mask/unmask to any IRQ index, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 06/14] hw/vfio/pci: introduce minimalist VFIODevice with fd, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 07/14] hw/vfio/pci: add type, name and group fields in VFIODevice, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 08/14] hw/vfio/pci: handle reset at VFIODevice, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 09/14] hw/vfio/pci: Introduce VFIORegion, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 10/14] hw/vfio/pci: split vfio_get_device, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 11/14] hw/vfio/pci: rename group_list into vfio_group_list,
Alex Williamson <=
- [Qemu-devel] [PULL 12/14] hw/vfio/pci: use name field in format strings, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 13/14] hw/vfio: create common module, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 14/14] vfio: Cleanup error_report()s, Alex Williamson, 2014/12/22
- [Qemu-devel] [PULL 03/14] vfio: move hw/misc/vfio.c to hw/vfio/pci.c Move vfio.h into include/hw/vfio, Alex Williamson, 2014/12/22
- Re: [Qemu-devel] [PULL 00/14] QEMU: VFIO updates, Peter Maydell, 2014/12/23