[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 08/27] vhost-user-scsi: code style fixes
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL v2 08/27] vhost-user-scsi: code style fixes |
Date: |
Tue, 10 Oct 2017 23:34:47 +0200 |
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c
b/contrib/vhost-user-scsi/vhost-user-scsi.c
index e01bf31296..fe567452cd 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -305,7 +305,8 @@ fail:
}
static struct scsi_task *scsi_task_new(int cdb_len, uint8_t *cdb, int dir,
- int xfer_len) {
+ int xfer_len)
+{
struct scsi_task *task;
assert(cdb_len > 0);
@@ -344,7 +345,8 @@ static int handle_cmd_sync(struct iscsi_context *ctx,
VirtIOSCSICmdReq *req,
struct iovec *out, unsigned int out_len,
VirtIOSCSICmdResp *rsp,
- struct iovec *in, unsigned int in_len) {
+ struct iovec *in, unsigned int in_len)
+{
struct scsi_task *task;
uint32_t dir;
uint32_t len;
@@ -454,7 +456,8 @@ static void vus_panic_cb(VuDev *vu_dev, const char *buf)
}
static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb,
- void *pvt) {
+ void *pvt)
+{
vhost_scsi_dev_t *vdev_scsi;
guint id;
@@ -529,7 +532,7 @@ static void vus_proc_req(VuDev *vu_dev, int idx)
return;
}
- if ((idx < 0) || (idx >= VHOST_MAX_NR_VIRTQUEUE)) {
+ if (idx < 0 || idx >= VHOST_MAX_NR_VIRTQUEUE) {
PERR("VQ Index out of range: %d", idx);
vus_panic_cb(vu_dev, NULL);
return;
@@ -556,8 +559,8 @@ static void vus_proc_req(VuDev *vu_dev, int idx)
}
PDBG("Popped address@hidden", elem);
- assert(!((elem->out_num > 1) && (elem->in_num > 1)));
- assert((elem->out_num > 0) && (elem->in_num > 0));
+ assert(!(elem->out_num > 1 && elem->in_num > 1));
+ assert(elem->out_num > 0 && elem->in_num > 0);
if (elem->out_sg[0].iov_len < sizeof(VirtIOSCSICmdReq)) {
PERR("Invalid virtio-scsi req header");
@@ -593,7 +596,7 @@ static void vus_queue_set_started(VuDev *vu_dev, int idx,
bool started)
assert(vu_dev);
- if ((idx < 0) || (idx >= VHOST_MAX_NR_VIRTQUEUE)) {
+ if (idx < 0 || idx >= VHOST_MAX_NR_VIRTQUEUE) {
PERR("VQ Index out of range: %d", idx);
vus_panic_cb(vu_dev, NULL);
return;
@@ -748,7 +751,8 @@ err:
}
static int vdev_scsi_add_iscsi_lun(vhost_scsi_dev_t *vdev_scsi,
- char *iscsi_uri, uint32_t lun) {
+ char *iscsi_uri, uint32_t lun)
+{
assert(vdev_scsi);
assert(iscsi_uri);
assert(lun < VUS_MAX_LUNS);
--
2.15.0.rc0.40.gaefcc5f6f
- [Qemu-devel] [PULL v2 00/27] vhost-user patches, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 01/27] glib-compat: move G_SOURCE_CONTINUE/REMOVE there, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 02/27] build-sys: fix libvhost-user.a build, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 03/27] build-sys: make vhost-user-scsi depend on libvhost-user.a, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 04/27] libvhost-user: drop dependency on glib, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 05/27] libvhost-user: improve vu_queue_pop() doc, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 06/27] vhost-user-scsi: use g_strdup(), Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 07/27] vhost-user-scsi: connect unix socket before allocating, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 08/27] vhost-user-scsi: code style fixes,
Marc-André Lureau <=
- [Qemu-devel] [PULL v2 09/27] vhost-user-scsi: use glib allocation, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 10/27] vhost-user-scsi: glib calls that allocate don't return NULL, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 11/27] vhost-user-scsi: also free the gtree, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 12/27] vhost-user-scsi: remove vdev_scsi_find_by_vu(), Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 13/27] vhost-user-scsi: simplify unix path cleanup, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 14/27] vhost-user-scsi: use NULL pointer, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 15/27] vhost-user-scsi: assert() in iscsi_add_lun(), Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 16/27] vhost-user-scsi: remove vdev_scsi_add_iscsi_lun(), Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 17/27] vhost-user-scsi: remove VUS_MAX_LUNS, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 18/27] vhost-user-scsi: remove unimplemented functions, Marc-André Lureau, 2017/10/10