From: Paulina Szubarczyk <paulinaszubarczyk@gmail.com>
To: xen-devel@lists.xenproject.org
Cc: wei.liu2@citrix.com, George.Dunlap@eu.citrix.com,
Paulina Szubarczyk <paulinaszubarczyk@gmail.com>,
dario.faggioli@citrix.com, ian.jackson@eu.citrix.com,
roger.pau@citrix.com
Subject: [PATCH v4 5/7] libxl: improve return codes for some pci related functions
Date: Mon, 9 May 2016 13:30:56 +0200 [thread overview]
Message-ID: <1462793458-27170-6-git-send-email-paulinaszubarczyk@gmail.com> (raw)
In-Reply-To: <1462793458-27170-1-git-send-email-paulinaszubarczyk@gmail.com>
*libxl__device_from_pcidev(), pcidev_struct_fill() initialize
the values of libxl_device and libxl_device_pci structs
and can be void.
*libxl__create_pci_backend(), libxl__device_pci_destroy_all()
should propagate the success/error, rather than always returning 0.
Signed-off-by: Paulina Szubarczyk <paulinaszubarczyk@gmail.com>
---
Changed since v3:
- pcidev_struct_fill() is now void
- corrected indention
tools/libxl/libxl_pci.c | 27 ++++++++++-----------------
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c
index ce8d763..4e2f56e 100644
--- a/tools/libxl/libxl_pci.c
+++ b/tools/libxl/libxl_pci.c
@@ -36,7 +36,7 @@ static unsigned int pcidev_encode_bdf(libxl_device_pci *pcidev)
return value;
}
-static int pcidev_struct_fill(libxl_device_pci *pcidev, unsigned int domain,
+static void pcidev_struct_fill(libxl_device_pci *pcidev, unsigned int domain,
unsigned int bus, unsigned int dev,
unsigned int func, unsigned int vdevfn)
{
@@ -45,7 +45,6 @@ static int pcidev_struct_fill(libxl_device_pci *pcidev, unsigned int domain,
pcidev->dev = dev;
pcidev->func = func;
pcidev->vdevfn = vdevfn;
- return 0;
}
static void libxl_create_pci_backend_device(libxl__gc *gc, flexarray_t *back, int num, libxl_device_pci *pcidev)
@@ -64,9 +63,9 @@ static void libxl_create_pci_backend_device(libxl__gc *gc, flexarray_t *back, in
flexarray_append_pair(back, GCSPRINTF("state-%d", num), GCSPRINTF("%d", XenbusStateInitialising));
}
-static int libxl__device_from_pcidev(libxl__gc *gc, uint32_t domid,
- libxl_device_pci *pcidev,
- libxl__device *device)
+static void libxl__device_from_pcidev(libxl__gc *gc, uint32_t domid,
+ libxl_device_pci *pcidev,
+ libxl__device *device)
{
device->backend_devid = 0;
device->backend_domid = 0;
@@ -74,8 +73,6 @@ static int libxl__device_from_pcidev(libxl__gc *gc, uint32_t domid,
device->devid = 0;
device->domid = domid;
device->kind = LIBXL__DEVICE_KIND_PCI;
-
- return 0;
}
int libxl__create_pci_backend(libxl__gc *gc, uint32_t domid,
@@ -84,13 +81,11 @@ int libxl__create_pci_backend(libxl__gc *gc, uint32_t domid,
flexarray_t *front = NULL;
flexarray_t *back = NULL;
libxl__device device;
- int ret = ERROR_NOMEM, i;
+ int i;
front = flexarray_make(gc, 16, 1);
back = flexarray_make(gc, 16, 1);
- ret = 0;
-
LOG(DEBUG, "Creating pci backend");
/* add pci device */
@@ -108,12 +103,10 @@ int libxl__create_pci_backend(libxl__gc *gc, uint32_t domid,
flexarray_append_pair(front, "backend-id", GCSPRINTF("%d", 0));
flexarray_append_pair(front, "state", GCSPRINTF("%d", XenbusStateInitialising));
- libxl__device_generic_add(gc, XBT_NULL, &device,
- libxl__xs_kvs_of_flexarray(gc, back, back->count),
- libxl__xs_kvs_of_flexarray(gc, front, front->count),
- NULL);
-
- return 0;
+ return libxl__device_generic_add(gc, XBT_NULL, &device,
+ libxl__xs_kvs_of_flexarray(gc, back, back->count),
+ libxl__xs_kvs_of_flexarray(gc, front, front->count),
+ NULL);
}
static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int starting)
@@ -1612,7 +1605,7 @@ int libxl__device_pci_destroy_all(libxl__gc *gc, uint32_t domid)
}
free(pcidevs);
- return 0;
+ return rc;
}
int libxl__grant_vga_iomem_permission(libxl__gc *gc, const uint32_t domid,
--
1.9.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-05-09 11:32 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-09 11:30 [PATCH v4 00/10] xl: improve coding style and return more failure on Paulina Szubarczyk
2016-05-09 11:30 ` [PATCH v4 1/7] xl_cmdimpl - Add return codes for pci-detach, pci-attach, pci-asssignable-add, and pci-assignable-remove Paulina Szubarczyk
2016-06-09 14:44 ` Wei Liu
2016-06-09 14:53 ` Paulina Szubarczyk
2016-06-09 15:50 ` Wei Liu
2016-05-09 11:30 ` [PATCH v4 2/7] xl: improve main_tmem_* return codes Paulina Szubarczyk
2016-05-09 11:30 ` [PATCH v4 3/7] xl_cmdimpl: improve return codes for cd-insert commands Paulina Szubarczyk
2016-05-09 13:02 ` Wei Liu
2016-05-09 11:30 ` [PATCH v4 4/7] libxl: Fix libxl_set_memory_target return value Paulina Szubarczyk
2016-05-09 13:02 ` Wei Liu
2016-05-09 11:30 ` Paulina Szubarczyk [this message]
2016-05-09 13:02 ` [PATCH v4 5/7] libxl: improve return codes for some pci related functions Wei Liu
2016-05-09 11:30 ` [PATCH v4 6/7] libxl: style cleanups in libxl_device_pci_assignable_list() Paulina Szubarczyk
2016-05-09 13:02 ` Wei Liu
2016-05-09 11:30 ` [PATCH v4 7/7] libxl: libxl_tmem functions improving coding style Paulina Szubarczyk
2016-05-09 13:02 ` Wei Liu
2016-05-09 13:06 ` [PATCH v4 00/10] xl: improve coding style and return more failure on Wei Liu
2016-05-09 13:25 ` Paulina Szubarczyk
2016-05-09 13:31 ` Wei Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1462793458-27170-6-git-send-email-paulinaszubarczyk@gmail.com \
--to=paulinaszubarczyk@gmail.com \
--cc=George.Dunlap@eu.citrix.com \
--cc=dario.faggioli@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=roger.pau@citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).