diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-01-22 13:56:11 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-01-22 13:56:11 +0000 |
| commit | adeecf14d668f5f0a73c9be91772e15b4f8727f3 (patch) | |
| tree | 8011d0cf9b9f6eed058dd3211c8aab7d8acf4add /ui/spice-core.c | |
| parent | b3a4755a67a52aa7297eb8927b482d09dabdefec (diff) | |
| parent | 51a090991449c7d3c6d428eda18b4f30a36e2c1b (diff) | |
| download | focaccia-qemu-adeecf14d668f5f0a73c9be91772e15b4f8727f3.tar.gz focaccia-qemu-adeecf14d668f5f0a73c9be91772e15b4f8727f3.zip | |
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20150122-1' into staging
spice: fix coverity defect, add unix address support # gpg: Signature made Thu 22 Jan 2015 11:17:24 GMT using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" * remotes/spice/tags/pull-spice-20150122-1: spice: fix coverity reported defect in display code spice: add unix address support Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/spice-core.c')
| -rw-r--r-- | ui/spice-core.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c index fe705c1ae2..c8f7f183c6 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -436,6 +436,11 @@ static QemuOptsList qemu_spice_opts = { },{ .name = "ipv6", .type = QEMU_OPT_BOOL, +#ifdef SPICE_ADDR_FLAG_UNIX_ONLY + },{ + .name = "unix", + .type = QEMU_OPT_BOOL, +#endif },{ .name = "password", .type = QEMU_OPT_STRING, @@ -708,6 +713,10 @@ void qemu_spice_init(void) addr_flags |= SPICE_ADDR_FLAG_IPV4_ONLY; } else if (qemu_opt_get_bool(opts, "ipv6", 0)) { addr_flags |= SPICE_ADDR_FLAG_IPV6_ONLY; +#ifdef SPICE_ADDR_FLAG_UNIX_ONLY + } else if (qemu_opt_get_bool(opts, "unix", 0)) { + addr_flags |= SPICE_ADDR_FLAG_UNIX_ONLY; +#endif } spice_server = spice_server_new(); |