-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1 iQEcBAABAgAGBQJgbs4gAAoJEO8Ells5jWIRvgAIAJjpj9ptxEfEAisTeU7IMNPk vFyf9aBj/QBPv8VmcC90Mz/x38bMn0zE6V9E53camA7s1YtLxWj5ZG9wvj0ExJB9 jgk4kEm5gpj8LY7/GwECNffaITQtLZgE4HVP98dVG9o1+5iCkZf8RnXAQH2ckzTs WoYuM0Glgj0XXdBauvpEkidQ+q23cOw7ipxNseI5wxZBAZt0RGdXoO6Dh+S219ro kFoDwzZS9tnuwpzzZJefQJuRWkUm1LsZ6rwC7Yd+gpk2Yt+fLGihF4dc0se2+SE1 jeq7fV1E62PvEs2GJx4hs3rqakcBDE4Bf83sZnbFKMVpuvFUh+mXcKaIfXABDi8= =3d/N -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging # gpg: Signature made Thu 08 Apr 2021 10:34:24 BST # gpg: using RSA key EF04965B398D6211 # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>" [marginal] # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211 * remotes/jasowang/tags/net-pull-request: tap-win32: correctly recycle buffers Revert "qapi: net: Add query-netdev command" Revert "tests: Add tests for query-netdev command" Revert "net: Move NetClientState.info_str to dynamic allocations" Revert "hmp: Use QAPI NetdevInfo in hmp_info_network" Revert "net: Do not fill legacy info_str for backends" Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
ce69aa92d7
|
@ -296,8 +296,9 @@ static int net_init(struct XenLegacyDevice *xendev)
|
||||||
netdev->nic = qemu_new_nic(&net_xen_info, &netdev->conf,
|
netdev->nic = qemu_new_nic(&net_xen_info, &netdev->conf,
|
||||||
"xen", NULL, netdev);
|
"xen", NULL, netdev);
|
||||||
|
|
||||||
qemu_get_queue(netdev->nic)->info_str = g_strdup_printf(
|
snprintf(qemu_get_queue(netdev->nic)->info_str,
|
||||||
"nic: xenbus vif macaddr=%s", netdev->mac);
|
sizeof(qemu_get_queue(netdev->nic)->info_str),
|
||||||
|
"nic: xenbus vif macaddr=%s", netdev->mac);
|
||||||
|
|
||||||
/* fill info */
|
/* fill info */
|
||||||
xenstore_write_be_int(&netdev->xendev, "feature-rx-copy", 1);
|
xenstore_write_be_int(&netdev->xendev, "feature-rx-copy", 1);
|
||||||
|
|
|
@ -5,8 +5,6 @@
|
||||||
#include "qapi/qapi-types-net.h"
|
#include "qapi/qapi-types-net.h"
|
||||||
#include "net/queue.h"
|
#include "net/queue.h"
|
||||||
#include "hw/qdev-properties-system.h"
|
#include "hw/qdev-properties-system.h"
|
||||||
#include "qapi/clone-visitor.h"
|
|
||||||
#include "qapi/qapi-visit-net.h"
|
|
||||||
|
|
||||||
#define MAC_FMT "%02X:%02X:%02X:%02X:%02X:%02X"
|
#define MAC_FMT "%02X:%02X:%02X:%02X:%02X:%02X"
|
||||||
#define MAC_ARG(x) ((uint8_t *)(x))[0], ((uint8_t *)(x))[1], \
|
#define MAC_ARG(x) ((uint8_t *)(x))[0], ((uint8_t *)(x))[1], \
|
||||||
|
@ -94,8 +92,7 @@ struct NetClientState {
|
||||||
NetQueue *incoming_queue;
|
NetQueue *incoming_queue;
|
||||||
char *model;
|
char *model;
|
||||||
char *name;
|
char *name;
|
||||||
char *info_str;
|
char info_str[256];
|
||||||
NetdevInfo *stored_config;
|
|
||||||
unsigned receive_disabled : 1;
|
unsigned receive_disabled : 1;
|
||||||
NetClientDestructor *destructor;
|
NetClientDestructor *destructor;
|
||||||
unsigned int queue_index;
|
unsigned int queue_index;
|
||||||
|
|
|
@ -1,30 +0,0 @@
|
||||||
/*
|
|
||||||
* HMP string output Visitor
|
|
||||||
*
|
|
||||||
* Copyright Yandex N.V., 2021
|
|
||||||
*
|
|
||||||
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
||||||
* See the COPYING file in the top-level directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef HMP_OUTPUT_VISITOR_H
|
|
||||||
#define HMP_OUTPUT_VISITOR_H
|
|
||||||
|
|
||||||
#include "qapi/visitor.h"
|
|
||||||
|
|
||||||
typedef struct HMPOutputVisitor HMPOutputVisitor;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a HMP string output visitor for @obj
|
|
||||||
*
|
|
||||||
* Flattens dicts/structures, only shows arrays borders.
|
|
||||||
*
|
|
||||||
* Errors are not expected to happen.
|
|
||||||
*
|
|
||||||
* The caller is responsible for freeing the visitor with
|
|
||||||
* visit_free().
|
|
||||||
*/
|
|
||||||
Visitor *hmp_output_visitor_new(char **result);
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -723,12 +723,8 @@ int net_init_l2tpv3(const Netdev *netdev,
|
||||||
|
|
||||||
l2tpv3_read_poll(s, true);
|
l2tpv3_read_poll(s, true);
|
||||||
|
|
||||||
/* Store startup parameters */
|
snprintf(s->nc.info_str, sizeof(s->nc.info_str),
|
||||||
nc->stored_config = g_new0(NetdevInfo, 1);
|
"l2tpv3: connected");
|
||||||
nc->stored_config->type = NET_BACKEND_L2TPV3;
|
|
||||||
|
|
||||||
QAPI_CLONE_MEMBERS(NetdevL2TPv3Options,
|
|
||||||
&nc->stored_config->u.l2tpv3, l2tpv3);
|
|
||||||
return 0;
|
return 0;
|
||||||
outerr:
|
outerr:
|
||||||
qemu_del_net_client(nc);
|
qemu_del_net_client(nc);
|
||||||
|
|
73
net/net.c
73
net/net.c
|
@ -36,6 +36,7 @@
|
||||||
#include "monitor/monitor.h"
|
#include "monitor/monitor.h"
|
||||||
#include "qemu/help_option.h"
|
#include "qemu/help_option.h"
|
||||||
#include "qapi/qapi-commands-net.h"
|
#include "qapi/qapi-commands-net.h"
|
||||||
|
#include "qapi/qapi-visit-net.h"
|
||||||
#include "qapi/qmp/qdict.h"
|
#include "qapi/qmp/qdict.h"
|
||||||
#include "qapi/qmp/qerror.h"
|
#include "qapi/qmp/qerror.h"
|
||||||
#include "qemu/error-report.h"
|
#include "qemu/error-report.h"
|
||||||
|
@ -55,7 +56,6 @@
|
||||||
#include "sysemu/sysemu.h"
|
#include "sysemu/sysemu.h"
|
||||||
#include "net/filter.h"
|
#include "net/filter.h"
|
||||||
#include "qapi/string-output-visitor.h"
|
#include "qapi/string-output-visitor.h"
|
||||||
#include "qapi/hmp-output-visitor.h"
|
|
||||||
|
|
||||||
/* Net bridge is currently not supported for W32. */
|
/* Net bridge is currently not supported for W32. */
|
||||||
#if !defined(_WIN32)
|
#if !defined(_WIN32)
|
||||||
|
@ -130,12 +130,11 @@ char *qemu_mac_strdup_printf(const uint8_t *macaddr)
|
||||||
|
|
||||||
void qemu_format_nic_info_str(NetClientState *nc, uint8_t macaddr[6])
|
void qemu_format_nic_info_str(NetClientState *nc, uint8_t macaddr[6])
|
||||||
{
|
{
|
||||||
g_free(nc->info_str);
|
snprintf(nc->info_str, sizeof(nc->info_str),
|
||||||
nc->info_str = g_strdup_printf(
|
"model=%s,macaddr=%02x:%02x:%02x:%02x:%02x:%02x",
|
||||||
"model=%s,macaddr=%02x:%02x:%02x:%02x:%02x:%02x",
|
nc->model,
|
||||||
nc->model,
|
macaddr[0], macaddr[1], macaddr[2],
|
||||||
macaddr[0], macaddr[1], macaddr[2],
|
macaddr[3], macaddr[4], macaddr[5]);
|
||||||
macaddr[3], macaddr[4], macaddr[5]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int mac_table[256] = {0};
|
static int mac_table[256] = {0};
|
||||||
|
@ -354,8 +353,6 @@ static void qemu_free_net_client(NetClientState *nc)
|
||||||
}
|
}
|
||||||
g_free(nc->name);
|
g_free(nc->name);
|
||||||
g_free(nc->model);
|
g_free(nc->model);
|
||||||
g_free(nc->info_str);
|
|
||||||
qapi_free_NetdevInfo(nc->stored_config);
|
|
||||||
if (nc->destructor) {
|
if (nc->destructor) {
|
||||||
nc->destructor(nc);
|
nc->destructor(nc);
|
||||||
}
|
}
|
||||||
|
@ -1222,42 +1219,14 @@ static void netfilter_print_info(Monitor *mon, NetFilterState *nf)
|
||||||
monitor_printf(mon, "\n");
|
monitor_printf(mon, "\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *generate_info_str(NetClientState *nc)
|
|
||||||
{
|
|
||||||
NetdevInfo *ni = nc->stored_config;
|
|
||||||
char *ret_out = NULL;
|
|
||||||
Visitor *v;
|
|
||||||
|
|
||||||
/* Use legacy field info_str for NIC and hubports */
|
|
||||||
if ((nc->info->type == NET_CLIENT_DRIVER_NIC) ||
|
|
||||||
(nc->info->type == NET_CLIENT_DRIVER_HUBPORT)) {
|
|
||||||
return g_strdup(nc->info_str ? nc->info_str : "");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!ni) {
|
|
||||||
return g_malloc0(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
v = hmp_output_visitor_new(&ret_out);
|
|
||||||
if (visit_type_NetdevInfo(v, "", &ni, NULL)) {
|
|
||||||
visit_complete(v, &ret_out);
|
|
||||||
}
|
|
||||||
visit_free(v);
|
|
||||||
|
|
||||||
return ret_out;
|
|
||||||
}
|
|
||||||
|
|
||||||
void print_net_client(Monitor *mon, NetClientState *nc)
|
void print_net_client(Monitor *mon, NetClientState *nc)
|
||||||
{
|
{
|
||||||
NetFilterState *nf;
|
NetFilterState *nf;
|
||||||
char *info_str = generate_info_str(nc);
|
|
||||||
|
|
||||||
monitor_printf(mon, "%s: index=%d,type=%s,%s\n", nc->name,
|
monitor_printf(mon, "%s: index=%d,type=%s,%s\n", nc->name,
|
||||||
nc->queue_index,
|
nc->queue_index,
|
||||||
NetClientDriver_str(nc->info->type),
|
NetClientDriver_str(nc->info->type),
|
||||||
info_str);
|
nc->info_str);
|
||||||
g_free(info_str);
|
|
||||||
|
|
||||||
if (!QTAILQ_EMPTY(&nc->filters)) {
|
if (!QTAILQ_EMPTY(&nc->filters)) {
|
||||||
monitor_printf(mon, "filters:\n");
|
monitor_printf(mon, "filters:\n");
|
||||||
}
|
}
|
||||||
|
@ -1320,34 +1289,6 @@ RxFilterInfoList *qmp_query_rx_filter(bool has_name, const char *name,
|
||||||
return filter_list;
|
return filter_list;
|
||||||
}
|
}
|
||||||
|
|
||||||
NetdevInfoList *qmp_query_netdev(Error **errp)
|
|
||||||
{
|
|
||||||
NetdevInfoList *list = NULL;
|
|
||||||
NetClientState *nc;
|
|
||||||
|
|
||||||
QTAILQ_FOREACH(nc, &net_clients, next) {
|
|
||||||
/*
|
|
||||||
* Only look at netdevs (backend network devices), not for each queue
|
|
||||||
* or NIC / hubport
|
|
||||||
*/
|
|
||||||
if (nc->stored_config) {
|
|
||||||
NetdevInfo *element = QAPI_CLONE(NetdevInfo, nc->stored_config);
|
|
||||||
|
|
||||||
g_free(element->id); /* Need to dealloc empty id after clone */
|
|
||||||
element->id = g_strdup(nc->name);
|
|
||||||
|
|
||||||
element->has_peer_id = nc->peer != NULL;
|
|
||||||
if (element->has_peer_id) {
|
|
||||||
element->peer_id = g_strdup(nc->peer->name);
|
|
||||||
}
|
|
||||||
|
|
||||||
QAPI_LIST_PREPEND(list, element);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
void hmp_info_network(Monitor *mon, const QDict *qdict)
|
void hmp_info_network(Monitor *mon, const QDict *qdict)
|
||||||
{
|
{
|
||||||
NetClientState *nc, *peer;
|
NetClientState *nc, *peer;
|
||||||
|
|
|
@ -427,13 +427,6 @@ int net_init_netmap(const Netdev *netdev,
|
||||||
pstrcpy(s->ifname, sizeof(s->ifname), netmap_opts->ifname);
|
pstrcpy(s->ifname, sizeof(s->ifname), netmap_opts->ifname);
|
||||||
netmap_read_poll(s, true); /* Initially only poll for reads. */
|
netmap_read_poll(s, true); /* Initially only poll for reads. */
|
||||||
|
|
||||||
/* Store startup parameters */
|
|
||||||
nc->stored_config = g_new0(NetdevInfo, 1);
|
|
||||||
nc->stored_config->type = NET_BACKEND_NETMAP;
|
|
||||||
|
|
||||||
QAPI_CLONE_MEMBERS(NetdevNetmapOptions,
|
|
||||||
&nc->stored_config->u.netmap, netmap_opts);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
124
net/slirp.c
124
net/slirp.c
|
@ -387,9 +387,6 @@ static int net_slirp_init(NetClientState *peer, const char *model,
|
||||||
int shift;
|
int shift;
|
||||||
char *end;
|
char *end;
|
||||||
struct slirp_config_str *config;
|
struct slirp_config_str *config;
|
||||||
NetdevUserOptions *stored;
|
|
||||||
StringList **stored_hostfwd;
|
|
||||||
StringList **stored_guestfwd;
|
|
||||||
|
|
||||||
if (!ipv4 && (vnetwork || vhost || vnameserver)) {
|
if (!ipv4 && (vnetwork || vhost || vnameserver)) {
|
||||||
error_setg(errp, "IPv4 disabled but netmask/host/dns provided");
|
error_setg(errp, "IPv4 disabled but netmask/host/dns provided");
|
||||||
|
@ -565,114 +562,9 @@ static int net_slirp_init(NetClientState *peer, const char *model,
|
||||||
|
|
||||||
nc = qemu_new_net_client(&net_slirp_info, peer, model, name);
|
nc = qemu_new_net_client(&net_slirp_info, peer, model, name);
|
||||||
|
|
||||||
/* Store startup parameters */
|
snprintf(nc->info_str, sizeof(nc->info_str),
|
||||||
nc->stored_config = g_new0(NetdevInfo, 1);
|
"net=%s,restrict=%s", inet_ntoa(net),
|
||||||
nc->stored_config->type = NET_BACKEND_USER;
|
restricted ? "on" : "off");
|
||||||
stored = &nc->stored_config->u.user;
|
|
||||||
|
|
||||||
if (vhostname) {
|
|
||||||
stored->has_hostname = true;
|
|
||||||
stored->hostname = g_strdup(vhostname);
|
|
||||||
}
|
|
||||||
|
|
||||||
stored->has_q_restrict = true;
|
|
||||||
stored->q_restrict = restricted;
|
|
||||||
|
|
||||||
stored->has_ipv4 = true;
|
|
||||||
stored->ipv4 = ipv4;
|
|
||||||
|
|
||||||
stored->has_ipv6 = true;
|
|
||||||
stored->ipv6 = ipv6;
|
|
||||||
|
|
||||||
if (ipv4) {
|
|
||||||
uint8_t *net_bytes = (uint8_t *)&net;
|
|
||||||
uint8_t *mask_bytes = (uint8_t *)&mask;
|
|
||||||
|
|
||||||
stored->has_net = true;
|
|
||||||
stored->net = 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 = true;
|
|
||||||
stored->host = g_strdup(inet_ntoa(host));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tftp_export) {
|
|
||||||
stored->has_tftp = true;
|
|
||||||
stored->tftp = g_strdup(tftp_export);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (bootfile) {
|
|
||||||
stored->has_bootfile = true;
|
|
||||||
stored->bootfile = g_strdup(bootfile);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (vdhcp_start) {
|
|
||||||
stored->has_dhcpstart = true;
|
|
||||||
stored->dhcpstart = g_strdup(vdhcp_start);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ipv4) {
|
|
||||||
stored->has_dns = true;
|
|
||||||
stored->dns = g_strdup(inet_ntoa(dns));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dnssearch) {
|
|
||||||
stored->has_dnssearch = true;
|
|
||||||
StringList **stored_list = &stored->dnssearch;
|
|
||||||
|
|
||||||
for (int i = 0; dnssearch[i]; i++) {
|
|
||||||
String *element = g_new0(String, 1);
|
|
||||||
|
|
||||||
element->str = g_strdup(dnssearch[i]);
|
|
||||||
QAPI_LIST_APPEND(stored_list, element);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (vdomainname) {
|
|
||||||
stored->has_domainname = true;
|
|
||||||
stored->domainname = g_strdup(vdomainname);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ipv6) {
|
|
||||||
char addrstr[INET6_ADDRSTRLEN];
|
|
||||||
const char *res;
|
|
||||||
|
|
||||||
stored->has_ipv6_prefix = true;
|
|
||||||
stored->ipv6_prefix = g_strdup(vprefix6);
|
|
||||||
|
|
||||||
stored->has_ipv6_prefixlen = true;
|
|
||||||
stored->ipv6_prefixlen = vprefix6_len;
|
|
||||||
|
|
||||||
res = inet_ntop(AF_INET6, &ip6_host,
|
|
||||||
addrstr, sizeof(addrstr));
|
|
||||||
|
|
||||||
stored->has_ipv6_host = true;
|
|
||||||
stored->ipv6_host = g_strdup(res);
|
|
||||||
|
|
||||||
res = inet_ntop(AF_INET6, &ip6_dns,
|
|
||||||
addrstr, sizeof(addrstr));
|
|
||||||
|
|
||||||
stored->has_ipv6_dns = true;
|
|
||||||
stored->ipv6_dns = g_strdup(res);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (smb_export) {
|
|
||||||
stored->has_smb = true;
|
|
||||||
stored->smb = g_strdup(smb_export);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (vsmbserver) {
|
|
||||||
stored->has_smbserver = true;
|
|
||||||
stored->smbserver = g_strdup(vsmbserver);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tftp_server_name) {
|
|
||||||
stored->has_tftp_server_name = true;
|
|
||||||
stored->tftp_server_name = g_strdup(tftp_server_name);
|
|
||||||
}
|
|
||||||
|
|
||||||
s = DO_UPCAST(SlirpState, nc, nc);
|
s = DO_UPCAST(SlirpState, nc, nc);
|
||||||
|
|
||||||
|
@ -699,25 +591,15 @@ static int net_slirp_init(NetClientState *peer, const char *model,
|
||||||
s->poll_notifier.notify = net_slirp_poll_notify;
|
s->poll_notifier.notify = net_slirp_poll_notify;
|
||||||
main_loop_poll_add_notifier(&s->poll_notifier);
|
main_loop_poll_add_notifier(&s->poll_notifier);
|
||||||
|
|
||||||
stored_hostfwd = &stored->hostfwd;
|
|
||||||
stored_guestfwd = &stored->guestfwd;
|
|
||||||
|
|
||||||
for (config = slirp_configs; config; config = config->next) {
|
for (config = slirp_configs; config; config = config->next) {
|
||||||
String *element = g_new0(String, 1);
|
|
||||||
|
|
||||||
element->str = g_strdup(config->str);
|
|
||||||
if (config->flags & SLIRP_CFG_HOSTFWD) {
|
if (config->flags & SLIRP_CFG_HOSTFWD) {
|
||||||
if (slirp_hostfwd(s, config->str, errp) < 0) {
|
if (slirp_hostfwd(s, config->str, errp) < 0) {
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
stored->has_hostfwd = true;
|
|
||||||
QAPI_LIST_APPEND(stored_hostfwd, element);
|
|
||||||
} else {
|
} else {
|
||||||
if (slirp_guestfwd(s, config->str, errp) < 0) {
|
if (slirp_guestfwd(s, config->str, errp) < 0) {
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
stored->has_guestfwd = true;
|
|
||||||
QAPI_LIST_APPEND(stored_guestfwd, element);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
|
|
92
net/socket.c
92
net/socket.c
|
@ -180,6 +180,7 @@ static void net_socket_send(void *opaque)
|
||||||
s->fd = -1;
|
s->fd = -1;
|
||||||
net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
|
net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
|
||||||
s->nc.link_down = true;
|
s->nc.link_down = true;
|
||||||
|
memset(s->nc.info_str, 0, sizeof(s->nc.info_str));
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -341,7 +342,6 @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
|
||||||
NetSocketState *s;
|
NetSocketState *s;
|
||||||
SocketAddress *sa;
|
SocketAddress *sa;
|
||||||
SocketAddressType sa_type;
|
SocketAddressType sa_type;
|
||||||
NetdevSocketOptions *stored;
|
|
||||||
|
|
||||||
sa = socket_local_address(fd, errp);
|
sa = socket_local_address(fd, errp);
|
||||||
if (!sa) {
|
if (!sa) {
|
||||||
|
@ -385,24 +385,19 @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
|
||||||
net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
|
net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
|
||||||
net_socket_read_poll(s, true);
|
net_socket_read_poll(s, true);
|
||||||
|
|
||||||
/* Store startup parameters */
|
|
||||||
nc->stored_config = g_new0(NetdevInfo, 1);
|
|
||||||
nc->stored_config->type = NET_BACKEND_SOCKET;
|
|
||||||
stored = &nc->stored_config->u.socket;
|
|
||||||
|
|
||||||
stored->has_fd = true;
|
|
||||||
stored->fd = g_strdup_printf("%d", fd);
|
|
||||||
|
|
||||||
/* mcast: save bound address as dst */
|
/* mcast: save bound address as dst */
|
||||||
if (is_connected && mcast != NULL) {
|
if (is_connected && mcast != NULL) {
|
||||||
stored->has_mcast = true;
|
|
||||||
stored->mcast = g_strdup(mcast);
|
|
||||||
|
|
||||||
s->dgram_dst = saddr;
|
s->dgram_dst = saddr;
|
||||||
|
snprintf(nc->info_str, sizeof(nc->info_str),
|
||||||
|
"socket: fd=%d (cloned mcast=%s:%d)",
|
||||||
|
fd, inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
|
||||||
} else {
|
} else {
|
||||||
if (sa_type == SOCKET_ADDRESS_TYPE_UNIX) {
|
if (sa_type == SOCKET_ADDRESS_TYPE_UNIX) {
|
||||||
s->dgram_dst.sin_family = AF_UNIX;
|
s->dgram_dst.sin_family = AF_UNIX;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
snprintf(nc->info_str, sizeof(nc->info_str),
|
||||||
|
"socket: fd=%d %s", fd, SocketAddressType_str(sa_type));
|
||||||
}
|
}
|
||||||
|
|
||||||
return s;
|
return s;
|
||||||
|
@ -433,10 +428,11 @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer,
|
||||||
{
|
{
|
||||||
NetClientState *nc;
|
NetClientState *nc;
|
||||||
NetSocketState *s;
|
NetSocketState *s;
|
||||||
NetdevSocketOptions *stored;
|
|
||||||
|
|
||||||
nc = qemu_new_net_client(&net_socket_info, peer, model, name);
|
nc = qemu_new_net_client(&net_socket_info, peer, model, name);
|
||||||
|
|
||||||
|
snprintf(nc->info_str, sizeof(nc->info_str), "socket: fd=%d", fd);
|
||||||
|
|
||||||
s = DO_UPCAST(NetSocketState, nc, nc);
|
s = DO_UPCAST(NetSocketState, nc, nc);
|
||||||
|
|
||||||
s->fd = fd;
|
s->fd = fd;
|
||||||
|
@ -451,15 +447,6 @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer,
|
||||||
} else {
|
} else {
|
||||||
qemu_set_fd_handler(s->fd, NULL, net_socket_connect, s);
|
qemu_set_fd_handler(s->fd, NULL, net_socket_connect, s);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Store startup parameters */
|
|
||||||
nc->stored_config = g_new0(NetdevInfo, 1);
|
|
||||||
nc->stored_config->type = NET_BACKEND_SOCKET;
|
|
||||||
stored = &nc->stored_config->u.socket;
|
|
||||||
|
|
||||||
stored->has_fd = true;
|
|
||||||
stored->fd = g_strdup_printf("%d", fd);
|
|
||||||
|
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -496,7 +483,6 @@ static void net_socket_accept(void *opaque)
|
||||||
struct sockaddr_in saddr;
|
struct sockaddr_in saddr;
|
||||||
socklen_t len;
|
socklen_t len;
|
||||||
int fd;
|
int fd;
|
||||||
NetdevSocketOptions *stored;
|
|
||||||
|
|
||||||
for(;;) {
|
for(;;) {
|
||||||
len = sizeof(saddr);
|
len = sizeof(saddr);
|
||||||
|
@ -512,12 +498,9 @@ static void net_socket_accept(void *opaque)
|
||||||
s->fd = fd;
|
s->fd = fd;
|
||||||
s->nc.link_down = false;
|
s->nc.link_down = false;
|
||||||
net_socket_connect(s);
|
net_socket_connect(s);
|
||||||
|
snprintf(s->nc.info_str, sizeof(s->nc.info_str),
|
||||||
/* Store additional startup parameters (extend net_socket_listen_init) */
|
"socket: connection from %s:%d",
|
||||||
stored = &s->nc.stored_config->u.socket;
|
inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
|
||||||
|
|
||||||
stored->has_fd = true;
|
|
||||||
stored->fd = g_strdup_printf("%d", fd);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int net_socket_listen_init(NetClientState *peer,
|
static int net_socket_listen_init(NetClientState *peer,
|
||||||
|
@ -530,7 +513,6 @@ static int net_socket_listen_init(NetClientState *peer,
|
||||||
NetSocketState *s;
|
NetSocketState *s;
|
||||||
struct sockaddr_in saddr;
|
struct sockaddr_in saddr;
|
||||||
int fd, ret;
|
int fd, ret;
|
||||||
NetdevSocketOptions *stored;
|
|
||||||
|
|
||||||
if (parse_host_port(&saddr, host_str, errp) < 0) {
|
if (parse_host_port(&saddr, host_str, errp) < 0) {
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -567,15 +549,6 @@ static int net_socket_listen_init(NetClientState *peer,
|
||||||
net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
|
net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
|
||||||
|
|
||||||
qemu_set_fd_handler(s->listen_fd, net_socket_accept, NULL, s);
|
qemu_set_fd_handler(s->listen_fd, net_socket_accept, NULL, s);
|
||||||
|
|
||||||
/* Store startup parameters */
|
|
||||||
nc->stored_config = g_new0(NetdevInfo, 1);
|
|
||||||
nc->stored_config->type = NET_BACKEND_SOCKET;
|
|
||||||
stored = &nc->stored_config->u.socket;
|
|
||||||
|
|
||||||
stored->has_listen = true;
|
|
||||||
stored->listen = g_strdup(host_str);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -588,7 +561,6 @@ static int net_socket_connect_init(NetClientState *peer,
|
||||||
NetSocketState *s;
|
NetSocketState *s;
|
||||||
int fd, connected, ret;
|
int fd, connected, ret;
|
||||||
struct sockaddr_in saddr;
|
struct sockaddr_in saddr;
|
||||||
NetdevSocketOptions *stored;
|
|
||||||
|
|
||||||
if (parse_host_port(&saddr, host_str, errp) < 0) {
|
if (parse_host_port(&saddr, host_str, errp) < 0) {
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -626,12 +598,9 @@ static int net_socket_connect_init(NetClientState *peer,
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Store additional startup parameters (extend net_socket_fd_init) */
|
snprintf(s->nc.info_str, sizeof(s->nc.info_str),
|
||||||
stored = &s->nc.stored_config->u.socket;
|
"socket: connect to %s:%d",
|
||||||
|
inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
|
||||||
stored->has_connect = true;
|
|
||||||
stored->connect = g_strdup(host_str);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -646,7 +615,6 @@ static int net_socket_mcast_init(NetClientState *peer,
|
||||||
int fd;
|
int fd;
|
||||||
struct sockaddr_in saddr;
|
struct sockaddr_in saddr;
|
||||||
struct in_addr localaddr, *param_localaddr;
|
struct in_addr localaddr, *param_localaddr;
|
||||||
NetdevSocketOptions *stored;
|
|
||||||
|
|
||||||
if (parse_host_port(&saddr, host_str, errp) < 0) {
|
if (parse_host_port(&saddr, host_str, errp) < 0) {
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -675,20 +643,11 @@ static int net_socket_mcast_init(NetClientState *peer,
|
||||||
|
|
||||||
s->dgram_dst = saddr;
|
s->dgram_dst = saddr;
|
||||||
|
|
||||||
/* Store additional startup parameters (extend net_socket_fd_init) */
|
snprintf(s->nc.info_str, sizeof(s->nc.info_str),
|
||||||
stored = &s->nc.stored_config->u.socket;
|
"socket: mcast=%s:%d",
|
||||||
|
inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
|
||||||
if (!stored->has_mcast) {
|
|
||||||
stored->has_mcast = true;
|
|
||||||
stored->mcast = g_strdup(host_str);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (localaddr_str) {
|
|
||||||
stored->has_localaddr = true;
|
|
||||||
stored->localaddr = g_strdup(localaddr_str);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int net_socket_udp_init(NetClientState *peer,
|
static int net_socket_udp_init(NetClientState *peer,
|
||||||
|
@ -701,7 +660,6 @@ static int net_socket_udp_init(NetClientState *peer,
|
||||||
NetSocketState *s;
|
NetSocketState *s;
|
||||||
int fd, ret;
|
int fd, ret;
|
||||||
struct sockaddr_in laddr, raddr;
|
struct sockaddr_in laddr, raddr;
|
||||||
NetdevSocketOptions *stored;
|
|
||||||
|
|
||||||
if (parse_host_port(&laddr, lhost, errp) < 0) {
|
if (parse_host_port(&laddr, lhost, errp) < 0) {
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -740,15 +698,9 @@ static int net_socket_udp_init(NetClientState *peer,
|
||||||
|
|
||||||
s->dgram_dst = raddr;
|
s->dgram_dst = raddr;
|
||||||
|
|
||||||
/* Store additional startup parameters (extend net_socket_fd_init) */
|
snprintf(s->nc.info_str, sizeof(s->nc.info_str),
|
||||||
stored = &s->nc.stored_config->u.socket;
|
"socket: udp=%s:%d",
|
||||||
|
inet_ntoa(raddr.sin_addr), ntohs(raddr.sin_port));
|
||||||
stored->has_localaddr = true;
|
|
||||||
stored->localaddr = g_strdup(lhost);
|
|
||||||
|
|
||||||
stored->has_udp = true;
|
|
||||||
stored->udp = g_strdup(rhost);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -686,7 +686,7 @@ static ssize_t tap_receive(NetClientState *nc, const uint8_t *buf, size_t size)
|
||||||
static void tap_win32_send(void *opaque)
|
static void tap_win32_send(void *opaque)
|
||||||
{
|
{
|
||||||
TAPState *s = opaque;
|
TAPState *s = opaque;
|
||||||
uint8_t *buf;
|
uint8_t *buf, *orig_buf;
|
||||||
int max_size = 4096;
|
int max_size = 4096;
|
||||||
int size;
|
int size;
|
||||||
uint8_t min_pkt[ETH_ZLEN];
|
uint8_t min_pkt[ETH_ZLEN];
|
||||||
|
@ -694,6 +694,8 @@ static void tap_win32_send(void *opaque)
|
||||||
|
|
||||||
size = tap_win32_read(s->handle, &buf, max_size);
|
size = tap_win32_read(s->handle, &buf, max_size);
|
||||||
if (size > 0) {
|
if (size > 0) {
|
||||||
|
orig_buf = buf;
|
||||||
|
|
||||||
if (!s->nc.peer->do_not_pad) {
|
if (!s->nc.peer->do_not_pad) {
|
||||||
if (eth_pad_short_frame(min_pkt, &min_pktsz, buf, size)) {
|
if (eth_pad_short_frame(min_pkt, &min_pktsz, buf, size)) {
|
||||||
buf = min_pkt;
|
buf = min_pkt;
|
||||||
|
@ -702,7 +704,7 @@ static void tap_win32_send(void *opaque)
|
||||||
}
|
}
|
||||||
|
|
||||||
qemu_send_packet(&s->nc, buf, size);
|
qemu_send_packet(&s->nc, buf, size);
|
||||||
tap_win32_free_buffer(s->handle, buf);
|
tap_win32_free_buffer(s->handle, orig_buf);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -778,7 +780,6 @@ static int tap_win32_init(NetClientState *peer, const char *model,
|
||||||
NetClientState *nc;
|
NetClientState *nc;
|
||||||
TAPState *s;
|
TAPState *s;
|
||||||
tap_win32_overlapped_t *handle;
|
tap_win32_overlapped_t *handle;
|
||||||
NetdevTapOptions *stored;
|
|
||||||
|
|
||||||
if (tap_win32_open(&handle, ifname) < 0) {
|
if (tap_win32_open(&handle, ifname) < 0) {
|
||||||
printf("tap: Could not open '%s'\n", ifname);
|
printf("tap: Could not open '%s'\n", ifname);
|
||||||
|
@ -789,13 +790,8 @@ static int tap_win32_init(NetClientState *peer, const char *model,
|
||||||
|
|
||||||
s = DO_UPCAST(TAPState, nc, nc);
|
s = DO_UPCAST(TAPState, nc, nc);
|
||||||
|
|
||||||
/* Store startup parameters */
|
snprintf(s->nc.info_str, sizeof(s->nc.info_str),
|
||||||
nc->stored_config = g_new0(NetdevInfo, 1);
|
"tap: ifname=%s", ifname);
|
||||||
nc->stored_config->type = NET_BACKEND_TAP;
|
|
||||||
stored = &nc->stored_config->u.tap;
|
|
||||||
|
|
||||||
stored->has_ifname = true;
|
|
||||||
stored->ifname = g_strdup(ifname);
|
|
||||||
|
|
||||||
s->handle = handle;
|
s->handle = handle;
|
||||||
|
|
||||||
|
|
107
net/tap.c
107
net/tap.c
|
@ -600,7 +600,6 @@ int net_init_bridge(const Netdev *netdev, const char *name,
|
||||||
const char *helper, *br;
|
const char *helper, *br;
|
||||||
TAPState *s;
|
TAPState *s;
|
||||||
int fd, vnet_hdr;
|
int fd, vnet_hdr;
|
||||||
NetdevBridgeOptions *stored;
|
|
||||||
|
|
||||||
assert(netdev->type == NET_CLIENT_DRIVER_BRIDGE);
|
assert(netdev->type == NET_CLIENT_DRIVER_BRIDGE);
|
||||||
bridge = &netdev->u.bridge;
|
bridge = &netdev->u.bridge;
|
||||||
|
@ -620,20 +619,8 @@ int net_init_bridge(const Netdev *netdev, const char *name,
|
||||||
}
|
}
|
||||||
s = net_tap_fd_init(peer, "bridge", name, fd, vnet_hdr);
|
s = net_tap_fd_init(peer, "bridge", name, fd, vnet_hdr);
|
||||||
|
|
||||||
/* Store startup parameters */
|
snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=%s,br=%s", helper,
|
||||||
s->nc.stored_config = g_new0(NetdevInfo, 1);
|
br);
|
||||||
s->nc.stored_config->type = NET_BACKEND_BRIDGE;
|
|
||||||
stored = &s->nc.stored_config->u.bridge;
|
|
||||||
|
|
||||||
if (br) {
|
|
||||||
stored->has_br = true;
|
|
||||||
stored->br = g_strdup(br);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (helper) {
|
|
||||||
stored->has_helper = true;
|
|
||||||
stored->helper = g_strdup(helper);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -679,13 +666,11 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
|
||||||
const char *model, const char *name,
|
const char *model, const char *name,
|
||||||
const char *ifname, const char *script,
|
const char *ifname, const char *script,
|
||||||
const char *downscript, const char *vhostfdname,
|
const char *downscript, const char *vhostfdname,
|
||||||
int vnet_hdr, int fd, NetdevInfo **common_stored,
|
int vnet_hdr, int fd, Error **errp)
|
||||||
Error **errp)
|
|
||||||
{
|
{
|
||||||
Error *err = NULL;
|
Error *err = NULL;
|
||||||
TAPState *s = net_tap_fd_init(peer, model, name, fd, vnet_hdr);
|
TAPState *s = net_tap_fd_init(peer, model, name, fd, vnet_hdr);
|
||||||
int vhostfd;
|
int vhostfd;
|
||||||
NetdevTapOptions *stored;
|
|
||||||
|
|
||||||
tap_set_sndbuf(s->fd, tap, &err);
|
tap_set_sndbuf(s->fd, tap, &err);
|
||||||
if (err) {
|
if (err) {
|
||||||
|
@ -693,59 +678,15 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Store startup parameters */
|
|
||||||
if (!*common_stored) {
|
|
||||||
*common_stored = g_new0(NetdevInfo, 1);
|
|
||||||
(*common_stored)->type = NET_BACKEND_TAP;
|
|
||||||
s->nc.stored_config = *common_stored;
|
|
||||||
}
|
|
||||||
stored = &(*common_stored)->u.tap;
|
|
||||||
|
|
||||||
if (tap->has_sndbuf && !stored->has_sndbuf) {
|
|
||||||
stored->has_sndbuf = true;
|
|
||||||
stored->sndbuf = tap->sndbuf;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (vnet_hdr && !stored->has_vnet_hdr) {
|
|
||||||
stored->has_vnet_hdr = true;
|
|
||||||
stored->vnet_hdr = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tap->has_fd || tap->has_fds) {
|
if (tap->has_fd || tap->has_fds) {
|
||||||
if (!stored->has_fds) {
|
snprintf(s->nc.info_str, sizeof(s->nc.info_str), "fd=%d", fd);
|
||||||
stored->has_fds = true;
|
|
||||||
stored->fds = g_strdup_printf("%d", fd);
|
|
||||||
} else {
|
|
||||||
char *tmp_s = stored->fds;
|
|
||||||
stored->fds = g_strdup_printf("%s:%d", stored->fds, fd);
|
|
||||||
g_free(tmp_s);
|
|
||||||
}
|
|
||||||
} else if (tap->has_helper) {
|
} else if (tap->has_helper) {
|
||||||
if (!stored->has_helper) {
|
snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=%s",
|
||||||
stored->has_helper = true;
|
tap->helper);
|
||||||
stored->helper = g_strdup(tap->helper);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!stored->has_br) {
|
|
||||||
stored->has_br = true;
|
|
||||||
stored->br = tap->has_br ? g_strdup(tap->br) :
|
|
||||||
g_strdup(DEFAULT_BRIDGE_INTERFACE);
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
if (ifname && !stored->has_ifname) {
|
snprintf(s->nc.info_str, sizeof(s->nc.info_str),
|
||||||
stored->has_ifname = true;
|
"ifname=%s,script=%s,downscript=%s", ifname, script,
|
||||||
stored->ifname = g_strdup(ifname);
|
downscript);
|
||||||
}
|
|
||||||
|
|
||||||
if (script && !stored->has_script) {
|
|
||||||
stored->has_script = true;
|
|
||||||
stored->script = g_strdup(script);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (downscript && !stored->has_downscript) {
|
|
||||||
stored->has_downscript = true;
|
|
||||||
stored->downscript = g_strdup(downscript);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (strcmp(downscript, "no") != 0) {
|
if (strcmp(downscript, "no") != 0) {
|
||||||
snprintf(s->down_script, sizeof(s->down_script), "%s", downscript);
|
snprintf(s->down_script, sizeof(s->down_script), "%s", downscript);
|
||||||
|
@ -758,20 +699,9 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
|
||||||
vhostfdname || (tap->has_vhostforce && tap->vhostforce)) {
|
vhostfdname || (tap->has_vhostforce && tap->vhostforce)) {
|
||||||
VhostNetOptions options;
|
VhostNetOptions options;
|
||||||
|
|
||||||
stored->has_vhost = true;
|
|
||||||
stored->vhost = true;
|
|
||||||
|
|
||||||
if (tap->has_vhostforce && tap->vhostforce) {
|
|
||||||
stored->has_vhostforce = true;
|
|
||||||
stored->vhostforce = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
options.backend_type = VHOST_BACKEND_TYPE_KERNEL;
|
options.backend_type = VHOST_BACKEND_TYPE_KERNEL;
|
||||||
options.net_backend = &s->nc;
|
options.net_backend = &s->nc;
|
||||||
if (tap->has_poll_us) {
|
if (tap->has_poll_us) {
|
||||||
stored->has_poll_us = true;
|
|
||||||
stored->poll_us = tap->poll_us;
|
|
||||||
|
|
||||||
options.busyloop_timeout = tap->poll_us;
|
options.busyloop_timeout = tap->poll_us;
|
||||||
} else {
|
} else {
|
||||||
options.busyloop_timeout = 0;
|
options.busyloop_timeout = 0;
|
||||||
|
@ -811,15 +741,6 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
|
||||||
}
|
}
|
||||||
options.opaque = (void *)(uintptr_t)vhostfd;
|
options.opaque = (void *)(uintptr_t)vhostfd;
|
||||||
|
|
||||||
if (!stored->has_vhostfds) {
|
|
||||||
stored->has_vhostfds = true;
|
|
||||||
stored->vhostfds = g_strdup_printf("%d", vhostfd);
|
|
||||||
} else {
|
|
||||||
char *tmp_s = stored->vhostfds;
|
|
||||||
stored->vhostfds = g_strdup_printf("%s:%d", stored->fds, vhostfd);
|
|
||||||
g_free(tmp_s);
|
|
||||||
}
|
|
||||||
|
|
||||||
s->vhost_net = vhost_net_init(&options);
|
s->vhost_net = vhost_net_init(&options);
|
||||||
if (!s->vhost_net) {
|
if (!s->vhost_net) {
|
||||||
if (tap->has_vhostforce && tap->vhostforce) {
|
if (tap->has_vhostforce && tap->vhostforce) {
|
||||||
|
@ -872,7 +793,6 @@ int net_init_tap(const Netdev *netdev, const char *name,
|
||||||
const char *vhostfdname;
|
const char *vhostfdname;
|
||||||
char ifname[128];
|
char ifname[128];
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
NetdevInfo *common_stored = NULL; /* will store configuration */
|
|
||||||
|
|
||||||
assert(netdev->type == NET_CLIENT_DRIVER_TAP);
|
assert(netdev->type == NET_CLIENT_DRIVER_TAP);
|
||||||
tap = &netdev->u.tap;
|
tap = &netdev->u.tap;
|
||||||
|
@ -919,7 +839,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
|
||||||
|
|
||||||
net_init_tap_one(tap, peer, "tap", name, NULL,
|
net_init_tap_one(tap, peer, "tap", name, NULL,
|
||||||
script, downscript,
|
script, downscript,
|
||||||
vhostfdname, vnet_hdr, fd, &common_stored, &err);
|
vhostfdname, vnet_hdr, fd, &err);
|
||||||
if (err) {
|
if (err) {
|
||||||
error_propagate(errp, err);
|
error_propagate(errp, err);
|
||||||
close(fd);
|
close(fd);
|
||||||
|
@ -982,7 +902,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
|
||||||
net_init_tap_one(tap, peer, "tap", name, ifname,
|
net_init_tap_one(tap, peer, "tap", name, ifname,
|
||||||
script, downscript,
|
script, downscript,
|
||||||
tap->has_vhostfds ? vhost_fds[i] : NULL,
|
tap->has_vhostfds ? vhost_fds[i] : NULL,
|
||||||
vnet_hdr, fd, &common_stored, &err);
|
vnet_hdr, fd, &err);
|
||||||
if (err) {
|
if (err) {
|
||||||
error_propagate(errp, err);
|
error_propagate(errp, err);
|
||||||
ret = -1;
|
ret = -1;
|
||||||
|
@ -1025,7 +945,7 @@ free_fail:
|
||||||
|
|
||||||
net_init_tap_one(tap, peer, "bridge", name, ifname,
|
net_init_tap_one(tap, peer, "bridge", name, ifname,
|
||||||
script, downscript, vhostfdname,
|
script, downscript, vhostfdname,
|
||||||
vnet_hdr, fd, &common_stored, &err);
|
vnet_hdr, fd, &err);
|
||||||
if (err) {
|
if (err) {
|
||||||
error_propagate(errp, err);
|
error_propagate(errp, err);
|
||||||
close(fd);
|
close(fd);
|
||||||
|
@ -1071,8 +991,7 @@ free_fail:
|
||||||
net_init_tap_one(tap, peer, "tap", name, ifname,
|
net_init_tap_one(tap, peer, "tap", name, ifname,
|
||||||
i >= 1 ? "no" : script,
|
i >= 1 ? "no" : script,
|
||||||
i >= 1 ? "no" : downscript,
|
i >= 1 ? "no" : downscript,
|
||||||
vhostfdname, vnet_hdr, fd,
|
vhostfdname, vnet_hdr, fd, &err);
|
||||||
&common_stored, &err);
|
|
||||||
if (err) {
|
if (err) {
|
||||||
error_propagate(errp, err);
|
error_propagate(errp, err);
|
||||||
close(fd);
|
close(fd);
|
||||||
|
|
25
net/vde.c
25
net/vde.c
|
@ -84,7 +84,6 @@ static int net_vde_init(NetClientState *peer, const char *model,
|
||||||
VDECONN *vde;
|
VDECONN *vde;
|
||||||
char *init_group = (char *)group;
|
char *init_group = (char *)group;
|
||||||
char *init_sock = (char *)sock;
|
char *init_sock = (char *)sock;
|
||||||
NetdevVdeOptions *stored;
|
|
||||||
|
|
||||||
struct vde_open_args args = {
|
struct vde_open_args args = {
|
||||||
.port = port,
|
.port = port,
|
||||||
|
@ -100,33 +99,15 @@ static int net_vde_init(NetClientState *peer, const char *model,
|
||||||
|
|
||||||
nc = qemu_new_net_client(&net_vde_info, peer, model, name);
|
nc = qemu_new_net_client(&net_vde_info, peer, model, name);
|
||||||
|
|
||||||
|
snprintf(nc->info_str, sizeof(nc->info_str), "sock=%s,fd=%d",
|
||||||
|
sock, vde_datafd(vde));
|
||||||
|
|
||||||
s = DO_UPCAST(VDEState, nc, nc);
|
s = DO_UPCAST(VDEState, nc, nc);
|
||||||
|
|
||||||
s->vde = vde;
|
s->vde = vde;
|
||||||
|
|
||||||
qemu_set_fd_handler(vde_datafd(s->vde), vde_to_qemu, NULL, s);
|
qemu_set_fd_handler(vde_datafd(s->vde), vde_to_qemu, NULL, s);
|
||||||
|
|
||||||
/* Store startup parameters */
|
|
||||||
nc->stored_config = g_new0(NetdevInfo, 1);
|
|
||||||
nc->stored_config->type = NET_BACKEND_VDE;
|
|
||||||
stored = &nc->stored_config->u.vde;
|
|
||||||
|
|
||||||
if (sock) {
|
|
||||||
stored->has_sock = true;
|
|
||||||
stored->sock = g_strdup(sock);
|
|
||||||
}
|
|
||||||
|
|
||||||
stored->has_port = true;
|
|
||||||
stored->port = port;
|
|
||||||
|
|
||||||
if (group) {
|
|
||||||
stored->has_group = true;
|
|
||||||
stored->group = g_strdup(group);
|
|
||||||
}
|
|
||||||
|
|
||||||
stored->has_mode = true;
|
|
||||||
stored->mode = mode;
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -311,15 +311,14 @@ static void net_vhost_user_event(void *opaque, QEMUChrEvent event)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int net_vhost_user_init(NetClientState *peer, const char *device,
|
static int net_vhost_user_init(NetClientState *peer, const char *device,
|
||||||
const char *name, const char *chardev,
|
const char *name, Chardev *chr,
|
||||||
Chardev *chr, int queues)
|
int queues)
|
||||||
{
|
{
|
||||||
Error *err = NULL;
|
Error *err = NULL;
|
||||||
NetClientState *nc, *nc0 = NULL;
|
NetClientState *nc, *nc0 = NULL;
|
||||||
NetVhostUserState *s = NULL;
|
NetVhostUserState *s = NULL;
|
||||||
VhostUserState *user;
|
VhostUserState *user;
|
||||||
int i;
|
int i;
|
||||||
NetdevVhostUserOptions *stored;
|
|
||||||
|
|
||||||
assert(name);
|
assert(name);
|
||||||
assert(queues > 0);
|
assert(queues > 0);
|
||||||
|
@ -327,6 +326,8 @@ static int net_vhost_user_init(NetClientState *peer, const char *device,
|
||||||
user = g_new0(struct VhostUserState, 1);
|
user = g_new0(struct VhostUserState, 1);
|
||||||
for (i = 0; i < queues; i++) {
|
for (i = 0; i < queues; i++) {
|
||||||
nc = qemu_new_net_client(&net_vhost_user_info, peer, device, name);
|
nc = qemu_new_net_client(&net_vhost_user_info, peer, device, name);
|
||||||
|
snprintf(nc->info_str, sizeof(nc->info_str), "vhost-user%d to %s",
|
||||||
|
i, chr->label);
|
||||||
nc->queue_index = i;
|
nc->queue_index = i;
|
||||||
if (!nc0) {
|
if (!nc0) {
|
||||||
nc0 = nc;
|
nc0 = nc;
|
||||||
|
@ -354,16 +355,6 @@ static int net_vhost_user_init(NetClientState *peer, const char *device,
|
||||||
|
|
||||||
assert(s->vhost_net);
|
assert(s->vhost_net);
|
||||||
|
|
||||||
/* Store startup parameters */
|
|
||||||
nc0->stored_config = g_new0(NetdevInfo, 1);
|
|
||||||
nc0->stored_config->type = NET_BACKEND_VHOST_USER;
|
|
||||||
stored = &nc0->stored_config->u.vhost_user;
|
|
||||||
|
|
||||||
stored->chardev = g_strdup(chardev);
|
|
||||||
|
|
||||||
stored->has_queues = true;
|
|
||||||
stored->queues = queues;
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err:
|
err:
|
||||||
|
@ -455,6 +446,5 @@ int net_init_vhost_user(const Netdev *netdev, const char *name,
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
return net_vhost_user_init(peer, "vhost_user", name,
|
return net_vhost_user_init(peer, "vhost_user", name, chr, queues);
|
||||||
vhost_user_opts->chardev, chr, queues);
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -184,22 +184,9 @@ static int net_vhost_vdpa_init(NetClientState *peer, const char *device,
|
||||||
VhostVDPAState *s;
|
VhostVDPAState *s;
|
||||||
int vdpa_device_fd = -1;
|
int vdpa_device_fd = -1;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
NetdevVhostVDPAOptions *stored;
|
|
||||||
|
|
||||||
assert(name);
|
assert(name);
|
||||||
nc = qemu_new_net_client(&net_vhost_vdpa_info, peer, device, name);
|
nc = qemu_new_net_client(&net_vhost_vdpa_info, peer, device, name);
|
||||||
|
snprintf(nc->info_str, sizeof(nc->info_str), TYPE_VHOST_VDPA);
|
||||||
/* Store startup parameters */
|
|
||||||
nc->stored_config = g_new0(NetdevInfo, 1);
|
|
||||||
nc->stored_config->type = NET_BACKEND_VHOST_VDPA;
|
|
||||||
stored = &nc->stored_config->u.vhost_vdpa;
|
|
||||||
|
|
||||||
stored->has_vhostdev = true;
|
|
||||||
stored->vhostdev = g_strdup(vhostdev);
|
|
||||||
|
|
||||||
stored->has_queues = true;
|
|
||||||
stored->queues = 1; /* TODO: change when support multiqueue */
|
|
||||||
|
|
||||||
nc->queue_index = 0;
|
nc->queue_index = 0;
|
||||||
s = DO_UPCAST(VhostVDPAState, nc, nc);
|
s = DO_UPCAST(VhostVDPAState, nc, nc);
|
||||||
vdpa_device_fd = qemu_open_old(vhostdev, O_RDWR);
|
vdpa_device_fd = qemu_open_old(vhostdev, O_RDWR);
|
||||||
|
|
|
@ -1,193 +0,0 @@
|
||||||
/*
|
|
||||||
* HMP string output Visitor
|
|
||||||
*
|
|
||||||
* Copyright Yandex N.V., 2021
|
|
||||||
*
|
|
||||||
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
||||||
* See the COPYING file in the top-level directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "qemu/osdep.h"
|
|
||||||
#include "qemu/cutils.h"
|
|
||||||
#include "qapi/hmp-output-visitor.h"
|
|
||||||
#include "qapi/visitor-impl.h"
|
|
||||||
|
|
||||||
struct HMPOutputVisitor {
|
|
||||||
Visitor visitor;
|
|
||||||
char **result;
|
|
||||||
GString *buffer;
|
|
||||||
bool is_continue;
|
|
||||||
};
|
|
||||||
|
|
||||||
static HMPOutputVisitor *to_hov(Visitor *v)
|
|
||||||
{
|
|
||||||
return container_of(v, HMPOutputVisitor, visitor);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void hmp_output_append_formatted(Visitor *v, const char *fmt, ...)
|
|
||||||
{
|
|
||||||
HMPOutputVisitor *ov = to_hov(v);
|
|
||||||
va_list args;
|
|
||||||
|
|
||||||
if (ov->is_continue) {
|
|
||||||
g_string_append(ov->buffer, ",");
|
|
||||||
} else {
|
|
||||||
ov->is_continue = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
va_start(args, fmt);
|
|
||||||
g_string_append_vprintf(ov->buffer, fmt, args);
|
|
||||||
va_end(args);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void hmp_output_skip_comma(Visitor *v)
|
|
||||||
{
|
|
||||||
HMPOutputVisitor *ov = to_hov(v);
|
|
||||||
|
|
||||||
ov->is_continue = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool hmp_output_start_struct(Visitor *v, const char *name,
|
|
||||||
void **obj, size_t unused, Error **errp)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void hmp_output_end_struct(Visitor *v, void **obj) {}
|
|
||||||
|
|
||||||
static bool hmp_output_start_list(Visitor *v, const char *name,
|
|
||||||
GenericList **listp, size_t size,
|
|
||||||
Error **errp)
|
|
||||||
{
|
|
||||||
hmp_output_append_formatted(v, "%s=[", name);
|
|
||||||
/* First element in array without comma before it */
|
|
||||||
hmp_output_skip_comma(v);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static GenericList *hmp_output_next_list(Visitor *v, GenericList *tail,
|
|
||||||
size_t size)
|
|
||||||
{
|
|
||||||
return tail->next;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void hmp_output_end_list(Visitor *v, void **obj)
|
|
||||||
{
|
|
||||||
/* Don't need comma after last array element */
|
|
||||||
hmp_output_skip_comma(v);
|
|
||||||
hmp_output_append_formatted(v, "]");
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool hmp_output_type_int64(Visitor *v, const char *name,
|
|
||||||
int64_t *obj, Error **errp)
|
|
||||||
{
|
|
||||||
hmp_output_append_formatted(v, "%s=%" PRId64, name, *obj);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool hmp_output_type_uint64(Visitor *v, const char *name,
|
|
||||||
uint64_t *obj, Error **errp)
|
|
||||||
{
|
|
||||||
hmp_output_append_formatted(v, "%s=%" PRIu64, name, *obj);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool hmp_output_type_bool(Visitor *v, const char *name, bool *obj,
|
|
||||||
Error **errp)
|
|
||||||
{
|
|
||||||
hmp_output_append_formatted(v, "%s=%s", name, *obj ? "true" : "false");
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool hmp_output_type_str(Visitor *v, const char *name, char **obj,
|
|
||||||
Error **errp)
|
|
||||||
{
|
|
||||||
/* Skip already printed or unused fields */
|
|
||||||
if (!*obj || g_str_equal(name, "id") || g_str_equal(name, "type")) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Do not print stub name for StringList elements */
|
|
||||||
if (g_str_equal(name, "str")) {
|
|
||||||
hmp_output_append_formatted(v, "%s", *obj);
|
|
||||||
} else {
|
|
||||||
hmp_output_append_formatted(v, "%s=%s", name, *obj);
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool hmp_output_type_number(Visitor *v, const char *name,
|
|
||||||
double *obj, Error **errp)
|
|
||||||
{
|
|
||||||
hmp_output_append_formatted(v, "%s=%.17g", name, *obj);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* TODO: remove this function? */
|
|
||||||
static bool hmp_output_type_any(Visitor *v, const char *name,
|
|
||||||
QObject **obj, Error **errp)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool hmp_output_type_null(Visitor *v, const char *name,
|
|
||||||
QNull **obj, Error **errp)
|
|
||||||
{
|
|
||||||
hmp_output_append_formatted(v, "%s=NULL", name);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void hmp_output_complete(Visitor *v, void *opaque)
|
|
||||||
{
|
|
||||||
HMPOutputVisitor *ov = to_hov(v);
|
|
||||||
|
|
||||||
*ov->result = g_string_free(ov->buffer, false);
|
|
||||||
ov->buffer = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void hmp_output_free(Visitor *v)
|
|
||||||
{
|
|
||||||
HMPOutputVisitor *ov = to_hov(v);
|
|
||||||
|
|
||||||
if (ov->buffer) {
|
|
||||||
g_string_free(ov->buffer, true);
|
|
||||||
}
|
|
||||||
g_free(v);
|
|
||||||
}
|
|
||||||
|
|
||||||
Visitor *hmp_output_visitor_new(char **result)
|
|
||||||
{
|
|
||||||
HMPOutputVisitor *v;
|
|
||||||
|
|
||||||
v = g_malloc0(sizeof(*v));
|
|
||||||
|
|
||||||
v->visitor.type = VISITOR_OUTPUT;
|
|
||||||
v->visitor.start_struct = hmp_output_start_struct;
|
|
||||||
v->visitor.end_struct = hmp_output_end_struct;
|
|
||||||
v->visitor.start_list = hmp_output_start_list;
|
|
||||||
v->visitor.next_list = hmp_output_next_list;
|
|
||||||
v->visitor.end_list = hmp_output_end_list;
|
|
||||||
v->visitor.type_int64 = hmp_output_type_int64;
|
|
||||||
v->visitor.type_uint64 = hmp_output_type_uint64;
|
|
||||||
v->visitor.type_bool = hmp_output_type_bool;
|
|
||||||
v->visitor.type_str = hmp_output_type_str;
|
|
||||||
v->visitor.type_number = hmp_output_type_number;
|
|
||||||
v->visitor.type_any = hmp_output_type_any;
|
|
||||||
v->visitor.type_null = hmp_output_type_null;
|
|
||||||
v->visitor.complete = hmp_output_complete;
|
|
||||||
v->visitor.free = hmp_output_free;
|
|
||||||
|
|
||||||
v->result = result;
|
|
||||||
v->buffer = g_string_new("");
|
|
||||||
v->is_continue = false;
|
|
||||||
|
|
||||||
return &v->visitor;
|
|
||||||
}
|
|
|
@ -8,7 +8,6 @@ util_ss.add(files(
|
||||||
'qobject-output-visitor.c',
|
'qobject-output-visitor.c',
|
||||||
'string-input-visitor.c',
|
'string-input-visitor.c',
|
||||||
'string-output-visitor.c',
|
'string-output-visitor.c',
|
||||||
'hmp-output-visitor.c',
|
|
||||||
))
|
))
|
||||||
if have_system or have_tools
|
if have_system or have_tools
|
||||||
util_ss.add(files(
|
util_ss.add(files(
|
||||||
|
|
|
@ -694,83 +694,3 @@
|
||||||
##
|
##
|
||||||
{ 'event': 'FAILOVER_NEGOTIATED',
|
{ 'event': 'FAILOVER_NEGOTIATED',
|
||||||
'data': {'device-id': 'str'} }
|
'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 frontend
|
|
||||||
# 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 (netdevs).
|
|
||||||
#
|
|
||||||
# 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'] }
|
|
||||||
|
|
|
@ -33,9 +33,6 @@ qtests_generic = \
|
||||||
if config_host.has_key('CONFIG_MODULES')
|
if config_host.has_key('CONFIG_MODULES')
|
||||||
qtests_generic += [ 'modules-test' ]
|
qtests_generic += [ 'modules-test' ]
|
||||||
endif
|
endif
|
||||||
if slirp.found()
|
|
||||||
qtests_generic += [ 'test-query-netdev' ]
|
|
||||||
endif
|
|
||||||
|
|
||||||
qtests_pci = \
|
qtests_pci = \
|
||||||
(config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) + \
|
(config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) + \
|
||||||
|
|
|
@ -1,120 +0,0 @@
|
||||||
/*
|
|
||||||
* QTest testcase for the query-netdev
|
|
||||||
*
|
|
||||||
* Copyright Yandex N.V., 2019
|
|
||||||
*
|
|
||||||
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
||||||
* See the COPYING file in the top-level directory.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "qemu/osdep.h"
|
|
||||||
|
|
||||||
#include "libqos/libqtest.h"
|
|
||||||
#include "qapi/qmp/qdict.h"
|
|
||||||
#include "qapi/qmp/qlist.h"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Events can get in the way of responses we are actually waiting for.
|
|
||||||
*/
|
|
||||||
GCC_FMT_ATTR(2, 3)
|
|
||||||
static QObject *wait_command(QTestState *who, const char *command, ...)
|
|
||||||
{
|
|
||||||
va_list ap;
|
|
||||||
QDict *response;
|
|
||||||
QObject *result;
|
|
||||||
|
|
||||||
va_start(ap, command);
|
|
||||||
qtest_qmp_vsend(who, command, ap);
|
|
||||||
va_end(ap);
|
|
||||||
|
|
||||||
response = qtest_qmp_receive(who);
|
|
||||||
|
|
||||||
result = qdict_get(response, "return");
|
|
||||||
g_assert(result);
|
|
||||||
qobject_ref(result);
|
|
||||||
qobject_unref(response);
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void qmp_query_netdev_no_error(QTestState *qts, size_t netdevs_count)
|
|
||||||
{
|
|
||||||
QObject *resp;
|
|
||||||
QList *netdevs;
|
|
||||||
|
|
||||||
resp = wait_command(qts, "{'execute': 'query-netdev'}");
|
|
||||||
|
|
||||||
netdevs = qobject_to(QList, resp);
|
|
||||||
g_assert(netdevs);
|
|
||||||
g_assert(qlist_size(netdevs) == netdevs_count);
|
|
||||||
|
|
||||||
qobject_unref(resp);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void test_query_netdev(void)
|
|
||||||
{
|
|
||||||
const char *arch = qtest_get_arch();
|
|
||||||
QObject *resp;
|
|
||||||
QTestState *state;
|
|
||||||
|
|
||||||
/* Choosing machine for platforms without default one */
|
|
||||||
if (g_str_equal(arch, "arm") ||
|
|
||||||
g_str_equal(arch, "aarch64")) {
|
|
||||||
state = qtest_init(
|
|
||||||
"-nodefaults "
|
|
||||||
"-M virt "
|
|
||||||
"-netdev user,id=slirp0");
|
|
||||||
} else if (g_str_equal(arch, "tricore")) {
|
|
||||||
state = qtest_init(
|
|
||||||
"-nodefaults "
|
|
||||||
"-M tricore_testboard "
|
|
||||||
"-netdev user,id=slirp0");
|
|
||||||
} else if (g_str_equal(arch, "avr")) {
|
|
||||||
state = qtest_init(
|
|
||||||
"-nodefaults "
|
|
||||||
"-M mega2560 "
|
|
||||||
"-netdev user,id=slirp0");
|
|
||||||
} else if (g_str_equal(arch, "rx")) {
|
|
||||||
state = qtest_init(
|
|
||||||
"-nodefaults "
|
|
||||||
"-M gdbsim-r5f562n8 "
|
|
||||||
"-netdev user,id=slirp0");
|
|
||||||
} else {
|
|
||||||
state = qtest_init(
|
|
||||||
"-nodefaults "
|
|
||||||
"-netdev user,id=slirp0");
|
|
||||||
}
|
|
||||||
g_assert(state);
|
|
||||||
|
|
||||||
qmp_query_netdev_no_error(state, 1);
|
|
||||||
|
|
||||||
resp = wait_command(state,
|
|
||||||
"{'execute': 'netdev_add', 'arguments': {"
|
|
||||||
" 'id': 'slirp1',"
|
|
||||||
" 'type': 'user'}}");
|
|
||||||
qobject_unref(resp);
|
|
||||||
|
|
||||||
qmp_query_netdev_no_error(state, 2);
|
|
||||||
|
|
||||||
resp = wait_command(state,
|
|
||||||
"{'execute': 'netdev_del', 'arguments': {"
|
|
||||||
" 'id': 'slirp1'}}");
|
|
||||||
qobject_unref(resp);
|
|
||||||
|
|
||||||
qmp_query_netdev_no_error(state, 1);
|
|
||||||
|
|
||||||
qtest_quit(state);
|
|
||||||
}
|
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
|
||||||
{
|
|
||||||
int ret = 0;
|
|
||||||
g_test_init(&argc, &argv, NULL);
|
|
||||||
|
|
||||||
qtest_add_func("/net/qapi/query_netdev", test_query_netdev);
|
|
||||||
|
|
||||||
ret = g_test_run();
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
Loading…
Reference in a new issue