lkml.org 
[lkml]   [2015]   [Jan]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v13 13/18] vfio: virqfd: rename vfio_pci_virqfd_init and vfio_pci_virqfd_exit
    Date
    From: Antonios Motakis <a.motakis@virtualopensystems.com>

    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: Antonios 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: Baptiste Reynal <b.reynal@virtualopensystems.com>
    ---
    drivers/vfio/pci/vfio_pci.c | 6 +++---
    drivers/vfio/pci/vfio_pci_intrs.c | 4 ++--
    drivers/vfio/pci/vfio_pci_private.h | 4 ++--
    3 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
    index 9558da3..fc4308c 100644
    --- a/drivers/vfio/pci/vfio_pci.c
    +++ b/drivers/vfio/pci/vfio_pci.c
    @@ -1012,7 +1012,7 @@ put_devs:
    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();
    }

    @@ -1026,7 +1026,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;

    @@ -1038,7 +1038,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;
    diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c
    index 0a41833d..a5378d5 100644
    --- a/drivers/vfio/pci/vfio_pci_intrs.c
    +++ b/drivers/vfio/pci/vfio_pci_intrs.c
    @@ -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);
    }
    diff --git a/drivers/vfio/pci/vfio_pci_private.h b/drivers/vfio/pci/vfio_pci_private.h
    index 671c17a..2e2f0ea 100644
    --- a/drivers/vfio/pci/vfio_pci_private.h
    +++ b/drivers/vfio/pci/vfio_pci_private.h
    @@ -86,8 +86,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);
    --
    2.2.2


    \
     
     \ /
      Last update: 2015-01-30 15:01    [W:3.970 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site