From patchwork Tue Mar 26 10:07:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 231143 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 52EC92C00D0 for ; Tue, 26 Mar 2013 21:07:00 +1100 (EST) Received: from localhost ([::1]:43063 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKQmQ-0004n0-Ai for incoming@patchwork.ozlabs.org; Tue, 26 Mar 2013 06:06:58 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKQkL-0002oT-RI for qemu-devel@nongnu.org; Tue, 26 Mar 2013 06:04:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKQkI-0007A2-Ot for qemu-devel@nongnu.org; Tue, 26 Mar 2013 06:04:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10127) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKQkI-00079r-HE for qemu-devel@nongnu.org; Tue, 26 Mar 2013 06:04:46 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2QA4jKU008703 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 26 Mar 2013 06:04:46 -0400 Received: from shalem.localdomain.com (vpn1-6-123.ams2.redhat.com [10.36.6.123]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r2QA4afw014732; Tue, 26 Mar 2013 06:04:44 -0400 From: Hans de Goede To: qemu-devel@nongnu.org Date: Tue, 26 Mar 2013 11:07:57 +0100 Message-Id: <1364292483-16564-6-git-send-email-hdegoede@redhat.com> In-Reply-To: <1364292483-16564-1-git-send-email-hdegoede@redhat.com> References: <1364292483-16564-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Amit Shah , Hans de Goede , Gerd Hoffmann Subject: [Qemu-devel] [PATCH 05/11] qemu-char: Cleanup: consolidate fe_open/fe_close into fe_set_open X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Hans de Goede --- hw/virtio-console.c | 4 ++-- include/char/char.h | 17 ++++------------- qemu-char.c | 24 ++++++------------------ 3 files changed, 12 insertions(+), 33 deletions(-) diff --git a/hw/virtio-console.c b/hw/virtio-console.c index 2f7c3df..7c89990 100644 --- a/hw/virtio-console.c +++ b/hw/virtio-console.c @@ -74,7 +74,7 @@ static void guest_open(VirtIOSerialPort *port) if (!vcon->chr) { return; } - qemu_chr_fe_open(vcon->chr); + qemu_chr_fe_set_open(vcon->chr, 1); } /* Callback function that's called when the guest closes the port */ @@ -85,7 +85,7 @@ static void guest_close(VirtIOSerialPort *port) if (!vcon->chr) { return; } - qemu_chr_fe_close(vcon->chr); + qemu_chr_fe_set_open(vcon->chr, 0); } /* Readiness of the guest to accept data on a port */ diff --git a/include/char/char.h b/include/char/char.h index 27ebbc3..3c8dd28 100644 --- a/include/char/char.h +++ b/include/char/char.h @@ -129,21 +129,12 @@ void qemu_chr_delete(CharDriverState *chr); void qemu_chr_fe_set_echo(struct CharDriverState *chr, bool echo); /** - * @qemu_chr_fe_open: + * @qemu_chr_fe_set_open: * - * Open a character backend. This function call is an indication that the - * front end is ready to begin doing I/O. + * Set character frontend open status. This is an indication that the + * front end is ready (or not) to begin doing I/O. */ -void qemu_chr_fe_open(struct CharDriverState *chr); - -/** - * @qemu_chr_fe_close: - * - * Close a character backend. This function call indicates that the front end - * no longer is able to process I/O. To process I/O again, the front end will - * call @qemu_chr_fe_open. - */ -void qemu_chr_fe_close(struct CharDriverState *chr); +void qemu_chr_fe_set_open(struct CharDriverState *chr, int fe_open); /** * @qemu_chr_fe_printf: diff --git a/qemu-char.c b/qemu-char.c index f580297..3651af1 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -211,11 +211,7 @@ void qemu_chr_add_handlers(CharDriverState *s, s->chr_update_read_handler(s); if (!s->explicit_fe_open) { - if (fe_open) { - qemu_chr_fe_open(s); - } else { - qemu_chr_fe_close(s); - } + qemu_chr_fe_set_open(s, fe_open); } /* We're connecting to an already opened device, so let's make sure we @@ -3396,24 +3392,16 @@ void qemu_chr_fe_set_echo(struct CharDriverState *chr, bool echo) } } -void qemu_chr_fe_open(struct CharDriverState *chr) +void qemu_chr_fe_set_open(struct CharDriverState *chr, int fe_open) { - if (chr->fe_open) { + if (chr->fe_open == fe_open) { return; } - chr->fe_open = 1; - if (chr->chr_guest_open) { + chr->fe_open = fe_open; + if (fe_open && chr->chr_guest_open) { chr->chr_guest_open(chr); } -} - -void qemu_chr_fe_close(struct CharDriverState *chr) -{ - if (!chr->fe_open) { - return; - } - chr->fe_open = 0; - if (chr->chr_guest_close) { + if (!fe_open && chr->chr_guest_close) { chr->chr_guest_close(chr); } }