From 81a8d16533d8fa17be434d87b5ba097387b12b59 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 14 Oct 2013 13:35:18 +0200 Subject: [PATCH 11/18] qemu-char: use ChardevBackendKind in CharDriver RH-Author: Gerd Hoffmann Message-id: <1381757723-23134-11-git-send-email-kraxel@redhat.com> Patchwork-id: 54864 O-Subject: [RHEL-7 qemu-kvm PATCH 10/15] qemu-char: use ChardevBackendKind in CharDriver Bugzilla: 922010 RH-Acked-by: Hans de Goede RH-Acked-by: Laszlo Ersek RH-Acked-by: Paolo Bonzini Signed-off-by: Gerd Hoffmann Reviewed-by: Laszlo Ersek Signed-off-by: Michael Tokarev (cherry picked from commit 99aec0123ce5ba307dc357c5bf1e0f22d2be0931) --- include/sysemu/char.h | 2 +- qemu-char.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) Signed-off-by: Miroslav Rezanina --- include/sysemu/char.h | 2 +- qemu-char.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/sysemu/char.h b/include/sysemu/char.h index f0ed280..ad101d9 100644 --- a/include/sysemu/char.h +++ b/include/sysemu/char.h @@ -283,7 +283,7 @@ CharDriverState *qemu_chr_find(const char *name); QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename); void register_char_driver(const char *name, CharDriverState *(*open)(QemuOpts *)); -void register_char_driver_qapi(const char *name, int kind, +void register_char_driver_qapi(const char *name, ChardevBackendKind kind, void (*parse)(QemuOpts *opts, ChardevBackend *backend, Error **errp)); /* add an eventfd to the qemu devices that are polled */ diff --git a/qemu-char.c b/qemu-char.c index 43bd5e2..b41bda4 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3147,7 +3147,7 @@ typedef struct CharDriver { /* old, pre qapi */ CharDriverState *(*open)(QemuOpts *opts); /* new, qapi-based */ - int kind; + ChardevBackendKind kind; void (*parse)(QemuOpts *opts, ChardevBackend *backend, Error **errp); } CharDriver; @@ -3164,7 +3164,7 @@ void register_char_driver(const char *name, CharDriverState *(*open)(QemuOpts *) backends = g_slist_append(backends, s); } -void register_char_driver_qapi(const char *name, int kind, +void register_char_driver_qapi(const char *name, ChardevBackendKind kind, void (*parse)(QemuOpts *opts, ChardevBackend *backend, Error **errp)) { CharDriver *s; -- 1.7.1