summaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorJes Sorensen <Jes.Sorensen@redhat.com>2011-02-01 15:53:23 +0100
committerGerd Hoffmann <kraxel@redhat.com>2011-05-03 15:35:48 +0200
commit14da8345b2f7c21bab20fd12b755a61d6277f171 (patch)
tree83f54fa0ed99d3aa9e349f720ef796737a946355 /ui
parentd2d979c628e4b2c4a3cb71a31841875795c79043 (diff)
downloadqemu-14da8345b2f7c21bab20fd12b755a61d6277f171.tar.gz
Make spice dummy functions inline to fix calls not checking return values
qemu_spice_set_passwd() and qemu_spice_set_pw_expire() dummy functions needs to be inline, in order to handle the case where they are called without checking the return value. Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'ui')
-rw-r--r--ui/qemu-spice.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/ui/qemu-spice.h b/ui/qemu-spice.h
index 916e5dce21..3c6f1fe419 100644
--- a/ui/qemu-spice.h
+++ b/ui/qemu-spice.h
@@ -47,8 +47,16 @@ CharDriverState *qemu_chr_open_spice(QemuOpts *opts);
#else /* CONFIG_SPICE */
#define using_spice 0
-#define qemu_spice_set_passwd(_p, _f1, _f2) (-1)
-#define qemu_spice_set_pw_expire(_e) (-1)
+static inline int qemu_spice_set_passwd(const char *passwd,
+ bool fail_if_connected,
+ bool disconnect_if_connected)
+{
+ return -1;
+}
+static inline int qemu_spice_set_pw_expire(time_t expires)
+{
+ return -1;
+}
static inline int qemu_spice_migrate_info(const char *h, int p, int t, const char *s)
{ return -1; }