From nobody Wed Sep 23 05:43:35 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; 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 38.145.34.151 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=1784735246; cv=none; d=zohomail.com; s=zohoarc; b=kddVF4zzjDe8o3XTqPjoCeHAtYo/PmBj0to2JvraTEHzEAm34SENA+SLcuLVOT8lwiDwtwm0qqCKLl2MHPqwkKcNANnt3V4/r7cOQxC+NdFkl/nfEdi+jBU/RpMkzRYjS/IK659R3gjhsX6TzgbCPm2XZamMfxpgXI0Mha06LdE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784735246; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner: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=5HBntN2etP/qt0Xg9nM+MKOl8Lpuk1WtTq5u791fSj8=; b=ilA5H+yWU6rWhzj1EaKvxjjT7OFQsCZKRr9niSh37gSuxbiwlRGA2EY1ohnu0XzuMgOaoQ34CfMjGbvDryuKjBmwXBN4gi5wTL3zwE7gvi35k6AOaf/yEKalGGcRT2lALS2yMft/nR6hbQgoGoCXT1z5JygmdKYicVPmE26pIoM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 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 [38.145.34.151]) by mx.zohomail.com with SMTPS id 1784735246978870.3594279681024; Wed, 22 Jul 2026 08:47:26 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id C1C1D41C14; Wed, 22 Jul 2026 11:47:25 -0400 (EDT) Received: from [172.19.199.10] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id E933043DE0; Wed, 22 Jul 2026 11:38:56 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 2020841920; Wed, 22 Jul 2026 11:38:30 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id CCC9F41920 for ; Wed, 22 Jul 2026 11:38:28 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-241-wBoHdymEMJqYVXw2f9OCvQ-1; Wed, 22 Jul 2026 11:38:26 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DC84C1955DD5 for ; Wed, 22 Jul 2026 15:38:25 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.24.17]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 390E3D71 for ; Wed, 22 Jul 2026 15:38:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784734708; 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=5HBntN2etP/qt0Xg9nM+MKOl8Lpuk1WtTq5u791fSj8=; b=FBksyM1eSuiw1VPfwPFe8CLHm/DA7Mpxodtip/dVefFazlWR0QWN9ByylIY1PWe1Qtz006 KHKmaMg/xXM9t0MlvwrhxnLqLKN35ZRviOoBafT5S60XJcaLZFm/XWTxbKQPR6SlsbjAyU Jc+i5hjs+r3pg1kH0yKLPIsQI8jVNng= X-MC-Unique: wBoHdymEMJqYVXw2f9OCvQ-1 X-Mimecast-MFC-AGG-ID: wBoHdymEMJqYVXw2f9OCvQ_1784734706 To: devel@lists.libvirt.org Subject: [PATCH 04/13] qemu: Remove 'allowReboot' field Date: Wed, 22 Jul 2026 17:38:09 +0200 Message-ID: <245ddece52123ba38b246d79c694caab0004ad4a.1784734635.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: mrd3a7ErUSfQ_6n76RjJwpy_X_7BYwfGZikozHwfSo4_1784734706 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CDFTSR27VM57KBEMFHCAULYAB5YQJTWL X-Message-ID-Hash: CDFTSR27VM57KBEMFHCAULYAB5YQJTWL X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: 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: 1784735248140158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The value is no longer used. Remove it including the status XML handling. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 33 ------------------- src/qemu/qemu_domain.h | 17 ---------- .../qemustatusxml2xmldata/backup-pull-in.xml | 1 - .../blockjob-blockdev-in.xml | 1 - .../blockjob-mirror-in.xml | 1 - .../memory-backing-dir-in.xml | 1 - .../migration-in-params-in.xml | 1 - .../migration-out-nbd-bitmaps-in.xml | 1 - .../migration-out-nbd-out.xml | 1 - .../migration-out-nbd-tls-out.xml | 1 - .../migration-out-params-in.xml | 1 - tests/qemustatusxml2xmldata/modern-in.xml | 1 - .../qcow2-data-file-in.xml | 1 - .../throttlefilter-out.xml | 1 - tests/qemustatusxml2xmldata/upgrade-out.xml | 1 - .../qemustatusxml2xmldata/vcpus-multi-in.xml | 1 - 16 files changed, 64 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e1b805d906..a4e5f92840 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1946,8 +1946,6 @@ qemuDomainObjPrivateDataClear(qemuDomainObjPrivate *p= riv) priv->rememberOwner =3D false; - priv->allowReboot =3D VIR_TRISTATE_BOOL_ABSENT; - g_clear_pointer(&priv->migrationCaps, virBitmapFree); virHashRemoveAll(priv->blockjobs); @@ -2621,17 +2619,6 @@ qemuDomainObjPrivateXMLFormatBackups(virBuffer *buf, } -void -qemuDomainObjPrivateXMLFormatAllowReboot(virBuffer *buf, - virTristateBool allowReboot) -{ - if (allowReboot) { - virBufferAsprintf(buf, "\n", - virTristateBoolTypeToString(allowReboot)); - } -} - - static void qemuDomainObjPrivateXMLFormatPR(virBuffer *buf, qemuDomainObjPrivate *priv) @@ -2812,8 +2799,6 @@ qemuDomainObjPrivateXMLFormat(virBuffer *buf, if (priv->rememberOwner) virBufferAddLit(buf, "\n"); - qemuDomainObjPrivateXMLFormatAllowReboot(buf, priv->allowReboot); - qemuDomainObjPrivateXMLFormatPR(buf, priv); virBufferAsprintf(buf, "\n", priv->nodenamei= ndex); @@ -3302,21 +3287,6 @@ qemuDomainObjPrivateXMLParseBackups(qemuDomainObjPri= vate *priv, } -int -qemuDomainObjPrivateXMLParseAllowReboot(xmlXPathContextPtr ctxt, - virTristateBool *allowReboot) -{ - xmlNodePtr node =3D virXPathNode("./allowReboot", ctxt); - - /* Allow value=3D'default' as the input here, because old versions - * of libvirt produced that output and we need to be able to read - * it back to correctly handle running guests on daemon upgrade */ - return virXMLPropTristateBoolAllowDefault(node, "value", - VIR_XML_PROP_NONE, - allowReboot); -} - - static void qemuDomainObjPrivateXMLParsePR(xmlXPathContextPtr ctxt, bool *prDaemonRunning) @@ -3548,9 +3518,6 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, priv->chardevStdioLogd =3D virXPathBoolean("boolean(./chardevStdioLogd= )", ctxt) =3D=3D 1; - if (qemuDomainObjPrivateXMLParseAllowReboot(ctxt, &priv->allowReboot) = < 0) - return -1; - qemuDomainObjPrivateXMLParsePR(ctxt, &priv->prDaemonRunning); if (qemuDomainObjPrivateXMLParseBlockjobs(vm, priv, ctxt) < 0) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 50ab492023..23e99dc68c 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -134,15 +134,6 @@ struct _qemuDomainObjPrivate { bool fakeReboot; bool fakeReset; bool pausedShutdown; - /* allowReboot: - * - * Unused with new QEMU versions which have QEMU_CAPS_SET_ACTION. - * - * Otherwise if it's set to VIR_TRISTATE_BOOL_YES, QEMU was started wi= th - * -no-shutdown, and if set to VIR_TRISTATE_BOOL_NO qemu was started w= ith - * -no-reboot instead. - */ - virTristateBool allowReboot; unsigned long migMaxBandwidth; char *origname; @@ -1010,14 +1001,6 @@ qemuDomainFixupCPUs(virDomainObj *vm, char * qemuDomainGetMachineName(virDomainObj *vm); -void -qemuDomainObjPrivateXMLFormatAllowReboot(virBuffer *buf, - virTristateBool allowReboot); - -int -qemuDomainObjPrivateXMLParseAllowReboot(xmlXPathContextPtr ctxt, - virTristateBool *allowReboot); - void qemuDomainPrepareDiskSourceData(virDomainDiskDef *disk, virStorageSource *src); diff --git a/tests/qemustatusxml2xmldata/backup-pull-in.xml b/tests/qemusta= tusxml2xmldata/backup-pull-in.xml index 2cedcc3cf2..fcaff2e38a 100644 --- a/tests/qemustatusxml2xmldata/backup-pull-in.xml +++ b/tests/qemustatusxml2xmldata/backup-pull-in.xml @@ -233,7 +233,6 @@ - diff --git a/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml b/tests/q= emustatusxml2xmldata/blockjob-blockdev-in.xml index 1c45fad370..58afae4168 100644 --- a/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml +++ b/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml @@ -232,7 +232,6 @@ - diff --git a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml b/tests/qem= ustatusxml2xmldata/blockjob-mirror-in.xml index df11e83ced..be85202c02 100644 --- a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml +++ b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml @@ -22,7 +22,6 @@ - diff --git a/tests/qemustatusxml2xmldata/memory-backing-dir-in.xml b/tests/= qemustatusxml2xmldata/memory-backing-dir-in.xml index eea671a41c..a1a1845495 100644 --- a/tests/qemustatusxml2xmldata/memory-backing-dir-in.xml +++ b/tests/qemustatusxml2xmldata/memory-backing-dir-in.xml @@ -22,7 +22,6 @@ - diff --git a/tests/qemustatusxml2xmldata/migration-in-params-in.xml b/tests= /qemustatusxml2xmldata/migration-in-params-in.xml index 861d8eeadb..986e5455aa 100644 --- a/tests/qemustatusxml2xmldata/migration-in-params-in.xml +++ b/tests/qemustatusxml2xmldata/migration-in-params-in.xml @@ -256,7 +256,6 @@ - diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-bitmaps-in.xml b= /tests/qemustatusxml2xmldata/migration-out-nbd-bitmaps-in.xml index 5d76545513..4f1fb07c1b 100644 --- a/tests/qemustatusxml2xmldata/migration-out-nbd-bitmaps-in.xml +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-bitmaps-in.xml @@ -342,7 +342,6 @@ - diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml b/tests/= qemustatusxml2xmldata/migration-out-nbd-out.xml index 581cf28286..a69d1c4590 100644 --- a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml @@ -259,7 +259,6 @@ - diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml b/te= sts/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml index dacaa3e42f..86a7fbc187 100644 --- a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml @@ -288,7 +288,6 @@ - diff --git a/tests/qemustatusxml2xmldata/migration-out-params-in.xml b/test= s/qemustatusxml2xmldata/migration-out-params-in.xml index b914236b62..f4e921ab38 100644 --- a/tests/qemustatusxml2xmldata/migration-out-params-in.xml +++ b/tests/qemustatusxml2xmldata/migration-out-params-in.xml @@ -270,7 +270,6 @@ - diff --git a/tests/qemustatusxml2xmldata/modern-in.xml b/tests/qemustatusxm= l2xmldata/modern-in.xml index 050669f554..422a04f3ca 100644 --- a/tests/qemustatusxml2xmldata/modern-in.xml +++ b/tests/qemustatusxml2xmldata/modern-in.xml @@ -260,7 +260,6 @@ - diff --git a/tests/qemustatusxml2xmldata/qcow2-data-file-in.xml b/tests/qem= ustatusxml2xmldata/qcow2-data-file-in.xml index 2675214417..951b4abfbe 100644 --- a/tests/qemustatusxml2xmldata/qcow2-data-file-in.xml +++ b/tests/qemustatusxml2xmldata/qcow2-data-file-in.xml @@ -22,7 +22,6 @@ - diff --git a/tests/qemustatusxml2xmldata/throttlefilter-out.xml b/tests/qem= ustatusxml2xmldata/throttlefilter-out.xml index 8751a42cce..eee01c79b1 100644 --- a/tests/qemustatusxml2xmldata/throttlefilter-out.xml +++ b/tests/qemustatusxml2xmldata/throttlefilter-out.xml @@ -233,7 +233,6 @@ - diff --git a/tests/qemustatusxml2xmldata/upgrade-out.xml b/tests/qemustatus= xml2xmldata/upgrade-out.xml index c7bc7128df..fd1c174200 100644 --- a/tests/qemustatusxml2xmldata/upgrade-out.xml +++ b/tests/qemustatusxml2xmldata/upgrade-out.xml @@ -258,7 +258,6 @@ - diff --git a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml b/tests/qemusta= tusxml2xmldata/vcpus-multi-in.xml index 6ee688ce03..1d5b34c2b6 100644 --- a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml +++ b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml @@ -308,7 +308,6 @@ - --=20 2.55.0