From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkxTo-0006cA-A1 for qemu-devel@nongnu.org; Fri, 07 Jun 2013 10:17:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UkxTi-0002Lp-8D for qemu-devel@nongnu.org; Fri, 07 Jun 2013 10:17:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10591) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkxTh-0002Kd-Vn for qemu-devel@nongnu.org; Fri, 07 Jun 2013 10:17:18 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r57EHHmg006146 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 7 Jun 2013 10:17:17 -0400 Date: Fri, 7 Jun 2013 10:17:15 -0400 From: Luiz Capitulino Message-ID: <20130607101715.1d97ac22@redhat.com> In-Reply-To: <1370434781-28570-17-git-send-email-kwolf@redhat.com> References: <1370434781-28570-1-git-send-email-kwolf@redhat.com> <1370434781-28570-17-git-send-email-kwolf@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 16/16] Make qemu-io commands available in HMP List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: pbonzini@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com On Wed, 5 Jun 2013 14:19:41 +0200 Kevin Wolf wrote: > It was decided to not make this command available in QMP in order to > make clear that this is not supposed to be a stable API and should be > used only for testing and debugging purposes. I like this as a temporary solution. But I also see that commands seem to print to stderr, so this needs work before being available in QMP. Even for HMP or the -debug extension this is not desirable. > > Signed-off-by: Kevin Wolf > --- > Makefile | 2 +- > Makefile.objs | 1 + > hmp-commands.hx | 16 ++++++++++++++++ > hmp.c | 18 ++++++++++++++++++ > hmp.h | 1 + > 5 files changed, 37 insertions(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 87298e5..9a77ae0 100644 > --- a/Makefile > +++ b/Makefile > @@ -186,7 +186,7 @@ qemu-img.o: qemu-img-cmds.h > > qemu-img$(EXESUF): qemu-img.o $(block-obj-y) libqemuutil.a libqemustub.a > qemu-nbd$(EXESUF): qemu-nbd.o $(block-obj-y) libqemuutil.a libqemustub.a > -qemu-io$(EXESUF): qemu-io.o qemu-io-cmds.o $(block-obj-y) libqemuutil.a libqemustub.a > +qemu-io$(EXESUF): qemu-io.o $(block-obj-y) libqemuutil.a libqemustub.a > > qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o > > diff --git a/Makefile.objs b/Makefile.objs > index 286ce06..5b288ba 100644 > --- a/Makefile.objs > +++ b/Makefile.objs > @@ -13,6 +13,7 @@ block-obj-$(CONFIG_POSIX) += aio-posix.o > block-obj-$(CONFIG_WIN32) += aio-win32.o > block-obj-y += block/ > block-obj-y += qapi-types.o qapi-visit.o > +block-obj-y += qemu-io-cmds.o > > block-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o > block-obj-y += qemu-coroutine-sleep.o > diff --git a/hmp-commands.hx b/hmp-commands.hx > index 9cea415..a6167bd 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -1551,6 +1551,22 @@ Removes the chardev @var{id}. > ETEXI > > { > + .name = "qemu-io", > + .args_type = "device:B,command:s", > + .params = "[device] \"[command]\"", > + .help = "run a qemu-io command on a block device", > + .mhandler.cmd = hmp_qemu_io, > + }, > + > +STEXI > +@item qemu-io @var{device} @var{command} > +@findex qemu-io > + > +Executes a qemu-io command on the given block device. > + > +ETEXI > + > + { > .name = "info", > .args_type = "item:s?", > .params = "[subcommand]", > diff --git a/hmp.c b/hmp.c > index 4fb76ec..64e0baa 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -22,6 +22,7 @@ > #include "qemu/sockets.h" > #include "monitor/monitor.h" > #include "ui/console.h" > +#include "qemu-io.h" > > static void hmp_handle_error(Monitor *mon, Error **errp) > { > @@ -1425,3 +1426,20 @@ void hmp_chardev_remove(Monitor *mon, const QDict *qdict) > qmp_chardev_remove(qdict_get_str(qdict, "id"), &local_err); > hmp_handle_error(mon, &local_err); > } > + > +void hmp_qemu_io(Monitor *mon, const QDict *qdict) > +{ > + BlockDriverState *bs; > + const char* device = qdict_get_str(qdict, "device"); > + const char* command = qdict_get_str(qdict, "command"); > + Error *err = NULL; > + > + bs = bdrv_find(device); > + if (bs) { > + qemuio_command(bs, command); > + } else { > + error_set(&err, QERR_DEVICE_NOT_FOUND, device); > + } > + > + hmp_handle_error(mon, &err); > +} > diff --git a/hmp.h b/hmp.h > index 95fe76e..56d2e92 100644 > --- a/hmp.h > +++ b/hmp.h > @@ -85,5 +85,6 @@ void hmp_nbd_server_add(Monitor *mon, const QDict *qdict); > void hmp_nbd_server_stop(Monitor *mon, const QDict *qdict); > void hmp_chardev_add(Monitor *mon, const QDict *qdict); > void hmp_chardev_remove(Monitor *mon, const QDict *qdict); > +void hmp_qemu_io(Monitor *mon, const QDict *qdict); > > #endif