[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/21] qemu-char: convert spice backend to data-driv
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 18/21] qemu-char: convert spice backend to data-driven creation |
Date: |
Mon, 12 Oct 2015 10:03:21 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
include/ui/qemu-spice.h | 2 --
qemu-char.c | 6 ++----
spice-qemu-char.c | 21 ++++++++++++---------
stubs/Makefile.objs | 1 -
stubs/qemu-chr-open-spice.c | 14 --------------
5 files changed, 14 insertions(+), 30 deletions(-)
delete mode 100644 stubs/qemu-chr-open-spice.c
diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h
index 0dff422..f9ce357 100644
--- a/include/ui/qemu-spice.h
+++ b/include/ui/qemu-spice.h
@@ -43,9 +43,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);
-CharDriverState *qemu_chr_open_spice_vmc(const char *type);
#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)
diff --git a/qemu-char.c b/qemu-char.c
index 535db73..43205ae 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -4359,14 +4359,12 @@ ChardevReturn *qmp_chardev_add(const char *id,
ChardevBackend *backend,
case CHARDEV_BACKEND_KIND_CONSOLE:
abort();
break;
-#ifdef CONFIG_SPICE
case CHARDEV_BACKEND_KIND_SPICEVMC:
- chr = qemu_chr_open_spice_vmc(backend->spicevmc->type);
+ abort();
break;
case CHARDEV_BACKEND_KIND_SPICEPORT:
- chr = qemu_chr_open_spice_port(backend->spiceport->fqdn);
+ abort();
break;
-#endif
case CHARDEV_BACKEND_KIND_VC:
chr = vc_init(backend->vc);
break;
diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index e4353ef..a20fb5c 100644
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -296,15 +296,14 @@ static CharDriverState *chr_open(const char *subtype,
return chr;
}
-CharDriverState *qemu_chr_open_spice_vmc(const char *type)
+static CharDriverState *qemu_chr_open_spice_vmc(const char *id,
+ ChardevBackend *backend,
+ ChardevReturn *ret,
+ Error **errp)
{
+ const char *type = backend->spicevmc->type;
const char **psubtype = spice_server_char_device_recognized_subtypes();
- if (type == NULL) {
- fprintf(stderr, "spice-qemu-char: missing name parameter\n");
- print_allowed_subtypes();
- return NULL;
- }
for (; *psubtype != NULL; ++psubtype) {
if (strcmp(type, *psubtype) == 0) {
break;
@@ -320,8 +319,12 @@ CharDriverState *qemu_chr_open_spice_vmc(const char *type)
}
#if SPICE_SERVER_VERSION >= 0x000c02
-CharDriverState *qemu_chr_open_spice_port(const char *name)
+static CharDriverState *qemu_chr_open_spice_port(const char *id,
+ ChardevBackend *backend,
+ ChardevReturn *ret,
+ Error **errp)
{
+ const char *name = backend->spiceport->fqdn;
CharDriverState *chr;
SpiceCharDriver *s;
@@ -379,9 +382,9 @@ static void qemu_chr_parse_spice_port(QemuOpts *opts,
ChardevBackend *backend,
static void register_types(void)
{
register_char_driver("spicevmc", CHARDEV_BACKEND_KIND_SPICEVMC,
- qemu_chr_parse_spice_vmc, NULL);
+ qemu_chr_parse_spice_vmc, qemu_chr_open_spice_vmc);
register_char_driver("spiceport", CHARDEV_BACKEND_KIND_SPICEPORT,
- qemu_chr_parse_spice_port, NULL);
+ qemu_chr_parse_spice_port, qemu_chr_open_spice_port);
}
type_init(register_types);
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index b5322a2..6d4363d 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -20,7 +20,6 @@ stub-obj-y += mon-is-qmp.o
stub-obj-y += mon-printf.o
stub-obj-y += monitor-init.o
stub-obj-y += notify-event.o
-stub-obj-$(CONFIG_SPICE) += qemu-chr-open-spice.o
stub-obj-y += qtest.o
stub-obj-y += reset.o
stub-obj-y += runstate-check.o
diff --git a/stubs/qemu-chr-open-spice.c b/stubs/qemu-chr-open-spice.c
deleted file mode 100644
index f1c4849..0000000
--- a/stubs/qemu-chr-open-spice.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "qemu-common.h"
-#include "ui/qemu-spice.h"
-
-CharDriverState *qemu_chr_open_spice_vmc(const char *type)
-{
- return NULL;
-}
-
-#if SPICE_SERVER_VERSION >= 0x000c02
-CharDriverState *qemu_chr_open_spice_port(const char *name)
-{
- return NULL;
-}
-#endif
--
2.5.0
- [Qemu-devel] [PATCH 15/21] qemu-char: convert testdev backend to data-driven creation, (continued)
- [Qemu-devel] [PATCH 15/21] qemu-char: convert testdev backend to data-driven creation, Paolo Bonzini, 2015/10/12
- [Qemu-devel] [PATCH 16/21] qemu-char: convert stdio backend to data-driven creation, Paolo Bonzini, 2015/10/12
- [Qemu-devel] [PATCH 17/21] qemu-char: convert console backend to data-driven creation, Paolo Bonzini, 2015/10/12
- [Qemu-devel] [PATCH 21/21] qemu-char: cleanup after completed conversion to cd->create, Paolo Bonzini, 2015/10/12
- [Qemu-devel] [PATCH 20/21] qemu-char: convert ringbuf backend to data-driven creation, Paolo Bonzini, 2015/10/12
- [Qemu-devel] [PATCH 18/21] qemu-char: convert spice backend to data-driven creation,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 01/21] qemu-char: cleanup qmp_chardev_add, Paolo Bonzini, 2015/10/15
- [Qemu-devel] [PATCH 07/21] qemu-char: convert pipe backend to data-driven creation, Paolo Bonzini, 2015/10/15
- [Qemu-devel] [PATCH 08/21] qemu-char: convert socket backend to data-driven creation, Paolo Bonzini, 2015/10/15
- [Qemu-devel] [PATCH 10/21] qemu-char: convert pty backend to data-driven creation, Paolo Bonzini, 2015/10/15