From nobody Sun May 19 05:22:48 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598288602; cv=none; d=zohomail.com; s=zohoarc; b=BEkwsAm5UDlE2ebH5AJ+BALPUhq5KUBDfoj5ssSiQ75M1kXpG9kc7nUz8h7WUg6CS4tYrlaoelt6bBhOcSA2tra5jxeCKIJ2K+rYPTnajn9MWZq/BXbrD5Zvq2vUdPuQruB0PukLKe23ZSeKUOug5+s3LSx8pa80I60dtqXPUVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598288602; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1+/IkwGNPcgmpVMqqB9rombZb0jmGPK8fNZSA1FEHUk=; b=elj1bmSP0ArDr1oz59sXu8iEWWiy6g+gjFhFanaMOFkvTZFEcv2enBU4dbo2ZY5LROdOl6lVP65XvY/GJZmqkGcbyqNzAWSZSaNHbBVXVSy9GPFrP88sehXxBDlyEY9JlaNyWkSdf9KToE1B6U5KlOm9tp74ukwmUOVBX7o8bmY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598288602955361.66762932475115; Mon, 24 Aug 2020 10:03:22 -0700 (PDT) Received: from localhost ([::1]:54504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAFsP-0008IF-O9 for importer@patchew.org; Mon, 24 Aug 2020 13:03:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAFrZ-0007Pe-IA for qemu-devel@nongnu.org; Mon, 24 Aug 2020 13:02:29 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:57963 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAFrX-0003Lu-9Y for qemu-devel@nongnu.org; Mon, 24 Aug 2020 13:02:29 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-292-44M6DdDNPlqxdEfGfhwVSw-1; Mon, 24 Aug 2020 13:02: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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 63CAA801ADE; Mon, 24 Aug 2020 17:02:23 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-114-223.ams2.redhat.com [10.36.114.223]) by smtp.corp.redhat.com (Postfix) with ESMTP id D1D405C1BB; Mon, 24 Aug 2020 17:02:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598288546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1+/IkwGNPcgmpVMqqB9rombZb0jmGPK8fNZSA1FEHUk=; b=h17+7r66Y0GkGcKcq5FHs3wwpbSkHNdUv6t7DHX264FjFDOI9obhxbFlggyswAjb2tXR9p z0LRxY+PsdgR5FzCwtKsfgd9dGJxNG3AEWeUtos3rh9ge0Le0wCuN5OK2BxujhH+2sjTN5 FcQuwpAQ1Ya8XtRH5eMsbeRKe9pe4ws= X-MC-Unique: 44M6DdDNPlqxdEfGfhwVSw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/2] block: add missing socket_init() calls to tools Date: Mon, 24 Aug 2020 18:02:17 +0100 Message-Id: <20200824170218.106255-2-berrange@redhat.com> In-Reply-To: <20200824170218.106255-1-berrange@redhat.com> References: <20200824170218.106255-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=berrange@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/24 06:40:32 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.956, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Any tool that uses sockets needs to call socket_init() in order to work on the Windows platform. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Eric Blake --- qemu-img.c | 2 ++ qemu-io.c | 2 ++ qemu-nbd.c | 1 + 3 files changed, 5 insertions(+) diff --git a/qemu-img.c b/qemu-img.c index 5308773811..eb2fc1f862 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -41,6 +41,7 @@ #include "qemu/log.h" #include "qemu/main-loop.h" #include "qemu/module.h" +#include "qemu/sockets.h" #include "qemu/units.h" #include "qom/object_interfaces.h" #include "sysemu/block-backend.h" @@ -5410,6 +5411,7 @@ int main(int argc, char **argv) signal(SIGPIPE, SIG_IGN); #endif =20 + socket_init(); error_init(argv[0]); module_call_init(MODULE_INIT_TRACE); qemu_init_exec_dir(argv[0]); diff --git a/qemu-io.c b/qemu-io.c index 3adc5a7d0d..7cc832b3d6 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -25,6 +25,7 @@ #include "qemu/config-file.h" #include "qemu/readline.h" #include "qemu/log.h" +#include "qemu/sockets.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp/qdict.h" #include "qom/object_interfaces.h" @@ -542,6 +543,7 @@ int main(int argc, char **argv) signal(SIGPIPE, SIG_IGN); #endif =20 + socket_init(); error_init(argv[0]); module_call_init(MODULE_INIT_TRACE); qemu_init_exec_dir(argv[0]); diff --git a/qemu-nbd.c b/qemu-nbd.c index d2657b8db5..b102874f0f 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -599,6 +599,7 @@ int main(int argc, char **argv) signal(SIGPIPE, SIG_IGN); #endif =20 + socket_init(); error_init(argv[0]); module_call_init(MODULE_INIT_TRACE); qcrypto_init(&error_fatal); --=20 2.26.2 From nobody Sun May 19 05:22:48 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598288682; cv=none; d=zohomail.com; s=zohoarc; b=QPvBbkcbWYseHd7cQVeZBElL3ih8i525saNMPbposTvohwJd9YdGxkbOq5+PBP4S+Ch3uilc9M5UkkfmZssHRd+Nmfkb2JO37W6D7CZ6apiOG6H1oMrbNPNf1ehh23pySzNvLa/FfnJG/vpelnhBkPA7umd6m4npntJe5G8Xyu0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598288682; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BxySJVrnEnh7ML01Y3qGldicKlwFsU6fSDsmzi00OZ8=; b=VDPIrBlC0dw6F5deYxs7jpm9QsXiJFCtJXVvhSALjiKRHhJogr5ZaTuCotoKK7iLMBUnwVcCMXtwh4f96cJaYYwhCBSP1PojcF6Y5icD226qWvjK8YeR+/yYx5UsMfT3Iu/8YrAXGSl9LkhJSOX8by+RYoNSzXRIX7tQU7P2BtY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598288682777664.533221403556; Mon, 24 Aug 2020 10:04:42 -0700 (PDT) Received: from localhost ([::1]:58710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAFth-0001YK-8x for importer@patchew.org; Mon, 24 Aug 2020 13:04:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAFrc-0007Sq-0o for qemu-devel@nongnu.org; Mon, 24 Aug 2020 13:02:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:45494) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAFra-0003MN-AC for qemu-devel@nongnu.org; Mon, 24 Aug 2020 13:02:31 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-488-I0uoE8YsOmCOIqKYN7chMQ-1; Mon, 24 Aug 2020 13:02:26 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6EA74801AC9; Mon, 24 Aug 2020 17:02:25 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-114-223.ams2.redhat.com [10.36.114.223]) by smtp.corp.redhat.com (Postfix) with ESMTP id C7DFC5C1BB; Mon, 24 Aug 2020 17:02:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598288549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BxySJVrnEnh7ML01Y3qGldicKlwFsU6fSDsmzi00OZ8=; b=imV7/iy7oZ8vFmCLP9wpqDBBXnTzs9/d3edulnDjMvBBDWo+c6ECaY2fbOu2gkhxCHieHl 1g5CCLIgwUzrS9buWcMawC0cmSZvN5v1LoT59/t/IA64GqFtNh9kLXhCcr5WVxi8ubW6UB /5xvhxKdPlL3heAt9ZAyX2ZLf7k3U1k= X-MC-Unique: I0uoE8YsOmCOIqKYN7chMQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/2] nbd: disable signals and forking on Windows builds Date: Mon, 24 Aug 2020 18:02:18 +0100 Message-Id: <20200824170218.106255-3-berrange@redhat.com> In-Reply-To: <20200824170218.106255-1-berrange@redhat.com> References: <20200824170218.106255-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0.003 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/24 06:48:00 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.956, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Disabling these parts are sufficient to get the qemu-nbd program compiling in a Windows build. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Eric Blake --- meson.build | 7 ++----- qemu-nbd.c | 10 +++++++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index df5bf728b5..1071871605 100644 --- a/meson.build +++ b/meson.build @@ -1074,12 +1074,9 @@ if have_tools dependencies: [authz, block, crypto, io, qom, qemuutil], inst= all: true) qemu_io =3D executable('qemu-io', files('qemu-io.c'), dependencies: [block, qemuutil], install: true) - qemu_block_tools +=3D [qemu_img, qemu_io] - if targetos =3D=3D 'linux' or targetos =3D=3D 'sunos' or targetos.endswi= th('bsd') - qemu_nbd =3D executable('qemu-nbd', files('qemu-nbd.c'), + qemu_nbd =3D executable('qemu-nbd', files('qemu-nbd.c'), dependencies: [block, qemuutil], install: true) - qemu_block_tools +=3D [qemu_nbd] - endif + qemu_block_tools +=3D [qemu_img, qemu_io, qemu_nbd] =20 subdir('storage-daemon') subdir('contrib/rdmacm-mux') diff --git a/qemu-nbd.c b/qemu-nbd.c index b102874f0f..c6fd6524d3 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -155,12 +155,13 @@ QEMU_COPYRIGHT "\n" , name); } =20 +#ifndef WIN32 static void termsig_handler(int signum) { atomic_cmpxchg(&state, RUNNING, TERMINATE); qemu_notify_event(); } - +#endif =20 static int qemu_nbd_client_list(SocketAddress *saddr, QCryptoTLSCreds *tls, const char *hostname) @@ -587,6 +588,7 @@ int main(int argc, char **argv) unsigned socket_activation; const char *pid_file_name =3D NULL; =20 +#ifndef WIN32 /* The client thread uses SIGTERM to interrupt the server. A signal * handler ensures that "qemu-nbd -v -c" exits with a nice status code. */ @@ -594,6 +596,7 @@ int main(int argc, char **argv) memset(&sa_sigterm, 0, sizeof(sa_sigterm)); sa_sigterm.sa_handler =3D termsig_handler; sigaction(SIGTERM, &sa_sigterm, NULL); +#endif =20 #ifdef CONFIG_POSIX signal(SIGPIPE, SIG_IGN); @@ -896,6 +899,7 @@ int main(int argc, char **argv) #endif =20 if ((device && !verbose) || fork_process) { +#ifndef WIN32 int stderr_fd[2]; pid_t pid; int ret; @@ -959,6 +963,10 @@ int main(int argc, char **argv) */ exit(errors); } +#else /* WIN32 */ + error_report("Unable to fork into background on Windows hosts"); + exit(EXIT_FAILURE); +#endif /* WIN32 */ } =20 if (device !=3D NULL && sockpath =3D=3D NULL) { --=20 2.26.2