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