From nobody Tue Dec 16 16:20:40 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1618483529; cv=none; d=zohomail.com; s=zohoarc; b=eCn8SjqqGzw6seFXWCww/QIuhVIF8/qfdFqo/3amljxwsqvno1gQzlj+vlEcpvT/PNMimiV/Hj4tZtWXDs7wtx1XZ0HhZCz6cr/HMdd6g73BPdm4kRNWeREYLQlJKtwVz0s5PpPQizH0LoME+4itQvcU0ZiY7oRjyb+wQbQ+Aww= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618483529; 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; bh=r8B+IfolEa4Nkuwfxjv36dmLesoSXHdsjbnY1Ilq5zY=; b=PTLXu377B3DEHLZBhos3wHXq1HzkPa9xhilu3NRvJGZ5KBdukQSf1rs3RtZrUTyCtrGXh0Gyk/4F5f2TRodQ5Nj8z6Pvi3SNt+1D+fYYYQj766WU1IxNzvdqlgnCkmGAjNt8/Naf8WN67kedNWz2H3sZgX91/kTlxsV8F6QYwD4= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1618483529234715.2623416479789; Thu, 15 Apr 2021 03:45:29 -0700 (PDT) Received: from localhost ([::1]:56996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWzV0-0005Kr-6Z for importer@patchew.org; Thu, 15 Apr 2021 06:45:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWzRI-0000vK-Rx for qemu-devel@nongnu.org; Thu, 15 Apr 2021 06:41:37 -0400 Received: from mga06.intel.com ([134.134.136.31]:54482) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWzRD-00029d-Th for qemu-devel@nongnu.org; Thu, 15 Apr 2021 06:41:36 -0400 Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2021 03:41:24 -0700 Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2021 03:41:21 -0700 IronPort-SDR: 0PuCJsy6f/Sb0gZIQdCSftca8Ru70wJUIERvSSXvBPycJPDcz4/n1GGxdg1mm1eVwYLneumEAP dm3lmST249oA== X-IronPort-AV: E=McAfee;i="6200,9189,9954"; a="256146919" X-IronPort-AV: E=Sophos;i="5.82,223,1613462400"; d="scan'208";a="256146919" IronPort-SDR: oOxzNrtGE10+ubuIhg0Pc+D0MVmWnVZ3hSL0MbbvnGT0LZTJavnzeDLzSkukew/dpAi3t2jQmC 2C71puYL/LSQ== X-IronPort-AV: E=Sophos;i="5.82,223,1613462400"; d="scan'208";a="425134946" From: Zhang Chen To: Jason Wang , qemu-dev , Eric Blake , "Dr. David Alan Gilbert" , Markus Armbruster , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , Li Zhijian Subject: [PATCH V5 3/6] hmp-commands: Add new HMP command for COLO passthrough Date: Thu, 15 Apr 2021 18:35:12 +0800 Message-Id: <20210415103515.1251386-4-chen.zhang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210415103515.1251386-1-chen.zhang@intel.com> References: <20210415103515.1251386-1-chen.zhang@intel.com> MIME-Version: 1.0 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=134.134.136.31; envelope-from=chen.zhang@intel.com; helo=mga06.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, 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: Zhang Chen , Lukas Straub , Zhang Chen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add hmp_colo_passthrough_add and hmp_colo_passthrough_del make user can maintain COLO network passthrough list in human monitor Signed-off-by: Zhang Chen --- hmp-commands.hx | 26 ++++++++++++++ include/monitor/hmp.h | 2 ++ monitor/hmp-cmds.c | 84 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index 435c591a1c..cbb08623c7 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1290,6 +1290,32 @@ SRST Remove host network device. ERST =20 + { + .name =3D "colo_passthrough_add", + .args_type =3D "protocol:s,object-name:s?,src:s?,dst:s?", + .params =3D "protocol [object-name] [src] [dst]", + .help =3D "Add network stream to colo passthrough list", + .cmd =3D hmp_colo_passthrough_add, + }, + +SRST +``colo_passthrough_add`` + Add network stream to colo passthrough list. +ERST + + { + .name =3D "colo_passthrough_del", + .args_type =3D "protocol:s,object-name:s?,src:s?,dst:s?", + .params =3D "protocol [object-name] [src] [dst]", + .help =3D "Delete network stream from colo passthrough list", + .cmd =3D hmp_colo_passthrough_del, + }, + +SRST +``colo_passthrough_del`` + Delete network stream from colo passthrough list. +ERST + { .name =3D "object_add", .args_type =3D "object:S", diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 605d57287a..a784f98531 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -77,6 +77,8 @@ void hmp_device_del(Monitor *mon, const QDict *qdict); void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict); void hmp_netdev_add(Monitor *mon, const QDict *qdict); void hmp_netdev_del(Monitor *mon, const QDict *qdict); +void hmp_colo_passthrough_add(Monitor *mon, const QDict *qdict); +void hmp_colo_passthrough_del(Monitor *mon, const QDict *qdict); void hmp_getfd(Monitor *mon, const QDict *qdict); void hmp_closefd(Monitor *mon, const QDict *qdict); void hmp_sendkey(Monitor *mon, const QDict *qdict); diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 0ad5b77477..2c1c382c9e 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -1634,6 +1634,90 @@ void hmp_netdev_del(Monitor *mon, const QDict *qdict) hmp_handle_error(mon, err); } =20 +void hmp_colo_passthrough_add(Monitor *mon, const QDict *qdict) +{ + const char *prot =3D qdict_get_str(qdict, "protocol"); + IPFlowSpec *spec =3D g_new0(IPFlowSpec, 1); + char *src, *dst; + Error *err =3D NULL; + + spec->object_name =3D g_strdup(qdict_get_try_str(qdict, "object-name")= ); + spec->protocol =3D qapi_enum_parse(&IPProtocol_lookup, prot, -1, &err); + + src =3D g_strdup(qdict_get_try_str(qdict, "src")); + if (src) { + spec->source =3D g_new0(InetSocketAddressBase, 1); + + if (inet_parse_base(spec->source, src, NULL)) { + monitor_printf(mon, "bad colo passthrough src address"); + goto out; + } + } + + dst =3D g_strdup(qdict_get_try_str(qdict, "dst")); + if (dst) { + spec->destination =3D g_new0(InetSocketAddressBase, 1); + + if (inet_parse_base(spec->destination, dst, NULL)) { + monitor_printf(mon, "bad colo passthrough dst address"); + goto out; + } + } + + qmp_colo_passthrough_add(spec, &err); + +out: + g_free(src); + src =3D NULL; + + g_free(dst); + dst =3D NULL; + + hmp_handle_error(mon, err); +} + +void hmp_colo_passthrough_del(Monitor *mon, const QDict *qdict) +{ + const char *prot =3D qdict_get_str(qdict, "protocol"); + IPFlowSpec *spec =3D g_new0(IPFlowSpec, 1); + char *src, *dst; + Error *err =3D NULL; + + spec->object_name =3D g_strdup(qdict_get_try_str(qdict, "object-name")= ); + spec->protocol =3D qapi_enum_parse(&IPProtocol_lookup, prot, -1, &err); + + src =3D g_strdup(qdict_get_try_str(qdict, "src")); + if (src) { + spec->source =3D g_new0(InetSocketAddressBase, 1); + + if (inet_parse_base(spec->source, src, NULL)) { + monitor_printf(mon, "bad colo passthrough src address"); + goto out; + } + } + + dst =3D g_strdup(qdict_get_try_str(qdict, "dst")); + if (dst) { + spec->destination =3D g_new0(InetSocketAddressBase, 1); + + if (inet_parse_base(spec->destination, dst, NULL)) { + monitor_printf(mon, "bad colo passthrough dst address"); + goto out; + } + } + + qmp_colo_passthrough_del(spec, &err); + +out: + g_free(src); + src =3D NULL; + + g_free(dst); + dst =3D NULL; + + hmp_handle_error(mon, err); +} + void hmp_object_add(Monitor *mon, const QDict *qdict) { const char *options =3D qdict_get_str(qdict, "object"); --=20 2.25.1