From nobody Sat May 4 18:02: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 1507655615614383.4807804121108; Tue, 10 Oct 2017 10:13:35 -0700 (PDT) Received: from localhost ([::1]:36171 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y5t-0000Do-Fd for importer@patchew.org; Tue, 10 Oct 2017 13:13:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44883) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y41-0007RE-Vo for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y41-0007BF-0g for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6723) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y40-0007B3-Qg for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:28 -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 EACB1806A0; Tue, 10 Oct 2017 17:11:27 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id B369417C2D; Tue, 10 Oct 2017 17:11:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com EACB1806A0 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, 10 Oct 2017 19:10:56 +0200 Message-Id: <20171010171122.9756-2-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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.26]); Tue, 10 Oct 2017 17:11: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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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 e15aca2d40..c49cf87196 100644 --- a/include/glib-compat.h +++ b/include/glib-compat.h @@ -356,5 +356,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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02: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 1507655625234161.76659644705512; Tue, 10 Oct 2017 10:13:45 -0700 (PDT) Received: from localhost ([::1]:36173 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y68-0000R4-9W for importer@patchew.org; Tue, 10 Oct 2017 13:13:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44914) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y49-0007TZ-Vv for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y44-0007CX-8Y for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33057) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y44-0007CK-1u for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:32 -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 25BF0806A1; Tue, 10 Oct 2017 17:11:31 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B87A60A9B; Tue, 10 Oct 2017 17:11:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 25BF0806A1 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, 10 Oct 2017 19:10:57 +0200 Message-Id: <20171010171122.9756-3-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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.26]); Tue, 10 Oct 2017 17:11:31 +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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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 cee6e28659..a0fe721c5b 100644 --- a/Makefile +++ b/Makefile @@ -337,7 +337,7 @@ dtc/%: mkdir -p $@ =20 $(SUBDIR_RULES): libqemuutil.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) # Build libraries =20 libqemuutil.a: $(util-obj-y) $(trace-obj-y) $(stub-obj-y) +libvhost-user.a: $(libvhost-user-obj-y) =20 ###################################################################### =20 diff --git a/tests/Makefile.include b/tests/Makefile.include index abc6707ef2..4ca15e6817 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02:30 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507655783908952.2809134181914; Tue, 10 Oct 2017 10:16:23 -0700 (PDT) Received: from localhost ([::1]:36187 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y8Q-0002V7-Q0 for importer@patchew.org; Tue, 10 Oct 2017 13:16:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y47-0007RU-Af for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y46-0007DB-El for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51334) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y46-0007Cy-8Y for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:34 -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 5F02481226; Tue, 10 Oct 2017 17:11:33 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD5E7779D6; Tue, 10 Oct 2017 17:11:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5F02481226 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, 10 Oct 2017 19:10:58 +0200 Message-Id: <20171010171122.9756-4-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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, 10 Oct 2017 17:11: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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 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 a0fe721c5b..c2ee765659 100644 --- a/Makefile +++ b/Makefile @@ -480,7 +480,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 bdfa3b6177..d4f973a8fc 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02:30 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507655788916719.5190803757096; Tue, 10 Oct 2017 10:16:28 -0700 (PDT) Received: from localhost ([::1]:36186 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y8N-0002Sf-FX for importer@patchew.org; Tue, 10 Oct 2017 13:15:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44945) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y4F-0007XW-Fq for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y49-0007EA-Q3 for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51494) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y49-0007Dq-Jc for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:37 -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 BA05781E1D; Tue, 10 Oct 2017 17:11:36 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id BFB7C6BC0F; Tue, 10 Oct 2017 17:11:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com BA05781E1D 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, 10 Oct 2017 19:10:59 +0200 Message-Id: <20171010171122.9756-5-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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, 10 Oct 2017 17:11:36 +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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 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..a0e0da4ccb 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/compiler.h" #include "qemu/atomic.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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02: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 1507655630130208.91134544430315; Tue, 10 Oct 2017 10:13:50 -0700 (PDT) Received: from localhost ([::1]:36174 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y68-0000S5-8P for importer@patchew.org; Tue, 10 Oct 2017 13:13:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y4D-0007WK-PZ for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y4B-0007El-Of for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41214) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y4B-0007EZ-IV for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:39 -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 AF1BCC047B89; Tue, 10 Oct 2017 17:11:38 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F8C868D21; Tue, 10 Oct 2017 17:11:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com AF1BCC047B89 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, 10 Oct 2017 19:11:00 +0200 Message-Id: <20171010171122.9756-6-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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, 10 Oct 2017 17:11:38 +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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02: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 1507655786688299.19155730466343; Tue, 10 Oct 2017 10:16:26 -0700 (PDT) Received: from localhost ([::1]:36190 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y8c-0002ec-6m for importer@patchew.org; Tue, 10 Oct 2017 13:16:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44943) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y4F-0007XT-Ef for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y4E-0007GJ-II for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41570) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y4E-0007Fp-Bu for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:42 -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 78D0EC047B7A; Tue, 10 Oct 2017 17:11:41 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 34C594D9EB; Tue, 10 Oct 2017 17:11:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 78D0EC047B7A 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, 10 Oct 2017 19:11:01 +0200 Message-Id: <20171010171122.9756-7-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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, 10 Oct 2017 17:11: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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02: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 1507655937899698.3490458941147; Tue, 10 Oct 2017 10:18:57 -0700 (PDT) Received: from localhost ([::1]:36197 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1yB7-0004mH-3H for importer@patchew.org; Tue, 10 Oct 2017 13:18:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44973) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y4K-0007bV-0t for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y4G-0007HY-RT for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41922) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y4G-0007Gz-Ax for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:44 -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 6A991C04B92C; Tue, 10 Oct 2017 17:11:43 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF52B5887F; Tue, 10 Oct 2017 17:11:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 6A991C04B92C 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, 10 Oct 2017 19:11:02 +0200 Message-Id: <20171010171122.9756-8-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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, 10 Oct 2017 17:11:43 +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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02: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 1507655945406140.67977206359365; Tue, 10 Oct 2017 10:19:05 -0700 (PDT) Received: from localhost ([::1]:36200 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1yBJ-0004wX-KX for importer@patchew.org; Tue, 10 Oct 2017 13:19:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y4K-0007bc-2o for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y4I-0007Ij-Vo for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42212) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y4I-0007IE-NT for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:46 -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 CEB32C04AC73; Tue, 10 Oct 2017 17:11:45 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id F0C0017C4D; Tue, 10 Oct 2017 17:11:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CEB32C04AC73 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, 10 Oct 2017 19:11:03 +0200 Message-Id: <20171010171122.9756-9-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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.31]); Tue, 10 Oct 2017 17:11: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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02:30 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507655778959126.17337746199348; Tue, 10 Oct 2017 10:16:18 -0700 (PDT) Received: from localhost ([::1]:36189 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y8c-0002eT-Mj for importer@patchew.org; Tue, 10 Oct 2017 13:16:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44994) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y4N-0007eu-2Z for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y4M-0007Kz-0A for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57930) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y4L-0007KR-NV for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:49 -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 CF00C5275A; Tue, 10 Oct 2017 17:11:48 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 173AB6C40A; Tue, 10 Oct 2017 17:11:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CF00C5275A 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, 10 Oct 2017 19:11:04 +0200 Message-Id: <20171010171122.9756-10-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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.29]); Tue, 10 Oct 2017 17:11:48 +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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02: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 1507656108769602.1111579961239; Tue, 10 Oct 2017 10:21:48 -0700 (PDT) Received: from localhost ([::1]:36213 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1yDh-0006zw-Bx for importer@patchew.org; Tue, 10 Oct 2017 13:21:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y4P-0007h5-8D for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y4O-0007MN-7p for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57064) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y4N-0007Lq-VD for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:52 -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 0F2E625791; Tue, 10 Oct 2017 17:11:51 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 23F3F5ED45; Tue, 10 Oct 2017 17:11:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0F2E625791 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, 10 Oct 2017 19:11:05 +0200 Message-Id: <20171010171122.9756-11-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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, 10 Oct 2017 17:11:51 +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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02: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 1507656251744463.5806374635804; Tue, 10 Oct 2017 10:24:11 -0700 (PDT) Received: from localhost ([::1]:36226 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1yGF-0000lY-PU for importer@patchew.org; Tue, 10 Oct 2017 13:24:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45019) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y4S-0007jz-Ei for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y4Q-0007OF-A4 for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40586) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y4Q-0007NW-3p for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:54 -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 3BAEF7F7A9; Tue, 10 Oct 2017 17:11:53 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id AF86D5ED45; Tue, 10 Oct 2017 17:11:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3BAEF7F7A9 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, 10 Oct 2017 19:11:06 +0200 Message-Id: <20171010171122.9756-12-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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, 10 Oct 2017 17:11:53 +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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02: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 1507655935423924.3254747051565; Tue, 10 Oct 2017 10:18:55 -0700 (PDT) Received: from localhost ([::1]:36196 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1yB4-0004kW-JO for importer@patchew.org; Tue, 10 Oct 2017 13:18:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45037) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y4U-0007l7-ER for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y4T-0007PA-9N for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47164) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y4T-0007Ok-1N for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:11:57 -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 21C767E440; Tue, 10 Oct 2017 17:11:56 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99B386248F; Tue, 10 Oct 2017 17:11:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 21C767E440 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, 10 Oct 2017 19:11:07 +0200 Message-Id: <20171010171122.9756-13-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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.27]); Tue, 10 Oct 2017 17:11:56 +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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02: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 15076561090391011.4325750251011; Tue, 10 Oct 2017 10:21:49 -0700 (PDT) Received: from localhost ([::1]:36215 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1yDq-00079B-3T for importer@patchew.org; Tue, 10 Oct 2017 13:21:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45056) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y4Y-0007qD-L2 for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y4X-0007Qb-LV for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42798) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y4X-0007QL-GA for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:01 -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 97D9DC04AC74; Tue, 10 Oct 2017 17:12:00 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C06917C57; Tue, 10 Oct 2017 17:11:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 97D9DC04AC74 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, 10 Oct 2017 19:11:08 +0200 Message-Id: <20171010171122.9756-14-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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.31]); Tue, 10 Oct 2017 17:12: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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02: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 1507656406755341.2369922564425; Tue, 10 Oct 2017 10:26:46 -0700 (PDT) Received: from localhost ([::1]:36241 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1yIg-000334-Ts for importer@patchew.org; Tue, 10 Oct 2017 13:26:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45106) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y4f-0007wB-Ge for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y4Z-0007SL-LP for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58410) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y4Z-0007RF-ET for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:03 -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 787F7552F1; Tue, 10 Oct 2017 17:12:02 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0618A6248F; Tue, 10 Oct 2017 17:12:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 787F7552F1 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, 10 Oct 2017 19:11:09 +0200 Message-Id: <20171010171122.9756-15-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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, 10 Oct 2017 17:12: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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02: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 1507655958858666.4806047690772; Tue, 10 Oct 2017 10:19:18 -0700 (PDT) Received: from localhost ([::1]:36199 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1yBI-0004vu-W0 for importer@patchew.org; Tue, 10 Oct 2017 13:19:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y4g-0007xD-HW for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y4c-0007W6-NR for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52850) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y4c-0007Ud-H7 for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:06 -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 A16A181E17; Tue, 10 Oct 2017 17:12:05 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 491D35ED45; Tue, 10 Oct 2017 17:12:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A16A181E17 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, 10 Oct 2017 19:11:10 +0200 Message-Id: <20171010171122.9756-16-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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.25]); Tue, 10 Oct 2017 17:12: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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02: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 1507656264080476.6815588868719; Tue, 10 Oct 2017 10:24:24 -0700 (PDT) Received: from localhost ([::1]:36227 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1yGP-0000u0-AT for importer@patchew.org; Tue, 10 Oct 2017 13:24:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45118) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y4g-0007xB-HU for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y4f-0007Zo-F5 for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47584) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y4f-0007ZF-8b for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:09 -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 601627E440; Tue, 10 Oct 2017 17:12:08 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6CFBA60630; Tue, 10 Oct 2017 17:12:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 601627E440 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, 10 Oct 2017 19:11:11 +0200 Message-Id: <20171010171122.9756-17-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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.27]); Tue, 10 Oct 2017 17:12: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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02:30 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507656103517992.8764241750391; Tue, 10 Oct 2017 10:21:43 -0700 (PDT) Received: from localhost ([::1]:36212 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1yDf-0006yD-8R for importer@patchew.org; Tue, 10 Oct 2017 13:21:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45154) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y4k-000809-C3 for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y4h-0007cN-6w for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56984) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y4h-0007b3-13 for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:11 -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 278965F2993; Tue, 10 Oct 2017 17:12:10 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA70D17C4D; Tue, 10 Oct 2017 17:12:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 278965F2993 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, 10 Oct 2017 19:11:12 +0200 Message-Id: <20171010171122.9756-18-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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.38]); Tue, 10 Oct 2017 17:12:10 +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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02:30 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) 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 1507656186684241.52525406831478; Tue, 10 Oct 2017 10:23:06 -0700 (PDT) Received: from localhost ([::1]:36216 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1yEu-00081u-L3 for importer@patchew.org; Tue, 10 Oct 2017 13:22:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45222) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y4p-00084N-BE for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y4j-0007dZ-OS for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58696) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y4j-0007d9-I9 for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:13 -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 AE0AD552F1; Tue, 10 Oct 2017 17:12:12 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id B8B936248F; Tue, 10 Oct 2017 17:12:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com AE0AD552F1 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, 10 Oct 2017 19:11:13 +0200 Message-Id: <20171010171122.9756-19-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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, 10 Oct 2017 17:12:12 +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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02: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 1507656552996955.2849411645266; Tue, 10 Oct 2017 10:29:12 -0700 (PDT) Received: from localhost ([::1]:36255 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1yL7-0005Lv-4p for importer@patchew.org; Tue, 10 Oct 2017 13:29:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45186) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y4n-00082k-6C for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y4l-0007eg-Uc for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46002) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y4l-0007eQ-MX for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:15 -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 C8FD6C059B60; Tue, 10 Oct 2017 17:12:14 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A7506266D; Tue, 10 Oct 2017 17:12:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C8FD6C059B60 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, 10 Oct 2017 19:11:14 +0200 Message-Id: <20171010171122.9756-20-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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.32]); Tue, 10 Oct 2017 17:12:14 +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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02: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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507656834584788.5836083274368; Tue, 10 Oct 2017 10:33:54 -0700 (PDT) Received: from localhost ([::1]:36287 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1yPc-0000tB-TM for importer@patchew.org; Tue, 10 Oct 2017 13:33:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y4t-00088T-Qi for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y4o-0007fk-3S for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41450) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y4n-0007fR-TZ for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:18 -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 064477F7A9; Tue, 10 Oct 2017 17:12:17 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F2626248F; Tue, 10 Oct 2017 17:12:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 064477F7A9 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, 10 Oct 2017 19:11:15 +0200 Message-Id: <20171010171122.9756-21-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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, 10 Oct 2017 17:12:17 +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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02: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 1507656251745221.04484098453133; Tue, 10 Oct 2017 10:24:11 -0700 (PDT) Received: from localhost ([::1]:36225 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1yGC-0000jH-S2 for importer@patchew.org; Tue, 10 Oct 2017 13:24:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45255) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y4t-00087z-8E for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y4q-0007gi-2u for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57298) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y4p-0007gO-QY for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:20 -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 DF7CA4E33D; Tue, 10 Oct 2017 17:12:18 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5CA1F60A9B; Tue, 10 Oct 2017 17:12:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DF7CA4E33D 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, 10 Oct 2017 19:11:16 +0200 Message-Id: <20171010171122.9756-22-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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.38]); Tue, 10 Oct 2017 17:12:19 +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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02: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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507656716387232.64790112069716; Tue, 10 Oct 2017 10:31:56 -0700 (PDT) Received: from localhost ([::1]:36274 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1yNf-0007al-DJ for importer@patchew.org; Tue, 10 Oct 2017 13:31:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45296) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y4w-0008An-IZ for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y4u-0007ic-Fg for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46362) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y4u-0007iE-9c for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:24 -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 5E671C0035AD; Tue, 10 Oct 2017 17:12:23 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id A59DE5887F; Tue, 10 Oct 2017 17:12:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5E671C0035AD 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, 10 Oct 2017 19:11:17 +0200 Message-Id: <20171010171122.9756-23-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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, 10 Oct 2017 17:12:23 +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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02: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 1507656323611289.3097623031874; Tue, 10 Oct 2017 10:25:23 -0700 (PDT) Received: from localhost ([::1]:36229 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1yHM-0001ou-Tg for importer@patchew.org; Tue, 10 Oct 2017 13:25:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45323) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y4z-0008D2-37 for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y4y-0007kM-3T for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57622) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y4x-0007k2-Qh for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:28 -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 EB51B5F298E; Tue, 10 Oct 2017 17:12:26 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 135646248F; Tue, 10 Oct 2017 17:12:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com EB51B5F298E 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, 10 Oct 2017 19:11:18 +0200 Message-Id: <20171010171122.9756-24-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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, 10 Oct 2017 17:12:27 +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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02: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 1507656494015359.65390403323454; Tue, 10 Oct 2017 10:28:14 -0700 (PDT) Received: from localhost ([::1]:36246 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1yJt-0004H1-GO for importer@patchew.org; Tue, 10 Oct 2017 13:27:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y55-0008MU-Rs for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y54-0007nX-5z for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33613) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y53-0007n6-UE for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:34 -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 0D10680082; Tue, 10 Oct 2017 17:12:33 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C2FE60C9A; Tue, 10 Oct 2017 17:12:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0D10680082 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, 10 Oct 2017 19:11:19 +0200 Message-Id: <20171010171122.9756-25-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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.28]); Tue, 10 Oct 2017 17:12: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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02: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 1507656408284940.3722365245625; Tue, 10 Oct 2017 10:26:48 -0700 (PDT) Received: from localhost ([::1]:36240 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1yIf-00030R-BE for importer@patchew.org; Tue, 10 Oct 2017 13:26:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45512) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y5G-0008VJ-Ef for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y58-0007q2-UT for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58276) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y58-0007ph-LU for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:38 -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 C930325B99; Tue, 10 Oct 2017 17:12:37 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8DD9560630; Tue, 10 Oct 2017 17:12:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C930325B99 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, 10 Oct 2017 19:11:20 +0200 Message-Id: <20171010171122.9756-26-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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.39]); Tue, 10 Oct 2017 17:12: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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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 file implements a bridge from the vu_init API of libvhost-user to GSource, so that libvhost-user can be used inside a GLib main loop. 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02: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 1507656963212167.62130982617475; Tue, 10 Oct 2017 10:36:03 -0700 (PDT) Received: from localhost ([::1]:36302 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1yRk-0002Gb-9c for importer@patchew.org; Tue, 10 Oct 2017 13:36:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45542) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y5J-00006J-Fj for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y5D-0007rw-Ud for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19208) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y5D-0007qy-LL for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:43 -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 93CDC25B99; Tue, 10 Oct 2017 17:12:40 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id E41D760BED; Tue, 10 Oct 2017 17:12:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 93CDC25B99 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, 10 Oct 2017 19:11:21 +0200 Message-Id: <20171010171122.9756-27-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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.39]); Tue, 10 Oct 2017 17:12:40 +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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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.15.0.rc0.40.gaefcc5f6f From nobody Sat May 4 18:02: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 150765709227761.795093934550096; Tue, 10 Oct 2017 10:38:12 -0700 (PDT) Received: from localhost ([::1]:36312 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1yTr-0003uK-G1 for importer@patchew.org; Tue, 10 Oct 2017 13:38:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45591) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y5M-0000Bw-KN for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y5J-0007ti-D2 for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41116) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y5J-0007sm-3z for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:49 -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 EF6C6883D4; Tue, 10 Oct 2017 17:12:45 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0DB1D17C57; Tue, 10 Oct 2017 17:12:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com EF6C6883D4 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, 10 Oct 2017 19:11:22 +0200 Message-Id: <20171010171122.9756-28-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-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.26]); Tue, 10 Oct 2017 17:12: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] [PULL 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, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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.15.0.rc0.40.gaefcc5f6f