From nobody Mon Sep 16 19:40:16 2024 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=1678135621; cv=none; d=zohomail.com; s=zohoarc; b=FMUqE4eT99zF72Nj32u26cwhhJj6CDkJBKmq2oK9r+Ai4EyxBoCjwlwMIKUtWBFcT0S/Yc0WAHMcW9X+vfVvq6PfzslU3ta8AT6Y4k7iL9hQ9wmc2fiwerYFwnqa0hSZSononavqiS/61OtvwmKEi+V9AaRFqHKs1e9wHIwQofk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678135621; 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=OYLSAhn1vvhbfvdHzPg9l1XE8tpwdjA/uX8Rrn6MROU=; b=XP/8fLlcETa5zM1fZxUKOGG8AyonI4Rqk23HlOdNDxTDqvs6Jd3Bb4I04JubVd7TdxKjDC+2yKk27rDTVyIdK5V2cp/2rYtCvPmIt0IiJjeLMnEkFAVfHef2kBaFpkFn/JBbvMEyd3z0RU2WmNkZ+ZH25pRxTVRz4CNuJMi9iiI= 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 1678135621575920.1030802978788; Mon, 6 Mar 2023 12:47:01 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-460-EcW5wL-GPiibNqEIDIayAA-1; Mon, 06 Mar 2023 15:46:57 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2F64B857A88; Mon, 6 Mar 2023 20:46:52 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E431492C1B; Mon, 6 Mar 2023 20:46:52 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 12081194658D; Mon, 6 Mar 2023 20:46:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2BC111946589 for ; Mon, 6 Mar 2023 20:46:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1033B440E1; Mon, 6 Mar 2023 20:46:51 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 78CA551FF for ; Mon, 6 Mar 2023 20:46:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678135620; 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=OYLSAhn1vvhbfvdHzPg9l1XE8tpwdjA/uX8Rrn6MROU=; b=GDaJAqPWvzBdjOHD5dB/+NpB+VqZvZ51+wIKbbiBBlf/uoAXgUYjQ8MGUD+op+luzpXExu M4ijSvRy4zFptsavxEgfEQkkIKPwToMlApFON4RGinXcBfOxMIuK7b09+TlQJtpViRHeD7 ma2diXxEcweRN8aj2E7N6tpoVHH0jWo= X-MC-Unique: EcW5wL-GPiibNqEIDIayAA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 03/15] qemu: command: Replace check using QEMU_CAPS_NO_ACPI with architecture check Date: Mon, 6 Mar 2023 21:46:31 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: 1678135623031100005 Content-Type: text/plain; charset="utf-8" QEMU_CAPS_NO_ACPI is asserted based on architecture, so it can be replaced by a non-capability check. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7a1cff1fd0..189be55537 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5969,7 +5969,9 @@ qemuBuildPMCommandLine(virCommand *cmd, /* Use old syntax of -no-acpi only if qemu didn't report that it suppo= rts the * new syntax */ if (virQEMUCapsMachineSupportsACPI(qemuCaps, def->virtType, def->os.ma= chine) =3D=3D VIR_TRISTATE_BOOL_ABSENT && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_ACPI)) { + (def->os.arch =3D=3D VIR_ARCH_I686 || + def->os.arch =3D=3D VIR_ARCH_X86_64 || + def->os.arch =3D=3D VIR_ARCH_AARCH64)) { if (def->features[VIR_DOMAIN_FEATURE_ACPI] !=3D VIR_TRISTATE_SWITC= H_ON) virCommandAddArg(cmd, "-no-acpi"); } --=20 2.39.2