From nobody Mon Feb 9 14:37:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1632151818; cv=none; d=zohomail.com; s=zohoarc; b=ff60HiZiQxXJxbh7Ii2MABENgpss6J0ahPsFGhryZUvMr0Pq7uoauXHsOJQDER5M+nh3t0gw1E8phbqZWEzME9wYOjxLWJ6xD+zWJtJyy/WEaEKVZua4Nm0IjQ8d0MX5UMF3B1j3jb8a1ArNcCuPbej3QmoQuoV54aphjyUT3pc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632151818; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9ESmlOYtqSChnxASaTkyHtfEtWhB0vx67oqeyotWCLw=; b=NnnH90rK+UOXYV0Z6ESve84JXAYsoLJPmPg6VZgc5joC7ZB8oUmVJNH7YM3EveTxbyRJ7hUyqpYa4VYInhxa16InxrnRXPF1aNT6L2OpWG3dEsNT48xpjNW0GH937DKLaxi5O+7/UrP313CWfMV7zcpGdMjaG3PrIl7gUSxWI8o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1632151818748670.8543795745866; Mon, 20 Sep 2021 08:30:18 -0700 (PDT) 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-589-SV6XR-kaNcS9WcTMHtapAA-1; Mon, 20 Sep 2021 11:30:16 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 18C8184A5E1; Mon, 20 Sep 2021 15:30:10 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EB1197621D; Mon, 20 Sep 2021 15:30:09 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B96E81806D02; Mon, 20 Sep 2021 15:30:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18KFTnJn017207 for ; Mon, 20 Sep 2021 11:29:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8F8A160C4A; Mon, 20 Sep 2021 15:29:49 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id E826760C17 for ; Mon, 20 Sep 2021 15:29:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632151817; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=9ESmlOYtqSChnxASaTkyHtfEtWhB0vx67oqeyotWCLw=; b=AsYzo3aA/WTGmw/DFt6uqT9ZVTq9tHYF8wi+5NqjOKoPNMAdtDdDI1332Qai46iLykw2zj v6lXDy+z6goVZUrDgkU2lIHmmuv7TT6tYULfuogGKEX3hwshHLkpAB0UZfd/2GXJsdvGsZ LBhg2lsZc0TQ7UIKf1xlI5wUPqOI1Go= X-MC-Unique: SV6XR-kaNcS9WcTMHtapAA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 04/14] qemu: Always assume QEMU_CAPS_REBOOT_TIMEOUT Date: Mon, 20 Sep 2021 17:29:26 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1632151819751100003 Content-Type: text/plain; charset="utf-8" Supported since ac05f34924 ("add a boot parameter to set reboot timeout") released in qemu-v1.3.0 and can't be compiled out. Assume that it's present and remove the validation code. Signed-off-by: Peter Krempa --- src/qemu/qemu_validate.c | 9 --------- tests/qemuxml2argvtest.c | 4 ++-- tests/qemuxml2xmltest.c | 4 ++-- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 6b685881a8..4eadcc6aae 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -598,15 +598,6 @@ qemuValidateDomainDefBoot(const virDomainDef *def, } } - if (def->os.bios.rt_set) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_REBOOT_TIMEOUT)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("reboot timeout is not supported " - "by this QEMU binary")); - return -1; - } - } - if (def->os.bm_timeout_set) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPLASH_TIMEOUT)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 64408caeff..e13aeb4b15 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1174,8 +1174,8 @@ mymain(void) driver.config->nogfxAllowHostAudio =3D false; g_unsetenv("QEMU_AUDIO_DRV"); - DO_TEST("reboot-timeout-disabled", QEMU_CAPS_REBOOT_TIMEOUT); - DO_TEST("reboot-timeout-enabled", QEMU_CAPS_REBOOT_TIMEOUT); + DO_TEST_NOCAPS("reboot-timeout-disabled"); + DO_TEST_NOCAPS("reboot-timeout-enabled"); DO_TEST("bios", QEMU_CAPS_DEVICE_ISA_SERIAL); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 6d3526f91f..8329f871b3 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -233,8 +233,8 @@ mymain(void) DO_TEST_NOCAPS("boot-menu-disable-with-timeout"); DO_TEST_NOCAPS("boot-order"); - DO_TEST("reboot-timeout-enabled", QEMU_CAPS_REBOOT_TIMEOUT); - DO_TEST("reboot-timeout-disabled", QEMU_CAPS_REBOOT_TIMEOUT); + DO_TEST_NOCAPS("reboot-timeout-enabled"); + DO_TEST_NOCAPS("reboot-timeout-disabled"); DO_TEST_NOCAPS("clock-utc"); DO_TEST_NOCAPS("clock-localtime"); --=20 2.31.1