From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42777) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fwszD-0003aC-9I for qemu-devel@nongnu.org; Mon, 03 Sep 2018 13:50:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fwszA-0004XC-5m for qemu-devel@nongnu.org; Mon, 03 Sep 2018 13:50:03 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:36928 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fwszA-0004W1-0Q for qemu-devel@nongnu.org; Mon, 03 Sep 2018 13:50:00 -0400 From: Juan Quintela In-Reply-To: <20180903162613.15877-1-joserz@linux.ibm.com> (Jose Ricardo Ziviani's message of "Mon, 3 Sep 2018 13:26:13 -0300") References: <20180903162613.15877-1-joserz@linux.ibm.com> Reply-To: quintela@redhat.com Date: Mon, 03 Sep 2018 19:49:56 +0200 Message-ID: <87r2ia1nej.fsf@trasno.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH] Add a hint message to loadvm and exits on failure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jose Ricardo Ziviani Cc: qemu-devel@nongnu.org, dgilbert@redhat.com, pbonzini@redhat.com Jose Ricardo Ziviani wrote: > This patch adds a small hint for the failure case of the load snapshot > process. It may be useful for users to remember that the VM > configuration has changed between the save and load processes. > > (qemu) loadvm vm-20180903083641 > Unknown savevm section or instance 'cpu_common' 4. > Make sure that your current VM setup matches your saved VM setup, including any hotplugged devices > Error -22 while loading VM state > (qemu) device_add host-spapr-cpu-core,core-id=4 > (qemu) loadvm vm-20180903083641 > (qemu) c > (qemu) info status > VM status: running > > It also exits Qemu if the snapshot cannot be loaded before reaching the > main loop (-loadvm in the command line). > > $ qemu-system-ppc64 ... -loadvm vm-20180903083641 > qemu-system-ppc64: Unknown savevm section or instance 'cpu_common' 4. > Make sure that your current VM setup matches your saved VM setup, including any hotplugged devices > qemu-system-ppc64: Error -22 while loading VM state > $ > > Signed-off-by: Jose Ricardo Ziviani Reviewed-by: Juan Quintela There are two bits of functionality on your patch, I will have put it as two patches (yes, I know they are both trivial, but comment is bigger than it should be). Queued. > --- > migration/savevm.c | 4 +++- > vl.c | 1 + > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/migration/savevm.c b/migration/savevm.c > index 13e51f0e34..9692577318 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -2078,7 +2078,9 @@ qemu_loadvm_section_start_full(QEMUFile *f, MigrationIncomingState *mis) > /* Find savevm section */ > se = find_se(idstr, instance_id); > if (se == NULL) { > - error_report("Unknown savevm section or instance '%s' %d", > + error_report("Unknown savevm section or instance '%s' %d. " > + "Make sure that your current VM setup matches your " > + "saved VM setup, including any hotplugged devices", > idstr, instance_id); > return -EINVAL; > } > diff --git a/vl.c b/vl.c > index 5ba06adf78..c63270a76a 100644 > --- a/vl.c > +++ b/vl.c > @@ -4620,6 +4620,7 @@ int main(int argc, char **argv, char **envp) > if (load_snapshot(loadvm, &local_err) < 0) { > error_report_err(local_err); > autostart = 0; > + exit(1); > } > }