From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:60926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTbGd-0003yg-1w for qemu-devel@nongnu.org; Mon, 06 Jun 2011 10:59:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QTbGa-0002QL-9r for qemu-devel@nongnu.org; Mon, 06 Jun 2011 10:58:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37743) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTbGY-0002PF-RS for qemu-devel@nongnu.org; Mon, 06 Jun 2011 10:58:55 -0400 Date: Mon, 6 Jun 2011 11:58:47 -0300 From: Luiz Capitulino Message-ID: <20110606115847.35ea7a00@doriath> In-Reply-To: References: <1307127842-12102-1-git-send-email-lcapitulino@redhat.com> <1307127842-12102-8-git-send-email-lcapitulino@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [RFC 07/10] QMP: Introduce the blockdev-media-insert command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: kwolf@redhat.com, amit.shah@redhat.com, aliguori@us.ibm.com, qemu-devel@nongnu.org On Mon, 06 Jun 2011 15:40:28 +0200 Markus Armbruster wrote: > Luiz Capitulino writes: > > > This command inserts a new media in an already opened tray. It's only > > available in QMP. > > > > Please, check the command's documentation (being introduced in this > > commit) for a detailed description. > > > > Signed-off-by: Luiz Capitulino > > --- > > blockdev.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > > blockdev.h | 1 + > > qmp-commands.hx | 32 ++++++++++++++++++++++++++++++++ > > 3 files changed, 85 insertions(+), 0 deletions(-) > > > > diff --git a/blockdev.c b/blockdev.c > > index 943905d..14c8312 100644 > > --- a/blockdev.c > > +++ b/blockdev.c > > @@ -721,6 +721,58 @@ static int tray_close(const char *device) > > return 0; > > } > > > > +static int media_insert(const char *device, const char *mediafile, > > + const char *format) > > +{ > > + BlockDriver *drv = NULL; > > + BlockDriverState *bs; > > + int bdrv_flags; > > + > > + bs = bdrv_removable_find(device); > > + if (!bs) { > > + return -1; > > + } > > + > > + if (bdrv_is_locked(bs)) { > > + qerror_report(QERR_DEVICE_LOCKED, bdrv_get_device_name(bs)); > > + return -1; > > + } > > Why fail if locked? > > If you managed to pry open the tray, I guess nothing should stop you > from changing the media in it. Makes sense. > > > + > > + if (bdrv_is_inserted(bs)) { > > + /* FIXME: will report undefined error in QMP */ > > + return -1; > > + } > > + > > + if (!bs->tray_open) { > > + /* FIXME: will report undefined error in QMP */ > > + return 1; > > + } > > + > > + if (format) { > > + drv = bdrv_find_whitelisted_format(format); > > + if (!drv) { > > + qerror_report(QERR_INVALID_BLOCK_FORMAT, format); > > + return -1; > > + } > > + } > > + > > + bdrv_flags = bdrv_is_read_only(bs) ? 0 : BDRV_O_RDWR; > > + bdrv_flags |= bdrv_is_snapshot(bs) ? BDRV_O_SNAPSHOT : 0; > > + if (bdrv_open(bs, mediafile, bdrv_flags, drv) < 0) { > > + qerror_report(QERR_OPEN_FILE_FAILED, mediafile); > > + return -1; > > + } > > + > > + return 0; > > +} > [...] >