From patchwork Mon Dec 17 16:24:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 206936 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 B52772C0095 for ; Tue, 18 Dec 2012 04:38:36 +1100 (EST) Received: from localhost ([::1]:52616 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkeeA-0005ue-UI for incoming@patchwork.ozlabs.org; Mon, 17 Dec 2012 12:38:34 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkdVr-0001AY-LL for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:25:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TkdVq-0008P3-Hy for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:25:55 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]:38820) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkdVq-0008Ot-DE for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:25:54 -0500 Received: by mail-ie0-f173.google.com with SMTP id e13so9604812iej.4 for ; Mon, 17 Dec 2012 08:25:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=rFDJTy7hrD9YZ4HoeTTL+huugg2a4jz9AsTN+eXp0u4=; b=JNUuzXiI1kgPZ1pN6VWNcLMEWtAjz+TqNdSXhAEebdSYMS6yGYBtjX9Xq5WCQ+L4Ex moU4eb4fpDIDLDiEYidiHyngyXbyT6+hmX5xZx5wM/tss2h/jHr9Lf8ONsaDUeRxVr6i HbCfy3qdK6m8XU4i6cHCs+YitRt4kOT11mbGH1nDqN8nXUn8MhaOLKm1vDBDH3mFDbhy FgmfWvP2VcsLZy2AEjtgHlfJ8lXM6+F6nes8UCCI993bEkEqCB57V6tBBufkRdF9v5lF VSqP0gf2dlAp8azTKPqDAIUGgLaa6jMtssWLzb9UHcpEaaDbyeBngFD4op2pKxd7pJ49 D8jw== Received: by 10.50.77.166 with SMTP id t6mr9635492igw.72.1355761553892; Mon, 17 Dec 2012 08:25:53 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-219-150.ip51.fastwebnet.it. [93.34.219.150]) by mx.google.com with ESMTPS id bh3sm5950327igc.0.2012.12.17.08.25.49 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Dec 2012 08:25:52 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 17 Dec 2012 17:24:50 +0100 Message-Id: <1355761490-10073-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.0.2 In-Reply-To: <1355761490-10073-1-git-send-email-pbonzini@redhat.com> References: <1355761490-10073-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.223.173 Cc: aliguori@us.ibm.com, mst@redhat.com Subject: [Qemu-devel] [PATCH 15/15] virtio-serial: do not perform bus reset by hand 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 Implement guest_reset as a bus-level reset callback. Then, the qdev and virtio core will call it when needed every time the device is reset or the status field is set to 0. Signed-off-by: Paolo Bonzini --- hw/virtio-serial-bus.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c index 155da58..1564482 100644 --- a/hw/virtio-serial-bus.c +++ b/hw/virtio-serial-bus.c @@ -532,12 +532,13 @@ static void set_config(VirtIODevice *vdev, const uint8_t *config_data) memcpy(&config, config_data, sizeof(config)); } -static void guest_reset(VirtIOSerial *vser) +static int virtser_bus_reset(BusState *qbus) { + VirtIOSerialBus *bus = DO_UPCAST(VirtIOSerialBus, qbus, qbus); VirtIOSerialPort *port; VirtIOSerialPortClass *vsc; - QTAILQ_FOREACH(port, &vser->ports, next) { + QTAILQ_FOREACH(port, &bus->vser->ports, next) { vsc = VIRTIO_SERIAL_PORT_GET_CLASS(port); if (port->guest_connected) { port->guest_connected = false; @@ -546,6 +547,7 @@ static void guest_reset(VirtIOSerial *vser) vsc->guest_close(port); } } + return 0; } static void set_status(VirtIODevice *vdev, uint8_t status) @@ -566,17 +568,6 @@ static void set_status(VirtIODevice *vdev, uint8_t status) */ port->guest_connected = true; } - if (!(status & VIRTIO_CONFIG_S_DRIVER_OK)) { - guest_reset(vser); - } -} - -static void vser_reset(VirtIODevice *vdev) -{ - VirtIOSerial *vser; - - vser = DO_UPCAST(VirtIOSerial, vdev, vdev); - guest_reset(vser); } static void virtio_serial_save(QEMUFile *f, void *opaque) @@ -766,6 +757,7 @@ static void virtser_bus_class_init(ObjectClass *klass, void *data) { BusClass *k = BUS_CLASS(klass); k->print_dev = virtser_bus_dev_print; + k->reset = virtser_bus_reset; } static const TypeInfo virtser_bus_info = { @@ -985,7 +977,6 @@ VirtIODevice *virtio_serial_init(DeviceState *dev, virtio_serial_conf *conf) vser->vdev.get_config = get_config; vser->vdev.set_config = set_config; vser->vdev.set_status = set_status; - vser->vdev.reset = vser_reset; vser->qdev = dev;