From patchwork Wed Feb 22 14:33:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 142499 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 094BEB6EEA for ; Thu, 23 Feb 2012 02:33:49 +1100 (EST) Received: from localhost ([::1]:56252 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0DHW-00042x-P2 for incoming@patchwork.ozlabs.org; Wed, 22 Feb 2012 09:34:58 -0500 Received: from eggs.gnu.org ([140.186.70.92]:37721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0DHH-0003fl-01 for qemu-devel@nongnu.org; Wed, 22 Feb 2012 09:34:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S0DH6-0002R5-OX for qemu-devel@nongnu.org; Wed, 22 Feb 2012 09:34:42 -0500 Received: from mail-pw0-f45.google.com ([209.85.160.45]:64984) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0DH6-0002M5-Fv for qemu-devel@nongnu.org; Wed, 22 Feb 2012 09:34:32 -0500 Received: by mail-pw0-f45.google.com with SMTP id ro12so281162pbb.4 for ; Wed, 22 Feb 2012 06:34:32 -0800 (PST) Received-SPF: pass (google.com: domain of paolo.bonzini@gmail.com designates 10.68.136.33 as permitted sender) client-ip=10.68.136.33; Authentication-Results: mr.google.com; spf=pass (google.com: domain of paolo.bonzini@gmail.com designates 10.68.136.33 as permitted sender) smtp.mail=paolo.bonzini@gmail.com; dkim=pass header.i=paolo.bonzini@gmail.com Received: from mr.google.com ([10.68.136.33]) by 10.68.136.33 with SMTP id px1mr54142846pbb.38.1329921272066 (num_hops = 1); Wed, 22 Feb 2012 06:34:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=QhoUjSymakqT4H1O2pzeE6TOw7ibNmUF1tJzDNTJ35E=; b=jIKPpEEBdnjPB0kFg82SmYZrH7EHqfzvUyQ0yLNzAWLSFtMpiyaVoAK3reQwbEOCLM WhjRQVTRikVPytLX91C3Q9jNZw3jk2WaEXyRHF5b4UxaiMuzofaP3TmF4OciHvUxw6Tq tpyknmwtrrYAsmB+6OWrWZO/9gdBr7K+nPkhg= Received: by 10.68.136.33 with SMTP id px1mr45122544pbb.38.1329921272017; Wed, 22 Feb 2012 06:34:32 -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 q1sm19120759pbv.49.2012.02.22.06.34.29 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 22 Feb 2012 06:34:31 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 22 Feb 2012 15:33:47 +0100 Message-Id: <1329921236-23461-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1329921236-23461-1-git-send-email-pbonzini@redhat.com> References: <1329921236-23461-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 v4 09/18] 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 86014aa..d856d23 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 = {