From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505841900982175.2055725727946; Tue, 19 Sep 2017 10:25:00 -0700 (PDT) Received: from localhost ([::1]:44263 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMGZ-0007q8-VE for importer@patchew.org; Tue, 19 Sep 2017 13:25:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45791) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLlH-000549-QZ for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:52:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLlH-0001IR-0d for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:52:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46314) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLlG-0001Hm-Qu for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:52:38 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C7CD5C052427; Tue, 19 Sep 2017 16:52:37 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D2A8600C2; Tue, 19 Sep 2017 16:52:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C7CD5C052427 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:00 +0200 Message-Id: <20170919165226.23022-2-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 19 Sep 2017 16:52:37 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 01/27] glib-compat: move G_SOURCE_CONTINUE/REMOVE there X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Marc-Andr=C3=A9 Lureau Acked-by: Philippe Mathieu-Daud=C3=A9 --- 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 =20 +/* 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 =20 #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 @@ =20 #include =20 -/* 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 */ =20 /** Log helpers **/ --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150584198489613.116813782360396; Tue, 19 Sep 2017 10:26:24 -0700 (PDT) Received: from localhost ([::1]:44272 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMHw-0000b3-3r for importer@patchew.org; Tue, 19 Sep 2017 13:26:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45900) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLlQ-00059W-7g for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:52:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLlL-0001Md-OY for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:52:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46816) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLlL-0001Lz-IV for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:52:43 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7C1CDC0546D5; Tue, 19 Sep 2017 16:52:42 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1B7760F89; Tue, 19 Sep 2017 16:52:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7C1CDC0546D5 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:01 +0200 Message-Id: <20170919165226.23022-3-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 19 Sep 2017 16:52:42 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 02/27] build-sys: fix libvhost-user.a build X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" And actually link to it from vhost-user-bridge. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 $@ =20 $(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 =20 ROMSUBDIR_RULES=3D$(patsubst %,romsubdir-%, $(ROMS)) # Only keep -O and -g cflags @@ -357,6 +357,7 @@ Makefile: $(version-obj-y) =20 libqemustub.a: $(stub-obj-y) libqemuutil.a: $(util-obj-y) $(trace-obj-y) +libvhost-user.a: $(libvhost-user-obj-y) =20 ###################################################################### =20 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-filte= r-redirector.o $(qtest-ob tests/test-x86-cpuid-compat$(EXESUF): tests/test-x86-cpuid-compat.o $(qtes= t-obj-y) tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/i= vshmem-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/libvho= st-user/libvhost-user.o $(test-util-obj-y) +tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-ob= j-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) --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150584181792491.13755885559237; Tue, 19 Sep 2017 10:23:37 -0700 (PDT) Received: from localhost ([::1]:44257 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMFF-0006gh-41 for importer@patchew.org; Tue, 19 Sep 2017 13:23:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLlQ-00059V-7c for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:52:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLlO-0001OO-LX for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:52:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45046) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLlO-0001Nz-GW for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:52:46 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7BE767E43A; Tue, 19 Sep 2017 16:52:45 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id B2A3C60F89; Tue, 19 Sep 2017 16:52:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7BE767E43A Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:02 +0200 Message-Id: <20170919165226.23022-4-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 19 Sep 2017 16:52:45 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 03/27] build-sys: make vhost-user-scsi depend on libvhost-user.a X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Paolo Bonzini --- 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) $(COMM= ON_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, $^) =20 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 =3D contrib/libvhost-user/ vhost-user-scsi.o-cflags :=3D $(LIBISCSI_CFLAGS) vhost-user-scsi.o-libs :=3D $(LIBISCSI_LIBS) vhost-user-scsi-obj-y =3D contrib/vhost-user-scsi/ -vhost-user-scsi-obj-y +=3D contrib/libvhost-user/libvhost-user.o =20 ###################################################################### trace-events-subdirs =3D --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505842063446154.6391988908232; Tue, 19 Sep 2017 10:27:43 -0700 (PDT) Received: from localhost ([::1]:44276 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMJC-0001ty-Dy for importer@patchew.org; Tue, 19 Sep 2017 13:27:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45949) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLlU-0005DR-DG for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:52:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLlT-0001T2-FE for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:52:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38268) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLlT-0001Sg-8b for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:52:51 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 419F481236; Tue, 19 Sep 2017 16:52:50 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id AFE3465E84; Tue, 19 Sep 2017 16:52:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 419F481236 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:03 +0200 Message-Id: <20170919165226.23022-5-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 19 Sep 2017 16:52:50 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 04/27] libvhost-user: drop dependency on glib X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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. */ =20 -#include +/* this code avoids GLib dependency */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include #include =20 #include "qemu/atomic.h" +#include "qemu/compiler.h" =20 #include "libvhost-user.h" =20 +/* usually provided by GLib */ +#ifndef MIN +#define MIN(x, y) ({ \ + typeof(x) _min1 =3D (x); \ + typeof(y) _min2 =3D (y); \ + (void) (&_min1 =3D=3D &_min2); \ + _min1 < _min2 ? _min1 : _min2; }) +#endif + #define VHOST_USER_HDR_SIZE offsetof(VhostUserMsg, payload.u64) =20 /* The version of the protocol we support */ @@ -81,7 +102,9 @@ vu_panic(VuDev *dev, const char *msg, ...) va_list ap; =20 va_start(ap, msg); - buf =3D g_strdup_vprintf(msg, ap); + if (vasprintf(&buf, msg, ap) < 0) { + buf =3D NULL; + } va_end(ap); =20 dev->broken =3D true; @@ -853,7 +876,7 @@ vu_dispatch(VuDev *dev) success =3D true; =20 end: - g_free(vmsg.data); + free(vmsg.data); return success; } =20 --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505842436797437.48657465564213; Tue, 19 Sep 2017 10:33:56 -0700 (PDT) Received: from localhost ([::1]:44305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMPD-0007RO-Pb for importer@patchew.org; Tue, 19 Sep 2017 13:33:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46076) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLlc-0005K1-VN for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLlY-0001Wi-Is for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38442) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLlY-0001WA-Cl for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:52:56 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5C8458123A; Tue, 19 Sep 2017 16:52:55 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D30A61342; Tue, 19 Sep 2017 16:52:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5C8458123A Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:04 +0200 Message-Id: <20170919165226.23022-6-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 19 Sep 2017 16:52:55 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 05/27] libvhost-user: improve vu_queue_pop() doc X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Paolo Bonzini --- 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 >=3D 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); =20 --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505842605296627.7104742505907; Tue, 19 Sep 2017 10:36:45 -0700 (PDT) Received: from localhost ([::1]:44362 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMRu-0001Mh-Di for importer@patchew.org; Tue, 19 Sep 2017 13:36:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLle-0005L3-4t for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLld-0001aG-AI for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47590) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLld-0001ZW-4C for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:01 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EDCE8C0587E4; Tue, 19 Sep 2017 16:52:59 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id A5C416061E; Tue, 19 Sep 2017 16:52:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com EDCE8C0587E4 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:05 +0200 Message-Id: <20170919165226.23022-7-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 19 Sep 2017 16:53:00 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 06/27] vhost-user-scsi: use g_strdup() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Since vhost-user-scsi uses glib. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 =3D strdup(optarg); + unix_fn =3D g_strdup(optarg); break; case 'i': - iscsi_uri =3D strdup(optarg); + iscsi_uri =3D 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); =20 return err; =20 --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505842770891685.0626836989844; Tue, 19 Sep 2017 10:39:30 -0700 (PDT) Received: from localhost ([::1]:44374 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMUc-0003oP-1S for importer@patchew.org; Tue, 19 Sep 2017 13:39:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLlg-0005Nk-J4 for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLlf-0001c2-Mm for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47646) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLlf-0001bS-GM for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:03 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6E337C0587E4; Tue, 19 Sep 2017 16:53:02 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA8FE5C882; Tue, 19 Sep 2017 16:53:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 6E337C0587E4 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:06 +0200 Message-Id: <20170919165226.23022-8-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 19 Sep 2017 16:53:02 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 07/27] vhost-user-scsi: connect unix socket before allocating X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This simplify a little bit memory management in the following patches. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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_s= csi) } } =20 -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 =3D NULL; =20 - assert(unix_fn); - vdev_scsi =3D calloc(1, sizeof(vhost_scsi_dev_t)); if (!vdev_scsi) { PERR("calloc: %s", strerror(errno)); return NULL; } =20 - vdev_scsi->server_sock =3D unix_sock_new(unix_fn); - if (vdev_scsi->server_sock < 0) { - goto err; - } - + vdev_scsi->server_sock =3D server_sock; vdev_scsi->loop =3D 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 =3D NULL; char *unix_fn =3D NULL; char *iscsi_uri =3D NULL; - int opt, err =3D EXIT_SUCCESS; + int sock, opt, err =3D EXIT_SUCCESS; =20 while ((opt =3D getopt(argc, argv, "u:i:")) !=3D -1) { switch (opt) { @@ -835,7 +829,11 @@ int main(int argc, char **argv) goto help; } =20 - vdev_scsi =3D vdev_scsi_new(unix_fn); + sock =3D unix_sock_new(unix_fn); + if (sock < 0) { + goto err; + } + vdev_scsi =3D vdev_scsi_new(sock); if (!vdev_scsi) { goto err; } --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505842123144631.587607718054; Tue, 19 Sep 2017 10:28:43 -0700 (PDT) Received: from localhost ([::1]:44278 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMK9-0002kL-Df for importer@patchew.org; Tue, 19 Sep 2017 13:28:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46262) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLlo-0005Un-1S for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLlj-0001f5-Fm for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47754) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLlj-0001eA-80 for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:07 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3C7C2C058EB4; Tue, 19 Sep 2017 16:53:06 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id B644F600C2; Tue, 19 Sep 2017 16:53:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3C7C2C058EB4 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:07 +0200 Message-Id: <20170919165226.23022-9-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 19 Sep 2017 16:53:06 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 08/27] vhost-user-scsi: code style fixes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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: } =20 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; =20 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) } =20 static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_c= b cb, - void *pvt) { + void *pvt) +{ vhost_scsi_dev_t *vdev_scsi; guint id; =20 @@ -529,7 +532,7 @@ static void vus_proc_req(VuDev *vu_dev, int idx) return; } =20 - if ((idx < 0) || (idx >=3D VHOST_MAX_NR_VIRTQUEUE)) { + if (idx < 0 || idx >=3D 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); =20 - 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); =20 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 id= x, bool started) =20 assert(vu_dev); =20 - if ((idx < 0) || (idx >=3D VHOST_MAX_NR_VIRTQUEUE)) { + if (idx < 0 || idx >=3D VHOST_MAX_NR_VIRTQUEUE) { PERR("VQ Index out of range: %d", idx); vus_panic_cb(vu_dev, NULL); return; @@ -748,7 +751,8 @@ err: } =20 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); --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505842141422193.5540975284307; Tue, 19 Sep 2017 10:29:01 -0700 (PDT) Received: from localhost ([::1]:44280 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMKS-00032d-Kr for importer@patchew.org; Tue, 19 Sep 2017 13:29:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLlt-0005Zp-Cn for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLls-0001mL-HS for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43330) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLls-0001la-8A for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:16 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 397971F56C; Tue, 19 Sep 2017 16:53:15 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE24F61346; Tue, 19 Sep 2017 16:53:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 397971F56C Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:08 +0200 Message-Id: <20170919165226.23022-10-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 19 Sep 2017 16:53:15 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 09/27] vhost-user-scsi: use glib allocation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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, ui= nt8_t *cdb, int dir, assert(cdb_len > 0); assert(cdb); =20 - task =3D calloc(1, sizeof(struct scsi_task)); - if (!task) { - PERR("Error allocating task: %s", strerror(errno)); - return NULL; - } - + task =3D g_new0(struct scsi_task, 1); memcpy(task->cdb, cdb, cdb_len); task->cdb_size =3D cdb_len; task->xfer_dir =3D dir; @@ -393,10 +388,6 @@ static int handle_cmd_sync(struct iscsi_context *ctx, } =20 task =3D scsi_task_new(cdb_len, req->cdb, dir, len); - if (!task) { - PERR("Unable to create iscsi task"); - return -1; - } =20 if (dir =3D=3D SCSI_XFER_TO_DEV) { task->iovector_out.iov =3D (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; } =20 @@ -425,7 +416,7 @@ static int handle_cmd_sync(struct iscsi_context *ctx, memcpy(rsp->sense, &task->datain.data[2], rsp->sense_len); } =20 - free(task); + g_free(task); =20 PDBG("Filled in rsp: status=3D%hhX, resid=3D%u, response=3D%hhX, sense= _len=3D%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; } =20 -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_s= csi) g_main_loop_unref(vdev_scsi->loop); vdev_scsi->loop =3D NULL; } + g_free(vdev_scsi); } =20 static vhost_scsi_dev_t *vdev_scsi_new(int server_sock) { - vhost_scsi_dev_t *vdev_scsi =3D NULL; - - vdev_scsi =3D calloc(1, sizeof(vhost_scsi_dev_t)); - if (!vdev_scsi) { - PERR("calloc: %s", strerror(errno)); - return NULL; - } + vhost_scsi_dev_t *vdev_scsi; =20 + vdev_scsi =3D g_new0(vhost_scsi_dev_t, 1); vdev_scsi->server_sock =3D server_sock; vdev_scsi->loop =3D 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; =20 err: - vdev_scsi_deinit(vdev_scsi); - free(vdev_scsi); + vdev_scsi_free(vdev_scsi); =20 return NULL; } @@ -852,10 +838,7 @@ int main(int argc, char **argv) } =20 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); =20 --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505842925788829.826627697012; Tue, 19 Sep 2017 10:42:05 -0700 (PDT) Received: from localhost ([::1]:44388 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMX6-00065X-Vz for importer@patchew.org; Tue, 19 Sep 2017 13:42:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46564) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLm2-0005gA-5k for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLlx-0001s3-OD for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45932) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLlx-0001rV-FX for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:21 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6EDEB80F75; Tue, 19 Sep 2017 16:53:20 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 89037610B0; Tue, 19 Sep 2017 16:53:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 6EDEB80F75 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:09 +0200 Message-Id: <20170919165226.23022-11-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 19 Sep 2017 16:53:20 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 10/27] vhost-user-scsi: glib calls that allocate don't return NULL X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" They abort instead, so get rid of failure conditions. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Paolo Bonzini --- 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 =3D { NULL }; =20 -static int vus_gsrc_new(vhost_scsi_dev_t *vdev_scsi, int fd, GIOCondition = cond, - vu_watch_cb vu_cb, GSourceFunc gsrc_cb, gpointer d= ata) +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, i= nt fd, GIOCondition cond, assert(!(vu_cb && gsrc_cb)); =20 vus_gsrc =3D g_source_new(&vus_gsrc_funcs, sizeof(vus_gsrc_t)); - if (!vus_gsrc) { - PERR("Error creating GSource for new watch"); - return -1; - } vus_src =3D (vus_gsrc_t *)vus_gsrc; =20 vus_src->vdev_scsi =3D vdev_scsi; @@ -171,8 +167,6 @@ static int vus_gsrc_new(vhost_scsi_dev_t *vdev_scsi, in= t fd, GIOCondition cond, =20 g_tree_insert(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd, (gpointer)(uintptr_t)id); - - return 0; } =20 /* from libiscsi's scsi-lowlevel.h ** @@ -440,10 +434,7 @@ static void vus_panic_cb(VuDev *vu_dev, const char *bu= f) PERR("vu_panic: %s", buf); } =20 - if (vdev_scsi) { - assert(vdev_scsi->loop); - g_main_loop_quit(vdev_scsi->loop); - } + g_main_loop_quit(vdev_scsi->loop); } =20 static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_c= b 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); } =20 - 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); } =20 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 =3D -1; } =20 - if (vdev_scsi->loop) { - g_main_loop_unref(vdev_scsi->loop); - vdev_scsi->loop =3D NULL; - } + g_main_loop_unref(vdev_scsi->loop); g_free(vdev_scsi); } =20 @@ -717,23 +703,9 @@ static vhost_scsi_dev_t *vdev_scsi_new(int server_sock) vdev_scsi =3D g_new0(vhost_scsi_dev_t, 1); vdev_scsi->server_sock =3D server_sock; vdev_scsi->loop =3D g_main_loop_new(NULL, FALSE); - if (!vdev_scsi->loop) { - PERR("Error creating glib event loop"); - goto err; - } - vdev_scsi->fdmap =3D g_tree_new(vus_fdmap_compare); - if (!vdev_scsi->fdmap) { - PERR("Error creating glib tree for fdmap"); - goto err; - } =20 return vdev_scsi; - -err: - vdev_scsi_free(vdev_scsi); - - return NULL; } =20 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); =20 - 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); =20 g_main_loop_run(vdev_scsi->loop); =20 -out: vu_deinit(&vdev_scsi->vu_dev); =20 return ret; - -fail: - ret =3D -1; - goto out; } =20 int main(int argc, char **argv) @@ -824,9 +789,6 @@ int main(int argc, char **argv) goto err; } vdev_scsi =3D vdev_scsi_new(sock); - if (!vdev_scsi) { - goto err; - } vhost_scsi_devs[0] =3D vdev_scsi; =20 if (vdev_scsi_add_iscsi_lun(vdev_scsi, iscsi_uri, 0) !=3D 0) { --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505842275734961.418700843016; Tue, 19 Sep 2017 10:31:15 -0700 (PDT) Received: from localhost ([::1]:44294 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMMc-00054P-37 for importer@patchew.org; Tue, 19 Sep 2017 13:31:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLm6-0005kL-Lg for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLm5-00022H-Q0 for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40600) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLm5-00020Q-K3 for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:29 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 994B97EA91; Tue, 19 Sep 2017 16:53:28 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6FF975D6A4; Tue, 19 Sep 2017 16:53:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 994B97EA91 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:10 +0200 Message-Id: <20170919165226.23022-12-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 19 Sep 2017 16:53:28 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 11/27] vhost-user-scsi: also free the gtree X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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) } =20 g_main_loop_unref(vdev_scsi->loop); + g_tree_destroy(vdev_scsi->fdmap); g_free(vdev_scsi); } =20 --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150584245774266.75232295452463; Tue, 19 Sep 2017 10:34:17 -0700 (PDT) Received: from localhost ([::1]:44306 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMPY-0007fW-OZ for importer@patchew.org; Tue, 19 Sep 2017 13:34:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46808) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLmF-0005rR-9W for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLmA-000274-TJ for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44618) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLmA-00026J-LC for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:34 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 993C54FD; Tue, 19 Sep 2017 16:53:33 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 862055C541; Tue, 19 Sep 2017 16:53:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 993C54FD Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:11 +0200 Message-Id: <20170919165226.23022-13-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 19 Sep 2017 16:53:33 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 12/27] vhost-user-scsi: remove vdev_scsi_find_by_vu() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The *dev pointer belongs to the vhost_scsi_dev_t parent. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Paolo Bonzini --- 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 @@ =20 /* 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" =20 typedef struct iscsi_lun { @@ -72,8 +70,6 @@ typedef struct vhost_scsi_dev { iscsi_lun_t luns[VUS_MAX_LUNS]; } vhost_scsi_dev_t; =20 -static vhost_scsi_dev_t *vhost_scsi_devs[VUS_MAX_DEVS]; - /** glib event loop integration for libvhost-user and misc callbacks **/ =20 QEMU_BUILD_BUG_ON((int)G_IO_IN !=3D (int)VU_WATCH_IN); @@ -420,16 +416,13 @@ static int handle_cmd_sync(struct iscsi_context *ctx, =20 /** libvhost-user callbacks **/ =20 -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; =20 assert(vu_dev); =20 - vdev_scsi =3D vdev_scsi_find_by_vu(vu_dev); - + vdev_scsi =3D 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, in= t vu_evt, vu_watch_cb cb, assert(fd >=3D 0); assert(cb); =20 - vdev_scsi =3D vdev_scsi_find_by_vu(vu_dev); - if (!vdev_scsi) { - vus_panic_cb(vu_dev, NULL); - return; - } - + vdev_scsi =3D container_of(vu_dev, vhost_scsi_dev_t, vu_dev); id =3D (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 >=3D 0); =20 - vdev_scsi =3D vdev_scsi_find_by_vu(vu_dev); - if (!vdev_scsi) { - vus_panic_cb(vu_dev, NULL); - return; - } - + vdev_scsi =3D container_of(vu_dev, vhost_scsi_dev_t, vu_dev); id =3D (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) =20 assert(vu_dev); =20 - vdev_scsi =3D vdev_scsi_find_by_vu(vu_dev); - if (!vdev_scsi) { - vus_panic_cb(vu_dev, NULL); - return; - } - + vdev_scsi =3D container_of(vu_dev, vhost_scsi_dev_t, vu_dev); if (idx < 0 || idx >=3D VHOST_MAX_NR_VIRTQUEUE) { PERR("VQ Index out of range: %d", idx); vus_panic_cb(vu_dev, NULL); @@ -656,22 +634,6 @@ fail: =20 /** vhost-user-scsi **/ =20 -static vhost_scsi_dev_t *vdev_scsi_find_by_vu(VuDev *vu_dev) -{ - int i; - - assert(vu_dev); - - for (i =3D 0; i < VUS_MAX_DEVS; i++) { - if (&vhost_scsi_devs[i]->vu_dev =3D=3D 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 =3D vdev_scsi_new(sock); - vhost_scsi_devs[0] =3D vdev_scsi; =20 if (vdev_scsi_add_iscsi_lun(vdev_scsi, iscsi_uri, 0) !=3D 0) { goto err; --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505843081339233.69406879455676; Tue, 19 Sep 2017 10:44:41 -0700 (PDT) Received: from localhost ([::1]:44399 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMZc-00006l-Ga for importer@patchew.org; Tue, 19 Sep 2017 13:44:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLmH-0005tJ-7F for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLmG-0002CD-DU for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39892) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLmG-0002BW-8e for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:40 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 39B2A81E0E; Tue, 19 Sep 2017 16:53:39 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A6B660E3B; Tue, 19 Sep 2017 16:53:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 39B2A81E0E Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:12 +0200 Message-Id: <20170919165226.23022-14-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 19 Sep 2017 16:53:39 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 13/27] vhost-user-scsi: simplify unix path cleanup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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=C3=A9 Lureau Reviewed-by: Paolo Bonzini --- 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: =20 static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scsi) { - if (!vdev_scsi) { - return; - } - if (vdev_scsi->server_sock >=3D 0) { - struct sockaddr_storage ss; - socklen_t sslen =3D sizeof(ss); - - if (getsockname(vdev_scsi->server_sock, (struct sockaddr *)&ss, - &sslen) =3D=3D 0) { - struct sockaddr_un *su =3D (struct sockaddr_un *)&ss; - (void)unlink(su->sun_path); - } - - (void)close(vdev_scsi->server_sock); - vdev_scsi->server_sock =3D -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) } =20 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); =20 --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505842218281397.12916207779733; Tue, 19 Sep 2017 10:30:18 -0700 (PDT) Received: from localhost ([::1]:44287 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMLh-0004AC-Dv for importer@patchew.org; Tue, 19 Sep 2017 13:30:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLmR-00062s-45 for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLmM-0002K1-N8 for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40094) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLmM-0002Je-H1 for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:46 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7E84481236; Tue, 19 Sep 2017 16:53:45 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 26C575C541; Tue, 19 Sep 2017 16:53:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7E84481236 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:13 +0200 Message-Id: <20170919165226.23022-15-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 19 Sep 2017 16:53:45 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 14/27] vhost-user-scsi: use NULL pointer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 >=3D 0); assert(vdev_scsi->loop); =20 - cli_sock =3D accept(vdev_scsi->server_sock, (void *)0, (void *)0); + cli_sock =3D accept(vdev_scsi->server_sock, NULL, NULL); if (cli_sock < 0) { perror("accept"); return -1; --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505842295833993.4832314689996; Tue, 19 Sep 2017 10:31:35 -0700 (PDT) Received: from localhost ([::1]:44295 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMMw-0005Kg-T9 for importer@patchew.org; Tue, 19 Sep 2017 13:31:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLmX-00068X-Ay for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLmW-0002QL-JM for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60876) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLmW-0002PY-Dt for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:56 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 281965F7AE; Tue, 19 Sep 2017 16:53:55 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A8A85C541; Tue, 19 Sep 2017 16:53:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 281965F7AE Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:14 +0200 Message-Id: <20170919165226.23022-16-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 19 Sep 2017 16:53:55 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 15/27] vhost-user-scsi: assert() in iscsi_add_lun() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Instead of a preliminary check, add an assert to the function that has the pre-condition. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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) =20 assert(lun); assert(iscsi_uri); + assert(!lun->iscsi_ctx); =20 iscsi_ctx =3D iscsi_create_context(VUS_ISCSI_INITIATOR); if (!iscsi_ctx) { @@ -663,11 +664,6 @@ static int vdev_scsi_add_iscsi_lun(vhost_scsi_dev_t *v= dev_scsi, assert(iscsi_uri); assert(lun < VUS_MAX_LUNS); =20 - 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) !=3D 0) { return -1; } --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505842620678856.6521542096361; Tue, 19 Sep 2017 10:37:00 -0700 (PDT) Received: from localhost ([::1]:44364 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMSB-0001cC-Ru for importer@patchew.org; Tue, 19 Sep 2017 13:36:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47136) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLmc-0006Ab-2b for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLmb-0002US-9w for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45428) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLmb-0002U8-3a for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:01 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 13BE92C975F; Tue, 19 Sep 2017 16:54:00 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E6515D6A8; Tue, 19 Sep 2017 16:53:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 13BE92C975F Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:15 +0200 Message-Id: <20170919165226.23022-17-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 19 Sep 2017 16:54:00 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 16/27] vhost-user-scsi: remove vdev_scsi_add_iscsi_lun() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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; } =20 -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) !=3D 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 =3D vdev_scsi_new(sock); =20 - if (vdev_scsi_add_iscsi_lun(vdev_scsi, iscsi_uri, 0) !=3D 0) { + if (iscsi_add_lun(&vdev_scsi->luns[0], iscsi_uri) !=3D 0) { goto err; } =20 --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505842380957477.03078511503645; Tue, 19 Sep 2017 10:33:00 -0700 (PDT) Received: from localhost ([::1]:44304 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMOK-0006gB-54 for importer@patchew.org; Tue, 19 Sep 2017 13:33:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47183) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLmf-0006Dc-5U for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLme-0002W7-8S for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33974) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLme-0002Vc-22 for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:04 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 03223883BF; Tue, 19 Sep 2017 16:54:03 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 586685D6A4; Tue, 19 Sep 2017 16:54:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 03223883BF Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:16 +0200 Message-Id: <20170919165226.23022-18-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 19 Sep 2017 16:54:03 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 17/27] vhost-user-scsi: remove VUS_MAX_LUNS X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" There is no code to support more than 1 yet, no need for that today. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 @@ =20 /** vhost-user-scsi specific definitions **/ =20 - /* Only 1 LUN and device supported today */ -#define VUS_MAX_LUNS 1 #define VUS_ISCSI_INITIATOR "iqn.2016-11.com.nutanix:vhost-user-scsi" =20 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; =20 /** 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 =3D (VirtIOSCSICmdResp *)elem->in_sg[0].iov_base; =20 - 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) !=3D 0= ) { vus_panic_cb(vu_dev, NULL); @@ -720,7 +718,7 @@ int main(int argc, char **argv) } vdev_scsi =3D vdev_scsi_new(sock); =20 - if (iscsi_add_lun(&vdev_scsi->luns[0], iscsi_uri) !=3D 0) { + if (iscsi_add_lun(&vdev_scsi->lun, iscsi_uri) !=3D 0) { goto err; } =20 --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505842467990585.0481494836251; Tue, 19 Sep 2017 10:34:27 -0700 (PDT) Received: from localhost ([::1]:44308 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMPj-0007pn-7S for importer@patchew.org; Tue, 19 Sep 2017 13:34:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLml-0006IO-Bl for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLmg-0002Ym-Ua for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32926) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLmg-0002YK-PJ for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:06 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B9A575F7AF; Tue, 19 Sep 2017 16:54:05 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3E8185C542; Tue, 19 Sep 2017 16:54:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B9A575F7AF Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:17 +0200 Message-Id: <20170919165226.23022-19-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 19 Sep 2017 16:54:05 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 18/27] vhost-user-scsi: remove unimplemented functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Paolo Bonzini --- 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) } } =20 -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 i= dx, bool started) =20 vq =3D vu_get_queue(vu_dev, idx); =20 - 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 =3D=3D 0 || idx =3D=3D 1) { + PDBG("queue %d unimplemented", idx); + } else { vu_set_queue_handler(vu_dev, vq, started ? vus_proc_req : NULL); } } --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505842784133922.946958246361; Tue, 19 Sep 2017 10:39:44 -0700 (PDT) Received: from localhost ([::1]:44375 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMUo-00041l-DH for importer@patchew.org; Tue, 19 Sep 2017 13:39:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47311) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLml-0006IP-Dc for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLmk-0002aw-24 for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40956) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLmj-0002aF-R2 for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:10 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CFD0581E1D; Tue, 19 Sep 2017 16:54:08 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 05FEA5D6A6; Tue, 19 Sep 2017 16:54:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CFD0581E1D Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:18 +0200 Message-Id: <20170919165226.23022-20-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 19 Sep 2017 16:54:08 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 19/27] vhost-user-scsi: rename VUS types X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" - 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=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 @@ =20 #define VUS_ISCSI_INITIATOR "iqn.2016-11.com.nutanix:vhost-user-scsi" =20 -typedef struct iscsi_lun { +typedef struct VusIscsiLun { struct iscsi_context *iscsi_ctx; int iscsi_lun; -} iscsi_lun_t; +} VusIscsiLun; =20 -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; =20 /** glib event loop integration for libvhost-user and misc callbacks **/ =20 @@ -78,7 +78,7 @@ QEMU_BUILD_BUG_ON((int)G_IO_HUP !=3D (int)VU_WATCH_HUP); =20 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) =20 static gboolean vus_gsrc_dispatch(GSource *src, GSourceFunc cb, gpointer d= ata) { - vhost_scsi_dev_t *vdev_scsi; + VusDev *vdev_scsi; vus_gsrc_t *vus_src =3D (vus_gsrc_t *)src; =20 assert(vus_src); @@ -133,7 +133,7 @@ static GSourceFuncs vus_gsrc_funcs =3D { NULL }; =20 -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 { =20 /** libiscsi integration **/ =20 -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, =20 static void vus_panic_cb(VuDev *vu_dev, const char *buf) { - vhost_scsi_dev_t *vdev_scsi; + VusDev *vdev_scsi; =20 assert(vu_dev); =20 - vdev_scsi =3D container_of(vu_dev, vhost_scsi_dev_t, vu_dev); + vdev_scsi =3D 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 *b= uf) static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_c= b cb, void *pvt) { - vhost_scsi_dev_t *vdev_scsi; + VusDev *vdev_scsi; guint id; =20 assert(vu_dev); assert(fd >=3D 0); assert(cb); =20 - vdev_scsi =3D container_of(vu_dev, vhost_scsi_dev_t, vu_dev); + vdev_scsi =3D container_of(vu_dev, VusDev, vu_dev); id =3D (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, i= nt vu_evt, vu_watch_cb cb, =20 static void vus_del_watch_cb(VuDev *vu_dev, int fd) { - vhost_scsi_dev_t *vdev_scsi; + VusDev *vdev_scsi; guint id; =20 assert(vu_dev); assert(fd >=3D 0); =20 - vdev_scsi =3D container_of(vu_dev, vhost_scsi_dev_t, vu_dev); + vdev_scsi =3D container_of(vu_dev, VusDev, vu_dev); id =3D (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) =20 static void vus_proc_req(VuDev *vu_dev, int idx) { - vhost_scsi_dev_t *vdev_scsi; + VusDev *vdev_scsi; VuVirtq *vq; =20 assert(vu_dev); =20 - vdev_scsi =3D container_of(vu_dev, vhost_scsi_dev_t, vu_dev); + vdev_scsi =3D container_of(vu_dev, VusDev, vu_dev); if (idx < 0 || idx >=3D VHOST_MAX_NR_VIRTQUEUE) { PERR("VQ Index out of range: %d", idx); vus_panic_cb(vu_dev, NULL); @@ -618,7 +618,7 @@ fail: =20 /** vhost-user-scsi **/ =20 -static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scsi) +static void vdev_scsi_free(VusDev *vdev_scsi) { if (vdev_scsi->server_sock >=3D 0) { close(vdev_scsi->server_sock); @@ -628,11 +628,11 @@ static void vdev_scsi_free(vhost_scsi_dev_t *vdev_scs= i) g_free(vdev_scsi); } =20 -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; =20 - vdev_scsi =3D g_new0(vhost_scsi_dev_t, 1); + vdev_scsi =3D g_new0(VusDev, 1); vdev_scsi->server_sock =3D server_sock; vdev_scsi->loop =3D g_main_loop_new(NULL, FALSE); vdev_scsi->fdmap =3D g_tree_new(vus_fdmap_compare); @@ -640,7 +640,7 @@ static vhost_scsi_dev_t *vdev_scsi_new(int server_sock) return vdev_scsi; } =20 -static int vdev_scsi_run(vhost_scsi_dev_t *vdev_scsi) +static int vdev_scsi_run(VusDev *vdev_scsi) { int cli_sock; int ret =3D 0; @@ -674,7 +674,7 @@ static int vdev_scsi_run(vhost_scsi_dev_t *vdev_scsi) =20 int main(int argc, char **argv) { - vhost_scsi_dev_t *vdev_scsi =3D NULL; + VusDev *vdev_scsi =3D NULL; char *unix_fn =3D NULL; char *iscsi_uri =3D NULL; int sock, opt, err =3D EXIT_SUCCESS; --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505842553592602.7390853971682; Tue, 19 Sep 2017 10:35:53 -0700 (PDT) Received: from localhost ([::1]:44320 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMR6-0000fQ-Ei for importer@patchew.org; Tue, 19 Sep 2017 13:35:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLmq-0006Mi-Kz for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLmp-0002fn-Oa for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41132) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLmp-0002f2-Hp for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:15 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9B9C581236; Tue, 19 Sep 2017 16:54:13 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 245916060A; Tue, 19 Sep 2017 16:54:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9B9C581236 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:19 +0200 Message-Id: <20170919165226.23022-21-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 19 Sep 2017 16:54:13 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 20/27] vhost-user-scsi: avoid use of iscsi_ namespace X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" It is confusing and could easily conflict with future versions. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 { =20 /** libiscsi integration **/ =20 -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 =3D vdev_scsi_new(sock); =20 - if (iscsi_add_lun(&vdev_scsi->lun, iscsi_uri) !=3D 0) { + if (vus_iscsi_add_lun(&vdev_scsi->lun, iscsi_uri) !=3D 0) { goto err; } =20 --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505842715880268.4609791202473; Tue, 19 Sep 2017 10:38:35 -0700 (PDT) Received: from localhost ([::1]:44370 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMTj-00036T-5L for importer@patchew.org; Tue, 19 Sep 2017 13:38:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLn0-0006XD-EM for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLmw-0002kq-1A for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23856) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLmv-0002kI-PQ for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:21 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BAFF05F7AD; Tue, 19 Sep 2017 16:54:20 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A2625D980; Tue, 19 Sep 2017 16:54:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com BAFF05F7AD Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:20 +0200 Message-Id: <20170919165226.23022-22-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 19 Sep 2017 16:54:20 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 21/27] vhost-user-scsi: don't copy iscsi/scsi-lowlevel.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 @@ =20 #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" =20 #include =20 @@ -163,90 +164,11 @@ static void vus_gsrc_new(VusDev *vdev_scsi, int fd, G= IOCondition cond, (gpointer)(uintptr_t)id); } =20 -/* from libiscsi's scsi-lowlevel.h ** - * - * nb. We can't directly include scsi-lowlevel.h due to a namespace confli= ct: - * 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 =3D 0x00, - SCSI_SENSE_RECOVERED_ERROR =3D 0x01, - SCSI_SENSE_NOT_READY =3D 0x02, - SCSI_SENSE_MEDIUM_ERROR =3D 0x03, - SCSI_SENSE_HARDWARE_ERROR =3D 0x04, - SCSI_SENSE_ILLEGAL_REQUEST =3D 0x05, - SCSI_SENSE_UNIT_ATTENTION =3D 0x06, - SCSI_SENSE_DATA_PROTECTION =3D 0x07, - SCSI_SENSE_BLANK_CHECK =3D 0x08, - SCSI_SENSE_VENDOR_SPECIFIC =3D 0x09, - SCSI_SENSE_COPY_ABORTED =3D 0x0a, - SCSI_SENSE_COMMAND_ABORTED =3D 0x0b, - SCSI_SENSE_OBSOLETE_ERROR_CODE =3D 0x0c, - SCSI_SENSE_OVERFLOW_COMMAND =3D 0x0d, - SCSI_SENSE_MISCOMPARE =3D 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 =3D 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 **/ =20 +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 =3D SCSI_XFER_NONE; } else if (out_len) { - dir =3D SCSI_XFER_TO_DEV; + dir =3D SCSI_XFER_WRITE; for (i =3D 0; i < out_len; i++) { len +=3D out[i].iov_len; } } else { - dir =3D SCSI_XFER_FROM_DEV; + dir =3D SCSI_XFER_READ; for (i =3D 0; i < in_len; i++) { len +=3D in[i].iov_len; } @@ -378,10 +300,10 @@ static int handle_cmd_sync(struct iscsi_context *ctx, =20 task =3D scsi_task_new(cdb_len, req->cdb, dir, len); =20 - if (dir =3D=3D SCSI_XFER_TO_DEV) { + if (dir =3D=3D SCSI_XFER_WRITE) { task->iovector_out.iov =3D (struct scsi_iovec *)out; task->iovector_out.niov =3D out_len; - } else if (dir =3D=3D SCSI_XFER_FROM_DEV) { + } else if (dir =3D=3D SCSI_XFER_READ) { task->iovector_in.iov =3D (struct scsi_iovec *)in; task->iovector_in.niov =3D in_len; } --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505842937345724.5948074172634; Tue, 19 Sep 2017 10:42:17 -0700 (PDT) Received: from localhost ([::1]:44389 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMXI-0006PO-Ik for importer@patchew.org; Tue, 19 Sep 2017 13:42:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47554) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLn2-0006ZR-M0 for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLn1-0002oq-Pg for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46168) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLn1-0002oP-Jy for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:27 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 869462C9746; Tue, 19 Sep 2017 16:54:26 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D46660F89; Tue, 19 Sep 2017 16:54:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 869462C9746 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:21 +0200 Message-Id: <20170919165226.23022-23-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 19 Sep 2017 16:54:26 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 22/27] vhost-user-scsi: drop extra callback pointer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Use the one from the source with casting, like any other glib source. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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; =20 static gint vus_fdmap_compare(gconstpointer a, gconstpointer b) @@ -112,18 +111,13 @@ static gboolean vus_gsrc_dispatch(GSource *src, GSour= ceFunc cb, gpointer data) vus_gsrc_t *vus_src =3D (vus_gsrc_t *)src; =20 assert(vus_src); - assert(!(vus_src->vu_cb && cb)); =20 vdev_scsi =3D vus_src->vdev_scsi; =20 assert(vdev_scsi); =20 - 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; } =20 @@ -147,12 +141,12 @@ static void vus_gsrc_new(VusDev *vdev_scsi, int fd, G= IOCondition cond, assert(!(vu_cb && gsrc_cb)); =20 vus_gsrc =3D g_source_new(&vus_gsrc_funcs, sizeof(vus_gsrc_t)); + g_source_set_callback(vus_gsrc, (GSourceFunc) vu_cb, data, NULL); vus_src =3D (vus_gsrc_t *)vus_gsrc; =20 vus_src->vdev_scsi =3D vdev_scsi; vus_src->gfd.fd =3D fd; vus_src->gfd.events =3D cond; - vus_src->vu_cb =3D vu_cb; =20 g_source_add_poll(vus_gsrc, &vus_src->gfd); g_source_set_callback(vus_gsrc, gsrc_cb, data, NULL); --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505842941953161.81358467733662; Tue, 19 Sep 2017 10:42:21 -0700 (PDT) Received: from localhost ([::1]:44392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMXN-0006SN-4K for importer@patchew.org; Tue, 19 Sep 2017 13:42:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLn6-0006dG-Im for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLn5-0002qg-CA for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42486) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLn5-0002q2-3n for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:31 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1331380476; Tue, 19 Sep 2017 16:54:30 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2BB955D980; Tue, 19 Sep 2017 16:54:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 1331380476 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:22 +0200 Message-Id: <20170919165226.23022-24-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 19 Sep 2017 16:54:30 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 23/27] vhost-user-scsi: simplify source handling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Using a hashtable. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Paolo Bonzini --- 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; =20 @@ -83,11 +83,6 @@ typedef struct vus_gsrc { GPollFD gfd; } vus_gsrc_t; =20 -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 =3D { NULL }; =20 -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, gpoin= ter data) { GSource *vus_gsrc; vus_gsrc_t *vus_src; @@ -143,7 +138,6 @@ static void vus_gsrc_new(VusDev *vdev_scsi, int fd, GIO= Condition cond, vus_gsrc =3D g_source_new(&vus_gsrc_funcs, sizeof(vus_gsrc_t)); g_source_set_callback(vus_gsrc, (GSourceFunc) vu_cb, data, NULL); vus_src =3D (vus_gsrc_t *)vus_gsrc; - vus_src->vdev_scsi =3D vdev_scsi; vus_src->gfd.fd =3D fd; vus_src->gfd.events =3D cond; @@ -154,8 +148,7 @@ static void vus_gsrc_new(VusDev *vdev_scsi, int fd, GIO= Condition cond, assert(id); g_source_unref(vus_gsrc); =20 - g_tree_insert(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd, - (gpointer)(uintptr_t)id); + return vus_gsrc; } =20 /** libiscsi integration **/ @@ -348,43 +341,27 @@ static void vus_panic_cb(VuDev *vu_dev, const char *b= uf) static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_c= b cb, void *pvt) { + GSource *src; VusDev *vdev_scsi; - guint id; =20 assert(vu_dev); assert(fd >=3D 0); assert(cb); =20 vdev_scsi =3D container_of(vu_dev, VusDev, vu_dev); - id =3D (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap, - (gpointer)(uintptr_t)fd); - if (id) { - GSource *vus_src =3D 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 =3D vus_gsrc_new(vdev_scsi, fd, vu_evt, cb, NULL, pvt); + g_hash_table_replace(vdev_scsi->fdmap, GINT_TO_POINTER(fd), src); } =20 static void vus_del_watch_cb(VuDev *vu_dev, int fd) { VusDev *vdev_scsi; - guint id; =20 assert(vu_dev); assert(fd >=3D 0); =20 vdev_scsi =3D container_of(vu_dev, VusDev, vu_dev); - id =3D (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap, - (gpointer)(uintptr_t)fd); - if (id) { - GSource *vus_src =3D 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)); } =20 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); } =20 @@ -551,7 +528,9 @@ static VusDev *vdev_scsi_new(int server_sock) vdev_scsi =3D g_new0(VusDev, 1); vdev_scsi->server_sock =3D server_sock; vdev_scsi->loop =3D g_main_loop_new(NULL, FALSE); - vdev_scsi->fdmap =3D g_tree_new(vus_fdmap_compare); + vdev_scsi->fdmap =3D + g_hash_table_new_full(NULL, NULL, NULL, + (GDestroyNotify) g_source_destroy); =20 return vdev_scsi; } --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505843098447550.4308067902565; Tue, 19 Sep 2017 10:44:58 -0700 (PDT) Received: from localhost ([::1]:44402 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMZt-0000NZ-GU for importer@patchew.org; Tue, 19 Sep 2017 13:44:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47685) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLnC-0006iG-Du for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLnB-0002uS-1i for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36960) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLnA-0002tx-Ov for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:36 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B3DDE4A6E9; Tue, 19 Sep 2017 16:54:35 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id D2B9D5D6A6; Tue, 19 Sep 2017 16:54:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B3DDE4A6E9 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:23 +0200 Message-Id: <20170919165226.23022-25-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 19 Sep 2017 16:54:35 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 24/27] vhost-user-scsi: use glib logging X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" - 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=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 @@ =20 #include =20 -/* #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" =20 typedef struct VusIscsiLun { @@ -168,27 +132,28 @@ static int vus_iscsi_add_lun(VusIscsiLun *lun, char *= iscsi_uri) =20 iscsi_ctx =3D iscsi_create_context(VUS_ISCSI_INITIATOR); if (!iscsi_ctx) { - PERR("Unable to create iSCSI context"); + g_warning("Unable to create iSCSI context"); return -1; } =20 iscsi_url =3D 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_c= tx)); goto fail; } =20 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->l= un)) { - 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; } =20 lun->iscsi_ctx =3D iscsi_ctx; lun->iscsi_lun =3D iscsi_url->lun; =20 - 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); =20 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; } =20 @@ -252,7 +217,7 @@ static int handle_cmd_sync(struct iscsi_context *ctx, =20 if (!(!req->lun[1] && req->lun[2] =3D=3D 0x40 && !req->lun[3])) { /* Ignore anything different than target=3D0, lun=3D0 */ - 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 =3D 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 =3D in_len; } =20 - PDBG("Sending iscsi cmd (cdb_len=3D%d, dir=3D%d, task=3D%p)", + g_debug("Sending iscsi cmd (cdb_len=3D%d, dir=3D%d, task=3D%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, =20 g_free(task); =20 - PDBG("Filled in rsp: status=3D%hhX, resid=3D%u, response=3D%hhX, sense= _len=3D%u", + g_debug("Filled in rsp: status=3D%hhX, resid=3D%u, response=3D%hhX, se= nse_len=3D%u", rsp->status, rsp->resid, rsp->response, rsp->sense_len); =20 return 0; @@ -332,7 +297,7 @@ static void vus_panic_cb(VuDev *vu_dev, const char *buf) =20 vdev_scsi =3D container_of(vu_dev, VusDev, vu_dev); if (buf) { - PERR("vu_panic: %s", buf); + g_warning("vu_panic: %s", buf); } =20 g_main_loop_quit(vdev_scsi->loop); @@ -373,19 +338,19 @@ static void vus_proc_req(VuDev *vu_dev, int idx) =20 vdev_scsi =3D container_of(vu_dev, VusDev, vu_dev); if (idx < 0 || idx >=3D 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; } =20 vq =3D vu_get_queue(vu_dev, idx); if (!vq) { - PERR("Error fetching VQ (dev=3D%p, idx=3D%d)", vu_dev, idx); + g_warning("Error fetching VQ (dev=3D%p, idx=3D%d)", vu_dev, idx); vus_panic_cb(vu_dev, NULL); return; } =20 - PDBG("Got kicked on vq[%d]@%p", idx, vq); + g_debug("Got kicked on vq[%d]@%p", idx, vq); =20 while (1) { VuVirtqElement *elem; @@ -394,23 +359,23 @@ static void vus_proc_req(VuDev *vu_dev, int idx) =20 elem =3D 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); =20 assert(!(elem->out_num > 1 && elem->in_num > 1)); assert(elem->out_num > 0 && elem->in_num > 0); =20 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 =3D (VirtIOSCSICmdReq *)elem->out_sg[0].iov_base; =20 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 id= x, bool started) assert(vu_dev); =20 if (idx < 0 || idx >=3D 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 id= x, bool started) vq =3D vu_get_queue(vu_dev, idx); =20 if (idx =3D=3D 0 || idx =3D=3D 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); =20 if (!vu_dispatch(vu_dev) !=3D 0) { - PERR("Error processing vhost message"); + g_warning("Error processing vhost message"); vus_panic_cb(vu_dev, NULL); return G_SOURCE_REMOVE; } --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150584309412915.693367718432; Tue, 19 Sep 2017 10:44:54 -0700 (PDT) Received: from localhost ([::1]:44401 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMZp-0000KA-7y for importer@patchew.org; Tue, 19 Sep 2017 13:44:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLnI-0006mJ-0t for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLnG-0002xT-Pv for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39688) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLnG-0002wf-3S for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:42 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 209B6C04B954; Tue, 19 Sep 2017 16:54:41 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2A0946060A; Tue, 19 Sep 2017 16:54:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 209B6C04B954 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:24 +0200 Message-Id: <20170919165226.23022-26-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 19 Sep 2017 16:54:41 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 25/27] libvhost-user: add glib source helper X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Paolo Bonzini --- 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=C3=A9 Lureau + * Felipe Franciosi + * + * 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 +#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=C3=A9 Lureau + * Felipe Franciosi + * + * 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 =3D=3D (int)VU_WATCH_IN); +G_STATIC_ASSERT((int)G_IO_OUT =3D=3D (int)VU_WATCH_OUT); +G_STATIC_ASSERT((int)G_IO_PRI =3D=3D (int)VU_WATCH_PRI); +G_STATIC_ASSERT((int)G_IO_ERR =3D=3D (int)VU_WATCH_ERR); +G_STATIC_ASSERT((int)G_IO_HUP =3D=3D (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 =3D -1; + return FALSE; +} + +static gboolean +vug_src_check(GSource *gsrc) +{ + VugSrc *src =3D (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 =3D (VugSrc *)gsrc; + + g_assert(src); + + ((vu_watch_cb)cb)(src->dev, src->gfd.revents, data); + + return G_SOURCE_CONTINUE; +} + +static GSourceFuncs vug_src_funcs =3D { + 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 >=3D 0); + g_assert(vu_cb); + + gsrc =3D g_source_new(&vug_src_funcs, sizeof(VugSrc)); + g_source_set_callback(gsrc, (GSourceFunc)vu_cb, data, NULL); + src =3D (VugSrc *)gsrc; + src->dev =3D dev; + src->gfd.fd =3D fd; + src->gfd.events =3D cond; + + g_source_add_poll(gsrc, &src->gfd); + id =3D 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 >=3D 0); + g_assert(cb); + + dev =3D container_of(vu_dev, VugDev, parent); + src =3D 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 >=3D 0); + + dev =3D 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) !=3D 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 =3D g_hash_table_new_full(NULL, NULL, NULL, + (GDestroyNotify) g_source_destroy); + + dev->src =3D 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/Ma= kefile.objs index cef1ad6e31..ef3778edd4 100644 --- a/contrib/libvhost-user/Makefile.objs +++ b/contrib/libvhost-user/Makefile.objs @@ -1 +1 @@ -libvhost-user-obj-y =3D libvhost-user.o +libvhost-user-obj-y +=3D libvhost-user.o libvhost-user-glib.o --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505843243890656.1452393173793; Tue, 19 Sep 2017 10:47:23 -0700 (PDT) Received: from localhost ([::1]:44447 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMcE-0002VN-PO for importer@patchew.org; Tue, 19 Sep 2017 13:47:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47818) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLnN-0006r7-5f for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLnL-000304-N4 for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39798) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLnL-0002zU-FR for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:47 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 70469C04B954; Tue, 19 Sep 2017 16:54:46 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id A4E185C541; Tue, 19 Sep 2017 16:54:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 70469C04B954 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:25 +0200 Message-Id: <20170919165226.23022-27-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 19 Sep 2017 16:54:46 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 26/27] vhost-user-scsi: use libvhost-user glib helper X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Paolo Bonzini --- 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 @@ */ =20 #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; =20 typedef struct VusDev { - VuDev vu_dev; + VugDev parent; + int server_sock; - GMainLoop *loop; - GHashTable *fdmap; /* fd -> gsource */ VusIscsiLun lun; + GMainLoop *loop; } VusDev; =20 -/** glib event loop integration for libvhost-user and misc callbacks **/ - -QEMU_BUILD_BUG_ON((int)G_IO_IN !=3D (int)VU_WATCH_IN); -QEMU_BUILD_BUG_ON((int)G_IO_OUT !=3D (int)VU_WATCH_OUT); -QEMU_BUILD_BUG_ON((int)G_IO_PRI !=3D (int)VU_WATCH_PRI); -QEMU_BUILD_BUG_ON((int)G_IO_ERR !=3D (int)VU_WATCH_ERR); -QEMU_BUILD_BUG_ON((int)G_IO_HUP !=3D (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 =3D -1; - return FALSE; -} - -static gboolean vus_gsrc_check(GSource *src) -{ - vus_gsrc_t *vus_src =3D (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 d= ata) -{ - VusDev *vdev_scsi; - vus_gsrc_t *vus_src =3D (vus_gsrc_t *)src; - - assert(vus_src); - - vdev_scsi =3D 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 =3D { - 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, gpoin= ter data) -{ - GSource *vus_gsrc; - vus_gsrc_t *vus_src; - guint id; - - assert(vdev_scsi); - assert(fd >=3D 0); - assert(vu_cb || gsrc_cb); - assert(!(vu_cb && gsrc_cb)); - - vus_gsrc =3D g_source_new(&vus_gsrc_funcs, sizeof(vus_gsrc_t)); - g_source_set_callback(vus_gsrc, (GSourceFunc) vu_cb, data, NULL); - vus_src =3D (vus_gsrc_t *)vus_gsrc; - vus_src->vdev_scsi =3D vdev_scsi; - vus_src->gfd.fd =3D fd; - vus_src->gfd.events =3D cond; - - g_source_add_poll(vus_gsrc, &vus_src->gfd); - g_source_set_callback(vus_gsrc, gsrc_cb, data, NULL); - id =3D g_source_attach(vus_gsrc, NULL); - assert(id); - g_source_unref(vus_gsrc); - - return vus_gsrc; -} - /** libiscsi integration **/ =20 typedef struct virtio_scsi_cmd_req VirtIOSCSICmdReq; @@ -291,11 +209,13 @@ static int handle_cmd_sync(struct iscsi_context *ctx, =20 static void vus_panic_cb(VuDev *vu_dev, const char *buf) { + VugDev *gdev; VusDev *vdev_scsi; =20 assert(vu_dev); =20 - vdev_scsi =3D container_of(vu_dev, VusDev, vu_dev); + gdev =3D container_of(vu_dev, VugDev, parent); + vdev_scsi =3D 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 *b= uf) g_main_loop_quit(vdev_scsi->loop); } =20 -static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_c= b cb, - void *pvt) -{ - GSource *src; - VusDev *vdev_scsi; - - assert(vu_dev); - assert(fd >=3D 0); - assert(cb); - - vdev_scsi =3D container_of(vu_dev, VusDev, vu_dev); - src =3D 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 >=3D 0); - - vdev_scsi =3D 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; =20 assert(vu_dev); =20 - vdev_scsi =3D container_of(vu_dev, VusDev, vu_dev); + gdev =3D container_of(vu_dev, VugDev, parent); + vdev_scsi =3D container_of(gdev, VusDev, parent); if (idx < 0 || idx >=3D 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 =3D { .queue_set_started =3D vus_queue_set_started, }; =20 -static gboolean vus_vhost_cb(gpointer data) -{ - VuDev *vu_dev =3D (VuDev *)data; - - assert(vu_dev); - - if (!vu_dispatch(vu_dev) !=3D 0) { - g_warning("Error processing vhost message"); - vus_panic_cb(vu_dev, NULL); - return G_SOURCE_REMOVE; - } - - return G_SOURCE_CONTINUE; -} - /** misc helpers **/ =20 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); } =20 @@ -493,9 +373,6 @@ static VusDev *vdev_scsi_new(int server_sock) vdev_scsi =3D g_new0(VusDev, 1); vdev_scsi->server_sock =3D server_sock; vdev_scsi->loop =3D g_main_loop_new(NULL, FALSE); - vdev_scsi->fdmap =3D - g_hash_table_new_full(NULL, NULL, NULL, - (GDestroyNotify) g_source_destroy); =20 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 =3D 0; =20 assert(vdev_scsi); assert(vdev_scsi->server_sock >=3D 0); - assert(vdev_scsi->loop); =20 cli_sock =3D 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; } =20 - 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); =20 g_main_loop_run(vdev_scsi->loop); =20 - vu_deinit(&vdev_scsi->vu_dev); + vug_deinit(&vdev_scsi->parent); =20 - return ret; + return 0; } =20 int main(int argc, char **argv) --=20 2.14.1.146.gd35faa819 From nobody Wed May 1 09:22:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505843254214202.83811970869363; Tue, 19 Sep 2017 10:47:34 -0700 (PDT) Received: from localhost ([::1]:44451 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duMcP-0002g6-FB for importer@patchew.org; Tue, 19 Sep 2017 13:47:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47863) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duLnP-0006rk-7x for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duLnO-00031s-9T for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46010) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duLnO-00031M-0a for qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:50 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0495A267FC; Tue, 19 Sep 2017 16:54:49 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 603D86061E; Tue, 19 Sep 2017 16:54:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0495A267FC Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 18:52:26 +0200 Message-Id: <20170919165226.23022-28-marcandre.lureau@redhat.com> In-Reply-To: <20170919165226.23022-1-marcandre.lureau@redhat.com> References: <20170919165226.23022-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 19 Sep 2017 16:54:49 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 27/27] vhost-user-scsi: remove server_sock from VusDev X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" It is unneeded in the VusDev device structure, and also simplify a bit the code. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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; =20 - int server_sock; VusIscsiLun lun; GMainLoop *loop; } VusDev; @@ -357,57 +356,12 @@ fail: =20 /** vhost-user-scsi **/ =20 -static void vdev_scsi_free(VusDev *vdev_scsi) -{ - if (vdev_scsi->server_sock >=3D 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 =3D g_new0(VusDev, 1); - vdev_scsi->server_sock =3D server_sock; - vdev_scsi->loop =3D 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 >=3D 0); - - cli_sock =3D 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 =3D NULL; char *unix_fn =3D NULL; char *iscsi_uri =3D NULL; - int sock, opt, err =3D EXIT_SUCCESS; + int lsock =3D -1, csock =3D -1, opt, err =3D EXIT_SUCCESS; =20 while ((opt =3D getopt(argc, argv, "u:i:")) !=3D -1) { switch (opt) { @@ -427,25 +381,42 @@ int main(int argc, char **argv) goto help; } =20 - sock =3D unix_sock_new(unix_fn); - if (sock < 0) { + lsock =3D unix_sock_new(unix_fn); + if (lsock < 0) { goto err; } - vdev_scsi =3D vdev_scsi_new(sock); =20 - if (vus_iscsi_add_lun(&vdev_scsi->lun, iscsi_uri) !=3D 0) { + csock =3D accept(lsock, NULL, NULL); + if (csock < 0) { + perror("accept"); goto err; } =20 - if (vdev_scsi_run(vdev_scsi) !=3D 0) { + vdev_scsi =3D g_new0(VusDev, 1); + vdev_scsi->loop =3D g_main_loop_new(NULL, FALSE); + + if (vus_iscsi_add_lun(&vdev_scsi->lun, iscsi_uri) !=3D 0) { goto err; } =20 + 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 >=3D 0) { + close(csock); + } + if (lsock >=3D 0) { + close(lsock); + } g_free(unix_fn); g_free(iscsi_uri); =20 --=20 2.14.1.146.gd35faa819