summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2013-11-29 11:16:19 +0100
committerMarc-André Lureau <marcandre.lureau@gmail.com>2014-03-19 17:14:44 +0100
commit25f6745202d204c25df5f9527128ec8fa95dafeb (patch)
treeea71dc0144769853628f8eba1e51f9fa8085f9b9
parente044cfca1e5440c576f2108356971de0b88649dc (diff)
downloadspice-25f6745202d204c25df5f9527128ec8fa95dafeb.zip
spice-25f6745202d204c25df5f9527128ec8fa95dafeb.tar.gz
spice-25f6745202d204c25df5f9527128ec8fa95dafeb.tar.xz
Associate org.spice-space.webdav.0 port to webdav channel
For example, with qemu, a webdav channel can be created this way: -chardev spiceport,name=org.spice-space.webdav.0,... And redirected to a virtio port: -device virtserialport,...,name=org.spice-space.webdav.0
-rw-r--r--server/reds.c7
m---------spice-common0
2 files changed, 6 insertions, 1 deletions
diff --git a/server/reds.c b/server/reds.c
index 2ef4aad..b63699c 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -2975,7 +2975,11 @@ static int spice_server_char_device_add_interface(SpiceServer *s,
dev_state = spicevmc_device_connect(char_device, SPICE_CHANNEL_USBREDIR);
}
else if (strcmp(char_device->subtype, SUBTYPE_PORT) == 0) {
- dev_state = spicevmc_device_connect(char_device, SPICE_CHANNEL_PORT);
+ if (strcmp(char_device->portname, "org.spice-space.webdav.0") == 0) {
+ dev_state = spicevmc_device_connect(char_device, SPICE_CHANNEL_WEBDAV);
+ } else {
+ dev_state = spicevmc_device_connect(char_device, SPICE_CHANNEL_PORT);
+ }
}
if (dev_state) {
@@ -3513,6 +3517,7 @@ SPICE_GNUC_VISIBLE int spice_server_set_channel_security(SpiceServer *s, const c
[ SPICE_CHANNEL_SMARTCARD] = "smartcard",
#endif
[ SPICE_CHANNEL_USBREDIR ] = "usbredir",
+ [ SPICE_CHANNEL_WEBDAV ] = "webdav",
};
int i;
diff --git a/spice-common b/spice-common
-Subproject 57ce430ccd66bd1ca2447c14503234cfb88e236
+Subproject 01955e70079876de62bb8c86ee6793c1405fb47