From patchwork Fri Mar 15 01:45:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asias He X-Patchwork-Id: 227838 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 7B19B2C00D5 for ; Fri, 15 Mar 2013 12:47:42 +1100 (EST) Received: from localhost ([::1]:35906 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGJkC-0004XR-PH for incoming@patchwork.ozlabs.org; Thu, 14 Mar 2013 21:47:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42491) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGJjn-0004Ql-8m for qemu-devel@nongnu.org; Thu, 14 Mar 2013 21:47:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGJjk-0006r5-Lu for qemu-devel@nongnu.org; Thu, 14 Mar 2013 21:47:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5335) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGJjk-0006qw-Ef for qemu-devel@nongnu.org; Thu, 14 Mar 2013 21:47:12 -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 r2F1l9Sk021410 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 14 Mar 2013 21:47:09 -0400 Received: from hj.localdomain.com (vpn1-113-152.nay.redhat.com [10.66.113.152]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2F1jfiG015840; Thu, 14 Mar 2013 21:46:50 -0400 From: Asias He To: seabios@seabios.org Date: Fri, 15 Mar 2013 09:45:16 +0800 Message-Id: <1363311916-23121-3-git-send-email-asias@redhat.com> In-Reply-To: <1363311916-23121-1-git-send-email-asias@redhat.com> References: <1363311916-23121-1-git-send-email-asias@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: target-devel@vger.kernel.org, kvm@vger.kernel.org, "Michael S. Tsirkin" , qemu-devel@nongnu.org, Nicholas Bellinger , virtualization@lists.linux-foundation.org, Kevin O'Connor , Stefan Hajnoczi , Paolo Bonzini , Asias He Subject: [Qemu-devel] [PATCH 2/2] virtio-scsi: Pack struct virtio_scsi_{req_cmd, resp_cmd} 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 Device needs the exact size of these data structure. Prevent padding. This fixes guest hang when booting seabios + tcm_vhost. Signed-off-by: Asias He Reviewed-by: Paolo Bonzini Acked-by: Michael S. Tsirkin --- src/virtio-scsi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/virtio-scsi.h b/src/virtio-scsi.h index bbfbf30..96c3701 100644 --- a/src/virtio-scsi.h +++ b/src/virtio-scsi.h @@ -26,7 +26,7 @@ struct virtio_scsi_req_cmd { u8 prio; u8 crn; char cdb[VIRTIO_SCSI_CDB_SIZE]; -}; +} __attribute__((packed)); /* This is the first element of the "in" scatter-gather list. */ struct virtio_scsi_resp_cmd { @@ -36,7 +36,7 @@ struct virtio_scsi_resp_cmd { u8 status; u8 response; u8 sense[VIRTIO_SCSI_SENSE_SIZE]; -}; +} __attribute__((packed)); #define VIRTIO_SCSI_S_OK 0