* [Qemu-devel] [PATCH 0/2] tests/vhost-user-bridge: enable on-line migration
@ 2015-11-24 10:55 Victor Kaplansky
2015-11-24 10:55 ` [Qemu-devel] [PATCH 1/2] tests/vhost-user-bridge: propose GUEST_ANNOUNCE feature Victor Kaplansky
2015-11-24 10:56 ` [Qemu-devel] [PATCH 2/2] tests/vhost-user-bridge: read command line arguments Victor Kaplansky
0 siblings, 2 replies; 3+ messages in thread
From: Victor Kaplansky @ 2015-11-24 10:55 UTC (permalink / raw)
To: qemu-devel
Cc: Victor Kaplansky, Marc-Andre Lureau, peterx, Michael S. Tsirkin
This series of patches enhances vhost-user command line interface
to enable using it for on-line migration testing.
Signed-off-by: Victor Kaplansky <victork@redhat.com>
Victor Kaplansky (2):
tests/vhost-user-bridge: propose GUEST_ANNOUNCE feature
tests/vhost-user-bridge: read command line arguments
tests/vhost-user-bridge.c | 130 +++++++++++++++++++++++++++++++++++++++-------
1 file changed, 112 insertions(+), 18 deletions(-)
--
--Victor
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Qemu-devel] [PATCH 1/2] tests/vhost-user-bridge: propose GUEST_ANNOUNCE feature
2015-11-24 10:55 [Qemu-devel] [PATCH 0/2] tests/vhost-user-bridge: enable on-line migration Victor Kaplansky
@ 2015-11-24 10:55 ` Victor Kaplansky
2015-11-24 10:56 ` [Qemu-devel] [PATCH 2/2] tests/vhost-user-bridge: read command line arguments Victor Kaplansky
1 sibling, 0 replies; 3+ messages in thread
From: Victor Kaplansky @ 2015-11-24 10:55 UTC (permalink / raw)
To: qemu-devel
Cc: Victor Kaplansky, Marc-Andre Lureau, peterx, Michael S. Tsirkin
The backend has to know whether VIRTIO_NET_F_GUEST_ANNOUNCE was
negotiated, so, as a hack we propose the feature by
vhost-user-bridge during the feature negotiation.
Signed-off-by: Victor Kaplansky <victork@redhat.com>
---
tests/vhost-user-bridge.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c
index 7bdfc98..784f15f 100644
--- a/tests/vhost-user-bridge.c
+++ b/tests/vhost-user-bridge.c
@@ -747,6 +747,7 @@ vubr_get_features_exec(VubrDev *dev, VhostUserMsg *vmsg)
vmsg->payload.u64 =
((1ULL << VIRTIO_NET_F_MRG_RXBUF) |
(1ULL << VHOST_F_LOG_ALL) |
+ (1ULL << VIRTIO_NET_F_GUEST_ANNOUNCE) |
(1ULL << VHOST_USER_F_PROTOCOL_FEATURES));
vmsg->size = sizeof(vmsg->payload.u64);
--
--Victor
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Qemu-devel] [PATCH 2/2] tests/vhost-user-bridge: read command line arguments
2015-11-24 10:55 [Qemu-devel] [PATCH 0/2] tests/vhost-user-bridge: enable on-line migration Victor Kaplansky
2015-11-24 10:55 ` [Qemu-devel] [PATCH 1/2] tests/vhost-user-bridge: propose GUEST_ANNOUNCE feature Victor Kaplansky
@ 2015-11-24 10:56 ` Victor Kaplansky
1 sibling, 0 replies; 3+ messages in thread
From: Victor Kaplansky @ 2015-11-24 10:56 UTC (permalink / raw)
To: qemu-devel
Cc: Victor Kaplansky, Marc-Andre Lureau, peterx, Michael S. Tsirkin
Now some vhost-user-bridge parameters can be passed from the
command line:
Usage: prog [-u ud_socket_path] [-l lhost:lport] [-r rhost:rport]
-u path to unix doman socket. default: /tmp/vubr.sock
-l local host and port. default: 127.0.0.1:4444
-r remote host and port. default: 127.0.0.1:5555
Signed-off-by: Victor Kaplansky <victork@redhat.com>
---
tests/vhost-user-bridge.c | 129 +++++++++++++++++++++++++++++++++++++++-------
1 file changed, 111 insertions(+), 18 deletions(-)
diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c
index 784f15f..85c4c8a 100644
--- a/tests/vhost-user-bridge.c
+++ b/tests/vhost-user-bridge.c
@@ -45,6 +45,8 @@
#include <sys/mman.h>
#include <sys/eventfd.h>
#include <arpa/inet.h>
+#include <ctype.h>
+#include <netdb.h>
#include <linux/vhost.h>
@@ -1211,32 +1213,61 @@ vubr_new(const char *path)
}
static void
+vubr_set_host(struct sockaddr_in *saddr, const char *host)
+{
+ if (isdigit(host[0])) {
+ if (!inet_aton(host, &saddr->sin_addr)) {
+ fprintf(stderr, "inet_aton() failed.\n");
+ exit(1);
+ }
+ } else {
+ struct hostent *he = gethostbyname(host);
+
+ if (!he) {
+ fprintf(stderr, "gethostbyname() failed.\n");
+ exit(1);
+ }
+ saddr->sin_addr = *(struct in_addr *)he->h_addr;
+ }
+}
+
+static void
vubr_backend_udp_setup(VubrDev *dev,
const char *local_host,
- uint16_t local_port,
- const char *dest_host,
- uint16_t dest_port)
+ const char *local_port,
+ const char *remote_host,
+ const char *remote_port)
{
int sock;
+ const char *r;
+
+ int lport, rport;
+
+ lport = strtol(local_port, (char **)&r, 0);
+ if (r == local_port) {
+ fprintf(stderr, "lport parsing failed.\n");
+ exit(1);
+ }
+
+ rport = strtol(remote_port, (char **)&r, 0);
+ if (r == remote_port) {
+ fprintf(stderr, "rport parsing failed.\n");
+ exit(1);
+ }
+
struct sockaddr_in si_local = {
.sin_family = AF_INET,
- .sin_port = htons(local_port),
+ .sin_port = htons(lport),
};
- if (inet_aton(local_host, &si_local.sin_addr) == 0) {
- fprintf(stderr, "inet_aton() failed.\n");
- exit(1);
- }
+ vubr_set_host(&si_local, local_host);
/* setup destination for sends */
dev->backend_udp_dest = (struct sockaddr_in) {
.sin_family = AF_INET,
- .sin_port = htons(dest_port),
+ .sin_port = htons(rport),
};
- if (inet_aton(dest_host, &dev->backend_udp_dest.sin_addr) == 0) {
- fprintf(stderr, "inet_aton() failed.\n");
- exit(1);
- }
+ vubr_set_host(&dev->backend_udp_dest, remote_host);
sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if (sock == -1) {
@@ -1250,7 +1281,7 @@ vubr_backend_udp_setup(VubrDev *dev,
dev->backend_udp_sock = sock;
dispatcher_add(&dev->dispatcher, sock, dev, vubr_backend_recv_cb);
DPRINT("Waiting for data from udp backend on %s:%d...\n",
- local_host, local_port);
+ local_host, lport);
}
static void
@@ -1263,19 +1294,81 @@ vubr_run(VubrDev *dev)
}
}
+static int
+vubr_parse_host_port(const char **host, const char **port, const char *buf)
+{
+ char *p = strchr(buf, ':');
+
+ if (!p) {
+ return -1;
+ }
+ *p = '\0';
+ *host = strdup(buf);
+ *port = strdup(p + 1);
+ return 0;
+}
+
+#define DEFAULT_UD_SOCKET "/tmp/vubr.sock"
+#define DEFAULT_LHOST "127.0.0.1"
+#define DEFAULT_LPORT "4444"
+#define DEFAULT_RHOST "127.0.0.1"
+#define DEFAULT_RPORT "5555"
+
+static const char *ud_socket_path = DEFAULT_UD_SOCKET;
+static const char *lhost = DEFAULT_LHOST;
+static const char *lport = DEFAULT_LPORT;
+static const char *rhost = DEFAULT_RHOST;
+static const char *rport = DEFAULT_RPORT;
+
int
main(int argc, char *argv[])
{
VubrDev *dev;
+ int opt;
- dev = vubr_new("/tmp/vubr.sock");
+ while ((opt = getopt(argc, argv, "l:r:u:")) != -1) {
+
+ switch (opt) {
+ case 'l':
+ if (vubr_parse_host_port(&lhost, &lport, optarg) < 0) {
+ goto out;
+ }
+ break;
+ case 'r':
+ if (vubr_parse_host_port(&rhost, &rport, optarg) < 0) {
+ goto out;
+ }
+ break;
+ case 'u':
+ ud_socket_path = strdup(optarg);
+ break;
+ default:
+ goto out;
+ }
+ }
+
+ DPRINT("ud socket: %s\n", ud_socket_path);
+ DPRINT("local: %s:%s\n", lhost, lport);
+ DPRINT("remote: %s:%s\n", rhost, rport);
+
+ dev = vubr_new(ud_socket_path);
if (!dev) {
return 1;
}
- vubr_backend_udp_setup(dev,
- "127.0.0.1", 4444,
- "127.0.0.1", 5555);
+ vubr_backend_udp_setup(dev, lhost, lport, rhost, rport);
vubr_run(dev);
return 0;
+
+out:
+ fprintf(stderr, "Usage: %s ", argv[0]);
+ fprintf(stderr, "[-u ud_socket_path] [-l lhost:lport] [-r rhost:rport]\n");
+ fprintf(stderr, "\t-u path to unix doman socket. default: %s\n",
+ DEFAULT_UD_SOCKET);
+ fprintf(stderr, "\t-l local host and port. default: %s:%s\n",
+ DEFAULT_LHOST, DEFAULT_LPORT);
+ fprintf(stderr, "\t-r remote host and port. default: %s:%s\n",
+ DEFAULT_RHOST, DEFAULT_RPORT);
+
+ return 1;
}
--
--Victor
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-11-24 10:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-24 10:55 [Qemu-devel] [PATCH 0/2] tests/vhost-user-bridge: enable on-line migration Victor Kaplansky
2015-11-24 10:55 ` [Qemu-devel] [PATCH 1/2] tests/vhost-user-bridge: propose GUEST_ANNOUNCE feature Victor Kaplansky
2015-11-24 10:56 ` [Qemu-devel] [PATCH 2/2] tests/vhost-user-bridge: read command line arguments Victor Kaplansky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).