From nobody Mon Feb 9 21:36:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=1560446341; cv=none; d=zoho.com; s=zohoarc; b=jE5RqzMwUdeOCIG4BDx0nf+WwHB+5V0iaq2ic1iKymMxQH1e46Oa/wmeOcYIBGaHlD8UXDN53SS/wrCHEGMeL0ru4l+2lS6yZGkKXnqx5NjWdIZOpgHz5uy1gfEiiEG04olNrZ/CpVRCtbjSVL2zboS+6CC61n73X3Uny2y7Z7k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560446341; h=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:ARC-Authentication-Results; bh=aJlfFOfSOP8VKwrbULO7peV2W1Z+OJe8bnGUtC6HSxY=; b=S4r6LwVkORBJdM42kKC4qcpJrELNpWacUJbhQ/X5m7gcQw7l5ToRJcz5VxohHbID4FUlWUZQ9A4lWvQl1zUwJkELgf/OEKqvtk4OWaryxwhZlIx8xU0UPRqCD/G8e6XWqq42yQQcihZS64kC27HI1szxG82HsSZ2AC7zRTUn+Tw= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1560446341208932.1096580885347; Thu, 13 Jun 2019 10:19:01 -0700 (PDT) Received: from localhost ([::1]:42224 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbTNM-0005dm-5H for importer@patchew.org; Thu, 13 Jun 2019 13:19:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35644) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbRy7-0002o5-MP for qemu-devel@nongnu.org; Thu, 13 Jun 2019 11:48:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbRy6-0006VH-2a for qemu-devel@nongnu.org; Thu, 13 Jun 2019 11:48:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37638) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hbRy3-0006RK-02; Thu, 13 Jun 2019 11:48:47 -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 C7CD781F31; Thu, 13 Jun 2019 15:48:41 +0000 (UTC) Received: from blue.redhat.com (ovpn-116-85.phx2.redhat.com [10.3.116.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 540565C6D6; Thu, 13 Jun 2019 15:48:41 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Thu, 13 Jun 2019 10:48:29 -0500 Message-Id: <20190613154837.21734-2-eblake@redhat.com> In-Reply-To: <20190613154837.21734-1-eblake@redhat.com> References: <20190613154837.21734-1-eblake@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]); Thu, 13 Jun 2019 15:48:41 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/9] qemu-nbd: Add --pid-file option 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: "open list:Network Block Dev..." , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Max Reitz --fork is a bit boring if there is no way to get the child's PID. This option helps. Signed-off-by: Max Reitz Message-Id: <20190508211820.17851-2-mreitz@redhat.com> Signed-off-by: Eric Blake --- qemu-nbd.texi | 2 ++ qemu-nbd.c | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/qemu-nbd.texi b/qemu-nbd.texi index de342c76b873..7f55657722bd 100644 --- a/qemu-nbd.texi +++ b/qemu-nbd.texi @@ -117,6 +117,8 @@ option; or provide the credentials needed for connectin= g as a client in list mode. @item --fork Fork off the server process and exit the parent once the server is running. +@item --pid-file=3DPATH +Store the server's process ID in the given file. @item --tls-authz=3DID Specify the ID of a qauthz object previously created with the --object option. This will be used to authorize connecting users diff --git a/qemu-nbd.c b/qemu-nbd.c index e24dd2f76766..99377a3f14e2 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -61,6 +61,7 @@ #define QEMU_NBD_OPT_IMAGE_OPTS 262 #define QEMU_NBD_OPT_FORK 263 #define QEMU_NBD_OPT_TLSAUTHZ 264 +#define QEMU_NBD_OPT_PID_FILE 265 #define MBR_SIZE 512 @@ -113,6 +114,7 @@ static void usage(const char *name) " specify tracing options\n" " --fork fork off the server process and exit the pare= nt\n" " once the server is running\n" +" --pid-file=3DPATH store the server's process ID in the given = file\n" #if HAVE_NBD_DEVICE "\n" "Kernel NBD client support:\n" @@ -641,6 +643,7 @@ int main(int argc, char **argv) { "image-opts", no_argument, NULL, QEMU_NBD_OPT_IMAGE_OPTS }, { "trace", required_argument, NULL, 'T' }, { "fork", no_argument, NULL, QEMU_NBD_OPT_FORK }, + { "pid-file", required_argument, NULL, QEMU_NBD_OPT_PID_FILE }, { NULL, 0, NULL, 0 } }; int ch; @@ -667,6 +670,7 @@ int main(int argc, char **argv) bool list =3D false; int old_stderr =3D -1; unsigned socket_activation; + const char *pid_file_name =3D NULL; /* The client thread uses SIGTERM to interrupt the server. A signal * handler ensures that "qemu-nbd -v -c" exits with a nice status code. @@ -866,6 +870,9 @@ int main(int argc, char **argv) case 'L': list =3D true; break; + case QEMU_NBD_OPT_PID_FILE: + pid_file_name =3D optarg; + break; } } @@ -1186,6 +1193,10 @@ int main(int argc, char **argv) nbd_update_server_watch(); + if (pid_file_name) { + qemu_write_pidfile(pid_file_name, &error_fatal); + } + /* now when the initialization is (almost) complete, chdir("/") * to free any busy filesystems */ if (chdir("/") < 0) { --=20 2.20.1