From patchwork Wed Jul 20 16:24:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 105786 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 07C3AB6F6F for ; Thu, 21 Jul 2011 04:41:50 +1000 (EST) Received: from localhost ([::1]:51090 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjbiM-0000hB-IK for incoming@patchwork.ozlabs.org; Wed, 20 Jul 2011 14:41:46 -0400 Received: from eggs.gnu.org ([140.186.70.92]:40004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZhJ-00060l-UL for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:32:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QjZhF-0001Nq-Ef for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:32:33 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:39239) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZhD-0001Lf-4g for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:32:27 -0400 Received: from oxygen-old.pond.sub.org (unknown [IPv6:2a01:4f8:130:9021::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "oxygen.pond.sub.org", Issuer "CAcert Class 3 Root" (verified OK)) by oxygen.pond.sub.org (Postfix) with ESMTPS id 14145A246F; Wed, 20 Jul 2011 18:32:25 +0200 (CEST) Received: from blackfin.pond.sub.org (p5B32D5F4.dip.t-dialin.net [91.50.213.244]) by oxygen-old.pond.sub.org (Postfix) with ESMTPA id 9CE1D2771CC; Wed, 20 Jul 2011 18:32:24 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id CE2CE367; Wed, 20 Jul 2011 18:24:32 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 20 Jul 2011 18:24:12 +0200 Message-Id: <1311179069-27882-39-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1311179069-27882-1-git-send-email-armbru@redhat.com> References: <1311179069-27882-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 78.46.104.156 Cc: kwolf@redhat.com, quintela@redhat.com, dbaryshkov@gmail.com, stefano.stabellini@eu.citrix.com, lcapitulino@redhat.com, amit.shah@redhat.com Subject: [Qemu-devel] [PATCH 38/55] scsi-disk: Preserve tray state on migration 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 Breaks migration of qdevs "scsi-cd" and legacy "scsi-disk" to older versions. We normally use subsections to avoid that. Not possible here, because we don't have a section to begin with. Too bad. Signed-off-by: Markus Armbruster --- hw/scsi-disk.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 553d8c6..ad63814 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1368,6 +1368,39 @@ static int scsi_disk_initfn(SCSIDevice *dev) return scsi_initfn(dev, kind); } +static int scsi_cd_post_load(void *opaque, int version_id) +{ + SCSIDiskState *s = opaque; + + bdrv_eject(s->bs, s->tray_open); + bdrv_lock_medium(s->bs, s->tray_locked); + return 0; +} + +static const VMStateDescription vmstate_scsi_cd = { + .name = "scsi-cd", + .version_id = 0, + .minimum_version_id = 0, + .post_load = scsi_cd_post_load, + .fields = (VMStateField[]) { + VMSTATE_BOOL(tray_open, SCSIDiskState), + VMSTATE_BOOL(tray_locked, SCSIDiskState), + VMSTATE_END_OF_LIST() + } +}; + +static const VMStateDescription vmstate_scsi_disk = { + .name = "scsi-disk", + .version_id = 0, + .minimum_version_id = 0, + .post_load = scsi_cd_post_load, + .fields = (VMStateField[]) { + VMSTATE_BOOL(tray_open, SCSIDiskState), + VMSTATE_BOOL(tray_locked, SCSIDiskState), + VMSTATE_END_OF_LIST() + } +}; + #define DEFINE_SCSI_DISK_PROPERTIES() \ DEFINE_BLOCK_PROPERTIES(SCSIDiskState, qdev.conf), \ DEFINE_PROP_STRING("ver", SCSIDiskState, version), \ @@ -1400,6 +1433,7 @@ static SCSIDeviceInfo scsi_disk_info[] = { .qdev.fw_name = "disk", .qdev.desc = "virtual SCSI CD-ROM", .qdev.size = sizeof(SCSIDiskState), + .qdev.vmsd = &vmstate_scsi_cd, .qdev.reset = scsi_disk_reset, .init = scsi_cd_initfn, .destroy = scsi_destroy, @@ -1420,6 +1454,7 @@ static SCSIDeviceInfo scsi_disk_info[] = { .qdev.fw_name = "disk", .qdev.desc = "virtual SCSI disk or CD-ROM (legacy)", .qdev.size = sizeof(SCSIDiskState), + .qdev.vmsd = &vmstate_scsi_disk, .qdev.reset = scsi_disk_reset, .init = scsi_disk_initfn, .destroy = scsi_destroy,