da34e65cb4
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
91 lines
2.6 KiB
C
91 lines
2.6 KiB
C
/*
|
|
* Copyright (C) 2010 Red Hat, Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 or
|
|
* (at your option) version 3 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef QEMU_SPICE_H
|
|
#define QEMU_SPICE_H
|
|
|
|
#include "qapi/error.h"
|
|
|
|
#ifdef CONFIG_SPICE
|
|
|
|
#include <spice.h>
|
|
#include "qemu/option.h"
|
|
#include "qemu/config-file.h"
|
|
|
|
extern int using_spice;
|
|
|
|
void qemu_spice_init(void);
|
|
void qemu_spice_input_init(void);
|
|
void qemu_spice_audio_init(void);
|
|
void qemu_spice_display_init(void);
|
|
int qemu_spice_display_add_client(int csock, int skipauth, int tls);
|
|
int qemu_spice_add_interface(SpiceBaseInstance *sin);
|
|
bool qemu_spice_have_display_interface(QemuConsole *con);
|
|
int qemu_spice_add_display_interface(QXLInstance *qxlin, QemuConsole *con);
|
|
int qemu_spice_set_passwd(const char *passwd,
|
|
bool fail_if_connected, bool disconnect_if_connected);
|
|
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);
|
|
|
|
#if SPICE_SERVER_VERSION >= 0x000c02
|
|
void qemu_spice_register_ports(void);
|
|
#else
|
|
static inline CharDriverState *qemu_chr_open_spice_port(const char *name)
|
|
{ return NULL; }
|
|
#endif
|
|
|
|
#else /* CONFIG_SPICE */
|
|
|
|
#define using_spice 0
|
|
#define spice_displays 0
|
|
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;
|
|
}
|
|
|
|
static inline int qemu_spice_display_add_client(int csock, int skipauth,
|
|
int tls)
|
|
{
|
|
return -1;
|
|
}
|
|
|
|
#endif /* CONFIG_SPICE */
|
|
|
|
static inline bool qemu_using_spice(Error **errp)
|
|
{
|
|
if (!using_spice) {
|
|
error_set(errp, ERROR_CLASS_DEVICE_NOT_ACTIVE,
|
|
"SPICE is not in use");
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
#endif /* QEMU_SPICE_H */
|