From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A5CEEECAAD3 for ; Wed, 31 Aug 2022 08:28:16 +0000 (UTC) Received: from localhost ([::1]:32892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oTJ54-0006i8-HC for qemu-devel@archiver.kernel.org; Wed, 31 Aug 2022 04:28:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTJ2z-0005D4-Rl for qemu-devel@nongnu.org; Wed, 31 Aug 2022 04:26:06 -0400 Received: from prt-mail.chinatelecom.cn ([42.123.76.227]:47368 helo=chinatelecom.cn) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oTJ2k-0005J4-Nc for qemu-devel@nongnu.org; Wed, 31 Aug 2022 04:26:05 -0400 HMM_SOURCE_IP: 172.18.0.48:42410.832384431 HMM_ATTACHE_NUM: 0000 HMM_SOURCE_TYPE: SMTP Received: from clientip-36.111.64.85 (unknown [172.18.0.48]) by chinatelecom.cn (HERMES) with SMTP id 50E1C280098; Wed, 31 Aug 2022 16:25:29 +0800 (CST) X-189-SAVE-TO-SEND: tugy@chinatelecom.cn Received: from ([172.18.0.48]) by app0024 with ESMTP id 3215e3c8ada44313bb36baab6533c8f0 for qemu_oss@crudebyte.com; Wed, 31 Aug 2022 16:25:39 CST X-Transaction-ID: 3215e3c8ada44313bb36baab6533c8f0 X-Real-From: tugy@chinatelecom.cn X-Receive-IP: 172.18.0.48 X-MEDUSA-Status: 0 Message-ID: <4d00eb30-73bc-25c3-4450-d4f8b1199063@chinatelecom.cn> Date: Wed, 31 Aug 2022 16:25:27 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH] osdep: Introduce qemu_get_fd() to wrap the common codes Content-Language: en-US To: Christian Schoenebeck , Markus Armbruster , "Dr. David Alan Gilbert" , Peter Maydell , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , Richard Henderson , =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= , qemu-devel@nongnu.org References: <1442ced4-ab22-c379-76ee-5e1f1c17108a@chinatelecom.cn> <47453703.NBG3G7Ahn1@silver> From: Guoyi Tu In-Reply-To: <47453703.NBG3G7Ahn1@silver> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=42.123.76.227; envelope-from=tugy@chinatelecom.cn; helo=chinatelecom.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 8/18/22 20:58, Christian Schoenebeck wrote: > On Donnerstag, 18. August 2022 14:06:04 CEST Guoyi Tu wrote: >> Ping... >> >> Any comments are welcome >> >> On 8/12/22 19:01, Guoyi Tu wrote: >>> socket_get_fd() have much the same codes as monitor_fd_param(), >>> so qemu_get_fd() is introduced to implement the common logic. >>> now socket_get_fd() and monitor_fd_param() directly call this >>> function. > > s/have/has/, s/now/Now/, some proper rephrasing wouldn't hurt either. will fix it. >>> Signed-off-by: Guoyi Tu >>> --- >>> >>> include/qemu/osdep.h | 1 + >>> monitor/misc.c | 21 +-------------------- >>> util/osdep.c | 25 +++++++++++++++++++++++++ >>> util/qemu-sockets.c | 17 +++++------------ >>> 4 files changed, 32 insertions(+), 32 deletions(-) >>> >>> diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h >>> index b1c161c035..b920f128a7 100644 >>> --- a/include/qemu/osdep.h >>> +++ b/include/qemu/osdep.h >>> @@ -491,6 +491,7 @@ int qemu_open_old(const char *name, int flags, ...); >>> >>> int qemu_open(const char *name, int flags, Error **errp); >>> int qemu_create(const char *name, int flags, mode_t mode, Error **errp); >>> int qemu_close(int fd); >>> >>> +int qemu_get_fd(Monitor *mon, const char *fdname, Error **errp); >>> >>> int qemu_unlink(const char *name); >>> #ifndef _WIN32 >>> int qemu_dup_flags(int fd, int flags); >>> >>> diff --git a/monitor/misc.c b/monitor/misc.c >>> index 3d2312ba8d..0d3372cf2b 100644 >>> --- a/monitor/misc.c >>> +++ b/monitor/misc.c >>> @@ -1395,26 +1395,7 @@ void monitor_fdset_dup_fd_remove(int dup_fd) >>> >>> int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp) >>> { >>> >>> - int fd; >>> - Error *local_err = NULL; >>> - >>> - if (!qemu_isdigit(fdname[0]) && mon) { >>> - fd = monitor_get_fd(mon, fdname, &local_err); >>> - } else { >>> - fd = qemu_parse_fd(fdname); >>> - if (fd == -1) { >>> - error_setg(&local_err, "Invalid file descriptor number '%s'", >>> - fdname); >>> - } >>> - } >>> - if (local_err) { >>> - error_propagate(errp, local_err); >>> - assert(fd == -1); >>> - } else { >>> - assert(fd != -1); >>> - } >>> - >>> - return fd; >>> + return qemu_get_fd(mon, fdname, errp); >>> >>> } >>> >>> /* Please update hmp-commands.hx when adding or changing commands */ >>> >>> diff --git a/util/osdep.c b/util/osdep.c >>> index 60fcbbaebe..c57551ca78 100644 >>> --- a/util/osdep.c >>> +++ b/util/osdep.c >>> @@ -23,6 +23,7 @@ >>> >>> */ >>> #include "qemu/osdep.h" >>> #include "qapi/error.h" >>> >>> +#include "qemu/ctype.h" >>> >>> #include "qemu/cutils.h" >>> #include "qemu/sockets.h" >>> #include "qemu/error-report.h" >>> >>> @@ -413,6 +414,30 @@ int qemu_close(int fd) >>> >>> return close(fd); >>> } >>> >>> +int qemu_get_fd(Monitor *mon, const char *fdname, Error **errp) >>> +{ >>> + int fd; >>> + Error *local_err = NULL; >>> + >>> + if (!qemu_isdigit(fdname[0]) && mon) { >>> + fd = monitor_get_fd(mon, fdname, &local_err); >>> + } else { >>> + fd = qemu_parse_fd(fdname); >>> + if (fd == -1) { >>> + error_setg(&local_err, "Invalid file descriptor number '%s'", >>> + fdname); >>> + } >>> + } >>> + if (local_err) { >>> + error_propagate(errp, local_err); >>> + assert(fd == -1); >>> + } else { >>> + assert(fd != -1); >>> + } >>> + >>> + return fd; >>> +} >>> + > > Up to here you are basically just moving the code of monitor_fd_param() to a > project wide shared new function qemu_get_fd(), but why? I mean you could > simply call monitor_fd_param() in socket_get_fd() below, no? > monitor_fd_param() is implemented in misc.c which is not linkded when build the test codes that test the socket_connect() api, such as test-unit-sockets.c and test-char.c. If call monitor_fd_param() directly in socket_get_fd(), we need to implement a stub version of monitor_fd_param() which actually has the same codes according to the codes in test-unit-socket.c which overwrite the monitor_get_fd(). what about moving monitor_fd_param() to the osdep.c and calling monitor_fd_param() in socket_get_fd() ? >>> /* >>> * Delete a file from the filesystem, unless the filename is >>> >>> /dev/fdset/... >>> >>> * >>> >>> diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c >>> index 13b5b197f9..92960ee6eb 100644 >>> --- a/util/qemu-sockets.c >>> +++ b/util/qemu-sockets.c >>> @@ -1142,19 +1142,12 @@ static int socket_get_fd(const char *fdstr, >>> Error **errp) >>> >>> { >>> Monitor *cur_mon = monitor_cur(); >>> int fd; >>> >>> - if (cur_mon) { >>> - fd = monitor_get_fd(cur_mon, fdstr, errp); >>> - if (fd < 0) { >>> - return -1; >>> - } >>> - } else { >>> - if (qemu_strtoi(fdstr, NULL, 10, &fd) < 0) { >>> - error_setg_errno(errp, errno, >>> - "Unable to parse FD number %s", >>> - fdstr); >>> - return -1; >>> - } >>> + >>> + fd = qemu_get_fd(cur_mon, fdstr, errp); >>> + if (fd < 0) { >>> + return -1; >>> >>> } > > This part looks like behaviour change to me. Haven't looked into the details > though whether it would be OK. Just saying. In my opinion the logic is almost the same. > >>> >>> + > > Unintentional white line added? will delete it. Thanks for your coomments > >>> >>> if (!fd_is_socket(fd)) { >>> error_setg(errp, "File descriptor '%s' is not a socket", fdstr); >>> close(fd); > > >