From patchwork Mon May 3 06:36:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 51478 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CBA27B7D73 for ; Mon, 3 May 2010 16:49:55 +1000 (EST) Received: from localhost ([127.0.0.1]:35813 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O8pMI-0001oi-7W for incoming@patchwork.ozlabs.org; Mon, 03 May 2010 02:42:26 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O8pIU-00013j-6K for qemu-devel@nongnu.org; Mon, 03 May 2010 02:38:30 -0400 Received: from [140.186.70.92] (port=54460 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O8pIS-00012g-FB for qemu-devel@nongnu.org; Mon, 03 May 2010 02:38:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O8pIO-0002Y6-K0 for qemu-devel@nongnu.org; Mon, 03 May 2010 02:38:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49422) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O8pIO-0002Xy-9T for qemu-devel@nongnu.org; Mon, 03 May 2010 02:38:24 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o436cHBf022177 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 3 May 2010 02:38:17 -0400 Received: from localhost (vpn-240-193.phx2.redhat.com [10.3.240.193]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o436cFRN018693; Mon, 3 May 2010 02:38:16 -0400 From: Amit Shah To: Anthony Liguori Date: Mon, 3 May 2010 12:06:33 +0530 Message-Id: <1272868593-3795-2-git-send-email-amit.shah@redhat.com> In-Reply-To: <1272868593-3795-1-git-send-email-amit.shah@redhat.com> References: <1272868593-3795-1-git-send-email-amit.shah@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Amit Shah , Kusanagi Kouichi , qemu list Subject: [Qemu-devel] [PATCH 2/2] virtio-console: Notify resize to the guest. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Kusanagi Kouichi I tested this patch as follows: I put printf()s into involved functions. Then ran qemu on a terminal emulator, and resized it. The guest kernel gets initial size, and follows host resize. Both singleport and multiport work. Signed-off-by: Kusanagi Kouichi Signed-off-by: Amit Shah --- hw/virtio-console.c | 3 +++ hw/virtio-serial-bus.c | 15 +++++++++++++++ hw/virtio-serial.h | 11 +++++++++-- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/hw/virtio-console.c b/hw/virtio-console.c index caea11f..58246d1 100644 --- a/hw/virtio-console.c +++ b/hw/virtio-console.c @@ -55,6 +55,9 @@ static void chr_event(void *opaque, int event) case CHR_EVENT_CLOSED: virtio_serial_close(&vcon->port); break; + case CHR_EVENT_RESIZE: + virtio_serial_resize_console(&vcon->port, vcon->chr->rows, vcon->chr->cols); + break; } } diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c index 97694d5..8766f1d 100644 --- a/hw/virtio-serial-bus.c +++ b/hw/virtio-serial-bus.c @@ -205,6 +205,20 @@ int virtio_serial_close(VirtIOSerialPort *port) return 0; } +void virtio_serial_resize_console(VirtIOSerialPort *port, int rows, int cols) +{ + VirtIOSerial *vser = port->vser; + + vser->config.rows = rows; + vser->config.cols = cols; + + if (use_multiport(vser)) { + send_control_event(port, VIRTIO_CONSOLE_RESIZE, 0); + } else { + virtio_notify_config(&vser->vdev); + } +} + /* Individual ports/apps call this function to write to the guest. */ ssize_t virtio_serial_write(VirtIOSerialPort *port, const uint8_t *buf, size_t size) @@ -425,6 +439,7 @@ static uint32_t get_features(VirtIODevice *vdev, uint32_t features) vser = DO_UPCAST(VirtIOSerial, vdev, vdev); + features |= (1 << VIRTIO_CONSOLE_F_SIZE); if (vser->bus->max_nr_ports > 1) { features |= (1 << VIRTIO_CONSOLE_F_MULTIPORT); } diff --git a/hw/virtio-serial.h b/hw/virtio-serial.h index a93b545..f685ee4 100644 --- a/hw/virtio-serial.h +++ b/hw/virtio-serial.h @@ -25,14 +25,16 @@ #define VIRTIO_ID_CONSOLE 3 /* Features supported */ +#define VIRTIO_CONSOLE_F_SIZE 0 #define VIRTIO_CONSOLE_F_MULTIPORT 1 #define VIRTIO_CONSOLE_BAD_ID (~(uint32_t)0) struct virtio_console_config { /* - * These two fields are used by VIRTIO_CONSOLE_F_SIZE which - * isn't implemented here yet + * These two fields hold the size of the underlying chardev. + * When it resized, the guest is notified by a control message + * if multiport is enabled, or by a config space update if not. */ uint16_t cols; uint16_t rows; @@ -165,6 +167,11 @@ int virtio_serial_open(VirtIOSerialPort *port); int virtio_serial_close(VirtIOSerialPort *port); /* + * Notify resize to the guest + */ +void virtio_serial_resize_console(VirtIOSerialPort *port, int rows, int cols); + +/* * Send data to Guest */ ssize_t virtio_serial_write(VirtIOSerialPort *port, const uint8_t *buf,