[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/11] qemu-char: Rename opened to be_open
From: |
Hans de Goede |
Subject: |
[Qemu-devel] [PATCH 01/11] qemu-char: Rename opened to be_open |
Date: |
Tue, 26 Mar 2013 11:07:53 +0100 |
Rename the opened variable to be_open to reflect that it contains the
opened state of the backend.
Signed-off-by: Hans de Goede <address@hidden>
---
hw/usb/dev-serial.c | 2 +-
hw/usb/redirect.c | 2 +-
include/char/char.h | 2 +-
qemu-char.c | 6 +++---
spice-qemu-char.c | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
index 47ac8c9..7c314dc 100644
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -495,7 +495,7 @@ static int usb_serial_initfn(USBDevice *dev)
usb_serial_event, s);
usb_serial_handle_reset(dev);
- if (s->cs->opened && !dev->attached) {
+ if (s->cs->be_open && !dev->attached) {
usb_device_attach(dev);
}
return 0;
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index c519b9b..9734e42 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -258,7 +258,7 @@ static int usbredir_write(void *priv, uint8_t *data, int
count)
{
USBRedirDevice *dev = priv;
- if (!dev->cs->opened) {
+ if (!dev->cs->be_open) {
return 0;
}
diff --git a/include/char/char.h b/include/char/char.h
index 0326b2a..d801f92 100644
--- a/include/char/char.h
+++ b/include/char/char.h
@@ -74,7 +74,7 @@ struct CharDriverState {
int idle_tag;
char *label;
char *filename;
- int opened;
+ int be_open;
int avail_connections;
QemuOpts *opts;
QTAILQ_ENTRY(CharDriverState) next;
diff --git a/qemu-char.c b/qemu-char.c
index 4e011df..32a05af 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -108,10 +108,10 @@ void qemu_chr_be_event(CharDriverState *s, int event)
/* Keep track if the char device is open */
switch (event) {
case CHR_EVENT_OPENED:
- s->opened = 1;
+ s->be_open = 1;
break;
case CHR_EVENT_CLOSED:
- s->opened = 0;
+ s->be_open = 0;
break;
}
@@ -207,7 +207,7 @@ void qemu_chr_add_handlers(CharDriverState *s,
/* We're connecting to an already opened device, so let's make sure we
also get the open event */
- if (s->opened) {
+ if (s->be_open) {
qemu_chr_generic_open(s);
}
}
diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index 8a9236d..c39095b 100644
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -100,8 +100,8 @@ static void vmc_state(SpiceCharDeviceInstance *sin, int
connected)
}
#endif
- if ((scd->chr->opened && connected) ||
- (!scd->chr->opened && !connected)) {
+ if ((scd->chr->be_open && connected) ||
+ (!scd->chr->be_open && !connected)) {
return;
}
--
1.8.1.4
- [Qemu-devel] [PATCH 0/11] chardev frontend open handling cleanup v2, Hans de Goede, 2013/03/26
- [Qemu-devel] [PATCH 01/11] qemu-char: Rename opened to be_open,
Hans de Goede <=
- [Qemu-devel] [PATCH 02/11] qemu-char: Rename qemu_chr_generic_open to qemu_chr_be_generic_open, Hans de Goede, 2013/03/26
- [Qemu-devel] [PATCH 05/11] qemu-char: Cleanup: consolidate fe_open/fe_close into fe_set_open, Hans de Goede, 2013/03/26
- [Qemu-devel] [PATCH 04/11] qemu-char: Automatically do fe_open / fe_close on qemu_chr_add_handlers, Hans de Goede, 2013/03/26
- [Qemu-devel] [PATCH 03/11] qemu-char: Add fe_open tracking, Hans de Goede, 2013/03/26
- [Qemu-devel] [PATCH 07/11] qemu-char: Move incrementing of avail_connections to qdev-properties-system, Hans de Goede, 2013/03/26