Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb78e9ea authored by Antonios Motakis's avatar Antonios Motakis Committed by Alex Williamson
Browse files

vfio: virqfd: rename vfio_pci_virqfd_init and vfio_pci_virqfd_exit 



The functions vfio_pci_virqfd_init and vfio_pci_virqfd_exit are not really
PCI specific, since we plan to reuse the virqfd code with more VFIO drivers
in addition to VFIO_PCI.

Signed-off-by: default avatarAntonios Motakis <a.motakis@virtualopensystems.com>
[Baptiste Reynal: Move rename vfio_pci_virqfd_init and vfio_pci_virqfd_exit
from "vfio: add a vfio_ prefix to virqfd_enable and virqfd_disable and export"]
Signed-off-by: default avatarBaptiste Reynal <b.reynal@virtualopensystems.com>
Reviewed-by: default avatarEric Auger <eric.auger@linaro.org>
Tested-by: default avatarEric Auger <eric.auger@linaro.org>
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent bdc5e102

drivers/vfio/pci/vfio_pci.c

+3 −3
Original line number Diff line number Diff line
@@ -1030,7 +1030,7 @@ static void vfio_pci_try_bus_reset(struct vfio_pci_device *vdev) 
static void __exit vfio_pci_cleanup(void)

{

	pci_unregister_driver(&vfio_pci_driver);

	vfio_pci_virqfd_exit();

	vfio_virqfd_exit();

	vfio_pci_uninit_perm_bits();

}
@@ -1044,7 +1044,7 @@ static int __init vfio_pci_init(void) 
		return ret;



	/* Start the virqfd cleanup handler */

	ret = vfio_pci_virqfd_init();

	ret = vfio_virqfd_init();

	if (ret)

		goto out_virqfd;
@@ -1056,7 +1056,7 @@ static int __init vfio_pci_init(void) 
	return 0;



out_driver:

	vfio_pci_virqfd_exit();

	vfio_virqfd_exit();

out_virqfd:

	vfio_pci_uninit_perm_bits();

	return ret;

drivers/vfio/pci/vfio_pci_intrs.c

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct virqfd { 


static struct workqueue_struct *vfio_irqfd_cleanup_wq;



int __init vfio_pci_virqfd_init(void)

int __init vfio_virqfd_init(void)

{

	vfio_irqfd_cleanup_wq =

		create_singlethread_workqueue("vfio-irqfd-cleanup");
@@ -55,7 +55,7 @@ int __init vfio_pci_virqfd_init(void) 
	return 0;

}



void vfio_pci_virqfd_exit(void)

void vfio_virqfd_exit(void)

{

	destroy_workqueue(vfio_irqfd_cleanup_wq);

}

drivers/vfio/pci/vfio_pci_private.h

+2 −2
Original line number Diff line number Diff line
@@ -87,8 +87,8 @@ extern ssize_t vfio_pci_vga_rw(struct vfio_pci_device *vdev, char __user *buf, 
extern int vfio_pci_init_perm_bits(void);

extern void vfio_pci_uninit_perm_bits(void);



extern int vfio_pci_virqfd_init(void);

extern void vfio_pci_virqfd_exit(void);

extern int vfio_virqfd_init(void);

extern void vfio_virqfd_exit(void);



extern int vfio_config_init(struct vfio_pci_device *vdev);

extern void vfio_config_free(struct vfio_pci_device *vdev);