From patchwork Sun Mar 24 12:39:52 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: 230443 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 0AF2C2C007C for ; Sun, 24 Mar 2013 23:38:52 +1100 (EST) Received: from localhost ([::1]:47122 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJkCI-0002K9-82 for incoming@patchwork.ozlabs.org; Sun, 24 Mar 2013 08:38:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54662) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJkAC-0007qe-DE for qemu-devel@nongnu.org; Sun, 24 Mar 2013 08:36:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UJkAB-0000Mm-8C for qemu-devel@nongnu.org; Sun, 24 Mar 2013 08:36:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6888) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJkAB-0000Mb-14 for qemu-devel@nongnu.org; Sun, 24 Mar 2013 08:36:39 -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 r2OCacha022487 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 24 Mar 2013 08:36:38 -0400 Received: from shalem.localdomain.com (vpn1-5-143.ams2.redhat.com [10.36.5.143]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2OCaRiK014234; Sun, 24 Mar 2013 08:36:37 -0400 From: Hans de Goede To: qemu-devel@nongnu.org Date: Sun, 24 Mar 2013 13:39:52 +0100 Message-Id: <1364128793-12689-8-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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 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 Subject: [Qemu-devel] [PATCH 7/8] virtio-serial: Consolidate guest_open/guest_close into set_guest_connected 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 | 23 +++++------------------ hw/virtio-serial-bus.c | 15 +++++---------- hw/virtio-serial.h | 6 ++---- 3 files changed, 12 insertions(+), 32 deletions(-) diff --git a/hw/virtio-console.c b/hw/virtio-console.c index c0d41c5..e28c54f 100644 --- a/hw/virtio-console.c +++ b/hw/virtio-console.c @@ -71,26 +71,15 @@ static ssize_t flush_buf(VirtIOSerialPort *port, const uint8_t *buf, size_t len) return ret; } -/* Callback function that's called when the guest opens the port */ -static void guest_open(VirtIOSerialPort *port) +/* Callback function that's called when the guest opens/closes the port */ +static void set_guest_connected(VirtIOSerialPort *port, int guest_connected) { VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port); if (!vcon->chr) { return; } - qemu_chr_fe_set_open(vcon->chr, 1); -} - -/* Callback function that's called when the guest closes the port */ -static void guest_close(VirtIOSerialPort *port) -{ - VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port); - - if (!vcon->chr) { - return; - } - qemu_chr_fe_set_open(vcon->chr, 0); + qemu_chr_fe_set_open(vcon->chr, guest_connected); } /* Readiness of the guest to accept data on a port */ @@ -173,8 +162,7 @@ static void virtconsole_class_init(ObjectClass *klass, void *data) k->init = virtconsole_initfn; k->exit = virtconsole_exitfn; k->have_data = flush_buf; - k->guest_open = guest_open; - k->guest_close = guest_close; + k->set_guest_connected = set_guest_connected; dc->props = virtconsole_properties; } @@ -197,8 +185,7 @@ static void virtserialport_class_init(ObjectClass *klass, void *data) k->init = virtconsole_initfn; k->have_data = flush_buf; - k->guest_open = guest_open; - k->guest_close = guest_close; + k->set_guest_connected = set_guest_connected; dc->props = virtserialport_properties; } diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c index ab7168e..eb7af21 100644 --- a/hw/virtio-serial-bus.c +++ b/hw/virtio-serial-bus.c @@ -372,14 +372,9 @@ static void handle_control_message(VirtIOSerial *vser, void *buf, size_t len) case VIRTIO_CONSOLE_PORT_OPEN: port->guest_connected = cpkt.value; - if (cpkt.value && vsc->guest_open) { + if (vsc->set_guest_connected) { /* Send the guest opened notification if an app is interested */ - vsc->guest_open(port); - } - - if (!cpkt.value && vsc->guest_close) { - /* Send the guest closed notification if an app is interested */ - vsc->guest_close(port); + vsc->set_guest_connected(port, cpkt.value); } break; } @@ -484,9 +479,9 @@ static void guest_reset(VirtIOSerial *vser) vsc = VIRTIO_SERIAL_PORT_GET_CLASS(port); if (port->guest_connected) { port->guest_connected = false; - - if (vsc->guest_close) - vsc->guest_close(port); + if (vsc->set_guest_connected) { + vsc->set_guest_connected(port, false); + } } } } diff --git a/hw/virtio-serial.h b/hw/virtio-serial.h index 484dcfe..516400f 100644 --- a/hw/virtio-serial.h +++ b/hw/virtio-serial.h @@ -92,10 +92,8 @@ typedef struct VirtIOSerialPortClass { int (*exit)(VirtIOSerialPort *port); /* Callbacks for guest events */ - /* Guest opened device. */ - void (*guest_open)(VirtIOSerialPort *port); - /* Guest closed device. */ - void (*guest_close)(VirtIOSerialPort *port); + /* Guest opened/closed device. */ + void (*set_guest_connected)(VirtIOSerialPort *port, int guest_connected); /* Guest is now ready to accept data (virtqueues set up). */ void (*guest_ready)(VirtIOSerialPort *port);