Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Adding breaktrace & disabling timer migration"
[kvmfornfv.git]
/
qemu
/
include
/
ui
/
qemu-spice.h
diff --git
a/qemu/include/ui/qemu-spice.h
b/qemu/include/ui/qemu-spice.h
index
0dff422
..
aa24363
100644
(file)
--- a/
qemu/include/ui/qemu-spice.h
+++ b/
qemu/include/ui/qemu-spice.h
@@
-18,12
+18,11
@@
#ifndef QEMU_SPICE_H
#define QEMU_SPICE_H
#ifndef QEMU_SPICE_H
#define QEMU_SPICE_H
-#include "
config-host
.h"
+#include "
qapi/error
.h"
#ifdef CONFIG_SPICE
#include <spice.h>
#ifdef CONFIG_SPICE
#include <spice.h>
-
#include "qemu/option.h"
#include "qemu/config-file.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
@@
-43,9
+42,7
@@
int qemu_spice_set_pw_expire(time_t expires);
int qemu_spice_migrate_info(const char *hostname, int port, int tls_port,
const char *subject);
int qemu_spice_migrate_info(const char *hostname, int port, int tls_port,
const char *subject);
-CharDriverState *qemu_chr_open_spice_vmc(const char *type);
#if SPICE_SERVER_VERSION >= 0x000c02
#if SPICE_SERVER_VERSION >= 0x000c02
-CharDriverState *qemu_chr_open_spice_port(const char *name);
void qemu_spice_register_ports(void);
#else
static inline CharDriverState *qemu_chr_open_spice_port(const char *name)
void qemu_spice_register_ports(void);
#else
static inline CharDriverState *qemu_chr_open_spice_port(const char *name)