From patchwork Tue Jul 6 12:37:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 58013 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BFBD2B6F05 for ; Tue, 6 Jul 2010 22:44:36 +1000 (EST) Received: from localhost ([127.0.0.1]:51419 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OW7Vo-0001O2-6z for incoming@patchwork.ozlabs.org; Tue, 06 Jul 2010 08:44:32 -0400 Received: from [140.186.70.92] (port=46836 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OW7PO-0005yP-OL for qemu-devel@nongnu.org; Tue, 06 Jul 2010 08:37:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OW7PM-00080I-3P for qemu-devel@nongnu.org; Tue, 06 Jul 2010 08:37:54 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:60884) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OW7PL-0007zf-Qy for qemu-devel@nongnu.org; Tue, 06 Jul 2010 08:37:52 -0400 Received: from blackfin.pond.sub.org (pD9E3954B.dip.t-dialin.net [217.227.149.75]) by oxygen.pond.sub.org (Postfix) with ESMTPA id B67052DD3C0; Tue, 6 Jul 2010 14:37:49 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 41FD2D8; Tue, 6 Jul 2010 14:37:49 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 6 Jul 2010 14:37:44 +0200 Message-Id: <1278419869-26126-4-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1278419869-26126-1-git-send-email-armbru@redhat.com> References: <1278419869-26126-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: kwolf@redhat.com, kraxel@redhat.com, hch@lst.de Subject: [Qemu-devel] [PATCH 3/8] ide scsi virtio-blk: Reject empty drives unless media is removable X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Disks without media make no sense. For SCSI, a Linux guest kernel complains during boot. I didn't try other combinations. scsi-generic doesn't need the additional check, because it already requires bdrv_is_sg(), which fails without media. Signed-off-by: Markus Armbruster Reviewed-by: Christoph Hellwig --- hw/ide/core.c | 4 ++++ hw/scsi-disk.c | 5 +++++ hw/virtio-blk.c | 4 ++++ 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index af52c2c..e20f2e7 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2630,6 +2630,10 @@ int ide_init_drive(IDEState *s, BlockDriverState *bs, s->drive_kind = IDE_CD; bdrv_set_change_cb(bs, cdrom_change_cb, s); } else { + if (!bdrv_is_inserted(s->bs)) { + error_report("Device needs media, but drive is empty"); + return -1; + } if (bdrv_is_read_only(bs)) { error_report("Can't use a read-only drive"); return -1; diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index c30709c..f43f2d0 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1059,6 +1059,11 @@ static int scsi_disk_initfn(SCSIDevice *dev) s->bs = s->qdev.conf.bs; is_cd = bdrv_get_type_hint(s->bs) == BDRV_TYPE_CDROM; + if (!is_cd && !bdrv_is_inserted(s->bs)) { + error_report("Device needs media, but drive is empty"); + return -1; + } + if (bdrv_get_on_error(s->bs, 1) != BLOCK_ERR_REPORT) { error_report("Device doesn't support drive option rerror"); return -1; diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 2de1a5a..89ea20e 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -495,6 +495,10 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf) error_report("virtio-blk-pci: drive property not set"); return NULL; } + if (!bdrv_is_inserted(conf->bs)) { + error_report("Device needs media, but drive is empty"); + return NULL; + } s = (VirtIOBlock *)virtio_common_init("virtio-blk", VIRTIO_ID_BLOCK, sizeof(struct virtio_blk_config),