[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/14] spice: add module helpers
From: |
Gerd Hoffmann |
Subject: |
[PULL 01/14] spice: add module helpers |
Date: |
Thu, 22 Oct 2020 07:12:10 +0200 |
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
---
include/ui/qemu-spice-module.h | 23 +++++++++++++++++++++++
include/ui/qemu-spice.h | 4 +---
ui/spice-core.c | 1 -
ui/spice-module.c | 23 +++++++++++++++++++++++
ui/meson.build | 1 +
5 files changed, 48 insertions(+), 4 deletions(-)
create mode 100644 include/ui/qemu-spice-module.h
create mode 100644 ui/spice-module.c
diff --git a/include/ui/qemu-spice-module.h b/include/ui/qemu-spice-module.h
new file mode 100644
index 000000000000..1af0e659a109
--- /dev/null
+++ b/include/ui/qemu-spice-module.h
@@ -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
diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h
index 0e8ec3f0d776..ab523788b9a9 100644
--- a/include/ui/qemu-spice.h
+++ b/include/ui/qemu-spice.h
@@ -19,14 +19,13 @@
#define QEMU_SPICE_H
#include "qapi/error.h"
+#include "ui/qemu-spice-module.h"
#ifdef CONFIG_SPICE
#include <spice.h>
#include "qemu/config-file.h"
-extern int using_spice;
-
void qemu_spice_init(void);
void qemu_spice_input_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"
-#define using_spice 0
#define spice_displays 0
static inline int qemu_spice_set_passwd(const char *passwd,
bool fail_if_connected,
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 47700b220059..a7fa5743585f 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -48,7 +48,6 @@ static time_t auth_expires = TIME_MAX;
static int spice_migration_completed;
static int spice_display_is_running;
static int spice_have_target_host;
-int using_spice = 0;
static QemuThread me;
diff --git a/ui/spice-module.c b/ui/spice-module.c
new file mode 100644
index 000000000000..f86b0ac517dc
--- /dev/null
+++ b/ui/spice-module.c
@@ -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;
diff --git a/ui/meson.build b/ui/meson.build
index ab4de98b381b..e89e298643a3 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -12,6 +12,7 @@ softmmu_ss.add(files(
'keymaps.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: [spice, 'CONFIG_SPICE'], if_true: files('spice-core.c',
'spice-input.c', 'spice-display.c'))
--
2.27.0
- [PULL 00/14] Modules 20201022 patches, Gerd Hoffmann, 2020/10/22
- [PULL 04/14] spice: move display_init() to QemuSpiceOps., Gerd Hoffmann, 2020/10/22
- [PULL 01/14] spice: add module helpers,
Gerd Hoffmann <=
- [PULL 13/14] opengl: build egl-headless display modular, Gerd Hoffmann, 2020/10/22
- [PULL 02/14] spice: add QemuSpiceOps, move migrate_info, Gerd Hoffmann, 2020/10/22
- [PULL 03/14] spice: move qemu_spice_init() to QemuSpiceOps., Gerd Hoffmann, 2020/10/22
- [PULL 08/14] spice: wire up monitor in QemuSpiceOps., Gerd Hoffmann, 2020/10/22
- [PULL 09/14] spice: load module when enabled on the cmdline, Gerd Hoffmann, 2020/10/22
- [PULL 12/14] spice: flip modules switch, Gerd Hoffmann, 2020/10/22
- [PULL 14/14] opengl: build opengl helper code modular, Gerd Hoffmann, 2020/10/22
- [PULL 10/14] modules: dependencies infrastructure, Gerd Hoffmann, 2020/10/22
- [PULL 11/14] modules: add spice dependencies, Gerd Hoffmann, 2020/10/22
- [PULL 07/14] spice: move display_add_client() to QemuSpiceOps., Gerd Hoffmann, 2020/10/22