From nobody Thu Apr 25 12:47:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599712017; cv=none; d=zohomail.com; s=zohoarc; b=dCjgkamUW82SmbYJbZtn9VuvMn12wvcGswImOpSomfTivqbfbtZ0krw8GPMvDXCcZ02hCXgy4ScnupxnwdeRVVEqCZQcZvz4gTNja9Ilm6EZ7m+RljcCNvaZFZdoi/xoGs302svTB984m1fCIvt3M7Zo4ywkHutDctqsJofDU5A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599712017; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=73Z1EuNDliG1s+p1hl+Mo2M4sBJJrP5Opu8uOlkXCVw=; b=HKapZZJLXk0lUeMhpprZNi4CDeTom2pXh2LaWC8S9/tBWOVJSbGsqEy8FvVQqKo6cuABenkyzlY6vLyLRXQZoZAzkoG/Nw4/Sa8GZq7f7LGlNFIeMq2G1gdoMbNy1kt+VDAzEVes15BsILB8s3lqqUprARWIw0G/5jO0lO28PX0= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1599712017767461.89975224267914; Wed, 9 Sep 2020 21:26:57 -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-532-jW2ZwMCOP16UpQkIkx7pZg-1; Thu, 10 Sep 2020 00:26:53 -0400 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 ABFA281CAF8; Thu, 10 Sep 2020 04:26:46 +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 61F651000239; Thu, 10 Sep 2020 04:26:44 +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 04DE4180B656; Thu, 10 Sep 2020 04:26:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08A4Qahv010935 for ; Thu, 10 Sep 2020 00:26:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 917992028DCC; Thu, 10 Sep 2020 04:26:36 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8B2F42018035 for ; Thu, 10 Sep 2020 04:26:34 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 223C880121C for ; Thu, 10 Sep 2020 04:26:34 +0000 (UTC) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-146-29zD2LX0Ohig2xi4vdaMzw-1; Thu, 10 Sep 2020 00:26:30 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 553275C00DF; Thu, 10 Sep 2020 00:18:09 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 10 Sep 2020 00:18:09 -0400 Received: from localhost.localdomain (ip5b40aa59.dynamic.kabel-deutschland.de [91.64.170.89]) by mail.messagingengine.com (Postfix) with ESMTPA id 2363B3280059; Thu, 10 Sep 2020 00:18:08 -0400 (EDT) X-MC-Unique: jW2ZwMCOP16UpQkIkx7pZg-1 X-MC-Unique: 29zD2LX0Ohig2xi4vdaMzw-1 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudehiedgkedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofggtghogfesthekre dtredtjeenucfhrhhomhepofgrrhgvkhcuofgrrhgtiiihkhhofihskhhiqdfikphrvggt khhiuceomhgrrhhmrghrvghksehinhhvihhsihgslhgvthhhihhnghhslhgrsgdrtghomh eqnecuggftrfgrthhtvghrnhepteegteekueekfffhjeeuleduheettdekueeitdfggfdt hfevfeeuieeihfduheegnecukfhppeeluddrieegrddujedtrdekleenucevlhhushhtvg hrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrghrmhgrrhgvkhesihhn vhhishhisghlvghthhhinhhgshhlrggsrdgtohhm X-ME-Proxy: From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= To: libvir-list@redhat.com Subject: [PATCH] libxl: use b_info->{acpi,acpi} when available Date: Thu, 10 Sep 2020 06:18:01 +0200 Message-Id: <20200910041801.1016202-1-marmarek@invisiblethingslab.com> MIME-Version: 1.0 Organization: Invisible Things Lab X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false; X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable b_info->u.hvm.{acpi,apic} are deprecated. But also, on recent libxl version (4.14) the old one seems to be broken. While libxl part should be fixed too, update the usage here and at some point drop support for the old version. b_info->acpi was added in Xen 4.8 b_info->apic was added in Xen 4.10 Xen 4.10 is the oldest version that still has security support (until December 2020). Signed-off-by: Marek Marczykowski-G=C3=B3recki Reviewed-by: Jim Fehlig Reviewed-by: Michal Privoznik --- src/libxl/libxl_conf.c | 13 +++++++++++++ tests/libxlxml2domconfigdata/basic-hvm.json | 4 ++-- tests/libxlxml2domconfigdata/cpu-shares-hvm.json | 4 ++-- .../libxlxml2domconfigdata/fullvirt-acpi-slic.json | 4 ++-- .../fullvirt-cpuid-legacy-nest.json | 4 ++-- tests/libxlxml2domconfigdata/fullvirt-cpuid.json | 4 ++-- .../max-eventchannels-hvm.json | 4 ++-- tests/libxlxml2domconfigdata/max-gntframes-hvm.json | 4 ++-- tests/libxlxml2domconfigdata/moredevs-hvm.json | 4 ++-- .../libxlxml2domconfigdata/variable-clock-hvm.json | 4 ++-- .../vnuma-hvm-legacy-nest.json | 4 ++-- tests/libxlxml2domconfigdata/vnuma-hvm.json | 4 ++-- 12 files changed, 35 insertions(+), 22 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index befd5eb965..5b729a019a 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -508,12 +508,25 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_defbool_set(&b_info->u.hvm.pae, def->features[VIR_DOMAIN_FEATURE_PAE] =3D=3D VIR_TRISTATE_SWITCH_ON); +#ifdef LIBXL_HAVE_BUILDINFO_APIC + libxl_defbool_set(&b_info->apic, + def->features[VIR_DOMAIN_FEATURE_APIC] =3D=3D + VIR_TRISTATE_SWITCH_ON); + /* + * Strictly speaking b_info->acpi was introduced earlier (Xen 4.8)= , but + * there is no separate #define in libxl.h. + */ + libxl_defbool_set(&b_info->acpi, + def->features[VIR_DOMAIN_FEATURE_ACPI] =3D=3D + VIR_TRISTATE_SWITCH_ON); +#else libxl_defbool_set(&b_info->u.hvm.apic, def->features[VIR_DOMAIN_FEATURE_APIC] =3D=3D VIR_TRISTATE_SWITCH_ON); libxl_defbool_set(&b_info->u.hvm.acpi, def->features[VIR_DOMAIN_FEATURE_ACPI] =3D=3D VIR_TRISTATE_SWITCH_ON); +#endif =20 /* copy SLIC table path to acpi_firmware */ if (def->os.slic_table) diff --git a/tests/libxlxml2domconfigdata/basic-hvm.json b/tests/libxlxml2d= omconfigdata/basic-hvm.json index ccd5853854..87f8cb7d8a 100644 --- a/tests/libxlxml2domconfigdata/basic-hvm.json +++ b/tests/libxlxml2domconfigdata/basic-hvm.json @@ -21,10 +21,10 @@ "sched_params": { =20 }, + "apic": "True", + "acpi": "True", "type.hvm": { "pae": "True", - "apic": "True", - "acpi": "True", "vga": { "kind": "cirrus" }, diff --git a/tests/libxlxml2domconfigdata/cpu-shares-hvm.json b/tests/libxl= xml2domconfigdata/cpu-shares-hvm.json index 2e647eada2..2aa97e88c5 100644 --- a/tests/libxlxml2domconfigdata/cpu-shares-hvm.json +++ b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json @@ -21,10 +21,10 @@ "sched_params": { "weight": 1500 }, + "apic": "True", + "acpi": "True", "type.hvm": { "pae": "True", - "apic": "True", - "acpi": "True", "vga": { "kind": "cirrus" }, diff --git a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json b/tests/l= ibxlxml2domconfigdata/fullvirt-acpi-slic.json index f16b4a971a..a2d46797aa 100644 --- a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json +++ b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json @@ -14,10 +14,10 @@ "shadow_memkb": 5656, "sched_params": { }, + "apic": "True", + "acpi": "True", "type.hvm": { "pae": "True", - "apic": "True", - "acpi": "True", "acpi_firmware": "/path/to/slic.dat", "nographic": "True", "vga": { diff --git a/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json b= /tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json index 0944476151..6290655c20 100644 --- a/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json +++ b/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json @@ -21,10 +21,10 @@ ], "sched_params": { }, + "apic": "True", + "acpi": "True", "type.hvm": { "pae": "True", - "apic": "True", - "acpi": "True", "nested_hvm": "False", "nographic": "True", "vga": { diff --git a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json b/tests/libxl= xml2domconfigdata/fullvirt-cpuid.json index ddc423bca7..811a4f0ac7 100644 --- a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json +++ b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json @@ -22,10 +22,10 @@ "sched_params": { }, "nested_hvm": "False", + "apic": "True", + "acpi": "True", "type.hvm": { "pae": "True", - "apic": "True", - "acpi": "True", "nographic": "True", "vga": { "kind": "none" diff --git a/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json b/test= s/libxlxml2domconfigdata/max-eventchannels-hvm.json index d5b351beb5..4a5b0ca65f 100644 --- a/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json +++ b/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json @@ -22,10 +22,10 @@ "sched_params": { =20 }, + "apic": "True", + "acpi": "True", "type.hvm": { "pae": "True", - "apic": "True", - "acpi": "True", "vga": { "kind": "cirrus" }, diff --git a/tests/libxlxml2domconfigdata/max-gntframes-hvm.json b/tests/li= bxlxml2domconfigdata/max-gntframes-hvm.json index ef602f09fc..2883d057ff 100644 --- a/tests/libxlxml2domconfigdata/max-gntframes-hvm.json +++ b/tests/libxlxml2domconfigdata/max-gntframes-hvm.json @@ -22,10 +22,10 @@ "sched_params": { =20 }, + "apic": "True", + "acpi": "True", "type.hvm": { "pae": "True", - "apic": "True", - "acpi": "True", "vga": { "kind": "cirrus" }, diff --git a/tests/libxlxml2domconfigdata/moredevs-hvm.json b/tests/libxlxm= l2domconfigdata/moredevs-hvm.json index 474aa2cef6..58cf32a8d4 100644 --- a/tests/libxlxml2domconfigdata/moredevs-hvm.json +++ b/tests/libxlxml2domconfigdata/moredevs-hvm.json @@ -23,10 +23,10 @@ "sched_params": { =20 }, + "apic": "True", + "acpi": "True", "type.hvm": { "pae": "True", - "apic": "True", - "acpi": "True", "hpet": "True", "vga": { "kind": "cirrus" diff --git a/tests/libxlxml2domconfigdata/variable-clock-hvm.json b/tests/l= ibxlxml2domconfigdata/variable-clock-hvm.json index 69be9c64cb..9a25d51da2 100644 --- a/tests/libxlxml2domconfigdata/variable-clock-hvm.json +++ b/tests/libxlxml2domconfigdata/variable-clock-hvm.json @@ -23,10 +23,10 @@ "sched_params": { =20 }, + "apic": "True", + "acpi": "True", "type.hvm": { "pae": "True", - "apic": "True", - "acpi": "True", "vga": { "kind": "cirrus" }, diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json b/test= s/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json index 3b2fc5f40f..6cda8d0252 100644 --- a/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json +++ b/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json @@ -109,10 +109,10 @@ "sched_params": { =20 }, + "apic": "True", + "acpi": "True", "type.hvm": { "pae": "True", - "apic": "True", - "acpi": "True", "nested_hvm": "True", "vga": { "kind": "cirrus" diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm.json b/tests/libxlxml2d= omconfigdata/vnuma-hvm.json index 02c10a9deb..f578ccd3d3 100644 --- a/tests/libxlxml2domconfigdata/vnuma-hvm.json +++ b/tests/libxlxml2domconfigdata/vnuma-hvm.json @@ -110,10 +110,10 @@ =20 }, "nested_hvm": "True", + "apic": "True", + "acpi": "True", "type.hvm": { "pae": "True", - "apic": "True", - "acpi": "True", "vga": { "kind": "cirrus" }, --=20 2.25.4