Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 7B75DD1951A for ; Mon, 26 Jan 2026 21:46:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vkUGA-0003tB-Sk; Mon, 26 Jan 2026 16:36:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vkUG6-0003lC-JB for qemu-devel@nongnu.org; Mon, 26 Jan 2026 16:36:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vkUG4-0003Mj-F0 for qemu-devel@nongnu.org; Mon, 26 Jan 2026 16:36:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1769463387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eZsH9FitHIES6sa1xE0K6RU7GHKSAzNerQxPCHFO/t8=; b=Vn7dYWB3I9w1JIHSgtgDeyyr6Vhh+ei+LLxf3ElgZe1ysTj14B9bp15hWSdqB5yKgeotq7 r6h5i33nk0Bk7+127b74WH5MgRuksBqB7pzRwCRNFEeenss3pu8savDnNPX6ZnrPapvIdV oT48AoPS7bd9o9e+xwiIFY0FZZk+kEc= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-531-zFjdUfJmOk226zm-jHJv7Q-1; Mon, 26 Jan 2026 16:36:26 -0500 X-MC-Unique: zFjdUfJmOk226zm-jHJv7Q-1 X-Mimecast-MFC-AGG-ID: zFjdUfJmOk226zm-jHJv7Q_1769463386 Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-502a341e108so156959431cf.1 for ; Mon, 26 Jan 2026 13:36:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1769463385; x=1770068185; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eZsH9FitHIES6sa1xE0K6RU7GHKSAzNerQxPCHFO/t8=; b=Nuy7StluGo12REfMfMcB0yWSrZFV07+TLaiM9h1fjA1lmcHC+QzLZhET73eUFUS4xi NA1zm2hs7dULlfA1LWFLTCqvArdF9JTAiKfi1dsq+RTvz92FmY9rcLyY1INjXik1bbgZ Fjm0kLoIpx0Lj3RBi/TGOC5GN2bJVewjlie7efvc2uG2wdyLnzaQLq805U02fihNUk3x ebu+2va9AVH1rCsj10oQGF2EEye69ZJJAFk0I2ToxDYQOb9jvjH66KWFb6khGTMK35Ct W0b+5NJja67pjZ8P0Pc/YaNqFZfcaD7kXYU4isN6rK1eBac6R2FdGjq4c1lnYH4uM/sO q0bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769463385; x=1770068185; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=eZsH9FitHIES6sa1xE0K6RU7GHKSAzNerQxPCHFO/t8=; b=jnjS+IdkvLCLhsWAklal5A0Xbw48jdPdidlXxVw9bVrwkn3OXqI8DfCw+mI+kuo/FK 4rWDAnn6CLm0IQGR3T+kTqTTvMgcI7XrgoEkp11PshJwbfI/Yl/6Xj5f0MM/S6e5+6FN Q6zRU69CUVx/vNAeGau9qVMiN2AkySfIlRBiPah+XmuJVHtpnQzRzvyipIRyvhEzewRU kVlohhajOaXG+aj+UsWjI8irEz3yUi4MlhztKrH+zHx6e5KoQo3ICm8AAiExWLb4Weyl Mjq0/MW2Fb0wZ0N52tTLunM0g+DG4pn10spY620c6J2woglZr7N+o0mIXnlk8EmJmOzH +SXw== X-Gm-Message-State: AOJu0YzPcbE5WSywV2CGotLopFzJQB5LlgFTZ6/I8b5Wab4HyS8HqeRE HCataMAmaxU/CPG/4koC18LXCYumLanya/H/GTtqz4cy88IomfwtIf0IBL/sl+k44WLPjefboA1 jw0xWwT+Dxw8f5wl8teAnKi8j+7/sp9J6zJaTlZ6tWm+DKbB2MHbYikYqWIg6j5fuwMiTtB1EO/ ZRcowxB06IWumyiBqe/l4vuP9aLN0C2eLqnC+Wug== X-Gm-Gg: AZuq6aLo3vo29z0LAcLHuG8J5KCpaOKh4xMxhurnxSetEiAcLPyEPtiIwWAfpsrz/Fb AM/R7+hqXB1qR4PKBsYra33EzwqvCTWMgKnobC3gFj/4xzWJm0QPLZD7aECA9OTqi/ommRiU9R/ jWxzMJPOg+7M9zUV8FlDkCkWxnYzsm7xw6BMLUgrBmxaoSw52izppzQMXxt560XQbEs6QUQp+Ku ld0tX8mChMsZO4gATX8fGXk3veC5jh6noQivWFqlS8FDHvat/c4QktR6lFvRApFhEc7u+8jQmJz cK8Yv6hiLR4kS6iIZMHcjGPXV0g64JVAd44nB4GFCkElenVeLhLljOHvCZJGaGlz0hejs/6xaS1 x X-Received: by 2002:a05:622a:1102:b0:4ed:6b27:1d1a with SMTP id d75a77b69052e-50314be8cdemr83592211cf.32.1769463385342; Mon, 26 Jan 2026 13:36:25 -0800 (PST) X-Received: by 2002:a05:622a:1102:b0:4ed:6b27:1d1a with SMTP id d75a77b69052e-50314be8cdemr83591751cf.32.1769463384885; Mon, 26 Jan 2026 13:36:24 -0800 (PST) Received: from x1.com ([142.188.210.156]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-502f7f9cd9esm89769281cf.33.2026.01.26.13.36.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jan 2026 13:36:23 -0800 (PST) From: Peter Xu To: qemu-devel@nongnu.org Cc: Prasad Pandit , Stefan Hajnoczi , peterx@redhat.com, Fabiano Rosas , Juraj Marcin Subject: [PATCH v2 5/5] migration: Rename MIG_EVENT_PRECOPY_* to MIG_EVENT_* Date: Mon, 26 Jan 2026 16:36:14 -0500 Message-ID: <20260126213614.3815900-6-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260126213614.3815900-1-peterx@redhat.com> References: <20260126213614.3815900-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org All three events are shared between precopy and postcopy, rather than precopy specific. For example, both precopy and postcopy will go through a SETUP process. Meanwhile, both FAILED and DONE notifiers will be notified for either precopy or postcopy on completions / failures. Rename them to make them match what they do, and shorter. Reviewed-by: Fabiano Rosas Acked-by: Stefan Hajnoczi Signed-off-by: Peter Xu --- include/migration/misc.h | 18 +++++++----------- hw/intc/arm_gicv3_kvm.c | 2 +- hw/net/virtio-net.c | 4 ++-- hw/vfio/cpr-legacy.c | 2 +- hw/vfio/cpr.c | 8 ++++---- hw/vfio/migration.c | 4 ++-- migration/cpr-exec.c | 6 +++--- migration/migration.c | 8 ++++---- net/vhost-vdpa.c | 4 ++-- ui/spice-core.c | 6 +++--- 10 files changed, 29 insertions(+), 33 deletions(-) diff --git a/include/migration/misc.h b/include/migration/misc.h index 1cd6cfd7f7..3159a5e53c 100644 --- a/include/migration/misc.h +++ b/include/migration/misc.h @@ -62,19 +62,15 @@ bool migration_thread_is_self(void); /* * Notifiers may receive events in any of the following orders: * - * - MIG_EVENT_PRECOPY_SETUP [-> MIG_EVENT_POSTCOPY_START] - * -> MIG_EVENT_PRECOPY_DONE - * - * - MIG_EVENT_PRECOPY_SETUP [-> MIG_EVENT_POSTCOPY_START] - * -> MIG_EVENT_PRECOPY_FAILED - * - * - MIG_EVENT_PRECOPY_FAILED + * - MIG_EVENT_SETUP [-> MIG_EVENT_POSTCOPY_START] -> MIG_EVENT_DONE + * - MIG_EVENT_SETUP [-> MIG_EVENT_POSTCOPY_START] -> MIG_EVENT_FAILED + * - MIG_EVENT_FAILED */ typedef enum MigrationEventType { - MIG_EVENT_PRECOPY_SETUP, - MIG_EVENT_PRECOPY_DONE, - MIG_EVENT_PRECOPY_FAILED, + MIG_EVENT_SETUP, MIG_EVENT_POSTCOPY_START, + MIG_EVENT_DONE, + MIG_EVENT_FAILED, MIG_EVENT_MAX } MigrationEventType; @@ -84,7 +80,7 @@ typedef struct MigrationEvent { /* * A MigrationNotifyFunc may return an error code and an Error object, - * but only when @e->type is MIG_EVENT_PRECOPY_SETUP. The code is an int + * but only when @e->type is MIG_EVENT_SETUP. The code is an int * to allow for different failure modes and recovery actions. */ typedef int (*MigrationNotifyFunc)(NotifierWithReturn *notify, diff --git a/hw/intc/arm_gicv3_kvm.c b/hw/intc/arm_gicv3_kvm.c index 6f311e37ef..fddeefa26f 100644 --- a/hw/intc/arm_gicv3_kvm.c +++ b/hw/intc/arm_gicv3_kvm.c @@ -774,7 +774,7 @@ static void vm_change_state_handler(void *opaque, bool running, static int kvm_arm_gicv3_notifier(NotifierWithReturn *notifier, MigrationEvent *e, Error **errp) { - if (e->type == MIG_EVENT_PRECOPY_DONE) { + if (e->type == MIG_EVENT_DONE) { GICv3State *s = container_of(notifier, GICv3State, cpr_notifier); return kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CTRL, KVM_DEV_ARM_VGIC_SAVE_PENDING_TABLES, diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 317f1ad23b..3e2dc30da6 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -3786,7 +3786,7 @@ static void virtio_net_handle_migration_primary(VirtIONet *n, MigrationEvent *e) should_be_hidden = qatomic_read(&n->failover_primary_hidden); - if (e->type == MIG_EVENT_PRECOPY_SETUP && !should_be_hidden) { + if (e->type == MIG_EVENT_SETUP && !should_be_hidden) { if (failover_unplug_primary(n, dev)) { vmstate_unregister(VMSTATE_IF(dev), qdev_get_vmsd(dev), dev); qapi_event_send_unplug_primary(dev->id); @@ -3794,7 +3794,7 @@ static void virtio_net_handle_migration_primary(VirtIONet *n, MigrationEvent *e) } else { warn_report("couldn't unplug primary device"); } - } else if (e->type == MIG_EVENT_PRECOPY_FAILED) { + } else if (e->type == MIG_EVENT_FAILED) { /* We already unplugged the device let's plug it back */ if (!failover_replug_primary(n, dev, &err)) { if (err) { diff --git a/hw/vfio/cpr-legacy.c b/hw/vfio/cpr-legacy.c index 7c03ddb961..033a546c30 100644 --- a/hw/vfio/cpr-legacy.c +++ b/hw/vfio/cpr-legacy.c @@ -137,7 +137,7 @@ static int vfio_cpr_fail_notifier(NotifierWithReturn *notifier, container_of(notifier, VFIOLegacyContainer, cpr.transfer_notifier); VFIOContainer *bcontainer = VFIO_IOMMU(container); - if (e->type != MIG_EVENT_PRECOPY_FAILED) { + if (e->type != MIG_EVENT_FAILED) { return 0; } diff --git a/hw/vfio/cpr.c b/hw/vfio/cpr.c index 998230d271..ffa4f8e099 100644 --- a/hw/vfio/cpr.c +++ b/hw/vfio/cpr.c @@ -18,7 +18,7 @@ int vfio_cpr_reboot_notifier(NotifierWithReturn *notifier, MigrationEvent *e, Error **errp) { - if (e->type == MIG_EVENT_PRECOPY_SETUP && + if (e->type == MIG_EVENT_SETUP && !runstate_check(RUN_STATE_SUSPENDED) && !vm_get_suspended()) { error_setg(errp, @@ -186,7 +186,7 @@ static int vfio_cpr_kvm_close_notifier(NotifierWithReturn *notifier, MigrationEvent *e, Error **errp) { - if (e->type == MIG_EVENT_PRECOPY_DONE) { + if (e->type == MIG_EVENT_DONE) { vfio_kvm_device_close(); } return 0; @@ -272,9 +272,9 @@ static int vfio_cpr_pci_notifier(NotifierWithReturn *notifier, VFIOPCIDevice *vdev = container_of(notifier, VFIOPCIDevice, cpr.transfer_notifier); - if (e->type == MIG_EVENT_PRECOPY_SETUP) { + if (e->type == MIG_EVENT_SETUP) { return vfio_cpr_set_msi_virq(vdev, errp, false); - } else if (e->type == MIG_EVENT_PRECOPY_FAILED) { + } else if (e->type == MIG_EVENT_FAILED) { return vfio_cpr_set_msi_virq(vdev, errp, true); } return 0; diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c index f857dc25ed..76a902b79c 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -917,10 +917,10 @@ static int vfio_migration_state_notifier(NotifierWithReturn *notifier, trace_vfio_migration_state_notifier(vbasedev->name, e->type); - if (e->type == MIG_EVENT_PRECOPY_FAILED) { + if (e->type == MIG_EVENT_FAILED) { /* * MigrationNotifyFunc may not return an error code and an Error - * object for MIG_EVENT_PRECOPY_FAILED. Hence, report the error + * object for MIG_EVENT_FAILED. Hence, report the error * locally and ignore the errp argument. */ ret = vfio_migration_set_state_or_reset(vbasedev, diff --git a/migration/cpr-exec.c b/migration/cpr-exec.c index e315a30f92..daa50916d2 100644 --- a/migration/cpr-exec.c +++ b/migration/cpr-exec.c @@ -164,7 +164,7 @@ static void cpr_exec_cb(void *opaque) err = NULL; /* Note, we can go from state COMPLETED to FAILED */ - migration_call_notifiers(MIG_EVENT_PRECOPY_FAILED, NULL); + migration_call_notifiers(MIG_EVENT_FAILED, NULL); if (!migration_block_activate(&err)) { /* error was already reported */ @@ -182,12 +182,12 @@ static int cpr_exec_notifier(NotifierWithReturn *notifier, MigrationEvent *e, { MigrationState *s = migrate_get_current(); - if (e->type == MIG_EVENT_PRECOPY_DONE) { + if (e->type == MIG_EVENT_DONE) { QEMUBH *cpr_exec_bh = qemu_bh_new(cpr_exec_cb, NULL); assert(s->state == MIGRATION_STATUS_COMPLETED); qemu_bh_schedule(cpr_exec_bh); qemu_notify_event(); - } else if (e->type == MIG_EVENT_PRECOPY_FAILED) { + } else if (e->type == MIG_EVENT_FAILED) { cpr_exec_unpersist_state(); } return 0; diff --git a/migration/migration.c b/migration/migration.c index a5b0561cbe..7ab0294d22 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1337,7 +1337,7 @@ static void migration_cleanup(MigrationState *s) * migration completed successfully. */ if (!migration_has_failed(s)) { - migration_call_notifiers(MIG_EVENT_PRECOPY_DONE, NULL); + migration_call_notifiers(MIG_EVENT_DONE, NULL); } yank_unregister_instance(MIGRATION_YANK_INSTANCE); @@ -1541,7 +1541,7 @@ int migration_call_notifiers(MigrationEventType type, Error **errp) notifier = (NotifierWithReturn *)elem->data; ret = notifier->notify(notifier, &e, errp); if (ret) { - assert(type == MIG_EVENT_PRECOPY_SETUP); + assert(type == MIG_EVENT_SETUP); return ret; } } @@ -3331,7 +3331,7 @@ static void migration_iteration_finish(MigrationState *s) * Notify FAILED before starting VM, so that devices can invoke * necessary fallbacks before vCPUs run again. */ - migration_call_notifiers(MIG_EVENT_PRECOPY_FAILED, NULL); + migration_call_notifiers(MIG_EVENT_FAILED, NULL); if (runstate_is_live(s->vm_old_state)) { if (!runstate_check(RUN_STATE_SHUTDOWN)) { @@ -3769,7 +3769,7 @@ void migration_start_outgoing(MigrationState *s) rate_limit = migrate_max_bandwidth(); /* Notify before starting migration thread */ - if (migration_call_notifiers(MIG_EVENT_PRECOPY_SETUP, &local_err)) { + if (migration_call_notifiers(MIG_EVENT_SETUP, &local_err)) { goto fail; } } diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 74d26a9497..f4b1f0e9e0 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -378,9 +378,9 @@ static int vdpa_net_migration_state_notifier(NotifierWithReturn *notifier, { VhostVDPAState *s = container_of(notifier, VhostVDPAState, migration_state); - if (e->type == MIG_EVENT_PRECOPY_SETUP) { + if (e->type == MIG_EVENT_SETUP) { vhost_vdpa_net_log_global_enable(s, true); - } else if (e->type == MIG_EVENT_PRECOPY_FAILED) { + } else if (e->type == MIG_EVENT_FAILED) { vhost_vdpa_net_log_global_enable(s, false); } return 0; diff --git a/ui/spice-core.c b/ui/spice-core.c index ce3c2954e3..ee13ecc4a5 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -583,13 +583,13 @@ static int migration_state_notifier(NotifierWithReturn *notifier, return 0; } - if (e->type == MIG_EVENT_PRECOPY_SETUP) { + if (e->type == MIG_EVENT_SETUP) { spice_server_migrate_start(spice_server); - } else if (e->type == MIG_EVENT_PRECOPY_DONE || + } else if (e->type == MIG_EVENT_DONE || e->type == MIG_EVENT_POSTCOPY_START) { spice_server_migrate_end(spice_server, true); spice_have_target_host = false; - } else if (e->type == MIG_EVENT_PRECOPY_FAILED) { + } else if (e->type == MIG_EVENT_FAILED) { spice_server_migrate_end(spice_server, false); spice_have_target_host = false; } -- 2.50.1