SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

spice: add module helpers

Browse Source 
Add new spice-module.c + qemu-spice-module.h files.  The code needed to
support modular spice will be there.  For starters this will be only the
using_spice variable, more will follow ...

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20201019075224.14803-2-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2020-10-19 09:52:11 +02:00
parent 4c41341af7
commit 2e31e210a8
5 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/ui/qemu-spice-module.h Normal file
View File

@ -0,0 +1,23 @@
/*
* 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_MODULE_H
#define QEMU_SPICE_MODULE_H
extern int using_spice;
#endif

4
include/ui/qemu-spice.h
View File

@ -19,14 +19,13 @@
#define QEMU_SPICE_H #define QEMU_SPICE_H
#include "qapi/error.h" #include "qapi/error.h"
#include "ui/qemu-spice-module.h"
#ifdef CONFIG_SPICE #ifdef CONFIG_SPICE
#include <spice.h> #include <spice.h>
#include "qemu/config-file.h" #include "qemu/config-file.h"
extern int using_spice;
void qemu_spice_init(void); void qemu_spice_init(void);
void qemu_spice_input_init(void); void qemu_spice_input_init(void);
void qemu_spice_display_init(void); void qemu_spice_display_init(void);
@ -50,7 +49,6 @@ int qemu_spice_migrate_info(const char *hostname, int port, int tls_port,
#include "qemu/error-report.h" #include "qemu/error-report.h"
#define using_spice 0
#define spice_displays 0 #define spice_displays 0
static inline int qemu_spice_set_passwd(const char *passwd, static inline int qemu_spice_set_passwd(const char *passwd,
bool fail_if_connected, bool fail_if_connected,

1
ui/meson.build
View File

@ -12,6 +12,7 @@ softmmu_ss.add(files(
'keymaps.c', 'keymaps.c',
'qemu-pixman.c', 'qemu-pixman.c',
)) ))
softmmu_ss.add([spice_headers, files('spice-module.c')])
softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('input-linux.c')) softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('input-linux.c'))
softmmu_ss.add(when: [spice, 'CONFIG_SPICE'], if_true: files('spice-core.c', 'spice-input.c', 'spice-display.c')) softmmu_ss.add(when: [spice, 'CONFIG_SPICE'], if_true: files('spice-core.c', 'spice-input.c', 'spice-display.c'))

1
ui/spice-core.c
View File

@ -48,7 +48,6 @@ static time_t auth_expires = TIME_MAX;
static int spice_migration_completed; static int spice_migration_completed;
static int spice_display_is_running; static int spice_display_is_running;
static int spice_have_target_host; static int spice_have_target_host;
int using_spice = 0;
static QemuThread me; static QemuThread me;

23
ui/spice-module.c Normal file
View File

@ -0,0 +1,23 @@
/*
* spice module support, also spice stubs.
*
* 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/>.
*/
#include "qemu/osdep.h"
#include "ui/qemu-spice-module.h"
int using_spice;