From af96383f32eae7b07a2d70b6bcabe5f7c2bede98 Mon Sep 17 00:00:00 2001 From: swapnili Date: Mon, 30 Nov 2020 18:57:23 +0100 Subject: Misc cleanup (#138) * Rename vfu_ctx_destroy() to vfu_destroy_ctx() * Remove unused function copy_sparse_mmap_area() * Coding style fixes Signed-off-by: Swapnil Ingle Reviewed-by: John Levon --- include/libvfio-user.h | 2 +- lib/irq.c | 5 ++-- lib/libvfio-user.c | 71 +++++++++++++++++++++------------------------- samples/gpio-pci-idio-16.c | 2 +- samples/null.c | 2 +- samples/server.c | 2 +- 6 files changed, 40 insertions(+), 44 deletions(-) diff --git a/include/libvfio-user.h b/include/libvfio-user.h index 4e53d6d..ed4e302 100644 --- a/include/libvfio-user.h +++ b/include/libvfio-user.h @@ -414,7 +414,7 @@ vfu_setup_device_migration(vfu_ctx_t *vfu_ctx, vfu_migration_t *migration); * @vfu_ctx: the libvfio-user context to destroy */ void -vfu_ctx_destroy(vfu_ctx_t *vfu_ctx); +vfu_destroy_ctx(vfu_ctx_t *vfu_ctx); /** * Once the vfu_ctx is configured vfu_ctx_drive() drives it. This function waits diff --git a/lib/irq.c b/lib/irq.c index ab174a1..9c8f105 100644 --- a/lib/irq.c +++ b/lib/irq.c @@ -366,7 +366,8 @@ handle_device_set_irqs(vfu_ctx_t *vfu_ctx, uint32_t size, return dev_set_irqs(vfu_ctx, irq_set, data); } -static int validate_irq_subindex(vfu_ctx_t *vfu_ctx, uint32_t subindex) +static int +validate_irq_subindex(vfu_ctx_t *vfu_ctx, uint32_t subindex) { if (vfu_ctx == NULL) { errno = EINVAL; @@ -430,4 +431,4 @@ vfu_irq_message(vfu_ctx_t *vfu_ctx, uint32_t subindex) return 0; } - +/* ex: set tabstop=4 shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lib/libvfio-user.c b/lib/libvfio-user.c index ab1cde5..3a1bd77 100644 --- a/lib/libvfio-user.c +++ b/lib/libvfio-user.c @@ -78,7 +78,8 @@ vfu_log(vfu_ctx_t *vfu_ctx, vfu_log_lvl_t lvl, const char *fmt, ...) errno = _errno; } -static inline int ERROR(int err) +static inline int +ERROR(int err) { errno = err; return -1; @@ -1039,7 +1040,8 @@ process_request(vfu_ctx_t *vfu_ctx) return ret; } -static int prepare_ctx(vfu_ctx_t *vfu_ctx) +static int +prepare_ctx(vfu_ctx_t *vfu_ctx) { vfu_reg_info_t *cfg_reg; const vfu_reg_info_t zero_reg = { 0 }; @@ -1202,7 +1204,7 @@ free_sparse_mmap_areas(vfu_ctx_t *vfu_ctx) } void -vfu_ctx_destroy(vfu_ctx_t *vfu_ctx) +vfu_destroy_ctx(vfu_ctx_t *vfu_ctx) { if (vfu_ctx == NULL) { @@ -1226,22 +1228,6 @@ vfu_ctx_destroy(vfu_ctx_t *vfu_ctx) // FIXME: Maybe close any open irq efds? Unmap stuff? } -struct vfu_sparse_mmap_areas* -copy_sparse_mmap_area(struct vfu_sparse_mmap_areas *src) -{ - struct vfu_sparse_mmap_areas *dest; - size_t size; - - assert(src != NULL); - - size = sizeof(*dest) + (src->nr_mmap_areas * sizeof(struct vfu_mmap_area)); - dest = calloc(1, size); - if (dest != NULL) { - memcpy(dest, src, size); - } - return dest; -} - int vfu_ctx_try_attach(vfu_ctx_t *vfu_ctx) { @@ -1261,8 +1247,8 @@ vfu_ctx_try_attach(vfu_ctx_t *vfu_ctx) return vfu_ctx->trans->attach(vfu_ctx); } -vfu_ctx_t *vfu_create_ctx(vfu_trans_t trans, const char *path, int flags, - void *pvt) +vfu_ctx_t * +vfu_create_ctx(vfu_trans_t trans, const char *path, int flags, void *pvt) { vfu_ctx_t *vfu_ctx = NULL; int err = 0; @@ -1314,7 +1300,7 @@ vfu_ctx_t *vfu_create_ctx(vfu_trans_t trans, const char *path, int flags, out: if (err != 0) { if (vfu_ctx != NULL) { - vfu_ctx_destroy(vfu_ctx); + vfu_destroy_ctx(vfu_ctx); vfu_ctx = NULL; } errno = -err; @@ -1323,7 +1309,8 @@ out: return vfu_ctx; } -int vfu_setup_log(vfu_ctx_t *vfu_ctx, vfu_log_fn_t *log, vfu_log_lvl_t log_lvl) +int +vfu_setup_log(vfu_ctx_t *vfu_ctx, vfu_log_fn_t *log, vfu_log_lvl_t log_lvl) { if (log_lvl != VFU_ERR && log_lvl != VFU_INF && log_lvl != VFU_DBG) { @@ -1336,9 +1323,10 @@ int vfu_setup_log(vfu_ctx_t *vfu_ctx, vfu_log_fn_t *log, vfu_log_lvl_t log_lvl) return 0; } -int vfu_pci_setup_config_hdr(vfu_ctx_t *vfu_ctx, vfu_pci_hdr_id_t id, - vfu_pci_hdr_ss_t ss, vfu_pci_hdr_cc_t cc, - UNUSED bool extended) +int +vfu_pci_setup_config_hdr(vfu_ctx_t *vfu_ctx, vfu_pci_hdr_id_t id, + vfu_pci_hdr_ss_t ss, vfu_pci_hdr_cc_t cc, + UNUSED bool extended) { vfu_pci_config_space_t *config_space; @@ -1365,7 +1353,8 @@ int vfu_pci_setup_config_hdr(vfu_ctx_t *vfu_ctx, vfu_pci_hdr_id_t id, return 0; } -int vfu_pci_setup_caps(vfu_ctx_t *vfu_ctx, vfu_cap_t **caps, int nr_caps) +int +vfu_pci_setup_caps(vfu_ctx_t *vfu_ctx, vfu_cap_t **caps, int nr_caps) { int ret; @@ -1416,16 +1405,18 @@ copy_sparse_mmap_areas(vfu_reg_info_t *reg_info, return 0; } -static inline bool is_valid_pci_config_space_region(int flags, size_t size) +static inline bool +is_valid_pci_config_space_region(int flags, size_t size) { return flags == VFU_REG_FLAG_RW && (size == PCI_CFG_SPACE_SIZE || size == PCI_CFG_SPACE_EXP_SIZE); } -int vfu_setup_region(vfu_ctx_t *vfu_ctx, int region_idx, size_t size, - vfu_region_access_cb_t *region_access, int flags, - struct vfu_mmap_area *mmap_areas, uint32_t nr_mmap_areas, - vfu_map_region_cb_t *map) +int +vfu_setup_region(vfu_ctx_t *vfu_ctx, int region_idx, size_t size, + vfu_region_access_cb_t *region_access, int flags, + struct vfu_mmap_area *mmap_areas, uint32_t nr_mmap_areas, + vfu_map_region_cb_t *map) { int ret; @@ -1462,7 +1453,8 @@ int vfu_setup_region(vfu_ctx_t *vfu_ctx, int region_idx, size_t size, return 0; } -int vfu_setup_device_reset_cb(vfu_ctx_t *vfu_ctx, vfu_reset_cb_t *reset) +int +vfu_setup_device_reset_cb(vfu_ctx_t *vfu_ctx, vfu_reset_cb_t *reset) { assert(vfu_ctx != NULL); @@ -1471,8 +1463,9 @@ int vfu_setup_device_reset_cb(vfu_ctx_t *vfu_ctx, vfu_reset_cb_t *reset) return 0; } -int vfu_setup_device_dma_cb(vfu_ctx_t *vfu_ctx, vfu_map_dma_cb_t *map_dma, - vfu_unmap_dma_cb_t *unmap_dma) +int +vfu_setup_device_dma_cb(vfu_ctx_t *vfu_ctx, vfu_map_dma_cb_t *map_dma, + vfu_unmap_dma_cb_t *unmap_dma) { assert(vfu_ctx != NULL); @@ -1491,8 +1484,9 @@ int vfu_setup_device_dma_cb(vfu_ctx_t *vfu_ctx, vfu_map_dma_cb_t *map_dma, return 0; } -int vfu_setup_device_nr_irqs(vfu_ctx_t *vfu_ctx, enum vfu_dev_irq_type type, - uint32_t count) +int +vfu_setup_device_nr_irqs(vfu_ctx_t *vfu_ctx, enum vfu_dev_irq_type type, + uint32_t count) { assert(vfu_ctx != NULL); @@ -1509,7 +1503,8 @@ int vfu_setup_device_nr_irqs(vfu_ctx_t *vfu_ctx, enum vfu_dev_irq_type type, return 0; } -int vfu_setup_device_migration(vfu_ctx_t *vfu_ctx, vfu_migration_t *migration) +int +vfu_setup_device_migration(vfu_ctx_t *vfu_ctx, vfu_migration_t *migration) { vfu_reg_info_t *migr_reg; int ret = 0; diff --git a/samples/gpio-pci-idio-16.c b/samples/gpio-pci-idio-16.c index 86d5177..17dfdaa 100644 --- a/samples/gpio-pci-idio-16.c +++ b/samples/gpio-pci-idio-16.c @@ -136,7 +136,7 @@ main(int argc, char *argv[]) } out: - vfu_ctx_destroy(vfu_ctx); + vfu_destroy_ctx(vfu_ctx); return ret; } diff --git a/samples/null.c b/samples/null.c index 1998a08..99e35cc 100644 --- a/samples/null.c +++ b/samples/null.c @@ -102,7 +102,7 @@ int main(int argc, char **argv) errno = ret; err(EXIT_FAILURE, "failed to create pthread"); } - vfu_ctx_destroy(vfu_ctx); + vfu_destroy_ctx(vfu_ctx); printf("device emulation stopped and cleaned up, press enter to exit\n"); if (getchar() == EOF) { diff --git a/samples/server.c b/samples/server.c index 7f9eefa..571e374 100644 --- a/samples/server.c +++ b/samples/server.c @@ -506,7 +506,7 @@ int main(int argc, char *argv[]) strerror(-ret)); } - vfu_ctx_destroy(vfu_ctx); + vfu_destroy_ctx(vfu_ctx); free(server_data.bar1); return EXIT_SUCCESS; } -- cgit v1.1