From 17b6be4a7fc9db4f4c56908bab137d4c491471f1 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 12 Nov 2012 14:25:17 +0100 Subject: nbd: disallow nbd-server-add before nbd-server-start It works nicely with the QMP commands, but it adds useless complication with HMP. In particular, see the following: (qemu) nbd_server_add -w scsi0-hd0 (qemu) nbd_server_start -a localhost:10809 NBD server already exporting device scsi0-hd0 Signed-off-by: Paolo Bonzini --- blockdev-nbd.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'blockdev-nbd.c') diff --git a/blockdev-nbd.c b/blockdev-nbd.c index e362572279..d1721a3e26 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -82,6 +82,11 @@ void qmp_nbd_server_add(const char *device, bool has_writable, bool writable, NBDExport *exp; NBDCloseNotifier *n; + if (server_fd == -1) { + error_setg(errp, "NBD server not running"); + return; + } + if (nbd_export_find(device)) { error_setg(errp, "NBD server already exporting device '%s'", device); return; -- cgit v1.2.1