From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJkA4-0007fL-Kk for qemu-devel@nongnu.org; Sun, 24 Mar 2013 08:36:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UJkA3-0000J0-7w for qemu-devel@nongnu.org; Sun, 24 Mar 2013 08:36:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53365) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJkA2-0000Iu-Vn for qemu-devel@nongnu.org; Sun, 24 Mar 2013 08:36:31 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2OCaUuC031336 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 24 Mar 2013 08:36:30 -0400 From: Hans de Goede Date: Sun, 24 Mar 2013 13:39:46 +0100 Message-Id: <1364128793-12689-2-git-send-email-hdegoede@redhat.com> In-Reply-To: <1364128793-12689-1-git-send-email-hdegoede@redhat.com> References: <1364128793-12689-1-git-send-email-hdegoede@redhat.com> Subject: [Qemu-devel] [PATCH 1/8] qemu-char: Rename opened to be_open List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Amit Shah , Hans de Goede Rename the opened variable to be_open to reflect that it contains the opened state of the backend. Signed-off-by: Hans de Goede --- 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 e0df74b..4d565ba 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -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; } 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 607abb6..613cc64 100644 --- a/spice-qemu-char.c +++ b/spice-qemu-char.c @@ -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; } -- 1.8.1.4