From patchwork Tue May 4 16:58:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1473928 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=aZF+ePY7; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FZRHJ35ccz9sRR for ; Wed, 5 May 2021 03:12:44 +1000 (AEST) Received: from localhost ([::1]:38924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldybC-0005Sc-AE for incoming@patchwork.ozlabs.org; Tue, 04 May 2021 13:12:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldyNX-0005Um-Kt for qemu-devel@nongnu.org; Tue, 04 May 2021 12:58:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:34878) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldyNT-00088v-UF for qemu-devel@nongnu.org; Tue, 04 May 2021 12:58:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620147510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tEhdwlmCNfXmfkMiOXRvqawPlHLjgpOLHng3N/SsIAs=; b=aZF+ePY7B4a1BKgIdSOmm6Gy54LQ3L4Mo44L6IlNjvEAYqDU59eQE8nTTxnlUu9mMEAl6W q4ISMcm08joI9ABYptTpY4tpJ5Ak3rHhft8n0ThuelhuxJ+7gPemDM3+JYP6xAON1QSB+S 3/90CkzahqpR7+NOdXWqcEU7MK5jEcE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-453-OzgeMS-xNgy9YrZNkI9deQ-1; Tue, 04 May 2021 12:58:28 -0400 X-MC-Unique: OzgeMS-xNgy9YrZNkI9deQ-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id B7BFC107ACE3; Tue, 4 May 2021 16:58:27 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 520085B4A0; Tue, 4 May 2021 16:58:27 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] migration: do not restart VM after successful snapshot-load Date: Tue, 4 May 2021 12:58:26 -0400 Message-Id: <20210504165826.618801-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.697, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dgilbert@redhat.com, qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The HMP loadvm code is calling load_snapshot rather than qmp_snapshot_load, in order to bypass the job infrastructure. The code around it is almost the same, with one difference: hmp_loadvm is restarting the VM if load_snapshot fails, qmp_snapshot_load is doing so if load_snapshot succeeds. Fix the bug in QMP by moving the common code to load_snapshot. Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini Reviewed-by: Eric Blake --- migration/savevm.c | 16 ++++++++-------- monitor/hmp-cmds.c | 7 +------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 52e2d72e4b..a899191cbf 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2992,6 +2992,7 @@ bool load_snapshot(const char *name, const char *vmstate, int ret; AioContext *aio_context; MigrationIncomingState *mis = migration_incoming_get_current(); + int saved_vm_running = runstate_is_running(); if (!bdrv_all_can_snapshot(has_devices, devices, errp)) { return false; @@ -3024,6 +3025,8 @@ bool load_snapshot(const char *name, const char *vmstate, return false; } + vm_stop(RUN_STATE_RESTORE_VM); + /* * Flush the record/replay queue. Now the VM state is going * to change. Therefore we don't need to preserve its consistency @@ -3061,13 +3064,17 @@ bool load_snapshot(const char *name, const char *vmstate, if (ret < 0) { error_setg(errp, "Error %d while loading VM state", ret); - return false; + goto err_restart; } return true; err_drain: bdrv_drain_all_end(); +err_restart: + if (saved_vm_running) { + vm_start(); + } return false; } @@ -3135,17 +3142,10 @@ static void snapshot_load_job_bh(void *opaque) { Job *job = opaque; SnapshotJob *s = container_of(job, SnapshotJob, common); - int orig_vm_running; job_progress_set_remaining(&s->common, 1); - orig_vm_running = runstate_is_running(); - vm_stop(RUN_STATE_RESTORE_VM); - s->ret = load_snapshot(s->tag, s->vmstate, true, s->devices, s->errp); - if (s->ret && orig_vm_running) { - vm_start(); - } job_progress_update(&s->common, 1); diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 0ad5b77477..a39436c8cb 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -1127,15 +1127,10 @@ void hmp_balloon(Monitor *mon, const QDict *qdict) void hmp_loadvm(Monitor *mon, const QDict *qdict) { - int saved_vm_running = runstate_is_running(); const char *name = qdict_get_str(qdict, "name"); Error *err = NULL; - vm_stop(RUN_STATE_RESTORE_VM); - - if (!load_snapshot(name, NULL, false, NULL, &err) && saved_vm_running) { - vm_start(); - } + load_snapshot(name, NULL, false, NULL, &err); hmp_handle_error(mon, err); }