From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43927)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <quintela@redhat.com>) id 1Zz13Y-00061O-9S
	for qemu-devel@nongnu.org; Wed, 18 Nov 2015 06:37:45 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <quintela@redhat.com>) id 1Zz13V-00043x-21
	for qemu-devel@nongnu.org; Wed, 18 Nov 2015 06:37:44 -0500
Received: from mx1.redhat.com ([209.132.183.28]:59009)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <quintela@redhat.com>) id 1Zz13U-00043k-Sv
	for qemu-devel@nongnu.org; Wed, 18 Nov 2015 06:37:40 -0500
From: Juan Quintela <quintela@redhat.com>
In-Reply-To: <87vb910w7r.fsf@blackfin.pond.sub.org> (Markus Armbruster's
	message of "Tue, 17 Nov 2015 11:14:00 +0100")
References: <1447687950-29350-1-git-send-email-den@openvz.org>
	<1447687950-29350-4-git-send-email-den@openvz.org>
	<87vb910w7r.fsf@blackfin.pond.sub.org>
Date: Wed, 18 Nov 2015 12:37:26 +0100
Message-ID: <87io4zmtc9.fsf@emacs.mitica>
MIME-Version: 1.0
Content-Type: text/plain
Subject: Re: [Qemu-devel] [PATCH 3/5] qmp: create qmp_delvm command
Reply-To: quintela@redhat.com
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Markus Armbruster <armbru@redhat.com>
Cc: Amit Shah <amit.shah@redhat.com>, "Denis V. Lunev" <den@openvz.org>, qemu-devel@nongnu.org

Markus Armbruster <armbru@redhat.com> wrote:
> "Denis V. Lunev" <den@openvz.org> writes:
>
>> Signed-off-by: Denis V. Lunev <den@openvz.org>
>> CC: Juan Quintela <quintela@redhat.com>
>> CC: Amit Shah <amit.shah@redhat.com>
>> CC: Markus Armbruster <armbru@redhat.com>
>> CC: Eric Blake <eblake@redhat.com>
>> ---
>>  migration/savevm.c | 27 ++++++++++++++++++---------
>>  qapi-schema.json   | 13 +++++++++++++
>>  qmp-commands.hx    | 23 +++++++++++++++++++++++
>>  3 files changed, 54 insertions(+), 9 deletions(-)
>>
>> diff --git a/migration/savevm.c b/migration/savevm.c
>> index 565b10a..90b6850 100644
>> --- a/migration/savevm.c
>> +++ b/migration/savevm.c
>> @@ -2115,17 +2115,26 @@ int load_vmstate(const char *name)
>>      return 0;
>>  }
>>  
>> -void hmp_delvm(Monitor *mon, const QDict *qdict)
>> +void qmp_delvm(const char *name, Error **errp)
>>  {
>>      BlockDriverState *bs;
>> -    Error *err;
>> -    const char *name = qdict_get_str(qdict, "name");
>> -
>> -    if (bdrv_all_delete_snapshot(name, &bs, &err) < 0) {
>> -        monitor_printf(mon,
>> -                       "Error while deleting snapshot on device '%s': %s\n",
>> -                       bdrv_get_device_name(bs), error_get_pretty(err));
>> -        error_free(err);
>> +    Error *local_err = NULL;
>> +
>> +    if (bdrv_all_delete_snapshot(name, &bs, errp) < 0) {
>> +        error_setg(errp, "Error while deleting snapshot on device '%s': %s",
>> +                   bdrv_get_device_name(bs), error_get_pretty(local_err));
>> +        error_free(local_err);
>> +    }
>> +}
>> +
>> +void hmp_delvm(Monitor *mon, const QDict *qdict)
>> +{
>> +    Error *local_err = NULL;
>> +    qmp_delvm(qdict_get_str(qdict, "name"), &local_err);
>> +
>> +    if (local_err != NULL) {
>> +        monitor_printf(mon, "%s\n", error_get_pretty(local_err));
>> +        error_free(local_err);
>
> error_report_err(), please.
>
>>      }
>>  }
>
> Juan, Amit, in case you'd prefer to move out the parts that implement
> HMP on top of QMP: they can go into hmp.c as long as they're as simple
> as this one.

Perfect for me.

Thanks, Juan.