From patchwork Fri Sep 30 12:09:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 677012 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3slrKP3R9yz9s5w for ; Fri, 30 Sep 2016 22:26:49 +1000 (AEST) Received: from localhost ([::1]:44088 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpwsk-0003OG-FV for incoming@patchwork.ozlabs.org; Fri, 30 Sep 2016 08:25:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpwfF-0007ZF-HN for qemu-devel@nongnu.org; Fri, 30 Sep 2016 08:11:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpwfD-0006Yo-HK for qemu-devel@nongnu.org; Fri, 30 Sep 2016 08:11:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57482) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpwf8-0006Vj-9V; Fri, 30 Sep 2016 08:11:34 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DD66D3F219; Fri, 30 Sep 2016 12:11:33 +0000 (UTC) Received: from lemon.redhat.com (vpn1-7-9.pek2.redhat.com [10.72.7.9]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u8UCA6Xj017272; Fri, 30 Sep 2016 08:11:28 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 30 Sep 2016 20:09:43 +0800 Message-Id: <1475237406-26917-14-git-send-email-famz@redhat.com> In-Reply-To: <1475237406-26917-1-git-send-email-famz@redhat.com> References: <1475237406-26917-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 30 Sep 2016 12:11:33 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v8 13/36] scsi-disk: Apply lock-mode when realize X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, Markus Armbruster , Jeff Cody , rjones@redhat.com, Max Reitz , stefanha@redhat.com, pbonzini@redhat.com, den@openvz.org, John Snow Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Fam Zheng --- hw/scsi/scsi-disk.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 88beaf4..fb406a0 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2288,6 +2288,12 @@ static void scsi_realize(SCSIDevice *dev, Error **errp) return; } + blk_lock_image(s->qdev.conf.blk, s->qdev.conf.lock_mode, &err); + if (err) { + error_propagate(errp, err); + return; + } + if (!(s->features & (1 << SCSI_DISK_F_REMOVABLE)) && !blk_is_inserted(s->qdev.conf.blk)) { error_setg(errp, "Device needs media, but drive is empty");