From nobody Sun Feb 8 15:25:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1641462307; cv=none; d=zohomail.com; s=zohoarc; b=eJfO8v69ImxZaLfn4neUWhY1MoAkEpB2jv0GLhM54u42xJrxoNZ6Jw4EGJhpqZzmV2pRui+2RBc1vQ9OHJdEzpkeJUhPHNvdsekPXjPV6p+nlhK4DWECJQxbzGAntCBaaMHBhsGfAOZYwaKrNCLrcK8G/5dv+0yBw7582ogyADw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641462307; 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=R7a5AiDVfx3oaP9MgDBHfGaZJ0PfwsT59uoEzRVK03M=; b=T7Anka4z+Jkt5nhQXia9FWkD3zVBtiCANfxDAuaUktC/BQwKjVnBRDRtwCQ7g6ZSiT7SBz8BPpSAFuyqJOaTBiTR3R4/h1FDO80ydqPrwFmpsO9jUnFYZbPLwsfqmqPdLZWGegykJk0DO9SrFnB7NynpFenULoQtx8jpY0nnLfE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1641462307004264.42413221960567; Thu, 6 Jan 2022 01:45:07 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-252-4QXBT1fwOKaOfJSlczi-MA-1; Thu, 06 Jan 2022 04:44:59 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0DCB281CCB6; Thu, 6 Jan 2022 09:44:55 +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 DDD41106A026; Thu, 6 Jan 2022 09:44:54 +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 0FD221806D03; Thu, 6 Jan 2022 09:44:54 +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 2069ictu005383 for ; Thu, 6 Jan 2022 04:44:38 -0500 Received: by smtp.corp.redhat.com (Postfix) id C3ED07CD68; Thu, 6 Jan 2022 09:44:38 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27DF27CAD2 for ; Thu, 6 Jan 2022 09:44:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641462305; 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=R7a5AiDVfx3oaP9MgDBHfGaZJ0PfwsT59uoEzRVK03M=; b=JVxJxBBA3sq8dh0poFI45gJvYUQvyUQ5sfgC7AXUGx8yFA+q2S9QCXiTa1lwcyacplsogH vHzTkdj+EqvJlguX/F+RX42JDo8E7Jjk6GAZcgwfE4pQLLm7Ke5ZiF5BC2Xlr8NYVfq6q+ YGnhP8Z9L4/eFM6ClfFxbqFCUnpaheE= X-MC-Unique: 4QXBT1fwOKaOfJSlczi-MA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 02/21] qemuDomainNeedsFDC: Simplify and improve checking if a machine needs FDC Date: Thu, 6 Jan 2022 10:44:01 +0100 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.84 on 10.5.11.22 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: 1641462307774100001 Content-Type: text/plain; charset="utf-8" Commit c7f3a1f7870 turned qemuDomainMachineNeedsFDC() effectively into qemuDomainIsQ35. Use it instead as it also matches the non-canonicalized 'q35'. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 3f10f9306f..a8401bac30 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8685,20 +8685,6 @@ bool qemuDomainHasBuiltinESP(const virDomainDef *def) } -static bool -qemuDomainMachineNeedsFDC(const char *machine, - const virArch arch) -{ - if (!ARCH_IS_X86(arch)) - return false; - - if (!STRPREFIX(machine, "pc-q35-")) - return false; - - return true; -} - - bool qemuDomainIsQ35(const virDomainDef *def) { @@ -8781,7 +8767,8 @@ qemuDomainHasBuiltinIDE(const virDomainDef *def) bool qemuDomainNeedsFDC(const virDomainDef *def) { - return qemuDomainMachineNeedsFDC(def->os.machine, def->os.arch); + /* all supported Q35 machines need explicit FDC */ + return qemuDomainIsQ35(def); } --=20 2.31.1