From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0Wsj-0003wg-WA for qemu-devel@nongnu.org; Fri, 27 Jun 2014 10:12:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X0Wsd-0006rI-4O for qemu-devel@nongnu.org; Fri, 27 Jun 2014 10:12:01 -0400 Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 27 Jun 2014 16:11:42 +0200 Message-Id: <1403878306-22683-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1403878306-22683-1-git-send-email-pbonzini@redhat.com> References: <1403878306-22683-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 1/5] nbd: Don't export a block device with no medium. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Hani Benhabiles From: Hani Benhabiles The device is exported with erroneous values and can't be read. Before the patch: $ sudo nbd-client localhost -p 10809 /dev/nbd0 -name floppy0 Negotiation: ..size = 17592186044415MB bs=1024, sz=18446744073709547520 bytes $ sudo mount /dev/nbd0 /mnt/tmp/ mount: block device /dev/nbd0 is write-protected, mounting read-only mount: /dev/nbd0: can't read superblock After the patch: (qemu) nbd_server_add ide0-hd0 (qemu) nbd_server_add floppy0 Device 'floppy0' has no medium Signed-off-by: Hani Benhabiles Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- blockdev-nbd.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/blockdev-nbd.c b/blockdev-nbd.c index b60b66d..18dc528 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -91,6 +91,10 @@ void qmp_nbd_server_add(const char *device, bool has_writable, bool writable, error_set(errp, QERR_DEVICE_NOT_FOUND, device); return; } + if (!bdrv_is_inserted(bs)) { + error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, device); + return; + } if (!has_writable) { writable = false; -- 1.8.3.1