From nobody Sun Apr 28 07:21:05 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.zoho.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 1488787710907489.510307856095; Mon, 6 Mar 2017 00:08:30 -0800 (PST) Received: from localhost ([::1]:42307 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ckngz-0004GP-Jm for importer@patchew.org; Mon, 06 Mar 2017 03:08:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60379) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cknec-0002iZ-OB for qemu-devel@nongnu.org; Mon, 06 Mar 2017 03:06:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ckneZ-0006VC-9s for qemu-devel@nongnu.org; Mon, 06 Mar 2017 03:06:02 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:37617) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ckneY-0006Uc-Oj for qemu-devel@nongnu.org; Mon, 06 Mar 2017 03:05:59 -0500 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v2683oVg140887 for ; Mon, 6 Mar 2017 03:05:57 -0500 Received: from e36.co.us.ibm.com (e36.co.us.ibm.com [32.97.110.154]) by mx0a-001b2d01.pphosted.com with ESMTP id 290u3hkymr-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 06 Mar 2017 03:05:57 -0500 Received: from localhost by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 6 Mar 2017 01:05:56 -0700 Received: from d03dlp02.boulder.ibm.com (9.17.202.178) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 6 Mar 2017 01:05:53 -0700 Received: from b03cxnp08025.gho.boulder.ibm.com (b03cxnp08025.gho.boulder.ibm.com [9.17.130.17]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 1BECA3E40048; Mon, 6 Mar 2017 01:05:53 -0700 (MST) Received: from b03ledav005.gho.boulder.ibm.com (b03ledav005.gho.boulder.ibm.com [9.17.130.236]) by b03cxnp08025.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v2685r2R9961728; Mon, 6 Mar 2017 01:05:53 -0700 Received: from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E789BBE03A; Mon, 6 Mar 2017 01:05:52 -0700 (MST) Received: from localhost (unknown [9.80.106.253]) by b03ledav005.gho.boulder.ibm.com (Postfix) with ESMTP id B59A5BE040; Mon, 6 Mar 2017 01:05:52 -0700 (MST) From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 6 Mar 2017 02:03:40 -0600 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488787422-30487-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1488787422-30487-1-git-send-email-mdroth@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17030608-0020-0000-0000-00000B8F4503 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00006731; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000206; SDB=6.00830639; UDB=6.00407454; IPR=6.00608236; BA=6.00005188; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00014523; XFM=3.00000012; UTC=2017-03-06 08:05:54 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17030608-0021-0000-0000-00005AAB3CBE Message-Id: <1488787422-30487-2-git-send-email-mdroth@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-03-06_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1703060071 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PULL for-2.9 1/3] qga: add systemd socket activation support 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: peter.maydell@linaro.org, Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Stefan Hajnoczi AF_UNIX and AF_VSOCK listen sockets can be passed in by systemd on startup. This allows systemd to manage the listen socket until the first client connects and between restarts. Advantages of socket activation are that parallel startup of network services becomes possible and that unused daemons do not consume memory. The key to achieving this is the LISTEN_FDS environment variable, which is a stable ABI as shown here: https://www.freedesktop.org/wiki/Software/systemd/InterfacePortabilityAndSt= abilityChart/ We could link against libsystemd and use sd_listen_fds(3) but it's easy to implement the tiny LISTEN_FDS ABI so that qemu-ga does not depend on libsystemd. Some systems may not have systemd installed and wish to avoid the dependency. Other init systems or socket activation servers may implement the same ABI without systemd involvement. Test as follows: $ cat ~/.config/systemd/user/qga.service [Unit] Description=3Dqga [Service] WorkingDirectory=3D/tmp ExecStart=3D/path/to/qemu-ga --logfile=3D/tmp/qga.log --pidfile=3D/tmp/qg= a.pid --statedir=3D/tmp $ cat ~/.config/systemd/user/qga.socket [Socket] ListenStream=3D/tmp/qga.sock [Install] WantedBy=3Ddefault.target $ systemctl --user daemon-reload $ systemctl --user start qga.socket $ nc -U /tmp/qga.sock Signed-off-by: Stefan Hajnoczi Reviewed-by: Daniel P. Berrange Signed-off-by: Michael Roth --- qga/channel-posix.c | 68 ++++++++++++++++++++++++++---------------------- qga/channel-win32.c | 2 +- qga/channel.h | 3 ++- qga/main.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++= ---- 4 files changed, 110 insertions(+), 37 deletions(-) diff --git a/qga/channel-posix.c b/qga/channel-posix.c index 71582e0..3f34465 100644 --- a/qga/channel-posix.c +++ b/qga/channel-posix.c @@ -118,14 +118,16 @@ static int ga_channel_client_add(GAChannel *c, int fd) return 0; } =20 -static gboolean ga_channel_open(GAChannel *c, const gchar *path, GAChannel= Method method) +static gboolean ga_channel_open(GAChannel *c, const gchar *path, + GAChannelMethod method, int fd) { int ret; c->method =3D method; =20 switch (c->method) { case GA_CHANNEL_VIRTIO_SERIAL: { - int fd =3D qemu_open(path, O_RDWR | O_NONBLOCK + assert(fd < 0); + fd =3D qemu_open(path, O_RDWR | O_NONBLOCK #ifndef CONFIG_SOLARIS | O_ASYNC #endif @@ -153,7 +155,9 @@ static gboolean ga_channel_open(GAChannel *c, const gch= ar *path, GAChannelMethod } case GA_CHANNEL_ISA_SERIAL: { struct termios tio; - int fd =3D qemu_open(path, O_RDWR | O_NOCTTY | O_NONBLOCK); + + assert(fd < 0); + fd =3D qemu_open(path, O_RDWR | O_NOCTTY | O_NONBLOCK); if (fd =3D=3D -1) { g_critical("error opening channel: %s", strerror(errno)); return false; @@ -183,37 +187,41 @@ static gboolean ga_channel_open(GAChannel *c, const g= char *path, GAChannelMethod break; } case GA_CHANNEL_UNIX_LISTEN: { - Error *local_err =3D NULL; - int fd =3D unix_listen(path, NULL, strlen(path), &local_err); - if (local_err !=3D NULL) { - g_critical("%s", error_get_pretty(local_err)); - error_free(local_err); - return false; + if (fd < 0) { + Error *local_err =3D NULL; + + fd =3D unix_listen(path, NULL, strlen(path), &local_err); + if (local_err !=3D NULL) { + g_critical("%s", error_get_pretty(local_err)); + error_free(local_err); + return false; + } } ga_channel_listen_add(c, fd, true); break; } case GA_CHANNEL_VSOCK_LISTEN: { - Error *local_err =3D NULL; - SocketAddress *addr; - char *addr_str; - int fd; - - addr_str =3D g_strdup_printf("vsock:%s", path); - addr =3D socket_parse(addr_str, &local_err); - g_free(addr_str); - if (local_err !=3D NULL) { - g_critical("%s", error_get_pretty(local_err)); - error_free(local_err); - return false; - } + if (fd < 0) { + Error *local_err =3D NULL; + SocketAddress *addr; + char *addr_str; =20 - fd =3D socket_listen(addr, &local_err); - qapi_free_SocketAddress(addr); - if (local_err !=3D NULL) { - g_critical("%s", error_get_pretty(local_err)); - error_free(local_err); - return false; + addr_str =3D g_strdup_printf("vsock:%s", path); + addr =3D socket_parse(addr_str, &local_err); + g_free(addr_str); + if (local_err !=3D NULL) { + g_critical("%s", error_get_pretty(local_err)); + error_free(local_err); + return false; + } + + fd =3D socket_listen(addr, &local_err); + qapi_free_SocketAddress(addr); + if (local_err !=3D NULL) { + g_critical("%s", error_get_pretty(local_err)); + error_free(local_err); + return false; + } } ga_channel_listen_add(c, fd, true); break; @@ -262,13 +270,13 @@ GIOStatus ga_channel_read(GAChannel *c, gchar *buf, g= size size, gsize *count) } =20 GAChannel *ga_channel_new(GAChannelMethod method, const gchar *path, - GAChannelCallback cb, gpointer opaque) + int listen_fd, GAChannelCallback cb, gpointer op= aque) { GAChannel *c =3D g_new0(GAChannel, 1); c->event_cb =3D cb; c->user_data =3D opaque; =20 - if (!ga_channel_open(c, path, method)) { + if (!ga_channel_open(c, path, method, listen_fd)) { g_critical("error opening channel"); ga_channel_free(c); return NULL; diff --git a/qga/channel-win32.c b/qga/channel-win32.c index 21f9dee..7e6dc4d 100644 --- a/qga/channel-win32.c +++ b/qga/channel-win32.c @@ -316,7 +316,7 @@ static gboolean ga_channel_open(GAChannel *c, GAChannel= Method method, } =20 GAChannel *ga_channel_new(GAChannelMethod method, const gchar *path, - GAChannelCallback cb, gpointer opaque) + int listen_fd, GAChannelCallback cb, gpointer op= aque) { GAChannel *c =3D g_new0(GAChannel, 1); SECURITY_ATTRIBUTES sec_attrs; diff --git a/qga/channel.h b/qga/channel.h index 8fd0c8f..1778416 100644 --- a/qga/channel.h +++ b/qga/channel.h @@ -25,7 +25,8 @@ typedef enum { typedef gboolean (*GAChannelCallback)(GIOCondition condition, gpointer opa= que); =20 GAChannel *ga_channel_new(GAChannelMethod method, const gchar *path, - GAChannelCallback cb, gpointer opaque); + int listen_fd, GAChannelCallback cb, + gpointer opaque); void ga_channel_free(GAChannel *c); GIOStatus ga_channel_read(GAChannel *c, gchar *buf, gsize size, gsize *cou= nt); GIOStatus ga_channel_write_all(GAChannel *c, const gchar *buf, gsize size); diff --git a/qga/main.c b/qga/main.c index 538e4ee..675ef81 100644 --- a/qga/main.c +++ b/qga/main.c @@ -28,6 +28,7 @@ #include "qga/channel.h" #include "qemu/bswap.h" #include "qemu/help_option.h" +#include "qemu/sockets.h" #ifdef _WIN32 #include "qga/service-win32.h" #include "qga/vss-win32.h" @@ -184,6 +185,37 @@ void reopen_fd_to_null(int fd) } #endif =20 +/** + * get_listen_fd: + * @consume: true to prevent future calls from succeeding + * + * Fetch a listen file descriptor that was passed via systemd socket + * activation. Use @consume to prevent child processes from thinking a fi= le + * descriptor was passed. + * + * Returns: file descriptor or -1 if no fd was passed + */ +static int get_listen_fd(bool consume) +{ +#ifdef _WIN32 + return -1; /* no fd passing expected, unsetenv(3) not available */ +#else + const char *listen_fds =3D getenv("LISTEN_FDS"); + int fd =3D STDERR_FILENO + 1; + + if (!listen_fds || strcmp(listen_fds, "1") !=3D 0) { + return -1; + } + + if (consume) { + unsetenv("LISTEN_FDS"); + } + + qemu_set_cloexec(fd); + return fd; +#endif /* !_WIN32 */ +} + static void usage(const char *cmd) { printf( @@ -648,7 +680,8 @@ static gboolean channel_event_cb(GIOCondition condition= , gpointer data) return true; } =20 -static gboolean channel_init(GAState *s, const gchar *method, const gchar = *path) +static gboolean channel_init(GAState *s, const gchar *method, const gchar = *path, + int listen_fd) { GAChannelMethod channel_method; =20 @@ -666,7 +699,8 @@ static gboolean channel_init(GAState *s, const gchar *m= ethod, const gchar *path) return false; } =20 - s->channel =3D ga_channel_new(channel_method, path, channel_event_cb, = s); + s->channel =3D ga_channel_new(channel_method, path, listen_fd, + channel_event_cb, s); if (!s->channel) { g_critical("failed to create guest agent channel"); return false; @@ -1025,7 +1059,9 @@ static void config_dump(GAConfig *config) =20 g_key_file_set_boolean(keyfile, "general", "daemon", config->daemonize= ); g_key_file_set_string(keyfile, "general", "method", config->method); - g_key_file_set_string(keyfile, "general", "path", config->channel_path= ); + if (config->channel_path) { + g_key_file_set_string(keyfile, "general", "path", config->channel_= path); + } if (config->log_filepath) { g_key_file_set_string(keyfile, "general", "logfile", config->log_filepath); @@ -1294,7 +1330,9 @@ static int run_agent(GAState *s, GAConfig *config) #endif =20 s->main_loop =3D g_main_loop_new(NULL, false); - if (!channel_init(ga_state, config->method, config->channel_path)) { + + if (!channel_init(ga_state, config->method, config->channel_path, + get_listen_fd(true))) { g_critical("failed to initialize guest agent channel"); return EXIT_FAILURE; } @@ -1318,6 +1356,7 @@ int main(int argc, char **argv) int ret =3D EXIT_SUCCESS; GAState *s =3D g_new0(GAState, 1); GAConfig *config =3D g_new0(GAConfig, 1); + int listen_fd; =20 config->log_level =3D G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL; =20 @@ -1339,7 +1378,32 @@ int main(int argc, char **argv) config->method =3D g_strdup("virtio-serial"); } =20 - if (config->channel_path =3D=3D NULL) { + listen_fd =3D get_listen_fd(false); + if (listen_fd >=3D 0) { + SocketAddress *addr; + + g_free(config->method); + g_free(config->channel_path); + config->method =3D NULL; + config->channel_path =3D NULL; + + addr =3D socket_local_address(listen_fd, NULL); + if (addr) { + if (addr->type =3D=3D SOCKET_ADDRESS_KIND_UNIX) { + config->method =3D g_strdup("unix-listen"); + } else if (addr->type =3D=3D SOCKET_ADDRESS_KIND_VSOCK) { + config->method =3D g_strdup("vsock-listen"); + } + + qapi_free_SocketAddress(addr); + } + + if (!config->method) { + g_critical("unsupported listen fd type"); + ret =3D EXIT_FAILURE; + goto end; + } + } else if (config->channel_path =3D=3D NULL) { if (strcmp(config->method, "virtio-serial") =3D=3D 0) { /* try the default path for the virtio-serial port */ config->channel_path =3D g_strdup(QGA_VIRTIO_PATH_DEFAULT); --=20 2.7.4 From nobody Sun Apr 28 07:21:05 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.zoho.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 1488787617401765.2121410134343; Mon, 6 Mar 2017 00:06:57 -0800 (PST) Received: from localhost ([::1]:42301 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cknfU-0002k9-5F for importer@patchew.org; Mon, 06 Mar 2017 03:06:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cknec-0002iM-Fx for qemu-devel@nongnu.org; Mon, 06 Mar 2017 03:06:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ckneY-0006Un-B1 for qemu-devel@nongnu.org; Mon, 06 Mar 2017 03:06:02 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:39635 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ckneY-0006UG-4R for qemu-devel@nongnu.org; Mon, 06 Mar 2017 03:05:58 -0500 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v26844Io012731 for ; Mon, 6 Mar 2017 03:05:57 -0500 Received: from e36.co.us.ibm.com (e36.co.us.ibm.com [32.97.110.154]) by mx0b-001b2d01.pphosted.com with ESMTP id 28yu2jhccw-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 06 Mar 2017 03:05:56 -0500 Received: from localhost by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 6 Mar 2017 01:05:56 -0700 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 6 Mar 2017 01:05:54 -0700 Received: from b03cxnp07029.gho.boulder.ibm.com (b03cxnp07029.gho.boulder.ibm.com [9.17.130.16]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 99AF619D8045; Mon, 6 Mar 2017 01:05:04 -0700 (MST) Received: from b03ledav002.gho.boulder.ibm.com (b03ledav002.gho.boulder.ibm.com [9.17.130.233]) by b03cxnp07029.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v2685eI012321278; Mon, 6 Mar 2017 01:05:54 -0700 Received: from b03ledav002.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DE34113603A; Mon, 6 Mar 2017 01:05:53 -0700 (MST) Received: from localhost (unknown [9.80.106.253]) by b03ledav002.gho.boulder.ibm.com (Postfix) with ESMTP id A5B08136043; Mon, 6 Mar 2017 01:05:53 -0700 (MST) From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 6 Mar 2017 02:03:41 -0600 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488787422-30487-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1488787422-30487-1-git-send-email-mdroth@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17030608-0020-0000-0000-00000B8F4505 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00006731; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000206; SDB=6.00830639; UDB=6.00407454; IPR=6.00608236; BA=6.00005188; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00014523; XFM=3.00000012; UTC=2017-03-06 08:05:55 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17030608-0021-0000-0000-00005AAB3CC2 Message-Id: <1488787422-30487-3-git-send-email-mdroth@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-03-06_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1703060071 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PULL for-2.9 2/3] qga: ignore EBUSY when freezing a filesystem 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: peter.maydell@linaro.org, Peter Lieven , qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Peter Lieven the current implementation fails if we try to freeze an already frozen filesystem. This can happen if a filesystem is mounted more than once (e.g. with a bind mount). Suggested-by: Christian Theune Cc: qemu-stable@nongnu.org Signed-off-by: Peter Lieven Reviewed-by: Paolo Bonzini Signed-off-by: Michael Roth --- qga/commands-posix.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index ea37c09..73d93eb 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -1243,6 +1243,9 @@ int64_t qmp_guest_fsfreeze_freeze_list(bool has_mount= points, * filesystems may not implement fsfreeze for less obvious reasons. * these will report EOPNOTSUPP. we simply ignore these when tally= ing * the number of frozen filesystems. + * if a filesystem is mounted more than once (aka bind mount) a + * consecutive attempt to freeze an already frozen filesystem will + * return EBUSY. * * any other error means a failure to freeze a filesystem we * expect to be freezable, so return an error in those cases @@ -1250,7 +1253,7 @@ int64_t qmp_guest_fsfreeze_freeze_list(bool has_mount= points, */ ret =3D ioctl(fd, FIFREEZE); if (ret =3D=3D -1) { - if (errno !=3D EOPNOTSUPP) { + if (errno !=3D EOPNOTSUPP && errno !=3D EBUSY) { error_setg_errno(errp, errno, "failed to freeze %s", mount->dirname); close(fd); --=20 2.7.4 From nobody Sun Apr 28 07:21:05 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.zoho.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 1488787617966742.4031249093052; Mon, 6 Mar 2017 00:06:57 -0800 (PST) Received: from localhost ([::1]:42302 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cknfU-0002kI-Iq for importer@patchew.org; Mon, 06 Mar 2017 03:06:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cknec-0002iP-Ge for qemu-devel@nongnu.org; Mon, 06 Mar 2017 03:06:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ckneZ-0006VM-AQ for qemu-devel@nongnu.org; Mon, 06 Mar 2017 03:06:02 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:38335) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ckneZ-0006Uj-14 for qemu-devel@nongnu.org; Mon, 06 Mar 2017 03:05:59 -0500 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v2683r9a090909 for ; Mon, 6 Mar 2017 03:05:57 -0500 Received: from e35.co.us.ibm.com (e35.co.us.ibm.com [32.97.110.153]) by mx0a-001b2d01.pphosted.com with ESMTP id 28yva2qa2r-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 06 Mar 2017 03:05:57 -0500 Received: from localhost by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 6 Mar 2017 01:05:56 -0700 Received: from d03dlp01.boulder.ibm.com (9.17.202.177) by e35.co.us.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 6 Mar 2017 01:05:55 -0700 Received: from b03cxnp08026.gho.boulder.ibm.com (b03cxnp08026.gho.boulder.ibm.com [9.17.130.18]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id DA9581FF0027; Mon, 6 Mar 2017 01:05:31 -0700 (MST) Received: from b03ledav006.gho.boulder.ibm.com (b03ledav006.gho.boulder.ibm.com [9.17.130.237]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v2685sL17930126; Mon, 6 Mar 2017 01:05:54 -0700 Received: from b03ledav006.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BC923C603C; Mon, 6 Mar 2017 01:05:54 -0700 (MST) Received: from localhost (unknown [9.80.106.253]) by b03ledav006.gho.boulder.ibm.com (Postfix) with ESMTP id 8C36CC6037; Mon, 6 Mar 2017 01:05:54 -0700 (MST) From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 6 Mar 2017 02:03:42 -0600 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488787422-30487-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1488787422-30487-1-git-send-email-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17030608-0012-0000-0000-000013DBA80D X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00006731; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000206; SDB=6.00830639; UDB=6.00407454; IPR=6.00608235; BA=6.00005188; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00014523; XFM=3.00000012; UTC=2017-03-06 08:05:56 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17030608-0013-0000-0000-00004BFE08BC Message-Id: <1488787422-30487-4-git-send-email-mdroth@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-03-06_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1703060071 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-001b2d01.pphosted.com id v2683r9a090909 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PULL for-2.9 3/3] tests: check path to avoid a failing qga/get-vcpus test 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: peter.maydell@linaro.org, Bruce Rogers 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" From: Bruce Rogers The qga/get-vcpus test fails in a simple chroot environment, as used in an openSUSE Build Service local build, so first check that the sysfs based path exists in order to avoid calling this test in an environment where it won't work right. Signed-off-by: Bruce Rogers Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Michael Roth --- tests/test-qga.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test-qga.c b/tests/test-qga.c index 868b02a..9e6d19a 100644 --- a/tests/test-qga.c +++ b/tests/test-qga.c @@ -924,7 +924,9 @@ int main(int argc, char **argv) g_test_add_data_func("/qga/info", &fix, test_qga_info); g_test_add_data_func("/qga/network-get-interfaces", &fix, test_qga_network_get_interfaces); - g_test_add_data_func("/qga/get-vcpus", &fix, test_qga_get_vcpus); + if (!access("/sys/devices/system/cpu/cpu0", F_OK)) { + g_test_add_data_func("/qga/get-vcpus", &fix, test_qga_get_vcpus); + } g_test_add_data_func("/qga/get-fsinfo", &fix, test_qga_get_fsinfo); g_test_add_data_func("/qga/get-memory-block-info", &fix, test_qga_get_memory_block_info); --=20 2.7.4