aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Shah <amit.shah@redhat.com>2009-11-03 19:59:55 +0530
committerAnthony Liguori <aliguori@us.ibm.com>2009-11-17 08:03:30 -0600
commit57e073a3a152d0e63c3df257c60ababb19f2c13d (patch)
tree0cc9772c7c7904ccb5ff71b4d8982c59d554bcef
parent9bd7854e1e5d6f4cfe4558090bbd9493c12bf846 (diff)
char: Remove special init_reset handling
The initial_reset sent to chardevs doesn't do much other than setting a bool to true. Char devices are interested in the open event and that gets sent whenever the device is opened. Moreover, the reset logic breaks as and when qemu's bh scheduling changes. Signed-off-by: Amit Shah <amit.shah@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--qemu-char.c9
-rw-r--r--qemu-char.h1
-rw-r--r--vl.c1
3 files changed, 0 insertions, 11 deletions
diff --git a/qemu-char.c b/qemu-char.c
index 1f63019520..d78bae3551 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -128,15 +128,6 @@ void qemu_chr_reset(CharDriverState *s)
}
}
-void qemu_chr_initial_reset(void)
-{
- CharDriverState *chr;
-
- QTAILQ_FOREACH(chr, &chardevs, next) {
- qemu_chr_reset(chr);
- }
-}
-
int qemu_chr_write(CharDriverState *s, const uint8_t *buf, int len)
{
return s->chr_write(s, buf, len);
diff --git a/qemu-char.h b/qemu-char.h
index 05fe15d8cd..b420111f7c 100644
--- a/qemu-char.h
+++ b/qemu-char.h
@@ -83,7 +83,6 @@ void qemu_chr_add_handlers(CharDriverState *s,
void *opaque);
int qemu_chr_ioctl(CharDriverState *s, int cmd, void *arg);
void qemu_chr_reset(CharDriverState *s);
-void qemu_chr_initial_reset(void);
int qemu_chr_can_read(CharDriverState *s);
void qemu_chr_read(CharDriverState *s, uint8_t *buf, int len);
int qemu_chr_get_msgfd(CharDriverState *s);
diff --git a/vl.c b/vl.c
index fff8e8d468..18353f289e 100644
--- a/vl.c
+++ b/vl.c
@@ -5790,7 +5790,6 @@ int main(int argc, char **argv, char **envp)
}
text_consoles_set_display(display_state);
- qemu_chr_initial_reset();
for (i = 0; i < MAX_MONITOR_DEVICES; i++) {
if (monitor_devices[i] && monitor_hds[i]) {