From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47168) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIhMy-000564-9i for qemu-devel@nongnu.org; Mon, 01 Oct 2012 10:53:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TIhMs-0002ol-21 for qemu-devel@nongnu.org; Mon, 01 Oct 2012 10:53:16 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:59686) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIhMr-0002hR-SE for qemu-devel@nongnu.org; Mon, 01 Oct 2012 10:53:09 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so4358094pad.4 for ; Mon, 01 Oct 2012 07:53:09 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 1 Oct 2012 16:52:24 +0200 Message-Id: <1349103144-6827-10-git-send-email-pbonzini@redhat.com> In-Reply-To: <1349103144-6827-1-git-send-email-pbonzini@redhat.com> References: <1349103144-6827-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 9/9] hmp: add NBD server commands List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com Signed-off-by: Paolo Bonzini --- hmp-commands.hx | 29 +++++++++++++++++++++++++++++ hmp.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ hmp.h | 2 ++ 3 file modificati, 86 inserzioni(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index ed67e99..b0af484 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1247,6 +1247,35 @@ Remove all matches from the access control list, and set the default policy back to @code{deny}. ETEXI + { + .name = "nbd_server_start", + .args_type = "writable:-w,uri:s", + .params = "nbd_server_start [-w] host:port", + .help = "serve block devices on the given host and port", + .mhandler.cmd = hmp_nbd_server_start, + }, +STEXI +@item nbd_server_start @var{host}:@var{port} +@findex nbd_server_start +Start an NBD server on the given host and/or port, and serve all of the +virtual machine's block devices that have an inserted media on it. +The @option{-w} option makes the devices writable. +ETEXI + + { + .name = "nbd_server_stop", + .args_type = "", + .params = "nbd_server_stop", + .help = "stop serving block devices using the NBD protocol", + .mhandler.cmd = hmp_nbd_server_stop, + }, +STEXI +@item nbd_server_stop +@findex nbd_server_stop +Stop the QEMU embedded NBD server. +ETEXI + + #if defined(TARGET_I386) { diff --git a/hmp.c b/hmp.c index ba6fbd3..3d27628 100644 --- a/hmp.c +++ b/hmp.c @@ -18,6 +18,7 @@ #include "qemu-option.h" #include "qemu-timer.h" #include "qmp-commands.h" +#include "qemu_socket.h" #include "monitor.h" #include "console.h" @@ -1168,3 +1169,57 @@ void hmp_screen_dump(Monitor *mon, const QDict *qdict) qmp_screendump(filename, &err); hmp_handle_error(mon, &err); } + +void hmp_nbd_server_start(Monitor *mon, const QDict *qdict) +{ + const char *uri = qdict_get_str(qdict, "uri"); + int writable = qdict_get_try_bool(qdict, "writable", 0); + Error *local_err = NULL; + BlockInfoList *block_list, *info; + SocketAddress *addr; + + /* First check if the address is valid and start the server. */ + addr = socket_parse(uri, &local_err); + if (local_err != NULL) { + goto exit; + } + + qmp_nbd_server_start(addr, &local_err); + qapi_free_SocketAddress(addr); + if (local_err != NULL) { + goto exit; + } + + /* Then try adding all block devices. If one fails, close all and + * exit. + */ + block_list = qmp_query_block(NULL); + + for (info = block_list; info; info = info->next) { + if (!info->value->has_inserted) { + continue; + } + + qmp_nbd_server_add(info->value->device, + true, !info->value->inserted->ro && writable, + &local_err); + + if (local_err != NULL) { + qmp_nbd_server_stop(NULL); + break; + } + } + + qapi_free_BlockInfoList(block_list); + +exit: + hmp_handle_error(mon, &local_err); +} + +void hmp_nbd_server_stop(Monitor *mon, const QDict *qdict) +{ + Error *errp = NULL; + + qmp_nbd_server_stop(&errp); + hmp_handle_error(mon, &errp); +} diff --git a/hmp.h b/hmp.h index 48b9c59..0d02479 100644 --- a/hmp.h +++ b/hmp.h @@ -73,5 +73,7 @@ void hmp_getfd(Monitor *mon, const QDict *qdict); void hmp_closefd(Monitor *mon, const QDict *qdict); void hmp_send_key(Monitor *mon, const QDict *qdict); void hmp_screen_dump(Monitor *mon, const QDict *qdict); +void hmp_nbd_server_start(Monitor *mon, const QDict *qdict); +void hmp_nbd_server_stop(Monitor *mon, const QDict *qdict); #endif -- 1.7.12