From nobody Thu Apr 17 06:00:17 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=fail;
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=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1615800445; cv=none;
d=zohomail.com; s=zohoarc;
b=dMhj8sWLsC7MDGwA6/Fet8CaVhuQwHRIPjKtZ+8j5ZSZ3iVafhDzgh+94oGpmmf+9vSp7yXkzoCWzz3fkWxdZaLIg5SJrnvmHWXBI4X9PJG1jWqRIXdpef2xahH5xbz3/DF31WgsPwV0Xl3556ErQCWpKJQCxAvykR9Y4IG2KGY=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1615800445;
h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To;
bh=HrClwnfx8I9ssnhe0q9H5fROi+DpFcnPBEVOnaDBar4=;
b=TVHy2Z8pSXirdll/UuXP5fEkaNlhEQRDUlLyi6VaJWGTdaYdSBR/ezE6of9948EQFV0ICb209pe/jpmxuiTfiwrMLB5LGjyUFPShFtHAzm2iPCPtTHCzb5ayzMXUChQVEEbzvmVcAm5TnWlrwrKdqomIpjeGOF1AywHfn3ydzFM=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=fail;
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=<jasowang@redhat.com> (p=none dis=none)
header.from=<jasowang@redhat.com>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1615800445423501.79870757249137;
Mon, 15 Mar 2021 02:27:25 -0700 (PDT)
Received: from localhost ([::1]:60898 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1lLjVU-0005pL-87
for importer@patchew.org; Mon, 15 Mar 2021 05:27:24 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:35708)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <jasowang@redhat.com>)
id 1lLjKH-0000Ig-It
for qemu-devel@nongnu.org; Mon, 15 Mar 2021 05:15:49 -0400
Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:49322)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256)
(Exim 4.90_1) (envelope-from <jasowang@redhat.com>)
id 1lLjKD-0008C0-Jo
for qemu-devel@nongnu.org; Mon, 15 Mar 2021 05:15:49 -0400
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
[209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-167-N0bdQvwKOACp_qvjKvrx-Q-1; Mon, 15 Mar 2021 05:15:42 -0400
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
[10.5.11.22])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D274F92524;
Mon, 15 Mar 2021 09:15:40 +0000 (UTC)
Received: from jason-ThinkPad-T430s.redhat.com (ovpn-13-105.pek2.redhat.com
[10.72.13.105])
by smtp.corp.redhat.com (Postfix) with ESMTP id B70E2100164C;
Mon, 15 Mar 2021 09:15:38 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1615799744;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to:
references:references; bh=HrClwnfx8I9ssnhe0q9H5fROi+DpFcnPBEVOnaDBar4=;
b=DLxQTAFWGdngty7yfWUYJ72ZYzarPF9jzFOmwf93WvyNgYOg88evfAp11PkPaXIZNIZfZR
dC+tXM+G6Qqj/V+nohWD2tP/GEzHGvM7BJoRNIyj8NlWk+5inPYmB0H55mgfCylhiKP3jq
3ex8bYFq5EkWOfCEuRF/LRogUJivn5E=
X-MC-Unique: N0bdQvwKOACp_qvjKvrx-Q-1
From: Jason Wang <jasowang@redhat.com>
To: peter.maydell@linaro.org
Subject: [PULL V2 16/20] qapi: net: Add query-netdev command
Date: Mon, 15 Mar 2021 17:14:29 +0800
Message-Id: <1615799673-31549-17-git-send-email-jasowang@redhat.com>
In-Reply-To: <1615799673-31549-1-git-send-email-jasowang@redhat.com>
References: <1615799673-31549-1-git-send-email-jasowang@redhat.com>
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
Authentication-Results: relay.mimecast.com;
auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
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=216.205.24.124;
envelope-from=jasowang@redhat.com;
helo=us-smtp-delivery-124.mimecast.com
X-Spam_score_int: -30
X-Spam_score: -3.1
X-Spam_bar: ---
X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25,
DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01,
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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: Alexey Kirillov <lekiravi@yandex-team.ru>,
Jason Wang <jasowang@redhat.com>,
qemu-devel@nongnu.org
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
From: Alexey Kirillov <lekiravi@yandex-team.ru>
The query-netdev command is used to get the configuration of the current
network device backends (netdevs).
This is the QMP analog of the HMP command "info network" but only for
netdevs (i.e. excluding NIC and hubports).
The query-netdev command returns an array of objects of the NetdevInfo
type, which are an extension of Netdev type. It means that response can
be used for netdev-add after small modification. This can be useful for
recreate the same netdev configuration.
Information about the network device is filled in when it is created or
modified and is available through the NetClientState->stored_config.
Signed-off-by: Alexey Kirillov <lekiravi@yandex-team.ru>
Acked-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
include/net/net.h | 3 ++
net/l2tpv3.c | 7 ++++
net/net.c | 30 +++++++++++++-
net/netmap.c | 7 ++++
net/slirp.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++=
++++
net/socket.c | 71 +++++++++++++++++++++++++++++++
net/tap-win32.c | 9 ++++
net/tap.c | 103 ++++++++++++++++++++++++++++++++++++++++++---
net/vde.c | 22 ++++++++++
net/vhost-user.c | 18 ++++++--
net/vhost-vdpa.c | 14 +++++++
qapi/net.json | 80 +++++++++++++++++++++++++++++++++++
12 files changed, 477 insertions(+), 9 deletions(-)
diff --git a/include/net/net.h b/include/net/net.h
index 4f56cae..dc3679f 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -5,6 +5,8 @@
#include "qapi/qapi-types-net.h"
#include "net/queue.h"
#include "hw/qdev-properties-system.h"
+#include "qapi/clone-visitor.h"
+#include "qapi/qapi-visit-net.h"
=20
#define MAC_FMT "%02X:%02X:%02X:%02X:%02X:%02X"
#define MAC_ARG(x) ((uint8_t *)(x))[0], ((uint8_t *)(x))[1], \
@@ -93,6 +95,7 @@ struct NetClientState {
char *model;
char *name;
char info_str[256];
+ NetdevInfo *stored_config;
unsigned receive_disabled : 1;
NetClientDestructor *destructor;
unsigned int queue_index;
diff --git a/net/l2tpv3.c b/net/l2tpv3.c
index e4d4218..8aa0a3e 100644
--- a/net/l2tpv3.c
+++ b/net/l2tpv3.c
@@ -723,6 +723,13 @@ int net_init_l2tpv3(const Netdev *netdev,
=20
l2tpv3_read_poll(s, true);
=20
+ /* Store startup parameters */
+ nc->stored_config =3D g_new0(NetdevInfo, 1);
+ nc->stored_config->type =3D NET_BACKEND_L2TPV3;
+
+ QAPI_CLONE_MEMBERS(NetdevL2TPv3Options,
+ &nc->stored_config->u.l2tpv3, l2tpv3);
+
snprintf(s->nc.info_str, sizeof(s->nc.info_str),
"l2tpv3: connected");
return 0;
diff --git a/net/net.c b/net/net.c
index edf9b95..9a2a6ab 100644
--- a/net/net.c
+++ b/net/net.c
@@ -36,7 +36,6 @@
#include "monitor/monitor.h"
#include "qemu/help_option.h"
#include "qapi/qapi-commands-net.h"
-#include "qapi/qapi-visit-net.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
#include "qemu/error-report.h"
@@ -353,6 +352,7 @@ static void qemu_free_net_client(NetClientState *nc)
}
g_free(nc->name);
g_free(nc->model);
+ qapi_free_NetdevInfo(nc->stored_config);
if (nc->destructor) {
nc->destructor(nc);
}
@@ -1289,6 +1289,34 @@ RxFilterInfoList *qmp_query_rx_filter(bool has_name,=
const char *name,
return filter_list;
}
=20
+NetdevInfoList *qmp_query_netdev(Error **errp)
+{
+ NetdevInfoList *list =3D NULL;
+ NetClientState *nc;
+
+ QTAILQ_FOREACH(nc, &net_clients, next) {
+ /*
+ * Only look at netdevs (backend network devices), not for each qu=
eue
+ * or NIC / hubport
+ */
+ if (nc->stored_config) {
+ NetdevInfo *element =3D QAPI_CLONE(NetdevInfo, nc->stored_conf=
ig);
+
+ g_free(element->id); /* Need to dealloc empty id after clone */
+ element->id =3D g_strdup(nc->name);
+
+ element->has_peer_id =3D nc->peer !=3D NULL;
+ if (element->has_peer_id) {
+ element->peer_id =3D g_strdup(nc->peer->name);
+ }
+
+ QAPI_LIST_PREPEND(list, element);
+ }
+ }
+
+ return list;
+}
+
void hmp_info_network(Monitor *mon, const QDict *qdict)
{
NetClientState *nc, *peer;
diff --git a/net/netmap.c b/net/netmap.c
index 350f097..ad59d4a 100644
--- a/net/netmap.c
+++ b/net/netmap.c
@@ -427,6 +427,13 @@ int net_init_netmap(const Netdev *netdev,
pstrcpy(s->ifname, sizeof(s->ifname), netmap_opts->ifname);
netmap_read_poll(s, true); /* Initially only poll for reads. */
=20
+ /* Store startup parameters */
+ nc->stored_config =3D g_new0(NetdevInfo, 1);
+ nc->stored_config->type =3D NET_BACKEND_NETMAP;
+
+ QAPI_CLONE_MEMBERS(NetdevNetmapOptions,
+ &nc->stored_config->u.netmap, netmap_opts);
+
return 0;
}
=20
diff --git a/net/slirp.c b/net/slirp.c
index be914c0..6ab348b 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -377,6 +377,9 @@ static int net_slirp_init(NetClientState *peer, const c=
har *model,
int shift;
char *end;
struct slirp_config_str *config;
+ NetdevUserOptions *stored;
+ StringList **stored_hostfwd;
+ StringList **stored_guestfwd;
=20
if (!ipv4 && (vnetwork || vhost || vnameserver)) {
error_setg(errp, "IPv4 disabled but netmask/host/dns provided");
@@ -552,6 +555,115 @@ static int net_slirp_init(NetClientState *peer, const=
char *model,
=20
nc =3D qemu_new_net_client(&net_slirp_info, peer, model, name);
=20
+ /* Store startup parameters */
+ nc->stored_config =3D g_new0(NetdevInfo, 1);
+ nc->stored_config->type =3D NET_BACKEND_USER;
+ stored =3D &nc->stored_config->u.user;
+
+ if (vhostname) {
+ stored->has_hostname =3D true;
+ stored->hostname =3D g_strdup(vhostname);
+ }
+
+ stored->has_q_restrict =3D true;
+ stored->q_restrict =3D restricted;
+
+ stored->has_ipv4 =3D true;
+ stored->ipv4 =3D ipv4;
+
+ stored->has_ipv6 =3D true;
+ stored->ipv6 =3D ipv6;
+
+ if (ipv4) {
+ uint8_t *net_bytes =3D (uint8_t *)&net;
+ uint8_t *mask_bytes =3D (uint8_t *)&mask;
+
+ stored->has_net =3D true;
+ stored->net =3D g_strdup_printf("%d.%d.%d.%d/%d.%d.%d.%d",
+ net_bytes[0], net_bytes[1],
+ net_bytes[2], net_bytes[3],
+ mask_bytes[0], mask_bytes[1],
+ mask_bytes[2], mask_bytes[3]);
+
+ stored->has_host =3D true;
+ stored->host =3D g_strdup(inet_ntoa(host));
+ }
+
+ if (tftp_export) {
+ stored->has_tftp =3D true;
+ stored->tftp =3D g_strdup(tftp_export);
+ }
+
+ if (bootfile) {
+ stored->has_bootfile =3D true;
+ stored->bootfile =3D g_strdup(bootfile);
+ }
+
+ if (vdhcp_start) {
+ stored->has_dhcpstart =3D true;
+ stored->dhcpstart =3D g_strdup(vdhcp_start);
+ }
+
+ if (ipv4) {
+ stored->has_dns =3D true;
+ stored->dns =3D g_strdup(inet_ntoa(dns));
+ }
+
+ if (dnssearch) {
+ stored->has_dnssearch =3D true;
+ StringList **stored_list =3D &stored->dnssearch;
+
+ for (int i =3D 0; dnssearch[i]; i++) {
+ String *element =3D g_new0(String, 1);
+
+ element->str =3D g_strdup(dnssearch[i]);
+ QAPI_LIST_APPEND(stored_list, element);
+ }
+ }
+
+ if (vdomainname) {
+ stored->has_domainname =3D true;
+ stored->domainname =3D g_strdup(vdomainname);
+ }
+
+ if (ipv6) {
+ char addrstr[INET6_ADDRSTRLEN];
+ const char *res;
+
+ stored->has_ipv6_prefix =3D true;
+ stored->ipv6_prefix =3D g_strdup(vprefix6);
+
+ stored->has_ipv6_prefixlen =3D true;
+ stored->ipv6_prefixlen =3D vprefix6_len;
+
+ res =3D inet_ntop(AF_INET6, &ip6_host,
+ addrstr, sizeof(addrstr));
+
+ stored->has_ipv6_host =3D true;
+ stored->ipv6_host =3D g_strdup(res);
+
+ res =3D inet_ntop(AF_INET6, &ip6_dns,
+ addrstr, sizeof(addrstr));
+
+ stored->has_ipv6_dns =3D true;
+ stored->ipv6_dns =3D g_strdup(res);
+ }
+
+ if (smb_export) {
+ stored->has_smb =3D true;
+ stored->smb =3D g_strdup(smb_export);
+ }
+
+ if (vsmbserver) {
+ stored->has_smbserver =3D true;
+ stored->smbserver =3D g_strdup(vsmbserver);
+ }
+
+ if (tftp_server_name) {
+ stored->has_tftp_server_name =3D true;
+ stored->tftp_server_name =3D g_strdup(tftp_server_name);
+ }
+
snprintf(nc->info_str, sizeof(nc->info_str),
"net=3D%s,restrict=3D%s", inet_ntoa(net),
restricted ? "on" : "off");
@@ -581,15 +693,25 @@ static int net_slirp_init(NetClientState *peer, const=
char *model,
s->poll_notifier.notify =3D net_slirp_poll_notify;
main_loop_poll_add_notifier(&s->poll_notifier);
=20
+ stored_hostfwd =3D &stored->hostfwd;
+ stored_guestfwd =3D &stored->guestfwd;
+
for (config =3D slirp_configs; config; config =3D config->next) {
+ String *element =3D g_new0(String, 1);
+
+ element->str =3D g_strdup(config->str);
if (config->flags & SLIRP_CFG_HOSTFWD) {
if (slirp_hostfwd(s, config->str, errp) < 0) {
goto error;
}
+ stored->has_hostfwd =3D true;
+ QAPI_LIST_APPEND(stored_hostfwd, element);
} else {
if (slirp_guestfwd(s, config->str, errp) < 0) {
goto error;
}
+ stored->has_guestfwd =3D true;
+ QAPI_LIST_APPEND(stored_guestfwd, element);
}
}
#ifndef _WIN32
diff --git a/net/socket.c b/net/socket.c
index 15b410e..1614523 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -342,6 +342,7 @@ static NetSocketState *net_socket_fd_init_dgram(NetClie=
ntState *peer,
NetSocketState *s;
SocketAddress *sa;
SocketAddressType sa_type;
+ NetdevSocketOptions *stored;
=20
sa =3D socket_local_address(fd, errp);
if (!sa) {
@@ -385,8 +386,19 @@ static NetSocketState *net_socket_fd_init_dgram(NetCli=
entState *peer,
net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
net_socket_read_poll(s, true);
=20
+ /* Store startup parameters */
+ nc->stored_config =3D g_new0(NetdevInfo, 1);
+ nc->stored_config->type =3D NET_BACKEND_SOCKET;
+ stored =3D &nc->stored_config->u.socket;
+
+ stored->has_fd =3D true;
+ stored->fd =3D g_strdup_printf("%d", fd);
+
/* mcast: save bound address as dst */
if (is_connected && mcast !=3D NULL) {
+ stored->has_mcast =3D true;
+ stored->mcast =3D g_strdup(mcast);
+
s->dgram_dst =3D saddr;
snprintf(nc->info_str, sizeof(nc->info_str),
"socket: fd=3D%d (cloned mcast=3D%s:%d)",
@@ -428,6 +440,7 @@ static NetSocketState *net_socket_fd_init_stream(NetCli=
entState *peer,
{
NetClientState *nc;
NetSocketState *s;
+ NetdevSocketOptions *stored;
=20
nc =3D qemu_new_net_client(&net_socket_info, peer, model, name);
=20
@@ -447,6 +460,15 @@ static NetSocketState *net_socket_fd_init_stream(NetCl=
ientState *peer,
} else {
qemu_set_fd_handler(s->fd, NULL, net_socket_connect, s);
}
+
+ /* Store startup parameters */
+ nc->stored_config =3D g_new0(NetdevInfo, 1);
+ nc->stored_config->type =3D NET_BACKEND_SOCKET;
+ stored =3D &nc->stored_config->u.socket;
+
+ stored->has_fd =3D true;
+ stored->fd =3D g_strdup_printf("%d", fd);
+
return s;
}
=20
@@ -483,6 +505,7 @@ static void net_socket_accept(void *opaque)
struct sockaddr_in saddr;
socklen_t len;
int fd;
+ NetdevSocketOptions *stored;
=20
for(;;) {
len =3D sizeof(saddr);
@@ -498,6 +521,13 @@ static void net_socket_accept(void *opaque)
s->fd =3D fd;
s->nc.link_down =3D false;
net_socket_connect(s);
+
+ /* Store additional startup parameters (extend net_socket_listen_init)=
*/
+ stored =3D &s->nc.stored_config->u.socket;
+
+ stored->has_fd =3D true;
+ stored->fd =3D g_strdup_printf("%d", fd);
+
snprintf(s->nc.info_str, sizeof(s->nc.info_str),
"socket: connection from %s:%d",
inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
@@ -513,6 +543,7 @@ static int net_socket_listen_init(NetClientState *peer,
NetSocketState *s;
struct sockaddr_in saddr;
int fd, ret;
+ NetdevSocketOptions *stored;
=20
if (parse_host_port(&saddr, host_str, errp) < 0) {
return -1;
@@ -549,6 +580,15 @@ static int net_socket_listen_init(NetClientState *peer,
net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
=20
qemu_set_fd_handler(s->listen_fd, net_socket_accept, NULL, s);
+
+ /* Store startup parameters */
+ nc->stored_config =3D g_new0(NetdevInfo, 1);
+ nc->stored_config->type =3D NET_BACKEND_SOCKET;
+ stored =3D &nc->stored_config->u.socket;
+
+ stored->has_listen =3D true;
+ stored->listen =3D g_strdup(host_str);
+
return 0;
}
=20
@@ -561,6 +601,7 @@ static int net_socket_connect_init(NetClientState *peer,
NetSocketState *s;
int fd, connected, ret;
struct sockaddr_in saddr;
+ NetdevSocketOptions *stored;
=20
if (parse_host_port(&saddr, host_str, errp) < 0) {
return -1;
@@ -598,6 +639,12 @@ static int net_socket_connect_init(NetClientState *pee=
r,
return -1;
}
=20
+ /* Store additional startup parameters (extend net_socket_fd_init) */
+ stored =3D &s->nc.stored_config->u.socket;
+
+ stored->has_connect =3D true;
+ stored->connect =3D g_strdup(host_str);
+
snprintf(s->nc.info_str, sizeof(s->nc.info_str),
"socket: connect to %s:%d",
inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
@@ -615,6 +662,7 @@ static int net_socket_mcast_init(NetClientState *peer,
int fd;
struct sockaddr_in saddr;
struct in_addr localaddr, *param_localaddr;
+ NetdevSocketOptions *stored;
=20
if (parse_host_port(&saddr, host_str, errp) < 0) {
return -1;
@@ -643,6 +691,19 @@ static int net_socket_mcast_init(NetClientState *peer,
=20
s->dgram_dst =3D saddr;
=20
+ /* Store additional startup parameters (extend net_socket_fd_init) */
+ stored =3D &s->nc.stored_config->u.socket;
+
+ if (!stored->has_mcast) {
+ stored->has_mcast =3D true;
+ stored->mcast =3D g_strdup(host_str);
+ }
+
+ if (localaddr_str) {
+ stored->has_localaddr =3D true;
+ stored->localaddr =3D g_strdup(localaddr_str);
+ }
+
snprintf(s->nc.info_str, sizeof(s->nc.info_str),
"socket: mcast=3D%s:%d",
inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
@@ -660,6 +721,7 @@ static int net_socket_udp_init(NetClientState *peer,
NetSocketState *s;
int fd, ret;
struct sockaddr_in laddr, raddr;
+ NetdevSocketOptions *stored;
=20
if (parse_host_port(&laddr, lhost, errp) < 0) {
return -1;
@@ -698,6 +760,15 @@ static int net_socket_udp_init(NetClientState *peer,
=20
s->dgram_dst =3D raddr;
=20
+ /* Store additional startup parameters (extend net_socket_fd_init) */
+ stored =3D &s->nc.stored_config->u.socket;
+
+ stored->has_localaddr =3D true;
+ stored->localaddr =3D g_strdup(lhost);
+
+ stored->has_udp =3D true;
+ stored->udp =3D g_strdup(rhost);
+
snprintf(s->nc.info_str, sizeof(s->nc.info_str),
"socket: udp=3D%s:%d",
inet_ntoa(raddr.sin_addr), ntohs(raddr.sin_port));
diff --git a/net/tap-win32.c b/net/tap-win32.c
index 2b5dcda..b60933b 100644
--- a/net/tap-win32.c
+++ b/net/tap-win32.c
@@ -768,6 +768,7 @@ static int tap_win32_init(NetClientState *peer, const c=
har *model,
NetClientState *nc;
TAPState *s;
tap_win32_overlapped_t *handle;
+ NetdevTapOptions *stored;
=20
if (tap_win32_open(&handle, ifname) < 0) {
printf("tap: Could not open '%s'\n", ifname);
@@ -778,6 +779,14 @@ static int tap_win32_init(NetClientState *peer, const =
char *model,
=20
s =3D DO_UPCAST(TAPState, nc, nc);
=20
+ /* Store startup parameters */
+ nc->stored_config =3D g_new0(NetdevInfo, 1);
+ nc->stored_config->type =3D NET_BACKEND_TAP;
+ stored =3D &nc->stored_config->u.tap;
+
+ stored->has_ifname =3D true;
+ stored->ifname =3D g_strdup(ifname);
+
snprintf(s->nc.info_str, sizeof(s->nc.info_str),
"tap: ifname=3D%s", ifname);
=20
diff --git a/net/tap.c b/net/tap.c
index b751285..8041245 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -590,6 +590,7 @@ int net_init_bridge(const Netdev *netdev, const char *n=
ame,
const char *helper, *br;
TAPState *s;
int fd, vnet_hdr;
+ NetdevBridgeOptions *stored;
=20
assert(netdev->type =3D=3D NET_CLIENT_DRIVER_BRIDGE);
bridge =3D &netdev->u.bridge;
@@ -609,6 +610,21 @@ int net_init_bridge(const Netdev *netdev, const char *=
name,
}
s =3D net_tap_fd_init(peer, "bridge", name, fd, vnet_hdr);
=20
+ /* Store startup parameters */
+ s->nc.stored_config =3D g_new0(NetdevInfo, 1);
+ s->nc.stored_config->type =3D NET_BACKEND_BRIDGE;
+ stored =3D &s->nc.stored_config->u.bridge;
+
+ if (br) {
+ stored->has_br =3D true;
+ stored->br =3D g_strdup(br);
+ }
+
+ if (helper) {
+ stored->has_helper =3D true;
+ stored->helper =3D g_strdup(helper);
+ }
+
snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=3D%s,br=3D%s"=
, helper,
br);
=20
@@ -656,11 +672,13 @@ static void net_init_tap_one(const NetdevTapOptions *=
tap, NetClientState *peer,
const char *model, const char *name,
const char *ifname, const char *script,
const char *downscript, const char *vhostfdna=
me,
- int vnet_hdr, int fd, Error **errp)
+ int vnet_hdr, int fd, NetdevInfo **common_sto=
red,
+ Error **errp)
{
Error *err =3D NULL;
TAPState *s =3D net_tap_fd_init(peer, model, name, fd, vnet_hdr);
int vhostfd;
+ NetdevTapOptions *stored;
=20
tap_set_sndbuf(s->fd, tap, &err);
if (err) {
@@ -668,12 +686,65 @@ static void net_init_tap_one(const NetdevTapOptions *=
tap, NetClientState *peer,
return;
}
=20
+ /* Store startup parameters */
+ if (!*common_stored) {
+ *common_stored =3D g_new0(NetdevInfo, 1);
+ (*common_stored)->type =3D NET_BACKEND_TAP;
+ s->nc.stored_config =3D *common_stored;
+ }
+ stored =3D &(*common_stored)->u.tap;
+
+ if (tap->has_sndbuf && !stored->has_sndbuf) {
+ stored->has_sndbuf =3D true;
+ stored->sndbuf =3D tap->sndbuf;
+ }
+
+ if (vnet_hdr && !stored->has_vnet_hdr) {
+ stored->has_vnet_hdr =3D true;
+ stored->vnet_hdr =3D true;
+ }
+
if (tap->has_fd || tap->has_fds) {
+ if (!stored->has_fds) {
+ stored->has_fds =3D true;
+ stored->fds =3D g_strdup_printf("%d", fd);
+ } else {
+ char *tmp_s =3D stored->fds;
+ stored->fds =3D g_strdup_printf("%s:%d", stored->fds, fd);
+ g_free(tmp_s);
+ }
+
snprintf(s->nc.info_str, sizeof(s->nc.info_str), "fd=3D%d", fd);
} else if (tap->has_helper) {
+ if (!stored->has_helper) {
+ stored->has_helper =3D true;
+ stored->helper =3D g_strdup(tap->helper);
+ }
+
+ if (!stored->has_br) {
+ stored->has_br =3D true;
+ stored->br =3D tap->has_br ? g_strdup(tap->br) :
+ g_strdup(DEFAULT_BRIDGE_INTERFACE);
+ }
+
snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=3D%s",
tap->helper);
} else {
+ if (ifname && !stored->has_ifname) {
+ stored->has_ifname =3D true;
+ stored->ifname =3D g_strdup(ifname);
+ }
+
+ if (script && !stored->has_script) {
+ stored->has_script =3D true;
+ stored->script =3D g_strdup(script);
+ }
+
+ if (downscript && !stored->has_downscript) {
+ stored->has_downscript =3D true;
+ stored->downscript =3D g_strdup(downscript);
+ }
+
snprintf(s->nc.info_str, sizeof(s->nc.info_str),
"ifname=3D%s,script=3D%s,downscript=3D%s", ifname, script,
downscript);
@@ -689,9 +760,20 @@ static void net_init_tap_one(const NetdevTapOptions *t=
ap, NetClientState *peer,
vhostfdname || (tap->has_vhostforce && tap->vhostforce)) {
VhostNetOptions options;
=20
+ stored->has_vhost =3D true;
+ stored->vhost =3D true;
+
+ if (tap->has_vhostforce && tap->vhostforce) {
+ stored->has_vhostforce =3D true;
+ stored->vhostforce =3D true;
+ }
+
options.backend_type =3D VHOST_BACKEND_TYPE_KERNEL;
options.net_backend =3D &s->nc;
if (tap->has_poll_us) {
+ stored->has_poll_us =3D true;
+ stored->poll_us =3D tap->poll_us;
+
options.busyloop_timeout =3D tap->poll_us;
} else {
options.busyloop_timeout =3D 0;
@@ -731,6 +813,15 @@ static void net_init_tap_one(const NetdevTapOptions *t=
ap, NetClientState *peer,
}
options.opaque =3D (void *)(uintptr_t)vhostfd;
=20
+ if (!stored->has_vhostfds) {
+ stored->has_vhostfds =3D true;
+ stored->vhostfds =3D g_strdup_printf("%d", vhostfd);
+ } else {
+ char *tmp_s =3D stored->vhostfds;
+ stored->vhostfds =3D g_strdup_printf("%s:%d", stored->fds, vho=
stfd);
+ g_free(tmp_s);
+ }
+
s->vhost_net =3D vhost_net_init(&options);
if (!s->vhost_net) {
if (tap->has_vhostforce && tap->vhostforce) {
@@ -783,6 +874,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
const char *vhostfdname;
char ifname[128];
int ret =3D 0;
+ NetdevInfo *common_stored =3D NULL; /* will store configuration */
=20
assert(netdev->type =3D=3D NET_CLIENT_DRIVER_TAP);
tap =3D &netdev->u.tap;
@@ -829,7 +921,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
=20
net_init_tap_one(tap, peer, "tap", name, NULL,
script, downscript,
- vhostfdname, vnet_hdr, fd, &err);
+ vhostfdname, vnet_hdr, fd, &common_stored, &err);
if (err) {
error_propagate(errp, err);
close(fd);
@@ -892,7 +984,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
net_init_tap_one(tap, peer, "tap", name, ifname,
script, downscript,
tap->has_vhostfds ? vhost_fds[i] : NULL,
- vnet_hdr, fd, &err);
+ vnet_hdr, fd, &common_stored, &err);
if (err) {
error_propagate(errp, err);
ret =3D -1;
@@ -935,7 +1027,7 @@ free_fail:
=20
net_init_tap_one(tap, peer, "bridge", name, ifname,
script, downscript, vhostfdname,
- vnet_hdr, fd, &err);
+ vnet_hdr, fd, &common_stored, &err);
if (err) {
error_propagate(errp, err);
close(fd);
@@ -981,7 +1073,8 @@ free_fail:
net_init_tap_one(tap, peer, "tap", name, ifname,
i >=3D 1 ? "no" : script,
i >=3D 1 ? "no" : downscript,
- vhostfdname, vnet_hdr, fd, &err);
+ vhostfdname, vnet_hdr, fd,
+ &common_stored, &err);
if (err) {
error_propagate(errp, err);
close(fd);
diff --git a/net/vde.c b/net/vde.c
index 99189cc..b0b8800 100644
--- a/net/vde.c
+++ b/net/vde.c
@@ -84,6 +84,7 @@ static int net_vde_init(NetClientState *peer, const char =
*model,
VDECONN *vde;
char *init_group =3D (char *)group;
char *init_sock =3D (char *)sock;
+ NetdevVdeOptions *stored;
=20
struct vde_open_args args =3D {
.port =3D port,
@@ -108,6 +109,27 @@ static int net_vde_init(NetClientState *peer, const ch=
ar *model,
=20
qemu_set_fd_handler(vde_datafd(s->vde), vde_to_qemu, NULL, s);
=20
+ /* Store startup parameters */
+ nc->stored_config =3D g_new0(NetdevInfo, 1);
+ nc->stored_config->type =3D NET_BACKEND_VDE;
+ stored =3D &nc->stored_config->u.vde;
+
+ if (sock) {
+ stored->has_sock =3D true;
+ stored->sock =3D g_strdup(sock);
+ }
+
+ stored->has_port =3D true;
+ stored->port =3D port;
+
+ if (group) {
+ stored->has_group =3D true;
+ stored->group =3D g_strdup(group);
+ }
+
+ stored->has_mode =3D true;
+ stored->mode =3D mode;
+
return 0;
}
=20
diff --git a/net/vhost-user.c b/net/vhost-user.c
index ffbd94d..5b7056b 100644
--- a/net/vhost-user.c
+++ b/net/vhost-user.c
@@ -311,14 +311,15 @@ static void net_vhost_user_event(void *opaque, QEMUCh=
rEvent event)
}
=20
static int net_vhost_user_init(NetClientState *peer, const char *device,
- const char *name, Chardev *chr,
- int queues)
+ const char *name, const char *chardev,
+ Chardev *chr, int queues)
{
Error *err =3D NULL;
NetClientState *nc, *nc0 =3D NULL;
NetVhostUserState *s =3D NULL;
VhostUserState *user;
int i;
+ NetdevVhostUserOptions *stored;
=20
assert(name);
assert(queues > 0);
@@ -355,6 +356,16 @@ static int net_vhost_user_init(NetClientState *peer, c=
onst char *device,
=20
assert(s->vhost_net);
=20
+ /* Store startup parameters */
+ nc0->stored_config =3D g_new0(NetdevInfo, 1);
+ nc0->stored_config->type =3D NET_BACKEND_VHOST_USER;
+ stored =3D &nc0->stored_config->u.vhost_user;
+
+ stored->chardev =3D g_strdup(chardev);
+
+ stored->has_queues =3D true;
+ stored->queues =3D queues;
+
return 0;
=20
err:
@@ -446,5 +457,6 @@ int net_init_vhost_user(const Netdev *netdev, const cha=
r *name,
return -1;
}
=20
- return net_vhost_user_init(peer, "vhost_user", name, chr, queues);
+ return net_vhost_user_init(peer, "vhost_user", name,
+ vhost_user_opts->chardev, chr, queues);
}
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index fe659ec..8c27ea0 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -184,8 +184,22 @@ static int net_vhost_vdpa_init(NetClientState *peer, c=
onst char *device,
VhostVDPAState *s;
int vdpa_device_fd =3D -1;
int ret =3D 0;
+ NetdevVhostVDPAOptions *stored;
+
assert(name);
nc =3D qemu_new_net_client(&net_vhost_vdpa_info, peer, device, name);
+
+ /* Store startup parameters */
+ nc->stored_config =3D g_new0(NetdevInfo, 1);
+ nc->stored_config->type =3D NET_BACKEND_VHOST_VDPA;
+ stored =3D &nc->stored_config->u.vhost_vdpa;
+
+ stored->has_vhostdev =3D true;
+ stored->vhostdev =3D g_strdup(vhostdev);
+
+ stored->has_queues =3D true;
+ stored->queues =3D 1; /* TODO: change when support multiqueue */
+
snprintf(nc->info_str, sizeof(nc->info_str), TYPE_VHOST_VDPA);
nc->queue_index =3D 0;
s =3D DO_UPCAST(VhostVDPAState, nc, nc);
diff --git a/qapi/net.json b/qapi/net.json
index c31748c8..87361eb 100644
--- a/qapi/net.json
+++ b/qapi/net.json
@@ -714,3 +714,83 @@
##
{ 'event': 'FAILOVER_NEGOTIATED',
'data': {'device-id': 'str'} }
+
+##
+# @NetBackend:
+#
+# Available netdev backend drivers.
+#
+# Since: 6.0
+##
+{ 'enum': 'NetBackend',
+ 'data': [ 'bridge', 'l2tpv3', 'netmap', 'socket', 'tap', 'user', 'vde',
+ 'vhost-user', 'vhost-vdpa' ] }
+
+##
+# @NetdevInfo:
+#
+# Configuration of a network backend device (netdev).
+#
+# @id: Device identifier.
+#
+# @type: Specify the driver used for interpreting remaining arguments.
+#
+# @peer-id: The connected frontend network device name (absent if no front=
end
+# is connected).
+#
+# Since: 6.0
+##
+{ 'union': 'NetdevInfo',
+ 'base': { 'id': 'str',
+ 'type': 'NetBackend',
+ '*peer-id': 'str' },
+ 'discriminator': 'type',
+ 'data': {
+ 'bridge': 'NetdevBridgeOptions',
+ 'l2tpv3': 'NetdevL2TPv3Options',
+ 'netmap': 'NetdevNetmapOptions',
+ 'socket': 'NetdevSocketOptions',
+ 'tap': 'NetdevTapOptions',
+ 'user': 'NetdevUserOptions',
+ 'vde': 'NetdevVdeOptions',
+ 'vhost-user': 'NetdevVhostUserOptions',
+ 'vhost-vdpa': 'NetdevVhostVDPAOptions' } }
+
+##
+# @query-netdev:
+#
+# Get a list of @NetdevInfo for all virtual network backend devices (netde=
vs).
+#
+# Returns: a list of @NetdevInfo describing each netdev.
+#
+# Since: 6.0
+#
+# Example:
+#
+# -> { "execute": "query-netdev" }
+# <- { "return": [
+# {
+# "ipv6": true,
+# "ipv4": true,
+# "host": "10.0.2.2",
+# "ipv6-dns": "fec0::3",
+# "ipv6-prefix": "fec0::",
+# "net": "10.0.2.0/255.255.255.0",
+# "ipv6-host": "fec0::2",
+# "type": "user",
+# "peer-id": "net0",
+# "dns": "10.0.2.3",
+# "hostfwd": [
+# {
+# "str": "tcp::20004-:22"
+# }
+# ],
+# "ipv6-prefixlen": 64,
+# "id": "netdev0",
+# "restrict": false
+# }
+# ]
+# }
+#
+##
+{ 'command': 'query-netdev', 'returns': ['NetdevInfo'] }
--=20
2.7.4