From patchwork Mon Feb 13 17:10:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 140958 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 057EAB6FA8 for ; Tue, 14 Feb 2012 05:32:32 +1100 (EST) Received: from localhost ([::1]:46835 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RwzR7-0003nz-1P for incoming@patchwork.ozlabs.org; Mon, 13 Feb 2012 12:11:33 -0500 Received: from eggs.gnu.org ([140.186.70.92]:41476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RwzQk-00035X-6l for qemu-devel@nongnu.org; Mon, 13 Feb 2012 12:11:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RwzQf-0005EW-11 for qemu-devel@nongnu.org; Mon, 13 Feb 2012 12:11:09 -0500 Received: from mail-pw0-f45.google.com ([209.85.160.45]:65375) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RwzQe-00057q-Kb for qemu-devel@nongnu.org; Mon, 13 Feb 2012 12:11:04 -0500 Received: by mail-pw0-f45.google.com with SMTP id ro12so5449571pbb.4 for ; Mon, 13 Feb 2012 09:11:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=sfelbXknUYORvm6nGIIomLmiWzPlkMgBNByx/FUpmZo=; b=o+U1axFsY2nBOcgV4LGmWzR8i4PQW9TyRJ5BVMxya8BPSKwzyL1v7rg/R7Hh72EVvf rdNtXxBLCVJ+pyFLcAnrvBRFzvfNdMYRBg3vQIsN4V8i9LEtawHa7QnLA+ZIH1XVDAhS h/H+JMZcSIyIUUp2TncbE80eLPY/fzKqRNNRo= Received: by 10.68.130.233 with SMTP id oh9mr5075077pbb.92.1329153064143; Mon, 13 Feb 2012 09:11:04 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-182-16.ip50.fastwebnet.it. [93.34.182.16]) by mx.google.com with ESMTPS id f1sm20940150pbq.15.2012.02.13.09.11.01 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 13 Feb 2012 09:11:03 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 13 Feb 2012 18:10:16 +0100 Message-Id: <1329153022-31159-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1329153022-31159-1-git-send-email-pbonzini@redhat.com> References: <1329153022-31159-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 Cc: kwolf@redhat.com, stefanha@gmail.com, christian.hoff@de.ibm.com, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH v3 09/15] scsi-generic: add migration support 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 Signed-off-by: Paolo Bonzini --- hw/scsi-generic.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 4859212..cd62922 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -59,6 +59,28 @@ typedef struct SCSIGenericReq { sg_io_hdr_t io_header; } SCSIGenericReq; +static void scsi_generic_save_request(QEMUFile *f, SCSIRequest *req) +{ + SCSIGenericReq *r = DO_UPCAST(SCSIGenericReq, req, req); + + qemu_put_sbe32s(f, &r->buflen); + if (r->buflen && r->req.cmd.mode == SCSI_XFER_TO_DEV) { + assert(!r->req.sg); + qemu_put_buffer(f, r->buf, r->req.cmd.xfer); + } +} + +static void scsi_generic_load_request(QEMUFile *f, SCSIRequest *req) +{ + SCSIGenericReq *r = DO_UPCAST(SCSIGenericReq, req, req); + + qemu_get_sbe32s(f, &r->buflen); + if (r->buflen && r->req.cmd.mode == SCSI_XFER_TO_DEV) { + assert(!r->req.sg); + qemu_get_buffer(f, r->buf, r->req.cmd.xfer); + } +} + static void scsi_free_request(SCSIRequest *req) { SCSIGenericReq *r = DO_UPCAST(SCSIGenericReq, req, req); @@ -446,6 +468,8 @@ const SCSIReqOps scsi_generic_req_ops = { .write_data = scsi_write_data, .cancel_io = scsi_cancel_io, .get_buf = scsi_get_buf, + .load_request = scsi_generic_load_request, + .save_request = scsi_generic_save_request, }; static SCSIRequest *scsi_new_request(SCSIDevice *d, uint32_t tag, uint32_t lun, @@ -474,6 +498,7 @@ static void scsi_generic_class_initfn(ObjectClass *klass, void *data) dc->desc = "pass through generic scsi device (/dev/sg*)"; dc->reset = scsi_generic_reset; dc->props = scsi_generic_properties; + dc->vmsd = &vmstate_scsi_device; } static TypeInfo scsi_generic_info = {