summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Shah <amit.shah@redhat.com>2009-10-07 18:31:16 +0530
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-21 13:35:37 -0500
commitb6b8df560c4cf7de53158ae91e2c0d3cc971f01e (patch)
tree123f129747b1d0b4e5db80757594d16a438e8b80
parent69795d6769910eaee4416470744e65ae066aeb54 (diff)
downloadqemu-b6b8df560c4cf7de53158ae91e2c0d3cc971f01e.tar.gz
char: rename CHR_EVENT_RESET to CHR_EVENT_OPENED
The char event RESET is emitted when a char device is opened. Give it a better name. Patchworks-ID: 35287 Signed-off-by: Amit Shah <amit.shah@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--gdbstub.c2
-rw-r--r--hw/baum.c2
-rw-r--r--hw/usb-serial.c2
-rw-r--r--monitor.c2
-rw-r--r--qemu-char.c2
-rw-r--r--qemu-char.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/gdbstub.c b/gdbstub.c
index 315f606ef2..055093f89b 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -2447,7 +2447,7 @@ static void gdb_chr_receive(void *opaque, const uint8_t *buf, int size)
static void gdb_chr_event(void *opaque, int event)
{
switch (event) {
- case CHR_EVENT_RESET:
+ case CHR_EVENT_OPENED:
vm_stop(EXCP_INTERRUPT);
gdb_has_xml = 0;
break;
diff --git a/hw/baum.c b/hw/baum.c
index 665deab8e6..c66e737ccd 100644
--- a/hw/baum.c
+++ b/hw/baum.c
@@ -475,7 +475,7 @@ static void baum_send_event(CharDriverState *chr, int event)
switch (event) {
case CHR_EVENT_BREAK:
break;
- case CHR_EVENT_RESET:
+ case CHR_EVENT_OPENED:
/* Reset state */
baum->in_buf_used = 0;
break;
diff --git a/hw/usb-serial.c b/hw/usb-serial.c
index e2379c4d5e..d02f6b2867 100644
--- a/hw/usb-serial.c
+++ b/hw/usb-serial.c
@@ -516,7 +516,7 @@ static void usb_serial_event(void *opaque, int event)
break;
case CHR_EVENT_FOCUS:
break;
- case CHR_EVENT_RESET:
+ case CHR_EVENT_OPENED:
usb_serial_reset(s);
/* TODO: Reset USB port */
break;
diff --git a/monitor.c b/monitor.c
index 3424e6010c..2566f4a1b4 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3470,7 +3470,7 @@ static void monitor_event(void *opaque, int event)
mon->mux_out = 1;
break;
- case CHR_EVENT_RESET:
+ case CHR_EVENT_OPENED:
monitor_printf(mon, "QEMU %s monitor - type 'help' for more "
"information\n", QEMU_VERSION);
if (!mon->mux_out) {
diff --git a/qemu-char.c b/qemu-char.c
index 8f7f81ca54..4757689993 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -119,7 +119,7 @@ static void qemu_chr_event(CharDriverState *s, int event)
static void qemu_chr_reset_bh(void *opaque)
{
CharDriverState *s = opaque;
- qemu_chr_event(s, CHR_EVENT_RESET);
+ qemu_chr_event(s, CHR_EVENT_OPENED);
qemu_bh_delete(s->bh);
s->bh = NULL;
}
diff --git a/qemu-char.h b/qemu-char.h
index c0654bca25..05fe15d8cd 100644
--- a/qemu-char.h
+++ b/qemu-char.h
@@ -10,7 +10,7 @@
#define CHR_EVENT_BREAK 0 /* serial break char */
#define CHR_EVENT_FOCUS 1 /* focus to this terminal (modal input needed) */
-#define CHR_EVENT_RESET 2 /* new connection established */
+#define CHR_EVENT_OPENED 2 /* new connection established */
#define CHR_EVENT_MUX_IN 3 /* mux-focus was set to this terminal */
#define CHR_EVENT_MUX_OUT 4 /* mux-focus will move on */
#define CHR_EVENT_CLOSED 5 /* connection closed */