From patchwork Thu Jun 16 16:38:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 100689 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B1A3DB6F82 for ; Fri, 17 Jun 2011 05:33:31 +1000 (EST) Received: from localhost ([::1]:54305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QXIJi-0004ou-HQ for incoming@patchwork.ozlabs.org; Thu, 16 Jun 2011 15:33:26 -0400 Received: from eggs.gnu.org ([140.186.70.92]:42016) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QXFhz-0004qn-8U for qemu-devel@nongnu.org; Thu, 16 Jun 2011 12:46:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QXFhx-00076v-Sy for qemu-devel@nongnu.org; Thu, 16 Jun 2011 12:46:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28978) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QXFhw-00076N-Ah for qemu-devel@nongnu.org; Thu, 16 Jun 2011 12:46:17 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p5GGjWh8007308 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 16 Jun 2011 12:46:11 -0400 Received: from doriath (ovpn-113-102.phx2.redhat.com [10.3.113.102]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p5GGcoUp019112; Thu, 16 Jun 2011 12:38:51 -0400 Date: Thu, 16 Jun 2011 13:38:49 -0300 From: Luiz Capitulino To: amit.shah@redhat.com Message-ID: <20110616133849.02fb4bea@doriath> Organization: Red Hat Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: qemu-devel , Markus Armbruster , mdroth@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH] virtio-serial: Fix segfault on guest boot 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 If I start qemu with: # qemu -hda disks/test.img -enable-kvm -m 1G -snapshot \ -device virtio-serial \ -chardev socket,host=localhost,port=1234,server,nowait,id=foo \ -device virtserialport,chardev=foo,name=org.qemu.guest_agent I get a segfault when booting a Fedora 14 guest. The backtrace says: Program terminated with signal 11, Segmentation fault. #0 0x0000000000420850 in handle_control_message (vser=0x3732bd0, buf=0x2c173e0, len=8) at /home/lcapitulino/src/qmp-unstable/hw/virtio-serial-bus.c:335 335 info = DO_UPCAST(VirtIOSerialPortInfo, qdev, port->dev.info); I've also bisected this and git points out to commit: commit a15bb0d6a981de749452a5180fc8084d625671da Author: Markus Armbruster Date: Wed May 25 14:21:13 2011 +0200 virtio-serial: Drop redundant VirtIOSerialPort member info I think what's happening is that the device is not initialized on a VIRTIO_CONSOLE_DEVICE_READY event. Moving the DO_UPCAST() call to the other events fixes the problem to me. Signed-off-by: Luiz Capitulino --- hw/virtio-serial-bus.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c index 9a12104..579f676 100644 --- a/hw/virtio-serial-bus.c +++ b/hw/virtio-serial-bus.c @@ -332,8 +332,6 @@ static void handle_control_message(VirtIOSerial *vser, void *buf, size_t len) if (!port && cpkt.event != VIRTIO_CONSOLE_DEVICE_READY) return; - info = DO_UPCAST(VirtIOSerialPortInfo, qdev, port->dev.info); - switch(cpkt.event) { case VIRTIO_CONSOLE_DEVICE_READY: if (!cpkt.value) { @@ -363,6 +361,7 @@ static void handle_control_message(VirtIOSerial *vser, void *buf, size_t len) * this port is a console port so that the guest can hook it * up to hvc. */ + info = DO_UPCAST(VirtIOSerialPortInfo, qdev, port->dev.info); if (info->is_console) { send_control_event(port, VIRTIO_CONSOLE_CONSOLE_PORT, 1); } @@ -398,6 +397,7 @@ static void handle_control_message(VirtIOSerial *vser, void *buf, size_t len) break; case VIRTIO_CONSOLE_PORT_OPEN: + info = DO_UPCAST(VirtIOSerialPortInfo, qdev, port->dev.info); port->guest_connected = cpkt.value; if (cpkt.value && info->guest_open) { /* Send the guest opened notification if an app is interested */