* [Qemu-devel] [PATCH v2 01/27] glib-compat: move G_SOURCE_CONTINUE/REMOVE there
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 02/27] build-sys: fix libvhost-user.a build Marc-André Lureau
` (25 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
include/glib-compat.h | 7 +++++++
contrib/vhost-user-scsi/vhost-user-scsi.c | 8 --------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/include/glib-compat.h b/include/glib-compat.h
index fcffcd3f07..d35d641b7f 100644
--- a/include/glib-compat.h
+++ b/include/glib-compat.h
@@ -354,5 +354,12 @@ g_test_add_data_func_full(const char *path,
}
#endif
+/* Small compat shim from glib 2.32 */
+#ifndef G_SOURCE_CONTINUE
+#define G_SOURCE_CONTINUE TRUE
+#endif
+#ifndef G_SOURCE_REMOVE
+#define G_SOURCE_REMOVE FALSE
+#endif
#endif
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index b5ae02c96f..78bcc65f5a 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -17,14 +17,6 @@
#include <glib.h>
-/* Small compat shim from glib 2.32 */
-#ifndef G_SOURCE_CONTINUE
-#define G_SOURCE_CONTINUE TRUE
-#endif
-#ifndef G_SOURCE_REMOVE
-#define G_SOURCE_REMOVE FALSE
-#endif
-
/* #define VUS_DEBUG 1 */
/** Log helpers **/
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 02/27] build-sys: fix libvhost-user.a build
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 01/27] glib-compat: move G_SOURCE_CONTINUE/REMOVE there Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 03/27] build-sys: make vhost-user-scsi depend on libvhost-user.a Marc-André Lureau
` (24 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
And actually link to it from vhost-user-bridge.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Makefile | 3 ++-
tests/Makefile.include | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index b53fc69a60..8a64b6afb0 100644
--- a/Makefile
+++ b/Makefile
@@ -336,7 +336,7 @@ dtc/%:
mkdir -p $@
$(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y) $(chardev-obj-y) \
- $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY))
+ $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY)) libvhost-user.a
ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
# Only keep -O and -g cflags
@@ -357,6 +357,7 @@ Makefile: $(version-obj-y)
libqemustub.a: $(stub-obj-y)
libqemuutil.a: $(util-obj-y) $(trace-obj-y)
+libvhost-user.a: $(libvhost-user-obj-y)
######################################################################
diff --git a/tests/Makefile.include b/tests/Makefile.include
index fae5715e9c..367d144275 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -795,7 +795,7 @@ tests/test-filter-redirector$(EXESUF): tests/test-filter-redirector.o $(qtest-ob
tests/test-x86-cpuid-compat$(EXESUF): tests/test-x86-cpuid-compat.o $(qtest-obj-y)
tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
tests/megasas-test$(EXESUF): tests/megasas-test.o $(libqos-spapr-obj-y) $(libqos-pc-obj-y)
-tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o contrib/libvhost-user/libvhost-user.o $(test-util-obj-y)
+tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a
tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y)
tests/test-arm-mptimer$(EXESUF): tests/test-arm-mptimer.o
tests/test-qapi-util$(EXESUF): tests/test-qapi-util.o $(test-util-obj-y)
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 03/27] build-sys: make vhost-user-scsi depend on libvhost-user.a
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 01/27] glib-compat: move G_SOURCE_CONTINUE/REMOVE there Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 02/27] build-sys: fix libvhost-user.a build Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-10-10 16:18 ` Paolo Bonzini
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 04/27] libvhost-user: drop dependency on glib Marc-André Lureau
` (23 subsequent siblings)
26 siblings, 1 reply; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
Makefile | 2 +-
Makefile.objs | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 8a64b6afb0..e0aeb77854 100644
--- a/Makefile
+++ b/Makefile
@@ -475,7 +475,7 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS)
ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
$(call LINK, $^)
endif
-vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y)
+vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) libvhost-user.a
$(call LINK, $^)
module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
diff --git a/Makefile.objs b/Makefile.objs
index 3a6914c56c..de2d92f8cb 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -115,7 +115,6 @@ libvhost-user-obj-y = contrib/libvhost-user/
vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS)
vhost-user-scsi.o-libs := $(LIBISCSI_LIBS)
vhost-user-scsi-obj-y = contrib/vhost-user-scsi/
-vhost-user-scsi-obj-y += contrib/libvhost-user/libvhost-user.o
######################################################################
trace-events-subdirs =
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* Re: [Qemu-devel] [PATCH v2 03/27] build-sys: make vhost-user-scsi depend on libvhost-user.a
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 03/27] build-sys: make vhost-user-scsi depend on libvhost-user.a Marc-André Lureau
@ 2017-10-10 16:18 ` Paolo Bonzini
0 siblings, 0 replies; 32+ messages in thread
From: Paolo Bonzini @ 2017-10-10 16:18 UTC (permalink / raw)
To: Marc-André Lureau, qemu-devel; +Cc: felipe, changpeng.liu, f4bug
On 19/09/2017 18:52, Marc-André Lureau wrote:
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> Makefile | 2 +-
> Makefile.objs | 1 -
> 2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 8a64b6afb0..e0aeb77854 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -475,7 +475,7 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS)
> ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
> $(call LINK, $^)
> endif
> -vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y)
> +vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) libvhost-user.a
> $(call LINK, $^)
>
> module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
> diff --git a/Makefile.objs b/Makefile.objs
> index 3a6914c56c..de2d92f8cb 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -115,7 +115,6 @@ libvhost-user-obj-y = contrib/libvhost-user/
> vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS)
> vhost-user-scsi.o-libs := $(LIBISCSI_LIBS)
> vhost-user-scsi-obj-y = contrib/vhost-user-scsi/
> -vhost-user-scsi-obj-y += contrib/libvhost-user/libvhost-user.o
>
> ######################################################################
> trace-events-subdirs =
>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
^ permalink raw reply [flat|nested] 32+ messages in thread
* [Qemu-devel] [PATCH v2 04/27] libvhost-user: drop dependency on glib
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (2 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 03/27] build-sys: make vhost-user-scsi depend on libvhost-user.a Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 05/27] libvhost-user: improve vu_queue_pop() doc Marc-André Lureau
` (22 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
libvhost-user is meant to be free of glib dependency. Make sure it is
by droping qemu/osdep.h (which included glib.h)
This fixes a bad malloc()/g_free() pair.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
contrib/libvhost-user/libvhost-user.c | 29 ++++++++++++++++++++++++++---
1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/contrib/libvhost-user/libvhost-user.c b/contrib/libvhost-user/libvhost-user.c
index d27d6303db..50657c5afb 100644
--- a/contrib/libvhost-user/libvhost-user.c
+++ b/contrib/libvhost-user/libvhost-user.c
@@ -13,14 +13,35 @@
* later. See the COPYING file in the top-level directory.
*/
-#include <qemu/osdep.h>
+/* this code avoids GLib dependency */
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <string.h>
+#include <assert.h>
+#include <inttypes.h>
+#include <sys/types.h>
+#include <sys/socket.h>
#include <sys/eventfd.h>
+#include <sys/mman.h>
#include <linux/vhost.h>
#include "qemu/atomic.h"
+#include "qemu/compiler.h"
#include "libvhost-user.h"
+/* usually provided by GLib */
+#ifndef MIN
+#define MIN(x, y) ({ \
+ typeof(x) _min1 = (x); \
+ typeof(y) _min2 = (y); \
+ (void) (&_min1 == &_min2); \
+ _min1 < _min2 ? _min1 : _min2; })
+#endif
+
#define VHOST_USER_HDR_SIZE offsetof(VhostUserMsg, payload.u64)
/* The version of the protocol we support */
@@ -81,7 +102,9 @@ vu_panic(VuDev *dev, const char *msg, ...)
va_list ap;
va_start(ap, msg);
- buf = g_strdup_vprintf(msg, ap);
+ if (vasprintf(&buf, msg, ap) < 0) {
+ buf = NULL;
+ }
va_end(ap);
dev->broken = true;
@@ -853,7 +876,7 @@ vu_dispatch(VuDev *dev)
success = true;
end:
- g_free(vmsg.data);
+ free(vmsg.data);
return success;
}
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 05/27] libvhost-user: improve vu_queue_pop() doc
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (3 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 04/27] libvhost-user: drop dependency on glib Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 06/27] vhost-user-scsi: use g_strdup() Marc-André Lureau
` (21 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
---
contrib/libvhost-user/libvhost-user.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/contrib/libvhost-user/libvhost-user.h b/contrib/libvhost-user/libvhost-user.h
index 4021f1124e..5825b66880 100644
--- a/contrib/libvhost-user/libvhost-user.h
+++ b/contrib/libvhost-user/libvhost-user.h
@@ -358,7 +358,8 @@ void vu_queue_notify(VuDev *dev, VuVirtq *vq);
* @vq: a VuVirtq queue
* @sz: the size of struct to return (must be >= VuVirtqElement)
*
- * Returns: a VuVirtqElement filled from the queue or NULL.
+ * Returns: a VuVirtqElement filled from the queue or NULL. The
+ * returned element must be free()-d by the caller.
*/
void *vu_queue_pop(VuDev *dev, VuVirtq *vq, size_t sz);
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 06/27] vhost-user-scsi: use g_strdup()
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (4 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 05/27] libvhost-user: improve vu_queue_pop() doc Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 07/27] vhost-user-scsi: connect unix socket before allocating Marc-André Lureau
` (20 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
Since vhost-user-scsi uses glib.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index 78bcc65f5a..1fb57da2da 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -822,10 +822,10 @@ int main(int argc, char **argv)
case 'h':
goto help;
case 'u':
- unix_fn = strdup(optarg);
+ unix_fn = g_strdup(optarg);
break;
case 'i':
- iscsi_uri = strdup(optarg);
+ iscsi_uri = g_strdup(optarg);
break;
default:
goto help;
@@ -854,12 +854,8 @@ out:
vdev_scsi_deinit(vdev_scsi);
free(vdev_scsi);
}
- if (unix_fn) {
- free(unix_fn);
- }
- if (iscsi_uri) {
- free(iscsi_uri);
- }
+ g_free(unix_fn);
+ g_free(iscsi_uri);
return err;
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 07/27] vhost-user-scsi: connect unix socket before allocating
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (5 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 06/27] vhost-user-scsi: use g_strdup() Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 08/27] vhost-user-scsi: code style fixes Marc-André Lureau
` (19 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
This simplify a little bit memory management in the following patches.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index 1fb57da2da..e01bf31296 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -715,23 +715,17 @@ static void vdev_scsi_deinit(vhost_scsi_dev_t *vdev_scsi)
}
}
-static vhost_scsi_dev_t *vdev_scsi_new(char *unix_fn)
+static vhost_scsi_dev_t *vdev_scsi_new(int server_sock)
{
vhost_scsi_dev_t *vdev_scsi = NULL;
- assert(unix_fn);
-
vdev_scsi = calloc(1, sizeof(vhost_scsi_dev_t));
if (!vdev_scsi) {
PERR("calloc: %s", strerror(errno));
return NULL;
}
- vdev_scsi->server_sock = unix_sock_new(unix_fn);
- if (vdev_scsi->server_sock < 0) {
- goto err;
- }
-
+ vdev_scsi->server_sock = server_sock;
vdev_scsi->loop = g_main_loop_new(NULL, FALSE);
if (!vdev_scsi->loop) {
PERR("Error creating glib event loop");
@@ -815,7 +809,7 @@ int main(int argc, char **argv)
vhost_scsi_dev_t *vdev_scsi = NULL;
char *unix_fn = NULL;
char *iscsi_uri = NULL;
- int opt, err = EXIT_SUCCESS;
+ int sock, opt, err = EXIT_SUCCESS;
while ((opt = getopt(argc, argv, "u:i:")) != -1) {
switch (opt) {
@@ -835,7 +829,11 @@ int main(int argc, char **argv)
goto help;
}
- vdev_scsi = vdev_scsi_new(unix_fn);
+ sock = unix_sock_new(unix_fn);
+ if (sock < 0) {
+ goto err;
+ }
+ vdev_scsi = vdev_scsi_new(sock);
if (!vdev_scsi) {
goto err;
}
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 08/27] vhost-user-scsi: code style fixes
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (6 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 07/27] vhost-user-scsi: connect unix socket before allocating Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 09/27] vhost-user-scsi: use glib allocation Marc-André Lureau
` (18 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
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 elem@%p", 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.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 09/27] vhost-user-scsi: use glib allocation
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (7 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 08/27] vhost-user-scsi: code style fixes Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 10/27] vhost-user-scsi: glib calls that allocate don't return NULL Marc-André Lureau
` (17 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
Use g_new/g_free instead of plain malloc. This simplify a bit memory
handling since glib will abort if it cannot allocate.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 35 ++++++++-----------------------
1 file changed, 9 insertions(+), 26 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index fe567452cd..cf2793ef02 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -312,12 +312,7 @@ static struct scsi_task *scsi_task_new(int cdb_len, uint8_t *cdb, int dir,
assert(cdb_len > 0);
assert(cdb);
- task = calloc(1, sizeof(struct scsi_task));
- if (!task) {
- PERR("Error allocating task: %s", strerror(errno));
- return NULL;
- }
-
+ task = g_new0(struct scsi_task, 1);
memcpy(task->cdb, cdb, cdb_len);
task->cdb_size = cdb_len;
task->xfer_dir = dir;
@@ -393,10 +388,6 @@ static int handle_cmd_sync(struct iscsi_context *ctx,
}
task = scsi_task_new(cdb_len, req->cdb, dir, len);
- if (!task) {
- PERR("Unable to create iscsi task");
- return -1;
- }
if (dir == SCSI_XFER_TO_DEV) {
task->iovector_out.iov = (struct scsi_iovec *)out;
@@ -410,7 +401,7 @@ static int handle_cmd_sync(struct iscsi_context *ctx,
cdb_len, dir, task);
if (!iscsi_scsi_command_sync(ctx, 0, task, NULL)) {
PERR("Error serving SCSI command");
- free(task);
+ g_free(task);
return -1;
}
@@ -425,7 +416,7 @@ static int handle_cmd_sync(struct iscsi_context *ctx,
memcpy(rsp->sense, &task->datain.data[2], rsp->sense_len);
}
- free(task);
+ g_free(task);
PDBG("Filled in rsp: status=%hhX, resid=%u, response=%hhX, sense_len=%u",
rsp->status, rsp->resid, rsp->response, rsp->sense_len);
@@ -692,7 +683,7 @@ static vhost_scsi_dev_t *vdev_scsi_find_by_vu(VuDev *vu_dev)
return NULL;
}
-static void vdev_scsi_deinit(vhost_scsi_dev_t *vdev_scsi)
+static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scsi)
{
if (!vdev_scsi) {
return;
@@ -716,18 +707,14 @@ static void vdev_scsi_deinit(vhost_scsi_dev_t *vdev_scsi)
g_main_loop_unref(vdev_scsi->loop);
vdev_scsi->loop = NULL;
}
+ g_free(vdev_scsi);
}
static vhost_scsi_dev_t *vdev_scsi_new(int server_sock)
{
- vhost_scsi_dev_t *vdev_scsi = NULL;
-
- vdev_scsi = calloc(1, sizeof(vhost_scsi_dev_t));
- if (!vdev_scsi) {
- PERR("calloc: %s", strerror(errno));
- return NULL;
- }
+ vhost_scsi_dev_t *vdev_scsi;
+ vdev_scsi = g_new0(vhost_scsi_dev_t, 1);
vdev_scsi->server_sock = server_sock;
vdev_scsi->loop = g_main_loop_new(NULL, FALSE);
if (!vdev_scsi->loop) {
@@ -744,8 +731,7 @@ static vhost_scsi_dev_t *vdev_scsi_new(int server_sock)
return vdev_scsi;
err:
- vdev_scsi_deinit(vdev_scsi);
- free(vdev_scsi);
+ vdev_scsi_free(vdev_scsi);
return NULL;
}
@@ -852,10 +838,7 @@ int main(int argc, char **argv)
}
out:
- if (vdev_scsi) {
- vdev_scsi_deinit(vdev_scsi);
- free(vdev_scsi);
- }
+ vdev_scsi_free(vdev_scsi);
g_free(unix_fn);
g_free(iscsi_uri);
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 10/27] vhost-user-scsi: glib calls that allocate don't return NULL
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (8 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 09/27] vhost-user-scsi: use glib allocation Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 11/27] vhost-user-scsi: also free the gtree Marc-André Lureau
` (16 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
They abort instead, so get rid of failure conditions.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 52 +++++--------------------------
1 file changed, 7 insertions(+), 45 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index cf2793ef02..e3ae2bbd72 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -139,8 +139,8 @@ static GSourceFuncs vus_gsrc_funcs = {
NULL
};
-static int vus_gsrc_new(vhost_scsi_dev_t *vdev_scsi, int fd, GIOCondition cond,
- vu_watch_cb vu_cb, GSourceFunc gsrc_cb, gpointer data)
+static void vus_gsrc_new(vhost_scsi_dev_t *vdev_scsi, int fd, GIOCondition cond,
+ vu_watch_cb vu_cb, GSourceFunc gsrc_cb, gpointer data)
{
GSource *vus_gsrc;
vus_gsrc_t *vus_src;
@@ -152,10 +152,6 @@ static int vus_gsrc_new(vhost_scsi_dev_t *vdev_scsi, int fd, GIOCondition cond,
assert(!(vu_cb && gsrc_cb));
vus_gsrc = g_source_new(&vus_gsrc_funcs, sizeof(vus_gsrc_t));
- if (!vus_gsrc) {
- PERR("Error creating GSource for new watch");
- return -1;
- }
vus_src = (vus_gsrc_t *)vus_gsrc;
vus_src->vdev_scsi = vdev_scsi;
@@ -171,8 +167,6 @@ static int vus_gsrc_new(vhost_scsi_dev_t *vdev_scsi, int fd, GIOCondition cond,
g_tree_insert(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd,
(gpointer)(uintptr_t)id);
-
- return 0;
}
/* from libiscsi's scsi-lowlevel.h **
@@ -440,10 +434,7 @@ static void vus_panic_cb(VuDev *vu_dev, const char *buf)
PERR("vu_panic: %s", buf);
}
- if (vdev_scsi) {
- assert(vdev_scsi->loop);
- g_main_loop_quit(vdev_scsi->loop);
- }
+ g_main_loop_quit(vdev_scsi->loop);
}
static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb,
@@ -471,9 +462,7 @@ static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb,
(void)g_tree_remove(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd);
}
- if (vus_gsrc_new(vdev_scsi, fd, vu_evt, cb, NULL, pvt)) {
- vus_panic_cb(vu_dev, NULL);
- }
+ vus_gsrc_new(vdev_scsi, fd, vu_evt, cb, NULL, pvt);
}
static void vus_del_watch_cb(VuDev *vu_dev, int fd)
@@ -703,10 +692,7 @@ static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scsi)
vdev_scsi->server_sock = -1;
}
- if (vdev_scsi->loop) {
- g_main_loop_unref(vdev_scsi->loop);
- vdev_scsi->loop = NULL;
- }
+ g_main_loop_unref(vdev_scsi->loop);
g_free(vdev_scsi);
}
@@ -717,23 +703,9 @@ static vhost_scsi_dev_t *vdev_scsi_new(int server_sock)
vdev_scsi = g_new0(vhost_scsi_dev_t, 1);
vdev_scsi->server_sock = server_sock;
vdev_scsi->loop = g_main_loop_new(NULL, FALSE);
- if (!vdev_scsi->loop) {
- PERR("Error creating glib event loop");
- goto err;
- }
-
vdev_scsi->fdmap = g_tree_new(vus_fdmap_compare);
- if (!vdev_scsi->fdmap) {
- PERR("Error creating glib tree for fdmap");
- goto err;
- }
return vdev_scsi;
-
-err:
- vdev_scsi_free(vdev_scsi);
-
- return NULL;
}
static int vdev_scsi_add_iscsi_lun(vhost_scsi_dev_t *vdev_scsi,
@@ -777,21 +749,14 @@ static int vdev_scsi_run(vhost_scsi_dev_t *vdev_scsi)
vus_del_watch_cb,
&vus_iface);
- if (vus_gsrc_new(vdev_scsi, cli_sock, G_IO_IN, NULL, vus_vhost_cb,
- &vdev_scsi->vu_dev)) {
- goto fail;
- }
+ vus_gsrc_new(vdev_scsi, cli_sock, G_IO_IN, NULL, vus_vhost_cb,
+ &vdev_scsi->vu_dev);
g_main_loop_run(vdev_scsi->loop);
-out:
vu_deinit(&vdev_scsi->vu_dev);
return ret;
-
-fail:
- ret = -1;
- goto out;
}
int main(int argc, char **argv)
@@ -824,9 +789,6 @@ int main(int argc, char **argv)
goto err;
}
vdev_scsi = vdev_scsi_new(sock);
- if (!vdev_scsi) {
- goto err;
- }
vhost_scsi_devs[0] = vdev_scsi;
if (vdev_scsi_add_iscsi_lun(vdev_scsi, iscsi_uri, 0) != 0) {
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 11/27] vhost-user-scsi: also free the gtree
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (9 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 10/27] vhost-user-scsi: glib calls that allocate don't return NULL Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 12/27] vhost-user-scsi: remove vdev_scsi_find_by_vu() Marc-André Lureau
` (15 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index e3ae2bbd72..17f676bf00 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -693,6 +693,7 @@ static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scsi)
}
g_main_loop_unref(vdev_scsi->loop);
+ g_tree_destroy(vdev_scsi->fdmap);
g_free(vdev_scsi);
}
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 12/27] vhost-user-scsi: remove vdev_scsi_find_by_vu()
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (10 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 11/27] vhost-user-scsi: also free the gtree Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 13/27] vhost-user-scsi: simplify unix path cleanup Marc-André Lureau
` (14 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
The *dev pointer belongs to the vhost_scsi_dev_t parent.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 47 +++----------------------------
1 file changed, 4 insertions(+), 43 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index 17f676bf00..82624a0f17 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -55,8 +55,6 @@
/* Only 1 LUN and device supported today */
#define VUS_MAX_LUNS 1
-#define VUS_MAX_DEVS 1
-
#define VUS_ISCSI_INITIATOR "iqn.2016-11.com.nutanix:vhost-user-scsi"
typedef struct iscsi_lun {
@@ -72,8 +70,6 @@ typedef struct vhost_scsi_dev {
iscsi_lun_t luns[VUS_MAX_LUNS];
} vhost_scsi_dev_t;
-static vhost_scsi_dev_t *vhost_scsi_devs[VUS_MAX_DEVS];
-
/** glib event loop integration for libvhost-user and misc callbacks **/
QEMU_BUILD_BUG_ON((int)G_IO_IN != (int)VU_WATCH_IN);
@@ -420,16 +416,13 @@ static int handle_cmd_sync(struct iscsi_context *ctx,
/** libvhost-user callbacks **/
-static vhost_scsi_dev_t *vdev_scsi_find_by_vu(VuDev *vu_dev);
-
static void vus_panic_cb(VuDev *vu_dev, const char *buf)
{
vhost_scsi_dev_t *vdev_scsi;
assert(vu_dev);
- vdev_scsi = vdev_scsi_find_by_vu(vu_dev);
-
+ vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);
if (buf) {
PERR("vu_panic: %s", buf);
}
@@ -447,12 +440,7 @@ static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb,
assert(fd >= 0);
assert(cb);
- vdev_scsi = vdev_scsi_find_by_vu(vu_dev);
- if (!vdev_scsi) {
- vus_panic_cb(vu_dev, NULL);
- return;
- }
-
+ vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);
id = (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap,
(gpointer)(uintptr_t)fd);
if (id) {
@@ -473,12 +461,7 @@ static void vus_del_watch_cb(VuDev *vu_dev, int fd)
assert(vu_dev);
assert(fd >= 0);
- vdev_scsi = vdev_scsi_find_by_vu(vu_dev);
- if (!vdev_scsi) {
- vus_panic_cb(vu_dev, NULL);
- return;
- }
-
+ vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);
id = (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap,
(gpointer)(uintptr_t)fd);
if (id) {
@@ -506,12 +489,7 @@ static void vus_proc_req(VuDev *vu_dev, int idx)
assert(vu_dev);
- vdev_scsi = vdev_scsi_find_by_vu(vu_dev);
- if (!vdev_scsi) {
- vus_panic_cb(vu_dev, NULL);
- return;
- }
-
+ vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);
if (idx < 0 || idx >= VHOST_MAX_NR_VIRTQUEUE) {
PERR("VQ Index out of range: %d", idx);
vus_panic_cb(vu_dev, NULL);
@@ -656,22 +634,6 @@ fail:
/** vhost-user-scsi **/
-static vhost_scsi_dev_t *vdev_scsi_find_by_vu(VuDev *vu_dev)
-{
- int i;
-
- assert(vu_dev);
-
- for (i = 0; i < VUS_MAX_DEVS; i++) {
- if (&vhost_scsi_devs[i]->vu_dev == vu_dev) {
- return vhost_scsi_devs[i];
- }
- }
-
- PERR("Unknown VuDev %p", vu_dev);
- return NULL;
-}
-
static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scsi)
{
if (!vdev_scsi) {
@@ -790,7 +752,6 @@ int main(int argc, char **argv)
goto err;
}
vdev_scsi = vdev_scsi_new(sock);
- vhost_scsi_devs[0] = vdev_scsi;
if (vdev_scsi_add_iscsi_lun(vdev_scsi, iscsi_uri, 0) != 0) {
goto err;
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 13/27] vhost-user-scsi: simplify unix path cleanup
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (11 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 12/27] vhost-user-scsi: remove vdev_scsi_find_by_vu() Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 14/27] vhost-user-scsi: use NULL pointer Marc-André Lureau
` (13 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
Always remove the unix path when leaving the program (instead of when
freeing scsi_dev). Note that unix_sock_new() also unlink() exisiting
path before creating the socket.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index 82624a0f17..a9a4066eeb 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -636,24 +636,9 @@ fail:
static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scsi)
{
- if (!vdev_scsi) {
- return;
- }
-
if (vdev_scsi->server_sock >= 0) {
- struct sockaddr_storage ss;
- socklen_t sslen = sizeof(ss);
-
- if (getsockname(vdev_scsi->server_sock, (struct sockaddr *)&ss,
- &sslen) == 0) {
- struct sockaddr_un *su = (struct sockaddr_un *)&ss;
- (void)unlink(su->sun_path);
- }
-
- (void)close(vdev_scsi->server_sock);
- vdev_scsi->server_sock = -1;
+ close(vdev_scsi->server_sock);
}
-
g_main_loop_unref(vdev_scsi->loop);
g_tree_destroy(vdev_scsi->fdmap);
g_free(vdev_scsi);
@@ -762,7 +747,10 @@ int main(int argc, char **argv)
}
out:
- vdev_scsi_free(vdev_scsi);
+ if (vdev_scsi) {
+ vdev_scsi_free(vdev_scsi);
+ unlink(unix_fn);
+ }
g_free(unix_fn);
g_free(iscsi_uri);
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 14/27] vhost-user-scsi: use NULL pointer
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (12 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 13/27] vhost-user-scsi: simplify unix path cleanup Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 15/27] vhost-user-scsi: assert() in iscsi_add_lun() Marc-André Lureau
` (12 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index a9a4066eeb..dd0de1fc89 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -684,7 +684,7 @@ static int vdev_scsi_run(vhost_scsi_dev_t *vdev_scsi)
assert(vdev_scsi->server_sock >= 0);
assert(vdev_scsi->loop);
- cli_sock = accept(vdev_scsi->server_sock, (void *)0, (void *)0);
+ cli_sock = accept(vdev_scsi->server_sock, NULL, NULL);
if (cli_sock < 0) {
perror("accept");
return -1;
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 15/27] vhost-user-scsi: assert() in iscsi_add_lun()
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (13 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 14/27] vhost-user-scsi: use NULL pointer Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 16/27] vhost-user-scsi: remove vdev_scsi_add_iscsi_lun() Marc-André Lureau
` (11 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
Instead of a preliminary check, add an assert to the function that has
the pre-condition.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index dd0de1fc89..0573ae794e 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -257,6 +257,7 @@ static int iscsi_add_lun(iscsi_lun_t *lun, char *iscsi_uri)
assert(lun);
assert(iscsi_uri);
+ assert(!lun->iscsi_ctx);
iscsi_ctx = iscsi_create_context(VUS_ISCSI_INITIATOR);
if (!iscsi_ctx) {
@@ -663,11 +664,6 @@ static int vdev_scsi_add_iscsi_lun(vhost_scsi_dev_t *vdev_scsi,
assert(iscsi_uri);
assert(lun < VUS_MAX_LUNS);
- if (vdev_scsi->luns[lun].iscsi_ctx) {
- PERR("Lun %d already configured", lun);
- return -1;
- }
-
if (iscsi_add_lun(&vdev_scsi->luns[lun], iscsi_uri) != 0) {
return -1;
}
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 16/27] vhost-user-scsi: remove vdev_scsi_add_iscsi_lun()
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (14 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 15/27] vhost-user-scsi: assert() in iscsi_add_lun() Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 17/27] vhost-user-scsi: remove VUS_MAX_LUNS Marc-André Lureau
` (10 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index 0573ae794e..38fe451619 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -657,20 +657,6 @@ static vhost_scsi_dev_t *vdev_scsi_new(int server_sock)
return vdev_scsi;
}
-static int vdev_scsi_add_iscsi_lun(vhost_scsi_dev_t *vdev_scsi,
- char *iscsi_uri, uint32_t lun)
-{
- assert(vdev_scsi);
- assert(iscsi_uri);
- assert(lun < VUS_MAX_LUNS);
-
- if (iscsi_add_lun(&vdev_scsi->luns[lun], iscsi_uri) != 0) {
- return -1;
- }
-
- return 0;
-}
-
static int vdev_scsi_run(vhost_scsi_dev_t *vdev_scsi)
{
int cli_sock;
@@ -734,7 +720,7 @@ int main(int argc, char **argv)
}
vdev_scsi = vdev_scsi_new(sock);
- if (vdev_scsi_add_iscsi_lun(vdev_scsi, iscsi_uri, 0) != 0) {
+ if (iscsi_add_lun(&vdev_scsi->luns[0], iscsi_uri) != 0) {
goto err;
}
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 17/27] vhost-user-scsi: remove VUS_MAX_LUNS
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (15 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 16/27] vhost-user-scsi: remove vdev_scsi_add_iscsi_lun() Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 18/27] vhost-user-scsi: remove unimplemented functions Marc-André Lureau
` (9 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
There is no code to support more than 1 yet, no need for that today.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index 38fe451619..6b55cc71d3 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -53,8 +53,6 @@
/** vhost-user-scsi specific definitions **/
- /* Only 1 LUN and device supported today */
-#define VUS_MAX_LUNS 1
#define VUS_ISCSI_INITIATOR "iqn.2016-11.com.nutanix:vhost-user-scsi"
typedef struct iscsi_lun {
@@ -67,7 +65,7 @@ typedef struct vhost_scsi_dev {
int server_sock;
GMainLoop *loop;
GTree *fdmap; /* fd -> gsource context id */
- iscsi_lun_t luns[VUS_MAX_LUNS];
+ iscsi_lun_t lun;
} vhost_scsi_dev_t;
/** glib event loop integration for libvhost-user and misc callbacks **/
@@ -535,7 +533,7 @@ static void vus_proc_req(VuDev *vu_dev, int idx)
}
rsp = (VirtIOSCSICmdResp *)elem->in_sg[0].iov_base;
- if (handle_cmd_sync(vdev_scsi->luns[0].iscsi_ctx,
+ if (handle_cmd_sync(vdev_scsi->lun.iscsi_ctx,
req, &elem->out_sg[1], elem->out_num - 1,
rsp, &elem->in_sg[1], elem->in_num - 1) != 0) {
vus_panic_cb(vu_dev, NULL);
@@ -720,7 +718,7 @@ int main(int argc, char **argv)
}
vdev_scsi = vdev_scsi_new(sock);
- if (iscsi_add_lun(&vdev_scsi->luns[0], iscsi_uri) != 0) {
+ if (iscsi_add_lun(&vdev_scsi->lun, iscsi_uri) != 0) {
goto err;
}
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 18/27] vhost-user-scsi: remove unimplemented functions
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (16 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 17/27] vhost-user-scsi: remove VUS_MAX_LUNS Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 19/27] vhost-user-scsi: rename VUS types Marc-André Lureau
` (8 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index 6b55cc71d3..26b17f348b 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -471,16 +471,6 @@ static void vus_del_watch_cb(VuDev *vu_dev, int fd)
}
}
-static void vus_proc_ctl(VuDev *vu_dev, int idx)
-{
- /* Control VQ not implemented */
-}
-
-static void vus_proc_evt(VuDev *vu_dev, int idx)
-{
- /* Event VQ not implemented */
-}
-
static void vus_proc_req(VuDev *vu_dev, int idx)
{
vhost_scsi_dev_t *vdev_scsi;
@@ -561,14 +551,9 @@ static void vus_queue_set_started(VuDev *vu_dev, int idx, bool started)
vq = vu_get_queue(vu_dev, idx);
- switch (idx) {
- case 0:
- vu_set_queue_handler(vu_dev, vq, started ? vus_proc_ctl : NULL);
- break;
- case 1:
- vu_set_queue_handler(vu_dev, vq, started ? vus_proc_evt : NULL);
- break;
- default:
+ if (idx == 0 || idx == 1) {
+ PDBG("queue %d unimplemented", idx);
+ } else {
vu_set_queue_handler(vu_dev, vq, started ? vus_proc_req : NULL);
}
}
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 19/27] vhost-user-scsi: rename VUS types
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (17 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 18/27] vhost-user-scsi: remove unimplemented functions Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 20/27] vhost-user-scsi: avoid use of iscsi_ namespace Marc-André Lureau
` (7 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
- use Vus prefix consistently
- use CamelCase, since that's glib & libvhost-user style
- avoid _t postfix, usually for system headers
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 46 +++++++++++++++----------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index 26b17f348b..fdd6014712 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -55,18 +55,18 @@
#define VUS_ISCSI_INITIATOR "iqn.2016-11.com.nutanix:vhost-user-scsi"
-typedef struct iscsi_lun {
+typedef struct VusIscsiLun {
struct iscsi_context *iscsi_ctx;
int iscsi_lun;
-} iscsi_lun_t;
+} VusIscsiLun;
-typedef struct vhost_scsi_dev {
+typedef struct VusDev {
VuDev vu_dev;
int server_sock;
GMainLoop *loop;
GTree *fdmap; /* fd -> gsource context id */
- iscsi_lun_t lun;
-} vhost_scsi_dev_t;
+ VusIscsiLun lun;
+} VusDev;
/** glib event loop integration for libvhost-user and misc callbacks **/
@@ -78,7 +78,7 @@ QEMU_BUILD_BUG_ON((int)G_IO_HUP != (int)VU_WATCH_HUP);
typedef struct vus_gsrc {
GSource parent;
- vhost_scsi_dev_t *vdev_scsi;
+ VusDev *vdev_scsi;
GPollFD gfd;
vu_watch_cb vu_cb;
} vus_gsrc_t;
@@ -107,7 +107,7 @@ static gboolean vus_gsrc_check(GSource *src)
static gboolean vus_gsrc_dispatch(GSource *src, GSourceFunc cb, gpointer data)
{
- vhost_scsi_dev_t *vdev_scsi;
+ VusDev *vdev_scsi;
vus_gsrc_t *vus_src = (vus_gsrc_t *)src;
assert(vus_src);
@@ -133,7 +133,7 @@ static GSourceFuncs vus_gsrc_funcs = {
NULL
};
-static void vus_gsrc_new(vhost_scsi_dev_t *vdev_scsi, int fd, GIOCondition cond,
+static void vus_gsrc_new(VusDev *vdev_scsi, int fd, GIOCondition cond,
vu_watch_cb vu_cb, GSourceFunc gsrc_cb, gpointer data)
{
GSource *vus_gsrc;
@@ -247,7 +247,7 @@ struct scsi_task {
/** libiscsi integration **/
-static int iscsi_add_lun(iscsi_lun_t *lun, char *iscsi_uri)
+static int iscsi_add_lun(VusIscsiLun *lun, char *iscsi_uri)
{
struct iscsi_url *iscsi_url;
struct iscsi_context *iscsi_ctx;
@@ -417,11 +417,11 @@ static int handle_cmd_sync(struct iscsi_context *ctx,
static void vus_panic_cb(VuDev *vu_dev, const char *buf)
{
- vhost_scsi_dev_t *vdev_scsi;
+ VusDev *vdev_scsi;
assert(vu_dev);
- vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);
+ vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
if (buf) {
PERR("vu_panic: %s", buf);
}
@@ -432,14 +432,14 @@ 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)
{
- vhost_scsi_dev_t *vdev_scsi;
+ VusDev *vdev_scsi;
guint id;
assert(vu_dev);
assert(fd >= 0);
assert(cb);
- vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);
+ vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
id = (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap,
(gpointer)(uintptr_t)fd);
if (id) {
@@ -454,13 +454,13 @@ static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb,
static void vus_del_watch_cb(VuDev *vu_dev, int fd)
{
- vhost_scsi_dev_t *vdev_scsi;
+ VusDev *vdev_scsi;
guint id;
assert(vu_dev);
assert(fd >= 0);
- vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);
+ vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
id = (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap,
(gpointer)(uintptr_t)fd);
if (id) {
@@ -473,12 +473,12 @@ static void vus_del_watch_cb(VuDev *vu_dev, int fd)
static void vus_proc_req(VuDev *vu_dev, int idx)
{
- vhost_scsi_dev_t *vdev_scsi;
+ VusDev *vdev_scsi;
VuVirtq *vq;
assert(vu_dev);
- vdev_scsi = container_of(vu_dev, vhost_scsi_dev_t, vu_dev);
+ vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
if (idx < 0 || idx >= VHOST_MAX_NR_VIRTQUEUE) {
PERR("VQ Index out of range: %d", idx);
vus_panic_cb(vu_dev, NULL);
@@ -618,7 +618,7 @@ fail:
/** vhost-user-scsi **/
-static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scsi)
+static void vdev_scsi_free(VusDev *vdev_scsi)
{
if (vdev_scsi->server_sock >= 0) {
close(vdev_scsi->server_sock);
@@ -628,11 +628,11 @@ static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scsi)
g_free(vdev_scsi);
}
-static vhost_scsi_dev_t *vdev_scsi_new(int server_sock)
+static VusDev *vdev_scsi_new(int server_sock)
{
- vhost_scsi_dev_t *vdev_scsi;
+ VusDev *vdev_scsi;
- vdev_scsi = g_new0(vhost_scsi_dev_t, 1);
+ vdev_scsi = g_new0(VusDev, 1);
vdev_scsi->server_sock = server_sock;
vdev_scsi->loop = g_main_loop_new(NULL, FALSE);
vdev_scsi->fdmap = g_tree_new(vus_fdmap_compare);
@@ -640,7 +640,7 @@ static vhost_scsi_dev_t *vdev_scsi_new(int server_sock)
return vdev_scsi;
}
-static int vdev_scsi_run(vhost_scsi_dev_t *vdev_scsi)
+static int vdev_scsi_run(VusDev *vdev_scsi)
{
int cli_sock;
int ret = 0;
@@ -674,7 +674,7 @@ static int vdev_scsi_run(vhost_scsi_dev_t *vdev_scsi)
int main(int argc, char **argv)
{
- vhost_scsi_dev_t *vdev_scsi = NULL;
+ VusDev *vdev_scsi = NULL;
char *unix_fn = NULL;
char *iscsi_uri = NULL;
int sock, opt, err = EXIT_SUCCESS;
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 20/27] vhost-user-scsi: avoid use of iscsi_ namespace
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (18 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 19/27] vhost-user-scsi: rename VUS types Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 21/27] vhost-user-scsi: don't copy iscsi/scsi-lowlevel.h Marc-André Lureau
` (6 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
It is confusing and could easily conflict with future versions.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index fdd6014712..c7f9d82142 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -247,7 +247,7 @@ struct scsi_task {
/** libiscsi integration **/
-static int iscsi_add_lun(VusIscsiLun *lun, char *iscsi_uri)
+static int vus_iscsi_add_lun(VusIscsiLun *lun, char *iscsi_uri)
{
struct iscsi_url *iscsi_url;
struct iscsi_context *iscsi_ctx;
@@ -703,7 +703,7 @@ int main(int argc, char **argv)
}
vdev_scsi = vdev_scsi_new(sock);
- if (iscsi_add_lun(&vdev_scsi->lun, iscsi_uri) != 0) {
+ if (vus_iscsi_add_lun(&vdev_scsi->lun, iscsi_uri) != 0) {
goto err;
}
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 21/27] vhost-user-scsi: don't copy iscsi/scsi-lowlevel.h
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (19 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 20/27] vhost-user-scsi: avoid use of iscsi_ namespace Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 22/27] vhost-user-scsi: drop extra callback pointer Marc-André Lureau
` (5 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
There is no need to include hw/virtio/virtio-scsi.h, then the conflict
with SCSI_XFER enum goes away.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 96 +++----------------------------
1 file changed, 9 insertions(+), 87 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index c7f9d82142..cfac1ce1fe 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -12,8 +12,9 @@
#include "qemu/osdep.h"
#include "contrib/libvhost-user/libvhost-user.h"
-#include "hw/virtio/virtio-scsi.h"
+#include "standard-headers/linux/virtio_scsi.h"
#include "iscsi/iscsi.h"
+#include "iscsi/scsi-lowlevel.h"
#include <glib.h>
@@ -163,90 +164,11 @@ static void vus_gsrc_new(VusDev *vdev_scsi, int fd, GIOCondition cond,
(gpointer)(uintptr_t)id);
}
-/* from libiscsi's scsi-lowlevel.h **
- *
- * nb. We can't directly include scsi-lowlevel.h due to a namespace conflict:
- * QEMU's scsi.h also defines "SCSI_XFER_NONE".
- */
-
-#define SCSI_CDB_MAX_SIZE 16
-
-struct scsi_iovector {
- struct scsi_iovec *iov;
- int niov;
- int nalloc;
- size_t offset;
- int consumed;
-};
-
-struct scsi_allocated_memory {
- struct scsi_allocated_memory *next;
- char buf[0];
-};
-
-struct scsi_data {
- int size;
- unsigned char *data;
-};
-
-enum scsi_sense_key {
- SCSI_SENSE_NO_SENSE = 0x00,
- SCSI_SENSE_RECOVERED_ERROR = 0x01,
- SCSI_SENSE_NOT_READY = 0x02,
- SCSI_SENSE_MEDIUM_ERROR = 0x03,
- SCSI_SENSE_HARDWARE_ERROR = 0x04,
- SCSI_SENSE_ILLEGAL_REQUEST = 0x05,
- SCSI_SENSE_UNIT_ATTENTION = 0x06,
- SCSI_SENSE_DATA_PROTECTION = 0x07,
- SCSI_SENSE_BLANK_CHECK = 0x08,
- SCSI_SENSE_VENDOR_SPECIFIC = 0x09,
- SCSI_SENSE_COPY_ABORTED = 0x0a,
- SCSI_SENSE_COMMAND_ABORTED = 0x0b,
- SCSI_SENSE_OBSOLETE_ERROR_CODE = 0x0c,
- SCSI_SENSE_OVERFLOW_COMMAND = 0x0d,
- SCSI_SENSE_MISCOMPARE = 0x0e
-};
-
-struct scsi_sense {
- unsigned char error_type;
- enum scsi_sense_key key;
- int ascq;
- unsigned sense_specific:1;
- unsigned ill_param_in_cdb:1;
- unsigned bit_pointer_valid:1;
- unsigned char bit_pointer;
- uint16_t field_pointer;
-};
-
-enum scsi_residual {
- SCSI_RESIDUAL_NO_RESIDUAL = 0,
- SCSI_RESIDUAL_UNDERFLOW,
- SCSI_RESIDUAL_OVERFLOW
-};
-
-struct scsi_task {
- int status;
- int cdb_size;
- int xfer_dir;
- int expxferlen;
- unsigned char cdb[SCSI_CDB_MAX_SIZE];
- enum scsi_residual residual_status;
- size_t residual;
- struct scsi_sense sense;
- struct scsi_data datain;
- struct scsi_allocated_memory *mem;
- void *ptr;
-
- uint32_t itt;
- uint32_t cmdsn;
- uint32_t lun;
-
- struct scsi_iovector iovector_in;
- struct scsi_iovector iovector_out;
-};
-
/** libiscsi integration **/
+typedef struct virtio_scsi_cmd_req VirtIOSCSICmdReq;
+typedef struct virtio_scsi_cmd_resp VirtIOSCSICmdResp;
+
static int vus_iscsi_add_lun(VusIscsiLun *lun, char *iscsi_uri)
{
struct iscsi_url *iscsi_url;
@@ -365,12 +287,12 @@ static int handle_cmd_sync(struct iscsi_context *ctx,
if (!out_len && !in_len) {
dir = SCSI_XFER_NONE;
} else if (out_len) {
- dir = SCSI_XFER_TO_DEV;
+ dir = SCSI_XFER_WRITE;
for (i = 0; i < out_len; i++) {
len += out[i].iov_len;
}
} else {
- dir = SCSI_XFER_FROM_DEV;
+ dir = SCSI_XFER_READ;
for (i = 0; i < in_len; i++) {
len += in[i].iov_len;
}
@@ -378,10 +300,10 @@ static int handle_cmd_sync(struct iscsi_context *ctx,
task = scsi_task_new(cdb_len, req->cdb, dir, len);
- if (dir == SCSI_XFER_TO_DEV) {
+ if (dir == SCSI_XFER_WRITE) {
task->iovector_out.iov = (struct scsi_iovec *)out;
task->iovector_out.niov = out_len;
- } else if (dir == SCSI_XFER_FROM_DEV) {
+ } else if (dir == SCSI_XFER_READ) {
task->iovector_in.iov = (struct scsi_iovec *)in;
task->iovector_in.niov = in_len;
}
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 22/27] vhost-user-scsi: drop extra callback pointer
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (20 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 21/27] vhost-user-scsi: don't copy iscsi/scsi-lowlevel.h Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 23/27] vhost-user-scsi: simplify source handling Marc-André Lureau
` (4 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
Use the one from the source with casting, like any other glib source.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index cfac1ce1fe..0e6784187c 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -81,7 +81,6 @@ typedef struct vus_gsrc {
GSource parent;
VusDev *vdev_scsi;
GPollFD gfd;
- vu_watch_cb vu_cb;
} vus_gsrc_t;
static gint vus_fdmap_compare(gconstpointer a, gconstpointer b)
@@ -112,18 +111,13 @@ static gboolean vus_gsrc_dispatch(GSource *src, GSourceFunc cb, gpointer data)
vus_gsrc_t *vus_src = (vus_gsrc_t *)src;
assert(vus_src);
- assert(!(vus_src->vu_cb && cb));
vdev_scsi = vus_src->vdev_scsi;
assert(vdev_scsi);
- if (cb) {
- return cb(data);
- }
- if (vus_src->vu_cb) {
- vus_src->vu_cb(&vdev_scsi->vu_dev, vus_src->gfd.revents, data);
- }
+ ((vu_watch_cb)cb)(&vdev_scsi->vu_dev, vus_src->gfd.revents, data);
+
return G_SOURCE_CONTINUE;
}
@@ -147,12 +141,12 @@ static void vus_gsrc_new(VusDev *vdev_scsi, int fd, GIOCondition cond,
assert(!(vu_cb && gsrc_cb));
vus_gsrc = g_source_new(&vus_gsrc_funcs, sizeof(vus_gsrc_t));
+ g_source_set_callback(vus_gsrc, (GSourceFunc) vu_cb, data, NULL);
vus_src = (vus_gsrc_t *)vus_gsrc;
vus_src->vdev_scsi = vdev_scsi;
vus_src->gfd.fd = fd;
vus_src->gfd.events = cond;
- vus_src->vu_cb = vu_cb;
g_source_add_poll(vus_gsrc, &vus_src->gfd);
g_source_set_callback(vus_gsrc, gsrc_cb, data, NULL);
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 23/27] vhost-user-scsi: simplify source handling
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (21 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 22/27] vhost-user-scsi: drop extra callback pointer Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 24/27] vhost-user-scsi: use glib logging Marc-André Lureau
` (3 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
Using a hashtable.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 45 +++++++++----------------------
1 file changed, 12 insertions(+), 33 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index 0e6784187c..2e1100dea3 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -65,7 +65,7 @@ typedef struct VusDev {
VuDev vu_dev;
int server_sock;
GMainLoop *loop;
- GTree *fdmap; /* fd -> gsource context id */
+ GHashTable *fdmap; /* fd -> gsource */
VusIscsiLun lun;
} VusDev;
@@ -83,11 +83,6 @@ typedef struct vus_gsrc {
GPollFD gfd;
} vus_gsrc_t;
-static gint vus_fdmap_compare(gconstpointer a, gconstpointer b)
-{
- return (b > a) - (b < a);
-}
-
static gboolean vus_gsrc_prepare(GSource *src, gint *timeout)
{
assert(timeout);
@@ -128,8 +123,8 @@ static GSourceFuncs vus_gsrc_funcs = {
NULL
};
-static void vus_gsrc_new(VusDev *vdev_scsi, int fd, GIOCondition cond,
- vu_watch_cb vu_cb, GSourceFunc gsrc_cb, gpointer data)
+static GSource *vus_gsrc_new(VusDev *vdev_scsi, int fd, GIOCondition cond,
+ vu_watch_cb vu_cb, GSourceFunc gsrc_cb, gpointer data)
{
GSource *vus_gsrc;
vus_gsrc_t *vus_src;
@@ -143,7 +138,6 @@ static void vus_gsrc_new(VusDev *vdev_scsi, int fd, GIOCondition cond,
vus_gsrc = g_source_new(&vus_gsrc_funcs, sizeof(vus_gsrc_t));
g_source_set_callback(vus_gsrc, (GSourceFunc) vu_cb, data, NULL);
vus_src = (vus_gsrc_t *)vus_gsrc;
-
vus_src->vdev_scsi = vdev_scsi;
vus_src->gfd.fd = fd;
vus_src->gfd.events = cond;
@@ -154,8 +148,7 @@ static void vus_gsrc_new(VusDev *vdev_scsi, int fd, GIOCondition cond,
assert(id);
g_source_unref(vus_gsrc);
- g_tree_insert(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd,
- (gpointer)(uintptr_t)id);
+ return vus_gsrc;
}
/** libiscsi integration **/
@@ -348,43 +341,27 @@ 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)
{
+ GSource *src;
VusDev *vdev_scsi;
- guint id;
assert(vu_dev);
assert(fd >= 0);
assert(cb);
vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
- id = (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap,
- (gpointer)(uintptr_t)fd);
- if (id) {
- GSource *vus_src = g_main_context_find_source_by_id(NULL, id);
- assert(vus_src);
- g_source_destroy(vus_src);
- (void)g_tree_remove(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd);
- }
-
- vus_gsrc_new(vdev_scsi, fd, vu_evt, cb, NULL, pvt);
+ src = vus_gsrc_new(vdev_scsi, fd, vu_evt, cb, NULL, pvt);
+ g_hash_table_replace(vdev_scsi->fdmap, GINT_TO_POINTER(fd), src);
}
static void vus_del_watch_cb(VuDev *vu_dev, int fd)
{
VusDev *vdev_scsi;
- guint id;
assert(vu_dev);
assert(fd >= 0);
vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
- id = (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap,
- (gpointer)(uintptr_t)fd);
- if (id) {
- GSource *vus_src = g_main_context_find_source_by_id(NULL, id);
- assert(vus_src);
- g_source_destroy(vus_src);
- (void)g_tree_remove(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd);
- }
+ g_hash_table_remove(vdev_scsi->fdmap, GINT_TO_POINTER(fd));
}
static void vus_proc_req(VuDev *vu_dev, int idx)
@@ -540,7 +517,7 @@ static void vdev_scsi_free(VusDev *vdev_scsi)
close(vdev_scsi->server_sock);
}
g_main_loop_unref(vdev_scsi->loop);
- g_tree_destroy(vdev_scsi->fdmap);
+ g_hash_table_unref(vdev_scsi->fdmap);
g_free(vdev_scsi);
}
@@ -551,7 +528,9 @@ static VusDev *vdev_scsi_new(int server_sock)
vdev_scsi = g_new0(VusDev, 1);
vdev_scsi->server_sock = server_sock;
vdev_scsi->loop = g_main_loop_new(NULL, FALSE);
- vdev_scsi->fdmap = g_tree_new(vus_fdmap_compare);
+ vdev_scsi->fdmap =
+ g_hash_table_new_full(NULL, NULL, NULL,
+ (GDestroyNotify) g_source_destroy);
return vdev_scsi;
}
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 24/27] vhost-user-scsi: use glib logging
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (22 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 23/27] vhost-user-scsi: simplify source handling Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 25/27] libvhost-user: add glib source helper Marc-André Lureau
` (2 subsequent siblings)
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
- PLOG is unused
- code is compiled out unless debug is enabled
- logging is too verbose
- you can pipe to ts to have timestamp if needed, or use structured
logging with more recent glib
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 77 +++++++++----------------------
1 file changed, 21 insertions(+), 56 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index 2e1100dea3..ff817d6643 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -18,42 +18,6 @@
#include <glib.h>
-/* #define VUS_DEBUG 1 */
-
-/** Log helpers **/
-
-#define PPRE \
- struct timespec ts; \
- char timebuf[64]; \
- struct tm tm; \
- (void)clock_gettime(CLOCK_REALTIME, &ts); \
- (void)strftime(timebuf, 64, "%Y%m%d %T", gmtime_r(&ts.tv_sec, &tm))
-
-#define PEXT(lvl, msg, ...) do { \
- PPRE; \
- fprintf(stderr, "%s.%06ld " lvl ": %s:%s():%d: " msg "\n", \
- timebuf, ts.tv_nsec / 1000, \
- __FILE__, __func__, __LINE__, ## __VA_ARGS__); \
-} while (0)
-
-#define PNOR(lvl, msg, ...) do { \
- PPRE; \
- fprintf(stderr, "%s.%06ld " lvl ": " msg "\n", \
- timebuf, ts.tv_nsec / 1000, ## __VA_ARGS__); \
-} while (0)
-
-#ifdef VUS_DEBUG
-#define PDBG(msg, ...) PEXT("DBG", msg, ## __VA_ARGS__)
-#define PERR(msg, ...) PEXT("ERR", msg, ## __VA_ARGS__)
-#define PLOG(msg, ...) PEXT("LOG", msg, ## __VA_ARGS__)
-#else
-#define PDBG(msg, ...) { }
-#define PERR(msg, ...) PNOR("ERR", msg, ## __VA_ARGS__)
-#define PLOG(msg, ...) PNOR("LOG", msg, ## __VA_ARGS__)
-#endif
-
-/** vhost-user-scsi specific definitions **/
-
#define VUS_ISCSI_INITIATOR "iqn.2016-11.com.nutanix:vhost-user-scsi"
typedef struct VusIscsiLun {
@@ -168,27 +132,28 @@ static int vus_iscsi_add_lun(VusIscsiLun *lun, char *iscsi_uri)
iscsi_ctx = iscsi_create_context(VUS_ISCSI_INITIATOR);
if (!iscsi_ctx) {
- PERR("Unable to create iSCSI context");
+ g_warning("Unable to create iSCSI context");
return -1;
}
iscsi_url = iscsi_parse_full_url(iscsi_ctx, iscsi_uri);
if (!iscsi_url) {
- PERR("Unable to parse iSCSI URL: %s", iscsi_get_error(iscsi_ctx));
+ g_warning("Unable to parse iSCSI URL: %s", iscsi_get_error(iscsi_ctx));
goto fail;
}
iscsi_set_session_type(iscsi_ctx, ISCSI_SESSION_NORMAL);
iscsi_set_header_digest(iscsi_ctx, ISCSI_HEADER_DIGEST_NONE_CRC32C);
if (iscsi_full_connect_sync(iscsi_ctx, iscsi_url->portal, iscsi_url->lun)) {
- PERR("Unable to login to iSCSI portal: %s", iscsi_get_error(iscsi_ctx));
+ g_warning("Unable to login to iSCSI portal: %s",
+ iscsi_get_error(iscsi_ctx));
goto fail;
}
lun->iscsi_ctx = iscsi_ctx;
lun->iscsi_lun = iscsi_url->lun;
- PDBG("Context %p created for lun 0: %s", iscsi_ctx, iscsi_uri);
+ g_debug("Context %p created for lun 0: %s", iscsi_ctx, iscsi_uri);
out:
if (iscsi_url) {
@@ -230,7 +195,7 @@ static int get_cdb_len(uint8_t *cdb)
case 4: return 16;
case 5: return 12;
}
- PERR("Unable to determine cdb len (0x%02hhX)", cdb[0] >> 5);
+ g_warning("Unable to determine cdb len (0x%02hhX)", cdb[0] >> 5);
return -1;
}
@@ -252,7 +217,7 @@ static int handle_cmd_sync(struct iscsi_context *ctx,
if (!(!req->lun[1] && req->lun[2] == 0x40 && !req->lun[3])) {
/* Ignore anything different than target=0, lun=0 */
- PDBG("Ignoring unconnected lun (0x%hhX, 0x%hhX)",
+ g_debug("Ignoring unconnected lun (0x%hhX, 0x%hhX)",
req->lun[1], req->lun[3]);
rsp->status = SCSI_STATUS_CHECK_CONDITION;
memset(rsp->sense, 0, sizeof(rsp->sense));
@@ -295,10 +260,10 @@ static int handle_cmd_sync(struct iscsi_context *ctx,
task->iovector_in.niov = in_len;
}
- PDBG("Sending iscsi cmd (cdb_len=%d, dir=%d, task=%p)",
+ g_debug("Sending iscsi cmd (cdb_len=%d, dir=%d, task=%p)",
cdb_len, dir, task);
if (!iscsi_scsi_command_sync(ctx, 0, task, NULL)) {
- PERR("Error serving SCSI command");
+ g_warning("Error serving SCSI command");
g_free(task);
return -1;
}
@@ -316,7 +281,7 @@ static int handle_cmd_sync(struct iscsi_context *ctx,
g_free(task);
- PDBG("Filled in rsp: status=%hhX, resid=%u, response=%hhX, sense_len=%u",
+ g_debug("Filled in rsp: status=%hhX, resid=%u, response=%hhX, sense_len=%u",
rsp->status, rsp->resid, rsp->response, rsp->sense_len);
return 0;
@@ -332,7 +297,7 @@ static void vus_panic_cb(VuDev *vu_dev, const char *buf)
vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
if (buf) {
- PERR("vu_panic: %s", buf);
+ g_warning("vu_panic: %s", buf);
}
g_main_loop_quit(vdev_scsi->loop);
@@ -373,19 +338,19 @@ static void vus_proc_req(VuDev *vu_dev, int idx)
vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
if (idx < 0 || idx >= VHOST_MAX_NR_VIRTQUEUE) {
- PERR("VQ Index out of range: %d", idx);
+ g_warning("VQ Index out of range: %d", idx);
vus_panic_cb(vu_dev, NULL);
return;
}
vq = vu_get_queue(vu_dev, idx);
if (!vq) {
- PERR("Error fetching VQ (dev=%p, idx=%d)", vu_dev, idx);
+ g_warning("Error fetching VQ (dev=%p, idx=%d)", vu_dev, idx);
vus_panic_cb(vu_dev, NULL);
return;
}
- PDBG("Got kicked on vq[%d]@%p", idx, vq);
+ g_debug("Got kicked on vq[%d]@%p", idx, vq);
while (1) {
VuVirtqElement *elem;
@@ -394,23 +359,23 @@ static void vus_proc_req(VuDev *vu_dev, int idx)
elem = vu_queue_pop(vu_dev, vq, sizeof(VuVirtqElement));
if (!elem) {
- PDBG("No more elements pending on vq[%d]@%p", idx, vq);
+ g_debug("No more elements pending on vq[%d]@%p", idx, vq);
break;
}
- PDBG("Popped elem@%p", elem);
+ g_debug("Popped elem@%p", elem);
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");
+ g_warning("Invalid virtio-scsi req header");
vus_panic_cb(vu_dev, NULL);
break;
}
req = (VirtIOSCSICmdReq *)elem->out_sg[0].iov_base;
if (elem->in_sg[0].iov_len < sizeof(VirtIOSCSICmdResp)) {
- PERR("Invalid virtio-scsi rsp header");
+ g_warning("Invalid virtio-scsi rsp header");
vus_panic_cb(vu_dev, NULL);
break;
}
@@ -437,7 +402,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) {
- PERR("VQ Index out of range: %d", idx);
+ g_warning("VQ Index out of range: %d", idx);
vus_panic_cb(vu_dev, NULL);
return;
}
@@ -445,7 +410,7 @@ static void vus_queue_set_started(VuDev *vu_dev, int idx, bool started)
vq = vu_get_queue(vu_dev, idx);
if (idx == 0 || idx == 1) {
- PDBG("queue %d unimplemented", idx);
+ g_debug("queue %d unimplemented", idx);
} else {
vu_set_queue_handler(vu_dev, vq, started ? vus_proc_req : NULL);
}
@@ -462,7 +427,7 @@ static gboolean vus_vhost_cb(gpointer data)
assert(vu_dev);
if (!vu_dispatch(vu_dev) != 0) {
- PERR("Error processing vhost message");
+ g_warning("Error processing vhost message");
vus_panic_cb(vu_dev, NULL);
return G_SOURCE_REMOVE;
}
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* [Qemu-devel] [PATCH v2 25/27] libvhost-user: add glib source helper
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (23 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 24/27] vhost-user-scsi: use glib logging Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-10-10 16:22 ` Paolo Bonzini
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 26/27] vhost-user-scsi: use libvhost-user glib helper Marc-André Lureau
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 27/27] vhost-user-scsi: remove server_sock from VusDev Marc-André Lureau
26 siblings, 1 reply; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
contrib/libvhost-user/libvhost-user-glib.h | 32 ++++++
contrib/libvhost-user/libvhost-user-glib.c | 154 +++++++++++++++++++++++++++++
contrib/libvhost-user/Makefile.objs | 2 +-
3 files changed, 187 insertions(+), 1 deletion(-)
create mode 100644 contrib/libvhost-user/libvhost-user-glib.h
create mode 100644 contrib/libvhost-user/libvhost-user-glib.c
diff --git a/contrib/libvhost-user/libvhost-user-glib.h b/contrib/libvhost-user/libvhost-user-glib.h
new file mode 100644
index 0000000000..6b2110b94c
--- /dev/null
+++ b/contrib/libvhost-user/libvhost-user-glib.h
@@ -0,0 +1,32 @@
+/*
+ * Vhost User library
+ *
+ * Copyright (c) 2016 Nutanix Inc. All rights reserved.
+ * Copyright (c) 2017 Red Hat, Inc.
+ *
+ * Authors:
+ * Marc-André Lureau <mlureau@redhat.com>
+ * Felipe Franciosi <felipe@nutanix.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or
+ * later. See the COPYING file in the top-level directory.
+ */
+
+#ifndef LIBVHOST_USER_GLIB_H
+#define LIBVHOST_USER_GLIB_H
+
+#include <glib.h>
+#include "libvhost-user.h"
+
+typedef struct VugDev {
+ VuDev parent;
+
+ GHashTable *fdmap; /* fd -> gsource */
+ GSource *src;
+} VugDev;
+
+void vug_init(VugDev *dev, int socket,
+ vu_panic_cb panic, const VuDevIface *iface);
+void vug_deinit(VugDev *dev);
+
+#endif /* LIBVHOST_USER_GLIB_H */
diff --git a/contrib/libvhost-user/libvhost-user-glib.c b/contrib/libvhost-user/libvhost-user-glib.c
new file mode 100644
index 0000000000..545f089587
--- /dev/null
+++ b/contrib/libvhost-user/libvhost-user-glib.c
@@ -0,0 +1,154 @@
+/*
+ * Vhost User library
+ *
+ * Copyright (c) 2016 Nutanix Inc. All rights reserved.
+ * Copyright (c) 2017 Red Hat, Inc.
+ *
+ * Authors:
+ * Marc-André Lureau <mlureau@redhat.com>
+ * Felipe Franciosi <felipe@nutanix.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or
+ * later. See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+
+#include "libvhost-user-glib.h"
+
+/* glib event loop integration for libvhost-user and misc callbacks */
+
+G_STATIC_ASSERT((int)G_IO_IN == (int)VU_WATCH_IN);
+G_STATIC_ASSERT((int)G_IO_OUT == (int)VU_WATCH_OUT);
+G_STATIC_ASSERT((int)G_IO_PRI == (int)VU_WATCH_PRI);
+G_STATIC_ASSERT((int)G_IO_ERR == (int)VU_WATCH_ERR);
+G_STATIC_ASSERT((int)G_IO_HUP == (int)VU_WATCH_HUP);
+
+typedef struct VugSrc {
+ GSource parent;
+ VuDev *dev;
+ GPollFD gfd;
+} VugSrc;
+
+static gboolean
+vug_src_prepare(GSource *gsrc, gint *timeout)
+{
+ g_assert(timeout);
+
+ *timeout = -1;
+ return FALSE;
+}
+
+static gboolean
+vug_src_check(GSource *gsrc)
+{
+ VugSrc *src = (VugSrc *)gsrc;
+
+ g_assert(src);
+
+ return src->gfd.revents & src->gfd.events;
+}
+
+static gboolean
+vug_src_dispatch(GSource *gsrc, GSourceFunc cb, gpointer data)
+{
+ VugSrc *src = (VugSrc *)gsrc;
+
+ g_assert(src);
+
+ ((vu_watch_cb)cb)(src->dev, src->gfd.revents, data);
+
+ return G_SOURCE_CONTINUE;
+}
+
+static GSourceFuncs vug_src_funcs = {
+ vug_src_prepare,
+ vug_src_check,
+ vug_src_dispatch,
+ NULL
+};
+
+static GSource *
+vug_source_new(VuDev *dev, int fd, GIOCondition cond,
+ vu_watch_cb vu_cb, gpointer data)
+{
+ GSource *gsrc;
+ VugSrc *src;
+ guint id;
+
+ g_assert(dev);
+ g_assert(fd >= 0);
+ g_assert(vu_cb);
+
+ gsrc = g_source_new(&vug_src_funcs, sizeof(VugSrc));
+ g_source_set_callback(gsrc, (GSourceFunc)vu_cb, data, NULL);
+ src = (VugSrc *)gsrc;
+ src->dev = dev;
+ src->gfd.fd = fd;
+ src->gfd.events = cond;
+
+ g_source_add_poll(gsrc, &src->gfd);
+ id = g_source_attach(gsrc, NULL);
+ g_assert(id);
+ g_source_unref(gsrc);
+
+ return gsrc;
+}
+
+static void
+set_watch(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb, void *pvt)
+{
+ GSource *src;
+ VugDev *dev;
+
+ g_assert(vu_dev);
+ g_assert(fd >= 0);
+ g_assert(cb);
+
+ dev = container_of(vu_dev, VugDev, parent);
+ src = vug_source_new(vu_dev, fd, vu_evt, cb, pvt);
+ g_hash_table_replace(dev->fdmap, GINT_TO_POINTER(fd), src);
+}
+
+static void
+remove_watch(VuDev *vu_dev, int fd)
+{
+ VugDev *dev;
+
+ g_assert(vu_dev);
+ g_assert(fd >= 0);
+
+ dev = container_of(vu_dev, VugDev, parent);
+ g_hash_table_remove(dev->fdmap, GINT_TO_POINTER(fd));
+}
+
+
+static void vug_watch(VuDev *dev, int condition, void *data)
+{
+ if (!vu_dispatch(dev) != 0) {
+ dev->panic(dev, "Error processing vhost message");
+ }
+}
+
+void
+vug_init(VugDev *dev, int socket,
+ vu_panic_cb panic, const VuDevIface *iface)
+{
+ g_assert(dev);
+ g_assert(iface);
+
+ vu_init(&dev->parent, socket, panic, set_watch, remove_watch, iface);
+ dev->fdmap = g_hash_table_new_full(NULL, NULL, NULL,
+ (GDestroyNotify) g_source_destroy);
+
+ dev->src = vug_source_new(&dev->parent, socket, G_IO_IN, vug_watch, NULL);
+}
+
+void
+vug_deinit(VugDev *dev)
+{
+ g_assert(dev);
+
+ g_hash_table_unref(dev->fdmap);
+ g_source_unref(dev->src);
+}
diff --git a/contrib/libvhost-user/Makefile.objs b/contrib/libvhost-user/Makefile.objs
index cef1ad6e31..ef3778edd4 100644
--- a/contrib/libvhost-user/Makefile.objs
+++ b/contrib/libvhost-user/Makefile.objs
@@ -1 +1 @@
-libvhost-user-obj-y = libvhost-user.o
+libvhost-user-obj-y += libvhost-user.o libvhost-user-glib.o
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* Re: [Qemu-devel] [PATCH v2 25/27] libvhost-user: add glib source helper
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 25/27] libvhost-user: add glib source helper Marc-André Lureau
@ 2017-10-10 16:22 ` Paolo Bonzini
2017-10-10 16:25 ` Marc-André Lureau
0 siblings, 1 reply; 32+ messages in thread
From: Paolo Bonzini @ 2017-10-10 16:22 UTC (permalink / raw)
To: Marc-André Lureau, qemu-devel; +Cc: felipe, changpeng.liu, f4bug
On 19/09/2017 18:52, Marc-André Lureau wrote:
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Maybe a few lines would help here, like
This file implements a bridge from the vu_init API of libvhost-user to
GSource, so that libvhost-user can be used inside a GLib main loop.
Paolo
> ---
> contrib/libvhost-user/libvhost-user-glib.h | 32 ++++++
> contrib/libvhost-user/libvhost-user-glib.c | 154 +++++++++++++++++++++++++++++
> contrib/libvhost-user/Makefile.objs | 2 +-
> 3 files changed, 187 insertions(+), 1 deletion(-)
> create mode 100644 contrib/libvhost-user/libvhost-user-glib.h
> create mode 100644 contrib/libvhost-user/libvhost-user-glib.c
>
> diff --git a/contrib/libvhost-user/libvhost-user-glib.h b/contrib/libvhost-user/libvhost-user-glib.h
> new file mode 100644
> index 0000000000..6b2110b94c
> --- /dev/null
> +++ b/contrib/libvhost-user/libvhost-user-glib.h
> @@ -0,0 +1,32 @@
> +/*
> + * Vhost User library
> + *
> + * Copyright (c) 2016 Nutanix Inc. All rights reserved.
> + * Copyright (c) 2017 Red Hat, Inc.
> + *
> + * Authors:
> + * Marc-André Lureau <mlureau@redhat.com>
> + * Felipe Franciosi <felipe@nutanix.com>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or
> + * later. See the COPYING file in the top-level directory.
> + */
> +
> +#ifndef LIBVHOST_USER_GLIB_H
> +#define LIBVHOST_USER_GLIB_H
> +
> +#include <glib.h>
> +#include "libvhost-user.h"
> +
> +typedef struct VugDev {
> + VuDev parent;
> +
> + GHashTable *fdmap; /* fd -> gsource */
> + GSource *src;
> +} VugDev;
> +
> +void vug_init(VugDev *dev, int socket,
> + vu_panic_cb panic, const VuDevIface *iface);
> +void vug_deinit(VugDev *dev);
> +
> +#endif /* LIBVHOST_USER_GLIB_H */
> diff --git a/contrib/libvhost-user/libvhost-user-glib.c b/contrib/libvhost-user/libvhost-user-glib.c
> new file mode 100644
> index 0000000000..545f089587
> --- /dev/null
> +++ b/contrib/libvhost-user/libvhost-user-glib.c
> @@ -0,0 +1,154 @@
> +/*
> + * Vhost User library
> + *
> + * Copyright (c) 2016 Nutanix Inc. All rights reserved.
> + * Copyright (c) 2017 Red Hat, Inc.
> + *
> + * Authors:
> + * Marc-André Lureau <mlureau@redhat.com>
> + * Felipe Franciosi <felipe@nutanix.com>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or
> + * later. See the COPYING file in the top-level directory.
> + */
> +
> +#include "qemu/osdep.h"
> +
> +#include "libvhost-user-glib.h"
> +
> +/* glib event loop integration for libvhost-user and misc callbacks */
> +
> +G_STATIC_ASSERT((int)G_IO_IN == (int)VU_WATCH_IN);
> +G_STATIC_ASSERT((int)G_IO_OUT == (int)VU_WATCH_OUT);
> +G_STATIC_ASSERT((int)G_IO_PRI == (int)VU_WATCH_PRI);
> +G_STATIC_ASSERT((int)G_IO_ERR == (int)VU_WATCH_ERR);
> +G_STATIC_ASSERT((int)G_IO_HUP == (int)VU_WATCH_HUP);
> +
> +typedef struct VugSrc {
> + GSource parent;
> + VuDev *dev;
> + GPollFD gfd;
> +} VugSrc;
> +
> +static gboolean
> +vug_src_prepare(GSource *gsrc, gint *timeout)
> +{
> + g_assert(timeout);
> +
> + *timeout = -1;
> + return FALSE;
> +}
> +
> +static gboolean
> +vug_src_check(GSource *gsrc)
> +{
> + VugSrc *src = (VugSrc *)gsrc;
> +
> + g_assert(src);
> +
> + return src->gfd.revents & src->gfd.events;
> +}
> +
> +static gboolean
> +vug_src_dispatch(GSource *gsrc, GSourceFunc cb, gpointer data)
> +{
> + VugSrc *src = (VugSrc *)gsrc;
> +
> + g_assert(src);
> +
> + ((vu_watch_cb)cb)(src->dev, src->gfd.revents, data);
> +
> + return G_SOURCE_CONTINUE;
> +}
> +
> +static GSourceFuncs vug_src_funcs = {
> + vug_src_prepare,
> + vug_src_check,
> + vug_src_dispatch,
> + NULL
> +};
> +
> +static GSource *
> +vug_source_new(VuDev *dev, int fd, GIOCondition cond,
> + vu_watch_cb vu_cb, gpointer data)
> +{
> + GSource *gsrc;
> + VugSrc *src;
> + guint id;
> +
> + g_assert(dev);
> + g_assert(fd >= 0);
> + g_assert(vu_cb);
> +
> + gsrc = g_source_new(&vug_src_funcs, sizeof(VugSrc));
> + g_source_set_callback(gsrc, (GSourceFunc)vu_cb, data, NULL);
> + src = (VugSrc *)gsrc;
> + src->dev = dev;
> + src->gfd.fd = fd;
> + src->gfd.events = cond;
> +
> + g_source_add_poll(gsrc, &src->gfd);
> + id = g_source_attach(gsrc, NULL);
> + g_assert(id);
> + g_source_unref(gsrc);
> +
> + return gsrc;
> +}
> +
> +static void
> +set_watch(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb, void *pvt)
> +{
> + GSource *src;
> + VugDev *dev;
> +
> + g_assert(vu_dev);
> + g_assert(fd >= 0);
> + g_assert(cb);
> +
> + dev = container_of(vu_dev, VugDev, parent);
> + src = vug_source_new(vu_dev, fd, vu_evt, cb, pvt);
> + g_hash_table_replace(dev->fdmap, GINT_TO_POINTER(fd), src);
> +}
> +
> +static void
> +remove_watch(VuDev *vu_dev, int fd)
> +{
> + VugDev *dev;
> +
> + g_assert(vu_dev);
> + g_assert(fd >= 0);
> +
> + dev = container_of(vu_dev, VugDev, parent);
> + g_hash_table_remove(dev->fdmap, GINT_TO_POINTER(fd));
> +}
> +
> +
> +static void vug_watch(VuDev *dev, int condition, void *data)
> +{
> + if (!vu_dispatch(dev) != 0) {
> + dev->panic(dev, "Error processing vhost message");
> + }
> +}
> +
> +void
> +vug_init(VugDev *dev, int socket,
> + vu_panic_cb panic, const VuDevIface *iface)
> +{
> + g_assert(dev);
> + g_assert(iface);
> +
> + vu_init(&dev->parent, socket, panic, set_watch, remove_watch, iface);
> + dev->fdmap = g_hash_table_new_full(NULL, NULL, NULL,
> + (GDestroyNotify) g_source_destroy);
> +
> + dev->src = vug_source_new(&dev->parent, socket, G_IO_IN, vug_watch, NULL);
> +}
> +
> +void
> +vug_deinit(VugDev *dev)
> +{
> + g_assert(dev);
> +
> + g_hash_table_unref(dev->fdmap);
> + g_source_unref(dev->src);
> +}
> diff --git a/contrib/libvhost-user/Makefile.objs b/contrib/libvhost-user/Makefile.objs
> index cef1ad6e31..ef3778edd4 100644
> --- a/contrib/libvhost-user/Makefile.objs
> +++ b/contrib/libvhost-user/Makefile.objs
> @@ -1 +1 @@
> -libvhost-user-obj-y = libvhost-user.o
> +libvhost-user-obj-y += libvhost-user.o libvhost-user-glib.o
>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [Qemu-devel] [PATCH v2 25/27] libvhost-user: add glib source helper
2017-10-10 16:22 ` Paolo Bonzini
@ 2017-10-10 16:25 ` Marc-André Lureau
0 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-10-10 16:25 UTC (permalink / raw)
To: Paolo Bonzini
Cc: QEMU, Philippe Mathieu-Daudé, Liu, Changpeng,
Felipe Franciosi
On Tue, Oct 10, 2017 at 6:22 PM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> On 19/09/2017 18:52, Marc-André Lureau wrote:
>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Maybe a few lines would help here, like
>
> This file implements a bridge from the vu_init API of libvhost-user to
> GSource, so that libvhost-user can be used inside a GLib main loop.
>
Indeed, added.
> Paolo
>
>> ---
>> contrib/libvhost-user/libvhost-user-glib.h | 32 ++++++
>> contrib/libvhost-user/libvhost-user-glib.c | 154 +++++++++++++++++++++++++++++
>> contrib/libvhost-user/Makefile.objs | 2 +-
>> 3 files changed, 187 insertions(+), 1 deletion(-)
>> create mode 100644 contrib/libvhost-user/libvhost-user-glib.h
>> create mode 100644 contrib/libvhost-user/libvhost-user-glib.c
>>
>> diff --git a/contrib/libvhost-user/libvhost-user-glib.h b/contrib/libvhost-user/libvhost-user-glib.h
>> new file mode 100644
>> index 0000000000..6b2110b94c
>> --- /dev/null
>> +++ b/contrib/libvhost-user/libvhost-user-glib.h
>> @@ -0,0 +1,32 @@
>> +/*
>> + * Vhost User library
>> + *
>> + * Copyright (c) 2016 Nutanix Inc. All rights reserved.
>> + * Copyright (c) 2017 Red Hat, Inc.
>> + *
>> + * Authors:
>> + * Marc-André Lureau <mlureau@redhat.com>
>> + * Felipe Franciosi <felipe@nutanix.com>
>> + *
>> + * This work is licensed under the terms of the GNU GPL, version 2 or
>> + * later. See the COPYING file in the top-level directory.
>> + */
>> +
>> +#ifndef LIBVHOST_USER_GLIB_H
>> +#define LIBVHOST_USER_GLIB_H
>> +
>> +#include <glib.h>
>> +#include "libvhost-user.h"
>> +
>> +typedef struct VugDev {
>> + VuDev parent;
>> +
>> + GHashTable *fdmap; /* fd -> gsource */
>> + GSource *src;
>> +} VugDev;
>> +
>> +void vug_init(VugDev *dev, int socket,
>> + vu_panic_cb panic, const VuDevIface *iface);
>> +void vug_deinit(VugDev *dev);
>> +
>> +#endif /* LIBVHOST_USER_GLIB_H */
>> diff --git a/contrib/libvhost-user/libvhost-user-glib.c b/contrib/libvhost-user/libvhost-user-glib.c
>> new file mode 100644
>> index 0000000000..545f089587
>> --- /dev/null
>> +++ b/contrib/libvhost-user/libvhost-user-glib.c
>> @@ -0,0 +1,154 @@
>> +/*
>> + * Vhost User library
>> + *
>> + * Copyright (c) 2016 Nutanix Inc. All rights reserved.
>> + * Copyright (c) 2017 Red Hat, Inc.
>> + *
>> + * Authors:
>> + * Marc-André Lureau <mlureau@redhat.com>
>> + * Felipe Franciosi <felipe@nutanix.com>
>> + *
>> + * This work is licensed under the terms of the GNU GPL, version 2 or
>> + * later. See the COPYING file in the top-level directory.
>> + */
>> +
>> +#include "qemu/osdep.h"
>> +
>> +#include "libvhost-user-glib.h"
>> +
>> +/* glib event loop integration for libvhost-user and misc callbacks */
>> +
>> +G_STATIC_ASSERT((int)G_IO_IN == (int)VU_WATCH_IN);
>> +G_STATIC_ASSERT((int)G_IO_OUT == (int)VU_WATCH_OUT);
>> +G_STATIC_ASSERT((int)G_IO_PRI == (int)VU_WATCH_PRI);
>> +G_STATIC_ASSERT((int)G_IO_ERR == (int)VU_WATCH_ERR);
>> +G_STATIC_ASSERT((int)G_IO_HUP == (int)VU_WATCH_HUP);
>> +
>> +typedef struct VugSrc {
>> + GSource parent;
>> + VuDev *dev;
>> + GPollFD gfd;
>> +} VugSrc;
>> +
>> +static gboolean
>> +vug_src_prepare(GSource *gsrc, gint *timeout)
>> +{
>> + g_assert(timeout);
>> +
>> + *timeout = -1;
>> + return FALSE;
>> +}
>> +
>> +static gboolean
>> +vug_src_check(GSource *gsrc)
>> +{
>> + VugSrc *src = (VugSrc *)gsrc;
>> +
>> + g_assert(src);
>> +
>> + return src->gfd.revents & src->gfd.events;
>> +}
>> +
>> +static gboolean
>> +vug_src_dispatch(GSource *gsrc, GSourceFunc cb, gpointer data)
>> +{
>> + VugSrc *src = (VugSrc *)gsrc;
>> +
>> + g_assert(src);
>> +
>> + ((vu_watch_cb)cb)(src->dev, src->gfd.revents, data);
>> +
>> + return G_SOURCE_CONTINUE;
>> +}
>> +
>> +static GSourceFuncs vug_src_funcs = {
>> + vug_src_prepare,
>> + vug_src_check,
>> + vug_src_dispatch,
>> + NULL
>> +};
>> +
>> +static GSource *
>> +vug_source_new(VuDev *dev, int fd, GIOCondition cond,
>> + vu_watch_cb vu_cb, gpointer data)
>> +{
>> + GSource *gsrc;
>> + VugSrc *src;
>> + guint id;
>> +
>> + g_assert(dev);
>> + g_assert(fd >= 0);
>> + g_assert(vu_cb);
>> +
>> + gsrc = g_source_new(&vug_src_funcs, sizeof(VugSrc));
>> + g_source_set_callback(gsrc, (GSourceFunc)vu_cb, data, NULL);
>> + src = (VugSrc *)gsrc;
>> + src->dev = dev;
>> + src->gfd.fd = fd;
>> + src->gfd.events = cond;
>> +
>> + g_source_add_poll(gsrc, &src->gfd);
>> + id = g_source_attach(gsrc, NULL);
>> + g_assert(id);
>> + g_source_unref(gsrc);
>> +
>> + return gsrc;
>> +}
>> +
>> +static void
>> +set_watch(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb, void *pvt)
>> +{
>> + GSource *src;
>> + VugDev *dev;
>> +
>> + g_assert(vu_dev);
>> + g_assert(fd >= 0);
>> + g_assert(cb);
>> +
>> + dev = container_of(vu_dev, VugDev, parent);
>> + src = vug_source_new(vu_dev, fd, vu_evt, cb, pvt);
>> + g_hash_table_replace(dev->fdmap, GINT_TO_POINTER(fd), src);
>> +}
>> +
>> +static void
>> +remove_watch(VuDev *vu_dev, int fd)
>> +{
>> + VugDev *dev;
>> +
>> + g_assert(vu_dev);
>> + g_assert(fd >= 0);
>> +
>> + dev = container_of(vu_dev, VugDev, parent);
>> + g_hash_table_remove(dev->fdmap, GINT_TO_POINTER(fd));
>> +}
>> +
>> +
>> +static void vug_watch(VuDev *dev, int condition, void *data)
>> +{
>> + if (!vu_dispatch(dev) != 0) {
>> + dev->panic(dev, "Error processing vhost message");
>> + }
>> +}
>> +
>> +void
>> +vug_init(VugDev *dev, int socket,
>> + vu_panic_cb panic, const VuDevIface *iface)
>> +{
>> + g_assert(dev);
>> + g_assert(iface);
>> +
>> + vu_init(&dev->parent, socket, panic, set_watch, remove_watch, iface);
>> + dev->fdmap = g_hash_table_new_full(NULL, NULL, NULL,
>> + (GDestroyNotify) g_source_destroy);
>> +
>> + dev->src = vug_source_new(&dev->parent, socket, G_IO_IN, vug_watch, NULL);
>> +}
>> +
>> +void
>> +vug_deinit(VugDev *dev)
>> +{
>> + g_assert(dev);
>> +
>> + g_hash_table_unref(dev->fdmap);
>> + g_source_unref(dev->src);
>> +}
>> diff --git a/contrib/libvhost-user/Makefile.objs b/contrib/libvhost-user/Makefile.objs
>> index cef1ad6e31..ef3778edd4 100644
>> --- a/contrib/libvhost-user/Makefile.objs
>> +++ b/contrib/libvhost-user/Makefile.objs
>> @@ -1 +1 @@
>> -libvhost-user-obj-y = libvhost-user.o
>> +libvhost-user-obj-y += libvhost-user.o libvhost-user-glib.o
>>
>
> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
>
thanks
--
Marc-André Lureau
^ permalink raw reply [flat|nested] 32+ messages in thread
* [Qemu-devel] [PATCH v2 26/27] vhost-user-scsi: use libvhost-user glib helper
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (24 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 25/27] libvhost-user: add glib source helper Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
2017-10-10 16:23 ` Paolo Bonzini
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 27/27] vhost-user-scsi: remove server_sock from VusDev Marc-André Lureau
26 siblings, 1 reply; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 162 +++---------------------------
1 file changed, 16 insertions(+), 146 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index ff817d6643..615e2a76bb 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -11,7 +11,7 @@
*/
#include "qemu/osdep.h"
-#include "contrib/libvhost-user/libvhost-user.h"
+#include "contrib/libvhost-user/libvhost-user-glib.h"
#include "standard-headers/linux/virtio_scsi.h"
#include "iscsi/iscsi.h"
#include "iscsi/scsi-lowlevel.h"
@@ -26,95 +26,13 @@ typedef struct VusIscsiLun {
} VusIscsiLun;
typedef struct VusDev {
- VuDev vu_dev;
+ VugDev parent;
+
int server_sock;
- GMainLoop *loop;
- GHashTable *fdmap; /* fd -> gsource */
VusIscsiLun lun;
+ GMainLoop *loop;
} VusDev;
-/** glib event loop integration for libvhost-user and misc callbacks **/
-
-QEMU_BUILD_BUG_ON((int)G_IO_IN != (int)VU_WATCH_IN);
-QEMU_BUILD_BUG_ON((int)G_IO_OUT != (int)VU_WATCH_OUT);
-QEMU_BUILD_BUG_ON((int)G_IO_PRI != (int)VU_WATCH_PRI);
-QEMU_BUILD_BUG_ON((int)G_IO_ERR != (int)VU_WATCH_ERR);
-QEMU_BUILD_BUG_ON((int)G_IO_HUP != (int)VU_WATCH_HUP);
-
-typedef struct vus_gsrc {
- GSource parent;
- VusDev *vdev_scsi;
- GPollFD gfd;
-} vus_gsrc_t;
-
-static gboolean vus_gsrc_prepare(GSource *src, gint *timeout)
-{
- assert(timeout);
-
- *timeout = -1;
- return FALSE;
-}
-
-static gboolean vus_gsrc_check(GSource *src)
-{
- vus_gsrc_t *vus_src = (vus_gsrc_t *)src;
-
- assert(vus_src);
-
- return vus_src->gfd.revents & vus_src->gfd.events;
-}
-
-static gboolean vus_gsrc_dispatch(GSource *src, GSourceFunc cb, gpointer data)
-{
- VusDev *vdev_scsi;
- vus_gsrc_t *vus_src = (vus_gsrc_t *)src;
-
- assert(vus_src);
-
- vdev_scsi = vus_src->vdev_scsi;
-
- assert(vdev_scsi);
-
- ((vu_watch_cb)cb)(&vdev_scsi->vu_dev, vus_src->gfd.revents, data);
-
- return G_SOURCE_CONTINUE;
-}
-
-static GSourceFuncs vus_gsrc_funcs = {
- vus_gsrc_prepare,
- vus_gsrc_check,
- vus_gsrc_dispatch,
- NULL
-};
-
-static GSource *vus_gsrc_new(VusDev *vdev_scsi, int fd, GIOCondition cond,
- vu_watch_cb vu_cb, GSourceFunc gsrc_cb, gpointer data)
-{
- GSource *vus_gsrc;
- vus_gsrc_t *vus_src;
- guint id;
-
- assert(vdev_scsi);
- assert(fd >= 0);
- assert(vu_cb || gsrc_cb);
- assert(!(vu_cb && gsrc_cb));
-
- vus_gsrc = g_source_new(&vus_gsrc_funcs, sizeof(vus_gsrc_t));
- g_source_set_callback(vus_gsrc, (GSourceFunc) vu_cb, data, NULL);
- vus_src = (vus_gsrc_t *)vus_gsrc;
- vus_src->vdev_scsi = vdev_scsi;
- vus_src->gfd.fd = fd;
- vus_src->gfd.events = cond;
-
- g_source_add_poll(vus_gsrc, &vus_src->gfd);
- g_source_set_callback(vus_gsrc, gsrc_cb, data, NULL);
- id = g_source_attach(vus_gsrc, NULL);
- assert(id);
- g_source_unref(vus_gsrc);
-
- return vus_gsrc;
-}
-
/** libiscsi integration **/
typedef struct virtio_scsi_cmd_req VirtIOSCSICmdReq;
@@ -291,11 +209,13 @@ static int handle_cmd_sync(struct iscsi_context *ctx,
static void vus_panic_cb(VuDev *vu_dev, const char *buf)
{
+ VugDev *gdev;
VusDev *vdev_scsi;
assert(vu_dev);
- vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
+ gdev = container_of(vu_dev, VugDev, parent);
+ vdev_scsi = container_of(gdev, VusDev, parent);
if (buf) {
g_warning("vu_panic: %s", buf);
}
@@ -303,40 +223,16 @@ static void vus_panic_cb(VuDev *vu_dev, const char *buf)
g_main_loop_quit(vdev_scsi->loop);
}
-static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb,
- void *pvt)
-{
- GSource *src;
- VusDev *vdev_scsi;
-
- assert(vu_dev);
- assert(fd >= 0);
- assert(cb);
-
- vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
- src = vus_gsrc_new(vdev_scsi, fd, vu_evt, cb, NULL, pvt);
- g_hash_table_replace(vdev_scsi->fdmap, GINT_TO_POINTER(fd), src);
-}
-
-static void vus_del_watch_cb(VuDev *vu_dev, int fd)
-{
- VusDev *vdev_scsi;
-
- assert(vu_dev);
- assert(fd >= 0);
-
- vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
- g_hash_table_remove(vdev_scsi->fdmap, GINT_TO_POINTER(fd));
-}
-
static void vus_proc_req(VuDev *vu_dev, int idx)
{
+ VugDev *gdev;
VusDev *vdev_scsi;
VuVirtq *vq;
assert(vu_dev);
- vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
+ gdev = container_of(vu_dev, VugDev, parent);
+ vdev_scsi = container_of(gdev, VusDev, parent);
if (idx < 0 || idx >= VHOST_MAX_NR_VIRTQUEUE) {
g_warning("VQ Index out of range: %d", idx);
vus_panic_cb(vu_dev, NULL);
@@ -420,21 +316,6 @@ static const VuDevIface vus_iface = {
.queue_set_started = vus_queue_set_started,
};
-static gboolean vus_vhost_cb(gpointer data)
-{
- VuDev *vu_dev = (VuDev *)data;
-
- assert(vu_dev);
-
- if (!vu_dispatch(vu_dev) != 0) {
- g_warning("Error processing vhost message");
- vus_panic_cb(vu_dev, NULL);
- return G_SOURCE_REMOVE;
- }
-
- return G_SOURCE_CONTINUE;
-}
-
/** misc helpers **/
static int unix_sock_new(char *unix_fn)
@@ -482,7 +363,6 @@ static void vdev_scsi_free(VusDev *vdev_scsi)
close(vdev_scsi->server_sock);
}
g_main_loop_unref(vdev_scsi->loop);
- g_hash_table_unref(vdev_scsi->fdmap);
g_free(vdev_scsi);
}
@@ -493,9 +373,6 @@ static VusDev *vdev_scsi_new(int server_sock)
vdev_scsi = g_new0(VusDev, 1);
vdev_scsi->server_sock = server_sock;
vdev_scsi->loop = g_main_loop_new(NULL, FALSE);
- vdev_scsi->fdmap =
- g_hash_table_new_full(NULL, NULL, NULL,
- (GDestroyNotify) g_source_destroy);
return vdev_scsi;
}
@@ -503,11 +380,9 @@ static VusDev *vdev_scsi_new(int server_sock)
static int vdev_scsi_run(VusDev *vdev_scsi)
{
int cli_sock;
- int ret = 0;
assert(vdev_scsi);
assert(vdev_scsi->server_sock >= 0);
- assert(vdev_scsi->loop);
cli_sock = accept(vdev_scsi->server_sock, NULL, NULL);
if (cli_sock < 0) {
@@ -515,21 +390,16 @@ static int vdev_scsi_run(VusDev *vdev_scsi)
return -1;
}
- vu_init(&vdev_scsi->vu_dev,
- cli_sock,
- vus_panic_cb,
- vus_add_watch_cb,
- vus_del_watch_cb,
- &vus_iface);
-
- vus_gsrc_new(vdev_scsi, cli_sock, G_IO_IN, NULL, vus_vhost_cb,
- &vdev_scsi->vu_dev);
+ vug_init(&vdev_scsi->parent,
+ cli_sock,
+ vus_panic_cb,
+ &vus_iface);
g_main_loop_run(vdev_scsi->loop);
- vu_deinit(&vdev_scsi->vu_dev);
+ vug_deinit(&vdev_scsi->parent);
- return ret;
+ return 0;
}
int main(int argc, char **argv)
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread* Re: [Qemu-devel] [PATCH v2 26/27] vhost-user-scsi: use libvhost-user glib helper
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 26/27] vhost-user-scsi: use libvhost-user glib helper Marc-André Lureau
@ 2017-10-10 16:23 ` Paolo Bonzini
0 siblings, 0 replies; 32+ messages in thread
From: Paolo Bonzini @ 2017-10-10 16:23 UTC (permalink / raw)
To: Marc-André Lureau, qemu-devel; +Cc: felipe, changpeng.liu, f4bug
On 19/09/2017 18:52, Marc-André Lureau wrote:
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> contrib/vhost-user-scsi/vhost-user-scsi.c | 162 +++---------------------------
> 1 file changed, 16 insertions(+), 146 deletions(-)
>
> diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
> index ff817d6643..615e2a76bb 100644
> --- a/contrib/vhost-user-scsi/vhost-user-scsi.c
> +++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
> @@ -11,7 +11,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "contrib/libvhost-user/libvhost-user.h"
> +#include "contrib/libvhost-user/libvhost-user-glib.h"
> #include "standard-headers/linux/virtio_scsi.h"
> #include "iscsi/iscsi.h"
> #include "iscsi/scsi-lowlevel.h"
> @@ -26,95 +26,13 @@ typedef struct VusIscsiLun {
> } VusIscsiLun;
>
> typedef struct VusDev {
> - VuDev vu_dev;
> + VugDev parent;
> +
> int server_sock;
> - GMainLoop *loop;
> - GHashTable *fdmap; /* fd -> gsource */
> VusIscsiLun lun;
> + GMainLoop *loop;
> } VusDev;
>
> -/** glib event loop integration for libvhost-user and misc callbacks **/
> -
> -QEMU_BUILD_BUG_ON((int)G_IO_IN != (int)VU_WATCH_IN);
> -QEMU_BUILD_BUG_ON((int)G_IO_OUT != (int)VU_WATCH_OUT);
> -QEMU_BUILD_BUG_ON((int)G_IO_PRI != (int)VU_WATCH_PRI);
> -QEMU_BUILD_BUG_ON((int)G_IO_ERR != (int)VU_WATCH_ERR);
> -QEMU_BUILD_BUG_ON((int)G_IO_HUP != (int)VU_WATCH_HUP);
> -
> -typedef struct vus_gsrc {
> - GSource parent;
> - VusDev *vdev_scsi;
> - GPollFD gfd;
> -} vus_gsrc_t;
> -
> -static gboolean vus_gsrc_prepare(GSource *src, gint *timeout)
> -{
> - assert(timeout);
> -
> - *timeout = -1;
> - return FALSE;
> -}
> -
> -static gboolean vus_gsrc_check(GSource *src)
> -{
> - vus_gsrc_t *vus_src = (vus_gsrc_t *)src;
> -
> - assert(vus_src);
> -
> - return vus_src->gfd.revents & vus_src->gfd.events;
> -}
> -
> -static gboolean vus_gsrc_dispatch(GSource *src, GSourceFunc cb, gpointer data)
> -{
> - VusDev *vdev_scsi;
> - vus_gsrc_t *vus_src = (vus_gsrc_t *)src;
> -
> - assert(vus_src);
> -
> - vdev_scsi = vus_src->vdev_scsi;
> -
> - assert(vdev_scsi);
> -
> - ((vu_watch_cb)cb)(&vdev_scsi->vu_dev, vus_src->gfd.revents, data);
> -
> - return G_SOURCE_CONTINUE;
> -}
> -
> -static GSourceFuncs vus_gsrc_funcs = {
> - vus_gsrc_prepare,
> - vus_gsrc_check,
> - vus_gsrc_dispatch,
> - NULL
> -};
> -
> -static GSource *vus_gsrc_new(VusDev *vdev_scsi, int fd, GIOCondition cond,
> - vu_watch_cb vu_cb, GSourceFunc gsrc_cb, gpointer data)
> -{
> - GSource *vus_gsrc;
> - vus_gsrc_t *vus_src;
> - guint id;
> -
> - assert(vdev_scsi);
> - assert(fd >= 0);
> - assert(vu_cb || gsrc_cb);
> - assert(!(vu_cb && gsrc_cb));
> -
> - vus_gsrc = g_source_new(&vus_gsrc_funcs, sizeof(vus_gsrc_t));
> - g_source_set_callback(vus_gsrc, (GSourceFunc) vu_cb, data, NULL);
> - vus_src = (vus_gsrc_t *)vus_gsrc;
> - vus_src->vdev_scsi = vdev_scsi;
> - vus_src->gfd.fd = fd;
> - vus_src->gfd.events = cond;
> -
> - g_source_add_poll(vus_gsrc, &vus_src->gfd);
> - g_source_set_callback(vus_gsrc, gsrc_cb, data, NULL);
> - id = g_source_attach(vus_gsrc, NULL);
> - assert(id);
> - g_source_unref(vus_gsrc);
> -
> - return vus_gsrc;
> -}
> -
> /** libiscsi integration **/
>
> typedef struct virtio_scsi_cmd_req VirtIOSCSICmdReq;
> @@ -291,11 +209,13 @@ static int handle_cmd_sync(struct iscsi_context *ctx,
>
> static void vus_panic_cb(VuDev *vu_dev, const char *buf)
> {
> + VugDev *gdev;
> VusDev *vdev_scsi;
>
> assert(vu_dev);
>
> - vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
> + gdev = container_of(vu_dev, VugDev, parent);
> + vdev_scsi = container_of(gdev, VusDev, parent);
> if (buf) {
> g_warning("vu_panic: %s", buf);
> }
> @@ -303,40 +223,16 @@ static void vus_panic_cb(VuDev *vu_dev, const char *buf)
> g_main_loop_quit(vdev_scsi->loop);
> }
>
> -static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb,
> - void *pvt)
> -{
> - GSource *src;
> - VusDev *vdev_scsi;
> -
> - assert(vu_dev);
> - assert(fd >= 0);
> - assert(cb);
> -
> - vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
> - src = vus_gsrc_new(vdev_scsi, fd, vu_evt, cb, NULL, pvt);
> - g_hash_table_replace(vdev_scsi->fdmap, GINT_TO_POINTER(fd), src);
> -}
> -
> -static void vus_del_watch_cb(VuDev *vu_dev, int fd)
> -{
> - VusDev *vdev_scsi;
> -
> - assert(vu_dev);
> - assert(fd >= 0);
> -
> - vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
> - g_hash_table_remove(vdev_scsi->fdmap, GINT_TO_POINTER(fd));
> -}
> -
> static void vus_proc_req(VuDev *vu_dev, int idx)
> {
> + VugDev *gdev;
> VusDev *vdev_scsi;
> VuVirtq *vq;
>
> assert(vu_dev);
>
> - vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
> + gdev = container_of(vu_dev, VugDev, parent);
> + vdev_scsi = container_of(gdev, VusDev, parent);
> if (idx < 0 || idx >= VHOST_MAX_NR_VIRTQUEUE) {
> g_warning("VQ Index out of range: %d", idx);
> vus_panic_cb(vu_dev, NULL);
> @@ -420,21 +316,6 @@ static const VuDevIface vus_iface = {
> .queue_set_started = vus_queue_set_started,
> };
>
> -static gboolean vus_vhost_cb(gpointer data)
> -{
> - VuDev *vu_dev = (VuDev *)data;
> -
> - assert(vu_dev);
> -
> - if (!vu_dispatch(vu_dev) != 0) {
> - g_warning("Error processing vhost message");
> - vus_panic_cb(vu_dev, NULL);
> - return G_SOURCE_REMOVE;
> - }
> -
> - return G_SOURCE_CONTINUE;
> -}
> -
> /** misc helpers **/
>
> static int unix_sock_new(char *unix_fn)
> @@ -482,7 +363,6 @@ static void vdev_scsi_free(VusDev *vdev_scsi)
> close(vdev_scsi->server_sock);
> }
> g_main_loop_unref(vdev_scsi->loop);
> - g_hash_table_unref(vdev_scsi->fdmap);
> g_free(vdev_scsi);
> }
>
> @@ -493,9 +373,6 @@ static VusDev *vdev_scsi_new(int server_sock)
> vdev_scsi = g_new0(VusDev, 1);
> vdev_scsi->server_sock = server_sock;
> vdev_scsi->loop = g_main_loop_new(NULL, FALSE);
> - vdev_scsi->fdmap =
> - g_hash_table_new_full(NULL, NULL, NULL,
> - (GDestroyNotify) g_source_destroy);
>
> return vdev_scsi;
> }
> @@ -503,11 +380,9 @@ static VusDev *vdev_scsi_new(int server_sock)
> static int vdev_scsi_run(VusDev *vdev_scsi)
> {
> int cli_sock;
> - int ret = 0;
>
> assert(vdev_scsi);
> assert(vdev_scsi->server_sock >= 0);
> - assert(vdev_scsi->loop);
>
> cli_sock = accept(vdev_scsi->server_sock, NULL, NULL);
> if (cli_sock < 0) {
> @@ -515,21 +390,16 @@ static int vdev_scsi_run(VusDev *vdev_scsi)
> return -1;
> }
>
> - vu_init(&vdev_scsi->vu_dev,
> - cli_sock,
> - vus_panic_cb,
> - vus_add_watch_cb,
> - vus_del_watch_cb,
> - &vus_iface);
> -
> - vus_gsrc_new(vdev_scsi, cli_sock, G_IO_IN, NULL, vus_vhost_cb,
> - &vdev_scsi->vu_dev);
> + vug_init(&vdev_scsi->parent,
> + cli_sock,
> + vus_panic_cb,
> + &vus_iface);
>
> g_main_loop_run(vdev_scsi->loop);
>
> - vu_deinit(&vdev_scsi->vu_dev);
> + vug_deinit(&vdev_scsi->parent);
>
> - return ret;
> + return 0;
> }
>
> int main(int argc, char **argv)
>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
^ permalink raw reply [flat|nested] 32+ messages in thread
* [Qemu-devel] [PATCH v2 27/27] vhost-user-scsi: remove server_sock from VusDev
2017-09-19 16:51 [Qemu-devel] [PATCH v2 00/27] vhost-user-scsi: code clean-up Marc-André Lureau
` (25 preceding siblings ...)
2017-09-19 16:52 ` [Qemu-devel] [PATCH v2 26/27] vhost-user-scsi: use libvhost-user glib helper Marc-André Lureau
@ 2017-09-19 16:52 ` Marc-André Lureau
26 siblings, 0 replies; 32+ messages in thread
From: Marc-André Lureau @ 2017-09-19 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, changpeng.liu, f4bug, felipe, Marc-André Lureau
It is unneeded in the VusDev device structure, and also simplify a bit
the code.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
contrib/vhost-user-scsi/vhost-user-scsi.c | 77 ++++++++++---------------------
1 file changed, 24 insertions(+), 53 deletions(-)
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index 615e2a76bb..54c1191db0 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -28,7 +28,6 @@ typedef struct VusIscsiLun {
typedef struct VusDev {
VugDev parent;
- int server_sock;
VusIscsiLun lun;
GMainLoop *loop;
} VusDev;
@@ -357,57 +356,12 @@ fail:
/** vhost-user-scsi **/
-static void vdev_scsi_free(VusDev *vdev_scsi)
-{
- if (vdev_scsi->server_sock >= 0) {
- close(vdev_scsi->server_sock);
- }
- g_main_loop_unref(vdev_scsi->loop);
- g_free(vdev_scsi);
-}
-
-static VusDev *vdev_scsi_new(int server_sock)
-{
- VusDev *vdev_scsi;
-
- vdev_scsi = g_new0(VusDev, 1);
- vdev_scsi->server_sock = server_sock;
- vdev_scsi->loop = g_main_loop_new(NULL, FALSE);
-
- return vdev_scsi;
-}
-
-static int vdev_scsi_run(VusDev *vdev_scsi)
-{
- int cli_sock;
-
- assert(vdev_scsi);
- assert(vdev_scsi->server_sock >= 0);
-
- cli_sock = accept(vdev_scsi->server_sock, NULL, NULL);
- if (cli_sock < 0) {
- perror("accept");
- return -1;
- }
-
- vug_init(&vdev_scsi->parent,
- cli_sock,
- vus_panic_cb,
- &vus_iface);
-
- g_main_loop_run(vdev_scsi->loop);
-
- vug_deinit(&vdev_scsi->parent);
-
- return 0;
-}
-
int main(int argc, char **argv)
{
VusDev *vdev_scsi = NULL;
char *unix_fn = NULL;
char *iscsi_uri = NULL;
- int sock, opt, err = EXIT_SUCCESS;
+ int lsock = -1, csock = -1, opt, err = EXIT_SUCCESS;
while ((opt = getopt(argc, argv, "u:i:")) != -1) {
switch (opt) {
@@ -427,25 +381,42 @@ int main(int argc, char **argv)
goto help;
}
- sock = unix_sock_new(unix_fn);
- if (sock < 0) {
+ lsock = unix_sock_new(unix_fn);
+ if (lsock < 0) {
goto err;
}
- vdev_scsi = vdev_scsi_new(sock);
- if (vus_iscsi_add_lun(&vdev_scsi->lun, iscsi_uri) != 0) {
+ csock = accept(lsock, NULL, NULL);
+ if (csock < 0) {
+ perror("accept");
goto err;
}
- if (vdev_scsi_run(vdev_scsi) != 0) {
+ vdev_scsi = g_new0(VusDev, 1);
+ vdev_scsi->loop = g_main_loop_new(NULL, FALSE);
+
+ if (vus_iscsi_add_lun(&vdev_scsi->lun, iscsi_uri) != 0) {
goto err;
}
+ vug_init(&vdev_scsi->parent, csock, vus_panic_cb, &vus_iface);
+
+ g_main_loop_run(vdev_scsi->loop);
+
+ vug_deinit(&vdev_scsi->parent);
+
out:
if (vdev_scsi) {
- vdev_scsi_free(vdev_scsi);
+ g_main_loop_unref(vdev_scsi->loop);
+ g_free(vdev_scsi);
unlink(unix_fn);
}
+ if (csock >= 0) {
+ close(csock);
+ }
+ if (lsock >= 0) {
+ close(lsock);
+ }
g_free(unix_fn);
g_free(iscsi_uri);
--
2.14.1.146.gd35faa819
^ permalink raw reply related [flat|nested] 32+ messages in thread