[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] [PATCH 4/9] qemu-xen-dir: spice: remove spice-experimental.h include

From: "Luis R. Rodriguez" <mcgrof@xxxxxxxx>

Upstream qemu commit e0883e2de0ef36f254acc274e80ddeac13a2a8f6
("spice: remove spice-experimental.h include")

commit e0883e2de0ef36f254acc274e80ddeac13a2a8f6
Author: Marc-Andrà Lureau <marcandre.lureau@xxxxxxxxx>
Date:   Mon Nov 17 16:52:49 2014 +0100

    spice: remove spice-experimental.h include
    Nothing seems to be using functions from spice-experimental.h (better
    that way). Let's remove its inclusion.
    Signed-off-by: Marc-Andrà Lureau <marcandre.lureau@xxxxxxxxx>
    Signed-off-by: Gerd Hoffmann <kraxel@xxxxxxxxxx>

As per upstream spice-server development via commit
2e88eb705bd584720d09 ("server: Readd spice-experimental.h") [0]
the spice-experimental.h header has been included on qemu since
qemu upstream commit v2.3.0-rc0~135^2~1 without using any of
its symbols, the upstream spice project has kept it to avoid
compilation issues. One can compile qemu then with --disable-werror,
but just clean this up instead.


Cc: Christophe Fergeau <cfergeau@xxxxxxxxxx>
Cc: Marc-Andrà Lureau <marcandre.lureau@xxxxxxxxx>
Cc: Gerd Hoffmann <kraxel@xxxxxxxxxx>
Signed-off-by: Luis R. Rodriguez <mcgrof@xxxxxxxx>
 spice-qemu-char.c | 1 -
 ui/spice-core.c   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index 8106e063c031..7e0d300777be 100644
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -3,7 +3,6 @@
 #include "ui/qemu-spice.h"
 #include "sysemu/char.h"
 #include <spice.h>
-#include <spice-experimental.h>
 #include <spice/protocol.h>
 #include "qemu/osdep.h"
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 6467fa477674..2eae2bd35fa2 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -16,7 +16,6 @@
 #include <spice.h>
-#include <spice-experimental.h>
 #include <netdb.h>
 #include "sysemu/sysemu.h"

Xen-devel mailing list



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.