From patchwork Fri Apr 6 14:02:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 151243 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 43169B704E for ; Sat, 7 Apr 2012 04:36:01 +1000 (EST) Received: from localhost ([::1]:33724 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SG9l5-0006ej-Hb for incoming@patchwork.ozlabs.org; Fri, 06 Apr 2012 10:03:23 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51904) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SG9ka-0005YV-Q4 for qemu-devel@nongnu.org; Fri, 06 Apr 2012 10:02:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SG9kP-00004s-Li for qemu-devel@nongnu.org; Fri, 06 Apr 2012 10:02:50 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:63177) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SG9kP-0008Ui-D8 for qemu-devel@nongnu.org; Fri, 06 Apr 2012 10:02:41 -0400 Received: by pbcuo5 with SMTP id uo5so3011214pbc.4 for ; Fri, 06 Apr 2012 07:02:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=R9awIOUnW6nGNcm+Nfpo3tpVSPOu4S8smWSYjw+sohc=; b=zxzllbx/AYj1fo+cGMxukJcIZGmqwBKv96P9iuLOJBH7SUUfPrH3Hj86FfaitepKSI zkGefczMZukwtGexx5jMRJ56flDCAHkeqAVToiwQgl4QWonnRnUbbk50EV2JdnU0L7r5 nH1SKuonhtF9kcrVlRqit6EwtwBU4sZqtHvlAKC5zjLcmyeOqg3ZxrZuDE+KQpryMF4x KspT4udJM1w5axadrZBwZMef4eUfwuPnZ0Xkn9x6i8wc4U6XZXvffF8CIYwGUVDJAcVX 1ITEOoL4BgaAE69VCHSNwZhSr9rEFc3VFQatXpEZOSvnSmqPnDKwWqTj5CM9ktFxnyMW QDHg== Received: by 10.68.222.165 with SMTP id qn5mr15858333pbc.88.1333720952532; Fri, 06 Apr 2012 07:02:32 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-182-16.ip50.fastwebnet.it. [93.34.182.16]) by mx.google.com with ESMTPS id o7sm6380309pbq.8.2012.04.06.07.02.30 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 06 Apr 2012 07:02:31 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 6 Apr 2012 16:02:17 +0200 Message-Id: <1333720939-670-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.9.3 In-Reply-To: <1333720939-670-1-git-send-email-pbonzini@redhat.com> References: <1333720939-670-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Subject: [Qemu-devel] [PATCH 1/3] virtio-scsi: prepare migration format for multiqueue 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 In order to restore requests correctly from a multitude of virtqueues, we need to store the id of the request queue that each request came from. Do this even for single-queue, by storing a hard-coded zero, to simplify future implementation of multiqueue. Signed-off-by: Paolo Bonzini --- hw/virtio-scsi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c index 45d54fa..0d90d9c 100644 --- a/hw/virtio-scsi.c +++ b/hw/virtio-scsi.c @@ -240,7 +240,9 @@ static VirtIOSCSIReq *virtio_scsi_pop_req(VirtIOSCSI *s, VirtQueue *vq) static void virtio_scsi_save_request(QEMUFile *f, SCSIRequest *sreq) { VirtIOSCSIReq *req = sreq->hba_private; + uint32_t n = 0; + qemu_put_be32s(f, &n); qemu_put_buffer(f, (unsigned char *)&req->elem, sizeof(req->elem)); } @@ -249,8 +251,11 @@ static void *virtio_scsi_load_request(QEMUFile *f, SCSIRequest *sreq) SCSIBus *bus = sreq->bus; VirtIOSCSI *s = container_of(bus, VirtIOSCSI, bus); VirtIOSCSIReq *req; + uint32_t n; req = g_malloc(sizeof(*req)); + qemu_get_be32s(f, &n); + assert(n == 0); qemu_get_buffer(f, (unsigned char *)&req->elem, sizeof(req->elem)); virtio_scsi_parse_req(s, s->cmd_vq, req);