From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d30Ut-0000Ld-Fg for qemu-devel@nongnu.org; Tue, 25 Apr 2017 09:27:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d30Uo-0005M6-HO for qemu-devel@nongnu.org; Tue, 25 Apr 2017 09:27:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45740) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d30Uo-0005LV-8I for qemu-devel@nongnu.org; Tue, 25 Apr 2017 09:27:10 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 44AA265D06 for ; Tue, 25 Apr 2017 13:27:09 +0000 (UTC) References: <20170425102446.4008-1-quintela@redhat.com> <20170425102446.4008-2-quintela@redhat.com> From: Laurent Vivier Message-ID: <187f04b5-a3a4-05f0-0ca9-6da60800bcf2@redhat.com> Date: Tue, 25 Apr 2017 15:27:01 +0200 MIME-Version: 1.0 In-Reply-To: <20170425102446.4008-2-quintela@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1/6] monitor: Remove monitor parameter from save_vmstate List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela , qemu-devel@nongnu.org Cc: dgilbert@redhat.com, peterx@redhat.com On 25/04/2017 12:24, Juan Quintela wrote: > load_vmstate() already use error_report, so be consistent. There is > an identical error message in load_vmstate() that ends in a > period. Remove it. > > Signed-off-by: Juan Quintela Reviewed-by: Laurent Vivier > --- > include/sysemu/sysemu.h | 2 +- > migration/savevm.c | 20 ++++++++++---------- > replay/replay-snapshot.c | 2 +- > 3 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h > index 16175f7..b6daf9d 100644 > --- a/include/sysemu/sysemu.h > +++ b/include/sysemu/sysemu.h > @@ -76,7 +76,7 @@ void qemu_add_machine_init_done_notifier(Notifier *notify); > void qemu_remove_machine_init_done_notifier(Notifier *notify); > > void hmp_savevm(Monitor *mon, const QDict *qdict); > -int save_vmstate(Monitor *mon, const char *name); > +int save_vmstate(const char *name); > int load_vmstate(const char *name); > void hmp_delvm(Monitor *mon, const QDict *qdict); > void hmp_info_snapshots(Monitor *mon, const QDict *qdict); > diff --git a/migration/savevm.c b/migration/savevm.c > index 7421a67..ff934aa 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -2070,7 +2070,7 @@ int qemu_loadvm_state(QEMUFile *f) > return ret; > } > > -int save_vmstate(Monitor *mon, const char *name) > +int save_vmstate(const char *name) > { > BlockDriverState *bs, *bs1; > QEMUSnapshotInfo sn1, *sn = &sn1, old_sn1, *old_sn = &old_sn1; > @@ -2084,8 +2084,8 @@ int save_vmstate(Monitor *mon, const char *name) > AioContext *aio_context; > > if (!bdrv_all_can_snapshot(&bs)) { > - monitor_printf(mon, "Device '%s' is writable but does not " > - "support snapshots.\n", bdrv_get_device_name(bs)); > + error_report("Device '%s' is writable but does not support snapshots", > + bdrv_get_device_name(bs)); > return ret; > } > > @@ -2102,7 +2102,7 @@ int save_vmstate(Monitor *mon, const char *name) > > bs = bdrv_all_find_vmstate_bs(); > if (bs == NULL) { > - monitor_printf(mon, "No block device can accept snapshots\n"); > + error_report("No block device can accept snapshots"); > return ret; > } > aio_context = bdrv_get_aio_context(bs); > @@ -2111,7 +2111,7 @@ int save_vmstate(Monitor *mon, const char *name) > > ret = global_state_store(); > if (ret) { > - monitor_printf(mon, "Error saving global state\n"); > + error_report("Error saving global state"); > return ret; > } > vm_stop(RUN_STATE_SAVE_VM); > @@ -2143,7 +2143,7 @@ int save_vmstate(Monitor *mon, const char *name) > /* save the VM state */ > f = qemu_fopen_bdrv(bs, 1); > if (!f) { > - monitor_printf(mon, "Could not open VM state file\n"); > + error_report("Could not open VM state file"); > goto the_end; > } > ret = qemu_savevm_state(f, &local_err); > @@ -2156,8 +2156,8 @@ int save_vmstate(Monitor *mon, const char *name) > > ret = bdrv_all_create_snapshot(sn, bs, vm_state_size, &bs); > if (ret < 0) { > - monitor_printf(mon, "Error while creating snapshot on '%s'\n", > - bdrv_get_device_name(bs)); > + error_report("Error while creating snapshot on '%s'", > + bdrv_get_device_name(bs)); > goto the_end; > } > > @@ -2173,7 +2173,7 @@ int save_vmstate(Monitor *mon, const char *name) > > void hmp_savevm(Monitor *mon, const QDict *qdict) > { > - save_vmstate(mon, qdict_get_try_str(qdict, "name")); > + save_vmstate(qdict_get_try_str(qdict, "name")); > } > > void qmp_xen_save_devices_state(const char *filename, Error **errp) > @@ -2245,7 +2245,7 @@ int load_vmstate(const char *name) > MigrationIncomingState *mis = migration_incoming_get_current(); > > if (!bdrv_all_can_snapshot(&bs)) { > - error_report("Device '%s' is writable but does not support snapshots.", > + error_report("Device '%s' is writable but does not support snapshots", > bdrv_get_device_name(bs)); > return -ENOTSUP; > } > diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c > index 65e2d37..8cced46 100644 > --- a/replay/replay-snapshot.c > +++ b/replay/replay-snapshot.c > @@ -64,7 +64,7 @@ void replay_vmstate_init(void) > { > if (replay_snapshot) { > if (replay_mode == REPLAY_MODE_RECORD) { > - if (save_vmstate(cur_mon, replay_snapshot) != 0) { > + if (save_vmstate(replay_snapshot) != 0) { > error_report("Could not create snapshot for icount record"); > exit(1); > } >