@@ -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;
@@ -272,7 +272,7 @@ static int usbredir_write(void *priv, uint8_t *data, int count)
USBRedirDevice *dev = priv;
int r;
- if (!dev->cs->opened) {
+ if (!dev->cs->be_open) {
return 0;
}
@@ -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;
@@ -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);
}
}
@@ -91,8 +91,8 @@ static void vmc_state(SpiceCharDeviceInstance *sin, int connected)
{
SpiceCharDriver *scd = container_of(sin, SpiceCharDriver, sin);
- if ((scd->chr->opened && connected) ||
- (!scd->chr->opened && !connected)) {
+ if ((scd->chr->be_open && connected) ||
+ (!scd->chr->be_open && !connected)) {
return;
}
Rename the opened variable to be_open to reflect that it contains the opened state of the backend. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- 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(-)