diff options
| -rw-r--r-- | hw/usb/dev-serial.c | 2 | ||||
| -rw-r--r-- | hw/usb/redirect.c | 2 | ||||
| -rw-r--r-- | include/char/char.h | 2 | ||||
| -rw-r--r-- | qemu-char.c | 6 | ||||
| -rw-r--r-- | 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 47ac8c9b69..7c314dc59d 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 c519b9b92a..9734e426ec 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 5c3a7a5756..90443fce3a 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 936150fa73..4419817715 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; } @@ -234,7 +234,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 8a9236d0a8..c39095b438 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; } |