OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qga: add vsock-listen method

Browse Source 
Add AF_VSOCK (virtio-vsock) support as an alternative to virtio-serial.

  $ qemu-system-x86_64 -device vhost-vsock-pci,guest-cid=3 ...
  (guest)# qemu-ga -m vsock-listen -p 3:1234

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Stefan Hajnoczi 2016-10-14 10:00:56 +01:00 committed by Michael Roth
parent 6a02c8069f
commit 586ef5dee7
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
qga/channel-posix.c
View File

@ -193,6 +193,31 @@ static gboolean ga_channel_open(GAChannel *c, const gchar *path, GAChannelMethod
ga_channel_listen_add(c, fd, true); ga_channel_listen_add(c, fd, true);
break; break;
} }
case GA_CHANNEL_VSOCK_LISTEN: {
Error *local_err = NULL;
SocketAddress *addr;
char *addr_str;
int fd;
addr_str = g_strdup_printf("vsock:%s", path);
addr = socket_parse(addr_str, &local_err);
g_free(addr_str);
if (local_err != NULL) {
g_critical("%s", error_get_pretty(local_err));
error_free(local_err);
return false;
}
fd = socket_listen(addr, &local_err);
qapi_free_SocketAddress(addr);
if (local_err != NULL) {
g_critical("%s", error_get_pretty(local_err));
error_free(local_err);
return false;
}
ga_channel_listen_add(c, fd, true);
break;
}
default: default:
g_critical("error binding/listening to specified socket"); g_critical("error binding/listening to specified socket");
return false; return false;

1
qga/channel.h
View File

@ -19,6 +19,7 @@ typedef enum {
GA_CHANNEL_VIRTIO_SERIAL, GA_CHANNEL_VIRTIO_SERIAL,
GA_CHANNEL_ISA_SERIAL, GA_CHANNEL_ISA_SERIAL,
GA_CHANNEL_UNIX_LISTEN, GA_CHANNEL_UNIX_LISTEN,
GA_CHANNEL_VSOCK_LISTEN,
} GAChannelMethod; } GAChannelMethod;
typedef gboolean (*GAChannelCallback)(GIOCondition condition, gpointer opaque); typedef gboolean (*GAChannelCallback)(GIOCondition condition, gpointer opaque);

6
qga/main.c
View File

@ -190,8 +190,8 @@ static void usage(const char *cmd)
"Usage: %s [-m <method> -p <path>] [<options>]\n" "Usage: %s [-m <method> -p <path>] [<options>]\n"
"QEMU Guest Agent %s\n" "QEMU Guest Agent %s\n"
"\n" "\n"
" -m, --method transport method: one of unix-listen, virtio-serial, or\n" " -m, --method transport method: one of unix-listen, virtio-serial,\n"
" isa-serial (virtio-serial is the default)\n" " isa-serial, or vsock-listen (virtio-serial is the default)\n"
" -p, --path device/socket path (the default for virtio-serial is:\n" " -p, --path device/socket path (the default for virtio-serial is:\n"
" %s,\n" " %s,\n"
" the default for isa-serial is:\n" " the default for isa-serial is:\n"
@ -659,6 +659,8 @@ static gboolean channel_init(GAState *s, const gchar *method, const gchar *path)
channel_method = GA_CHANNEL_ISA_SERIAL; channel_method = GA_CHANNEL_ISA_SERIAL;
} else if (strcmp(method, "unix-listen") == 0) { } else if (strcmp(method, "unix-listen") == 0) {
channel_method = GA_CHANNEL_UNIX_LISTEN; channel_method = GA_CHANNEL_UNIX_LISTEN;
} else if (strcmp(method, "vsock-listen") == 0) {
channel_method = GA_CHANNEL_VSOCK_LISTEN;
} else { } else {
g_critical("unsupported channel method/type: %s", method); g_critical("unsupported channel method/type: %s", method);
return false; return false;