From 58fa54947e6b8a26aaeb1b719eabfd0e1461a2b3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Sat, 22 Oct 2016 13:09:40 +0300
Subject: [PATCH] char: remove unused qemu_chr_fe_event
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
I introduced this function in d61b0c9a2f7f, but it isn't
used. Furthermore, it was incomplete, as it would need to translate QEMU
chr events to Spice port events.
(presumably it was used in the follow-up NBD-spice series that was not
completed: http://lists.gnu.org/archive/html/qemu-devel/2013-11/msg02024.html)
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20161022100951.19562-4-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/sysemu/char.h | 11 -----------
qemu-char.c | 9 ---------
spice-qemu-char.c | 10 ----------
3 files changed, 30 deletions(-)
diff --git a/include/sysemu/char.h b/include/sysemu/char.h
index de0d99b3c2..6bad8564bc 100644
--- a/include/sysemu/char.h
+++ b/include/sysemu/char.h
@@ -103,7 +103,6 @@ struct CharDriverState {
void (*chr_accept_input)(struct CharDriverState *chr);
void (*chr_set_echo)(struct CharDriverState *chr, bool echo);
void (*chr_set_fe_open)(struct CharDriverState *chr, int fe_open);
- void (*chr_fe_event)(struct CharDriverState *chr, int event);
CharBackend *be;
void *opaque;
char *label;
@@ -238,16 +237,6 @@ void qemu_chr_fe_set_echo(CharBackend *be, bool echo);
*/
void qemu_chr_fe_set_open(CharBackend *be, int fe_open);
-/**
- * @qemu_chr_fe_event:
- *
- * Send an event from the front end to the back end. It does nothing
- * without associated CharDriver.
- *
- * @event the event to send
- */
-void qemu_chr_fe_event(CharBackend *be, int event);
-
/**
* @qemu_chr_fe_printf:
*
diff --git a/qemu-char.c b/qemu-char.c
index 3b98acf279..9bd2e652ed 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -4226,15 +4226,6 @@ void qemu_chr_fe_set_open(CharBackend *be, int fe_open)
}
}
-void qemu_chr_fe_event(CharBackend *be, int event)
-{
- CharDriverState *chr = be->chr;
-
- if (chr && chr->chr_fe_event) {
- chr->chr_fe_event(chr, event);
- }
-}
-
guint qemu_chr_fe_add_watch(CharBackend *be, GIOCondition cond,
GIOFunc func, void *user_data)
{
diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index 930b8c5b2d..89fae6dc3f 100644
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -236,15 +236,6 @@ static void spice_port_set_fe_open(struct CharDriverState *chr, int fe_open)
#endif
}
-static void spice_chr_fe_event(struct CharDriverState *chr, int event)
-{
-#if SPICE_SERVER_VERSION >= 0x000c02
- SpiceCharDriver *s = chr->opaque;
-
- spice_server_port_event(&s->sin, event);
-#endif
-}
-
static void print_allowed_subtypes(void)
{
const char** psubtype;
@@ -292,7 +283,6 @@ static CharDriverState *chr_open(const char *subtype,
chr->chr_free = spice_chr_free;
chr->chr_set_fe_open = set_fe_open;
chr->explicit_be_open = true;
- chr->chr_fe_event = spice_chr_fe_event;
chr->chr_accept_input = spice_chr_accept_input;
QLIST_INSERT_HEAD(&spice_chars, s, next);
--
2.30.2