From nobody Sun Dec 14 06:37:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1751547279; cv=none; d=zohomail.com; s=zohoarc; b=Y5s7fIq0UvZ0LjRew/VizrIyaTOZIJxK4w2+ZSYzXc4EULmchCyxaGHV9EmeXE9gXZycUGkpdR6SmK9fVs1mrRyyLJTvORwW+7aPj6ql6H3IjgCGRYgzdWsIBn8JlJXP93pCJjvRYO/C2zPiTMZt5bmMh9XoZH2oP+uGSM0PNWg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751547279; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=ntRYiGFVJ5mhP+HvYzVCRoQ3YN4smqb6oARdqTXms4s=; b=eSw+PPjujrKgxP75zb9FWzYMZEmIEftRvJRsLMkzYJakal5+3HhwTJLJZMrsbS6b/u8BUN8z1Ds5MNEfiqmaYO0hgskbTJjtoQM789240O0vl7NXlmCBMBqCExBsdLcxzTOR6wUtbukLwgIcbJavURh0Inhp9x91k5Zpe7TjODU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1751547279909317.1924925725324; Thu, 3 Jul 2025 05:54:39 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C36CF11DF; Thu, 3 Jul 2025 08:54:38 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4C180128E; Thu, 3 Jul 2025 08:51:06 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E391E125D; Thu, 3 Jul 2025 08:51:02 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B048A11B7 for ; Thu, 3 Jul 2025 08:50:48 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-439-b9j3oRXeNzu3ORuCpBptXQ-1; Thu, 03 Jul 2025 08:50:47 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 61FD81808993 for ; Thu, 3 Jul 2025 12:50:46 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.5]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9BFC1195608F for ; Thu, 3 Jul 2025 12:50:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751547048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tMao4iUHSAlbtJF9AkWLdVWPBz8cfMV6B5RgGrFOuR0=; b=ExUZl4xF49dbCd4iT2X1Wo8F5GCd3+vb19flHnQSVUcS+P6fImGHYtKCUPbY8FwZ9Npc3E 1KuQmshVayPCHVCETGkemmaexuZtPd+o5QcoJaL3XUQUKOUtoec6m+Tex3blYecvuzxtg7 m/R60I/U//ahQ/NFScWIqbv0wIgevTw= X-MC-Unique: b9j3oRXeNzu3ORuCpBptXQ-1 X-Mimecast-MFC-AGG-ID: b9j3oRXeNzu3ORuCpBptXQ_1751547046 To: devel@lists.libvirt.org Subject: [PATCH 08/10] hypervisor: Split out individual steps out of virDomainDriverAutoShutdown Date: Thu, 3 Jul 2025 14:50:31 +0200 Message-ID: <798789ba2dfbdc8d90e3d8269a25f68d64b58ed0.1751546915.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: rAle92UYoHGJtmmeAAFzJ2QlWABU0BU2a4vpT5B6wo0_1751547046 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: JGUO5RRDGO472USIUBVLRIMMBXPSGUMM X-Message-ID-Hash: JGUO5RRDGO472USIUBVLRIMMBXPSGUMM X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1751547282081116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa 'virDomainDriverAutoShutdown' grew into an unwieldy function. Extract the code for each of the save/shutdown/poweroff steps into helpers and call them. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/hypervisor/domain_driver.c | 285 +++++++++++++++++++-------------- 1 file changed, 161 insertions(+), 124 deletions(-) diff --git a/src/hypervisor/domain_driver.c b/src/hypervisor/domain_driver.c index 353b8875ec..cce6c64d1b 100644 --- a/src/hypervisor/domain_driver.c +++ b/src/hypervisor/domain_driver.c @@ -738,6 +738,164 @@ virDomainDriverAutoShutdownActive(virDomainDriverAuto= ShutdownConfig *cfg) } +static void +virDomainDriverAutoShutdownDoSave(virDomainPtr *domains, + bool *transient, + size_t numDomains, + virDomainDriverAutoShutdownConfig *cfg) +{ + g_autofree unsigned int *flags =3D g_new0(unsigned int, numDomains); + size_t i; + + if (cfg->trySave =3D=3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCOPE_NONE) + return; + + for (i =3D 0; i < numDomains; i++) { + int state; + + if ((transient[i] && cfg->trySave =3D=3D VIR_DOMAIN_DRIVER_AUTO_SH= UTDOWN_SCOPE_PERSISTENT) || + (!transient[i] && cfg->trySave =3D=3D VIR_DOMAIN_DRIVER_AUTO_S= HUTDOWN_SCOPE_TRANSIENT)) + continue; + + virSystemdNotifyStatus("Suspending '%s' (%zu of %zu)", + virDomainGetName(domains[i]), i + 1, numDom= ains); + VIR_INFO("Suspending '%s'", virDomainGetName(domains[i])); + + /* + * Pause all VMs to make them stop dirtying pages, + * so save is quicker. We remember if any VMs were + * paused so we can restore that on resume. + */ + flags[i] =3D VIR_DOMAIN_SAVE_RUNNING; + if (virDomainGetState(domains[i], &state, NULL, 0) =3D=3D 0) { + if (state =3D=3D VIR_DOMAIN_PAUSED) + flags[i] =3D VIR_DOMAIN_SAVE_PAUSED; + } + if (cfg->saveBypassCache) + flags[i] |=3D VIR_DOMAIN_SAVE_BYPASS_CACHE; + + if (flags[i] & VIR_DOMAIN_SAVE_RUNNING) + virDomainSuspend(domains[i]); + } + + for (i =3D 0; i < numDomains; i++) { + virSystemdNotifyStatus("Saving '%s' (%zu of %zu)", + virDomainGetName(domains[i]), i + 1, numDom= ains); + VIR_INFO("Saving '%s'", virDomainGetName(domains[i])); + + if (virDomainManagedSave(domains[i], flags[i]) < 0) { + VIR_WARN("auto-shutdown: unable to perform managed save of '%s= ': %s", + domains[i]->name, + virGetLastErrorMessage()); + if (flags[i] & VIR_DOMAIN_SAVE_RUNNING) + virDomainResume(domains[i]); + continue; + } + virObjectUnref(domains[i]); + domains[i] =3D NULL; + } +} + + +static void +virDomainDriverAutoShutdownDoShutdown(virDomainPtr *domains, + bool *transient, + size_t numDomains, + virDomainDriverAutoShutdownConfig *c= fg) +{ + GTimer *timer =3D NULL; + size_t i; + + if (cfg->tryShutdown =3D=3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCOPE_NONE) + return; + + for (i =3D 0; i < numDomains; i++) { + if (domains[i] =3D=3D NULL) + continue; + + if ((transient[i] && cfg->tryShutdown =3D=3D VIR_DOMAIN_DRIVER_AUT= O_SHUTDOWN_SCOPE_PERSISTENT) || + (!transient[i] && cfg->tryShutdown =3D=3D VIR_DOMAIN_DRIVER_AU= TO_SHUTDOWN_SCOPE_TRANSIENT)) + continue; + + virSystemdNotifyStatus("Shutting down '%s' (%zu of %zu)", + virDomainGetName(domains[i]), i + 1, numDom= ains); + VIR_INFO("Shutting down '%s'", virDomainGetName(domains[i])); + + if (virDomainShutdown(domains[i]) < 0) { + VIR_WARN("auto-shutdown: unable to request graceful shutdown o= f '%s': %s", + domains[i]->name, + virGetLastErrorMessage()); + break; + } + } + + timer =3D g_timer_new(); + virSystemdNotifyStatus("Waiting %u secs for VM shutdown completion", + cfg->waitShutdownSecs); + VIR_INFO("Waiting %u secs for VM shutdown completion", cfg->waitShutdo= wnSecs); + while (1) { + bool anyRunning =3D false; + for (i =3D 0; i < numDomains; i++) { + if (!domains[i]) + continue; + + if ((transient[i] && cfg->tryShutdown =3D=3D VIR_DOMAIN_DRIVER= _AUTO_SHUTDOWN_SCOPE_PERSISTENT) || + (!transient[i] && cfg->tryShutdown =3D=3D VIR_DOMAIN_DRIVE= R_AUTO_SHUTDOWN_SCOPE_TRANSIENT)) + continue; + + if (virDomainIsActive(domains[i]) =3D=3D 1) { + anyRunning =3D true; + } else { + virObjectUnref(domains[i]); + domains[i] =3D NULL; + } + } + + if (!anyRunning) + break; + if (g_timer_elapsed(timer, NULL) > cfg->waitShutdownSecs) + break; + g_usleep(1000*500); + } + g_timer_destroy(timer); +} + + +static void +virDomainDriverAutoShutdownDoPoweroff(virDomainPtr *domains, + bool *transient, + size_t numDomains, + virDomainDriverAutoShutdownConfig *c= fg) +{ + size_t i; + + if (cfg->poweroff =3D=3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCOPE_NONE) + return; + + for (i =3D 0; i < numDomains; i++) { + if (domains[i] =3D=3D NULL) + continue; + + if ((transient[i] && cfg->poweroff =3D=3D VIR_DOMAIN_DRIVER_AUTO_S= HUTDOWN_SCOPE_PERSISTENT) || + (!transient[i] && cfg->poweroff =3D=3D VIR_DOMAIN_DRIVER_AUTO_= SHUTDOWN_SCOPE_TRANSIENT)) + continue; + + virSystemdNotifyStatus("Destroying '%s' (%zu of %zu)", + virDomainGetName(domains[i]), i + 1, numDom= ains); + VIR_INFO("Destroying '%s'", virDomainGetName(domains[i])); + /* + * NB might fail if we gave up on waiting for + * virDomainShutdown, but it then completed anyway, + * hence we're not checking for failure + */ + virDomainDestroy(domains[i]); + + virObjectUnref(domains[i]); + domains[i] =3D NULL; + } +} + + void virDomainDriverAutoShutdown(virDomainDriverAutoShutdownConfig *cfg) { @@ -816,130 +974,9 @@ virDomainDriverAutoShutdown(virDomainDriverAutoShutdo= wnConfig *cfg) } } - if (cfg->trySave !=3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCOPE_NONE) { - g_autofree unsigned int *flags =3D g_new0(unsigned int, numDomains= ); - for (i =3D 0; i < numDomains; i++) { - int state; - - if ((transient[i] && cfg->trySave =3D=3D VIR_DOMAIN_DRIVER_AUT= O_SHUTDOWN_SCOPE_PERSISTENT) || - (!transient[i] && cfg->trySave =3D=3D VIR_DOMAIN_DRIVER_AU= TO_SHUTDOWN_SCOPE_TRANSIENT)) - continue; - - virSystemdNotifyStatus("Suspending '%s' (%zu of %d)", - virDomainGetName(domains[i]), i + 1, nu= mDomains); - VIR_INFO("Suspending '%s'", virDomainGetName(domains[i])); - - /* - * Pause all VMs to make them stop dirtying pages, - * so save is quicker. We remember if any VMs were - * paused so we can restore that on resume. - */ - flags[i] =3D VIR_DOMAIN_SAVE_RUNNING; - if (virDomainGetState(domains[i], &state, NULL, 0) =3D=3D 0) { - if (state =3D=3D VIR_DOMAIN_PAUSED) - flags[i] =3D VIR_DOMAIN_SAVE_PAUSED; - } - if (cfg->saveBypassCache) - flags[i] |=3D VIR_DOMAIN_SAVE_BYPASS_CACHE; - - if (flags[i] & VIR_DOMAIN_SAVE_RUNNING) - virDomainSuspend(domains[i]); - } - - for (i =3D 0; i < numDomains; i++) { - virSystemdNotifyStatus("Saving '%s' (%zu of %d)", - virDomainGetName(domains[i]), i + 1, nu= mDomains); - VIR_INFO("Saving '%s'", virDomainGetName(domains[i])); - - if (virDomainManagedSave(domains[i], flags[i]) < 0) { - VIR_WARN("auto-shutdown: unable to perform managed save of= '%s': %s", - domains[i]->name, - virGetLastErrorMessage()); - if (flags[i] & VIR_DOMAIN_SAVE_RUNNING) - virDomainResume(domains[i]); - continue; - } - virObjectUnref(domains[i]); - domains[i] =3D NULL; - } - } - - if (cfg->tryShutdown !=3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCOPE_NONE) { - GTimer *timer =3D NULL; - for (i =3D 0; i < numDomains; i++) { - if (domains[i] =3D=3D NULL) - continue; - - if ((transient[i] && cfg->tryShutdown =3D=3D VIR_DOMAIN_DRIVER= _AUTO_SHUTDOWN_SCOPE_PERSISTENT) || - (!transient[i] && cfg->tryShutdown =3D=3D VIR_DOMAIN_DRIVE= R_AUTO_SHUTDOWN_SCOPE_TRANSIENT)) - continue; - - virSystemdNotifyStatus("Shutting down '%s' (%zu of %d)", - virDomainGetName(domains[i]), i + 1, nu= mDomains); - VIR_INFO("Shutting down '%s'", virDomainGetName(domains[i])); - - if (virDomainShutdown(domains[i]) < 0) { - VIR_WARN("auto-shutdown: unable to request graceful shutdo= wn of '%s': %s", - domains[i]->name, - virGetLastErrorMessage()); - break; - } - } - - timer =3D g_timer_new(); - virSystemdNotifyStatus("Waiting %u secs for VM shutdown completion= ", - cfg->waitShutdownSecs); - VIR_INFO("Waiting %u secs for VM shutdown completion", cfg->waitSh= utdownSecs); - while (1) { - bool anyRunning =3D false; - for (i =3D 0; i < numDomains; i++) { - if (!domains[i]) - continue; - - if ((transient[i] && cfg->tryShutdown =3D=3D VIR_DOMAIN_DR= IVER_AUTO_SHUTDOWN_SCOPE_PERSISTENT) || - (!transient[i] && cfg->tryShutdown =3D=3D VIR_DOMAIN_D= RIVER_AUTO_SHUTDOWN_SCOPE_TRANSIENT)) - continue; - - if (virDomainIsActive(domains[i]) =3D=3D 1) { - anyRunning =3D true; - } else { - virObjectUnref(domains[i]); - domains[i] =3D NULL; - } - } - - if (!anyRunning) - break; - if (g_timer_elapsed(timer, NULL) > cfg->waitShutdownSecs) - break; - g_usleep(1000*500); - } - g_timer_destroy(timer); - } - - if (cfg->poweroff !=3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCOPE_NONE) { - for (i =3D 0; i < numDomains; i++) { - if (domains[i] =3D=3D NULL) - continue; - - if ((transient[i] && cfg->poweroff =3D=3D VIR_DOMAIN_DRIVER_AU= TO_SHUTDOWN_SCOPE_PERSISTENT) || - (!transient[i] && cfg->poweroff =3D=3D VIR_DOMAIN_DRIVER_A= UTO_SHUTDOWN_SCOPE_TRANSIENT)) - continue; - - virSystemdNotifyStatus("Destroying '%s' (%zu of %d)", - virDomainGetName(domains[i]), i + 1, nu= mDomains); - VIR_INFO("Destroying '%s'", virDomainGetName(domains[i])); - /* - * NB might fail if we gave up on waiting for - * virDomainShutdown, but it then completed anyway, - * hence we're not checking for failure - */ - virDomainDestroy(domains[i]); - - virObjectUnref(domains[i]); - domains[i] =3D NULL; - } - } + virDomainDriverAutoShutdownDoSave(domains, transient, numDomains, cfg); + virDomainDriverAutoShutdownDoShutdown(domains, transient, numDomains, = cfg); + virDomainDriverAutoShutdownDoPoweroff(domains, transient, numDomains, = cfg); virSystemdNotifyStatus("Processed %d domains", numDomains); VIR_INFO("Processed %d domains", numDomains); --=20 2.49.0