From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpwfI-0007dK-9E for qemu-devel@nongnu.org; Fri, 30 Sep 2016 08:11:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpwfG-0006aY-Mf for qemu-devel@nongnu.org; Fri, 30 Sep 2016 08:11:43 -0400 From: Fam Zheng Date: Fri, 30 Sep 2016 20:09:44 +0800 Message-Id: <1475237406-26917-15-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> Subject: [Qemu-devel] [PATCH v8 14/36] scsi-generic: Apply lock-mode when realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: berrange@redhat.com, John Snow , qemu-block@nongnu.org, Kevin Wolf , rjones@redhat.com, Jeff Cody , Max Reitz , Markus Armbruster , stefanha@redhat.com, den@openvz.org, pbonzini@redhat.com, eblake@redhat.com Signed-off-by: Fam Zheng --- hw/scsi/scsi-generic.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 7a588a7..4f131e8 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -502,12 +502,19 @@ static void scsi_generic_realize(SCSIDevice *s, Error **errp) int rc; int sg_version; struct sg_scsi_id scsiid; + Error *err = NULL; if (!s->conf.blk) { error_setg(errp, "drive property not set"); return; } + blk_lock_image(s->conf.blk, s->conf.lock_mode, &err); + if (err) { + error_propagate(errp, err); + return; + } + if (blk_get_on_error(s->conf.blk, 0) != BLOCKDEV_ON_ERROR_ENOSPC) { error_setg(errp, "Device doesn't support drive option werror"); return; -- 2.7.4