From patchwork Fri Aug 12 11:01:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guoyi Tu X-Patchwork-Id: 1665848 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4M416w47QXz9sG6 for ; Fri, 12 Aug 2022 21:05:27 +1000 (AEST) Received: from localhost ([::1]:35504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oMSTk-0008IM-1j for incoming@patchwork.ozlabs.org; Fri, 12 Aug 2022 07:05:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oMSQI-0008Hy-Hq for qemu-devel@nongnu.org; Fri, 12 Aug 2022 07:01:50 -0400 Received: from prt-mail.chinatelecom.cn ([42.123.76.222]:50462 helo=chinatelecom.cn) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oMSQC-0003CI-RU for qemu-devel@nongnu.org; Fri, 12 Aug 2022 07:01:50 -0400 HMM_SOURCE_IP: 172.18.0.48:33104.1040593120 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 D2D452800B6; Fri, 12 Aug 2022 19:01:28 +0800 (CST) X-189-SAVE-TO-SEND: +tugy@chinatelecom.cn Received: from ([172.18.0.48]) by app0024 with ESMTP id 6f113a3c3a7f46fda2f82f41d7dbbe91 for armbru@redhat.com; Fri, 12 Aug 2022 19:01:32 CST X-Transaction-ID: 6f113a3c3a7f46fda2f82f41d7dbbe91 X-Real-From: tugy@chinatelecom.cn X-Receive-IP: 172.18.0.48 X-MEDUSA-Status: 0 Message-ID: Date: Fri, 12 Aug 2022 19:01:27 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Content-Language: en-US To: Markus Armbruster , "Dr. David Alan Gilbert" , Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Christian Schoenebeck , =?utf-8?q?Daniel_P=2E_Berra?= =?utf-8?q?ng=C3=A9?= Cc: qemu-devel@nongnu.org, tugy@chinatelecom.cn From: Guoyi Tu Subject: [PATCH] osdep: Introduce qemu_get_fd() to wrap the common codes Received-SPF: pass client-ip=42.123.76.222; 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, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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. 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(-)          close(fd); 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; +} +  /*   * 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;      } +      if (!fd_is_socket(fd)) {          error_setg(errp, "File descriptor '%s' is not a socket", fdstr);