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=1751547141; cv=none; d=zohomail.com; s=zohoarc; b=HS5dP9ucUsjb/4C60Dl+stLRBTTJQd15zaiTobC2UAb2vxM6KhL8LmSs3vMxlw3GTYn81GPG6fT32aurDqZPIKYWMAllLzb//i1ohhxguC7gG8nsnjpVmGy5/gRRHnv5pK4Q3fnka6Ay/XIEr/JReWmLNwEkptQB1reYRk6ivaE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751547141; 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=RnhBMZ6wsTi+WJkYYhOW1Z6Oimwo9RIzzjWnzzSFWKE=; b=cBhA4MpKrio3mZ6qKp22xeBrV3ExG1P0UhXmgA52pFdM8UIs+wk4/tVFTFehiUYarX+U/P5wUFfXjxx+gDgyH2lYMZi8quJ6e1IIoI0L8HfhJUNbncS67GEhFwTT68uMAysPUCt9jGvSUSVcVWPsGQsY83QyXygdO0ikU+HyZUo= 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 1751547141438616.3920007752884; Thu, 3 Jul 2025 05:52:21 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 795941280; Thu, 3 Jul 2025 08:52:20 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 77CF61375; Thu, 3 Jul 2025 08:50:53 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8A8B1121C; Thu, 3 Jul 2025 08:50:49 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 516D11210 for ; Thu, 3 Jul 2025 08:50:43 -0400 (EDT) Received: from mx-prod-mc-06.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-630-UJ6ux5M0OECfoUGheuOMPA-1; Thu, 03 Jul 2025 08:50:41 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 27869180029E for ; Thu, 3 Jul 2025 12:50:40 +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 60E45195608F for ; Thu, 3 Jul 2025 12:50:39 +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=1751547042; 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=JiXidyDF/zLttTxE+AQOFwMW/BaxT6u/WlarPzH1vPk=; b=g7Pz/grSt59VGyswWS5McPNZDCHk4vdqcSJbUnW3VlR3CWpUkCURaPsJF/TffIBMkXWVC1 O5d5WsbufT8WWr1aw2f+BhA2OZGBObfABmGK1hzftRZXaQ5BNA9/Oaog7q7fuSHle5cESP hcNqOSYlo6MBOBzUVNpldyEmH7PY81A= X-MC-Unique: UJ6ux5M0OECfoUGheuOMPA-1 X-Mimecast-MFC-AGG-ID: UJ6ux5M0OECfoUGheuOMPA_1751547040 To: devel@lists.libvirt.org Subject: [PATCH 03/10] qemu: conf: Store 'autoShutdown' config in virDomainDriverAutoShutdownConfig Date: Thu, 3 Jul 2025 14:50:26 +0200 Message-ID: <967e8d0dc2f296899a83502a06f1a9e54c05769a.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: rP9tKe6nf72-4fV2CJdzZqhq4aaD3sn3JWTHgFDIo_k_1751547040 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: AVFURVGVIDL55F4BQCCMQEC6N4U7B6YC X-Message-ID-Hash: AVFURVGVIDL55F4BQCCMQEC6N4U7B6YC 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: 1751547142475116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Rather than having a bunch of extra variables save the configuration of the daemon auto shutdown in virDomainDriverAutoShutdownConfig which is also used when initiating the shutdown. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_conf.c | 30 +++++++++++++++--------------- src/qemu/qemu_conf.h | 7 +------ src/qemu/qemu_driver.c | 12 +++--------- 3 files changed, 19 insertions(+), 30 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 9bf12fc179..482e19b502 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -320,15 +320,15 @@ virQEMUDriverConfig *virQEMUDriverConfigNew(bool priv= ileged, * * XXX, or query if libvirt-guests.service is enabled perhaps ? */ - cfg->autoShutdownTrySave =3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCOPE= _NONE; - cfg->autoShutdownTryShutdown =3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_S= COPE_NONE; - cfg->autoShutdownPoweroff =3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCOP= E_NONE; + cfg->autoShutdown.trySave =3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCOP= E_NONE; + cfg->autoShutdown.tryShutdown =3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_= SCOPE_NONE; + cfg->autoShutdown.poweroff =3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCO= PE_NONE; } else { - cfg->autoShutdownTrySave =3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCOPE= _PERSISTENT; - cfg->autoShutdownTryShutdown =3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_S= COPE_ALL; - cfg->autoShutdownPoweroff =3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCOP= E_ALL; + cfg->autoShutdown.trySave =3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCOP= E_PERSISTENT; + cfg->autoShutdown.tryShutdown =3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_= SCOPE_ALL; + cfg->autoShutdown.poweroff =3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SCO= PE_ALL; } - cfg->autoShutdownRestore =3D true; + cfg->autoShutdown.autoRestore =3D true; return g_steal_pointer(&cfg); } @@ -719,11 +719,11 @@ virQEMUDriverConfigLoadSaveEntry(virQEMUDriverConfig = *cfg, autoShutdownTrySave); return -1; } - cfg->autoShutdownTrySave =3D autoShutdownVal; + cfg->autoShutdown.trySave =3D autoShutdownVal; } - if (cfg->autoShutdownTrySave =3D=3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SC= OPE_ALL || - cfg->autoShutdownTrySave =3D=3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_SC= OPE_TRANSIENT) { + if (cfg->autoShutdown.trySave =3D=3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_S= COPE_ALL || + cfg->autoShutdown.trySave =3D=3D VIR_DOMAIN_DRIVER_AUTO_SHUTDOWN_S= COPE_TRANSIENT) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("managed save cannot be requested for transient d= omains")); return -1; @@ -740,7 +740,7 @@ virQEMUDriverConfigLoadSaveEntry(virQEMUDriverConfig *c= fg, autoShutdownTryShutdown); return -1; } - cfg->autoShutdownTryShutdown =3D autoShutdownVal; + cfg->autoShutdown.tryShutdown =3D autoShutdownVal; } if (virConfGetValueString(conf, "auto_shutdown_poweroff", &autoShutdow= nPoweroff) < 0) @@ -754,16 +754,16 @@ virQEMUDriverConfigLoadSaveEntry(virQEMUDriverConfig = *cfg, autoShutdownPoweroff); return -1; } - cfg->autoShutdownPoweroff =3D autoShutdownVal; + cfg->autoShutdown.poweroff =3D autoShutdownVal; } if (virConfGetValueUInt(conf, "auto_shutdown_wait", - &cfg->autoShutdownWait) < 0) + &cfg->autoShutdown.waitShutdownSecs) < 0) return -1; - if (virConfGetValueBool(conf, "auto_shutdown_restore", &cfg->autoShutd= ownRestore) < 0) + if (virConfGetValueBool(conf, "auto_shutdown_restore", &cfg->autoShutd= own.autoRestore) < 0) return -1; if (virConfGetValueBool(conf, "auto_save_bypass_cache", - &cfg->autoSaveBypassCache) < 0) + &cfg->autoShutdown.saveBypassCache) < 0) return -1; return 0; diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 1ce9dbe4a8..ff376aed4d 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -208,12 +208,7 @@ struct _virQEMUDriverConfig { bool autoDumpBypassCache; bool autoStartBypassCache; unsigned int autoStartDelayMS; - virDomainDriverAutoShutdownScope autoShutdownTrySave; - virDomainDriverAutoShutdownScope autoShutdownTryShutdown; - virDomainDriverAutoShutdownScope autoShutdownPoweroff; - unsigned int autoShutdownWait; - bool autoShutdownRestore; - bool autoSaveBypassCache; + virDomainDriverAutoShutdownConfig autoShutdown; char *lockManagerName; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9b583ad7aa..4dbd5ec2fc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -964,15 +964,9 @@ static int qemuStateStop(void) { g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(qemu_dri= ver); - virDomainDriverAutoShutdownConfig ascfg =3D { - .uri =3D cfg->uri, - .trySave =3D cfg->autoShutdownTrySave, - .tryShutdown =3D cfg->autoShutdownTryShutdown, - .poweroff =3D cfg->autoShutdownPoweroff, - .waitShutdownSecs =3D cfg->autoShutdownWait, - .saveBypassCache =3D cfg->autoSaveBypassCache, - .autoRestore =3D cfg->autoShutdownRestore, - }; + virDomainDriverAutoShutdownConfig ascfg =3D cfg->autoShutdown; + + ascfg.uri =3D cfg->uri; virDomainDriverAutoShutdown(&ascfg); --=20 2.49.0