From nobody Sat May 30 11:18:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1778257741; cv=none; d=zohomail.com; s=zohoarc; b=KrLa7KN96U9Iyx4DKGeonacEALPY/bSB6XVLm1BXx+RgdcGjqfOzZjKV7ybmnDkr9LgsAav/VsDrJvyizknGSgUC/TW+h25JKdwYVC1qm1KXgCfXLhPkVCb8DdiUuTXF0Oknd+4rZERe+LJ5CKYSCy0F6sXwidqeYuysw5Tw6JI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778257741; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4odYMv7FIvcLkk0IlEKAOlg7gcBezyvcr5ysKnJqIv4=; b=AYRyIY9Xc3aMGFmPAO9ZQ77WdeTNSGGACg0dryG5eXxjqToLUVrl500iQ27NBlmQo2XBwBP5udLx2wjTeQ9DP/XuGa04saxFp5EvaM8k7EVHQHG53k8/DmTrrgsxYfZwPBtpXLLh++Ovu+L39ITEgaTzM0ezx3vQJS8QAmkY5bg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1778257741680201.10088084056747; Fri, 8 May 2026 09:29:01 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1304027.1577226 (Exim 4.92) (envelope-from ) id 1wLO3q-0002Ps-Sc; Fri, 08 May 2026 16:28:22 +0000 Received: by outflank-mailman (output) from mailman id 1304027.1577226; Fri, 08 May 2026 16:28:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wLO3q-0002Pl-Pw; Fri, 08 May 2026 16:28:22 +0000 Received: by outflank-mailman (input) for mailman id 1304027; Fri, 08 May 2026 16:28:21 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wLO3p-0002Nd-9M for xen-devel@lists.xenproject.org; Fri, 08 May 2026 16:28:21 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wLO3o-007knQ-Ma for xen-devel@lists.xenproject.org; Fri, 08 May 2026 18:28:20 +0200 Received: from [10.42.69.2] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 69fe0eed-e002-0a2a0a5209dd-0a2a45028ab8-32 for ; Fri, 08 May 2026 18:28:20 +0200 Received: from [209.85.128.43] (helo=mail-wm1-f43.google.com) by tlsNG-720697.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 69fe0f24-af86-0a2a45020019-d155802ba5a5-3 for ; Fri, 08 May 2026 18:28:20 +0200 Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-48a3e9862f0so14953325e9.1 for ; Fri, 08 May 2026 09:28:20 -0700 (PDT) Received: from localhost.localdomain (host-78-146-242-105.as13285.net. [78.146.242.105]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e6d8d69a0sm3326705e9.2.2026.05.08.09.28.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2026 09:28:19 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=citrix.com header.i="@citrix.com" header.h="Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1778257700; x=1778862500; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=4odYMv7FIvcLkk0IlEKAOlg7gcBezyvcr5ysKnJqIv4=; b=ecKbahM6HNSuoQOl8Pn7Flk2XdJuy89NHow85Bnlrv3uVLJmtouynq/7+UimfzNEEw L5uCp5vqOOHdz4uaE5Rt2YvWI2ELTdUFu2A6qnxbNX0GWydfzFUDyZAf0C/w87EgTc+b 1B2yeFz2T5o9+yMwuYraTtz4BQSuwxH+lHsB0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778257700; x=1778862500; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=4odYMv7FIvcLkk0IlEKAOlg7gcBezyvcr5ysKnJqIv4=; b=IQSW7PgcuwYHX6pebuLeIMLJGQ5IBr73W3eRZ3RpnVk1GIKkEABCqvEZoe9WLrGTkk MaIzPy0YpGJ5xb7UeMaaaKn2FK+ULEf/RxFFLZC96CnXQQM32aY9/TOehvtYkBPdTOfQ x4UdsElDOaLHqBOsr356s7Vj8oi368gdsN7bn51ovPtUl+CbYV5uk6HdKveIzt6DpMcQ ytFQZZZbVpwW96ye4VN7k/cqgrx8Aqz455Om6Ad6INlt0QlqC75CqcvMz1l6x2nDVCEF Ok7ZHtYCRIrH5TOIxdne6lPGSzR6ibqftMAu3OktpqfhFLetV83GlWyn2UQK3DSzskVS w12A== X-Gm-Message-State: AOJu0YzRvuGB2H+qDeI45WMu0AC6wlv6cv2yglDaUk6R2iPMF4xbR4mw dc5cdXzeI8oYejWG9fQ4UI7XOug6ucuiKzvgX62+L2plaH9aPCIuXc6z0VwANRJge/cfNGZpcMf skQj2ScQ= X-Gm-Gg: AeBDievFfq94Ip6oINC5OYOlT9kbG+pDzNNlEKR+vKb7CaJ2wA0Y8gIXOSyQW/WdnAC uyVasPbBfEmgzOzb2kD8VrgoFeQ8hCvCiaESliPl3+AhzIJUUZHZLDnhWJEA7Nht7LjXb6FUa20 Gg9ZsvcQTpjYhIPipJ6CF6LXgBz8FstBQdHgbds6gZzA4akmBxoNwa/8uMZkCBeyXj1A5mQhQXF dY/MM7hK7VDzsa0mXukavKEW9UczikJfgvZfdhPfyl+7sebmODFB6iTg+8DiVV4ZGFbt8+mhRsB VP5rL14d85vm3gf6HQnmaqDieMp371LGlx6kXv/DFSYPHnP1OGyerX2rNtApDpjs6dNuamOhrQq x6SXpnVEXeSSytbWCG1gSl2WIwrILRBeRQNmpo0pFsQArYo8cWf0WF1UM1TnCyG5q6Z/un1xAue AQqygoCIC7Vm5aEu0oRQ4JunG3MeG8XSyZ/JNmg1ncziEimT4hulIi0Kdr/TlwTD16wULSetY4b JR3CGL0/ZJBmyU= X-Received: by 2002:a05:600c:32af:b0:48a:534a:eed8 with SMTP id 5b1f17b1804b1-48e5dfcd722mr75823715e9.1.1778257699651; Fri, 08 May 2026 09:28:19 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , Michael Young , Stefano Stabellini Subject: [PATCH] tools/libxl: Fix libxl_nocpuid.c build with json-c Date: Fri, 8 May 2026 17:28:15 +0100 Message-Id: <20260508162815.1617203-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-720697/1778257700-8256B161-C917A6F4/0/0 X-purgate-type: clean X-purgate-size: 1692 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1778257742495158500 Content-Type: text/plain; charset="utf-8" libxl_nocpuid.c needs the same treatment as libxl_cpuid.c Fixes: f6c6f2679d49 ("libxl: Convert libxl__object_to_json() to json-c") Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Juergen Gross CC: Michael Young CC: Stefano Stabellini Discovered while trying to complete the ARM CI cleanup. This supercedes https://lore.kernel.org/xen-devel/94ffdeb1-6826-4c3a-a9c1-3ccc8b129a61@durh= am.ac.uk/T/#u using Anthony's suggested approach. Failed run: https://gitlab.com/xen-project/hardware/xen-staging/-/jobs/14282279751 Succeeding run (same container): https://gitlab.com/xen-project/hardware/xen-staging/-/jobs/14282714527 --- tools/libs/light/libxl_nocpuid.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/libs/light/libxl_nocpuid.c b/tools/libs/light/libxl_nocp= uid.c index 0630959e760c..ce334633b376 100644 --- a/tools/libs/light/libxl_nocpuid.c +++ b/tools/libs/light/libxl_nocpuid.c @@ -40,11 +40,21 @@ int libxl__cpuid_legacy(libxl_ctx *ctx, uint32_t domid,= bool restore, return 0; } =20 +#ifdef HAVE_LIBJSONC +int libxl_cpuid_policy_list_gen_jso(json_object **jso_r, libxl_cpuid_polic= y_list *pl) +{ + *jso_r =3D NULL; + return 0; +} +#endif + +#ifdef HAVE_LIBYAJL yajl_gen_status libxl_cpuid_policy_list_gen_json(yajl_gen hand, libxl_cpuid_policy_list *pcpuid) { return 0; } +#endif =20 int libxl__cpuid_policy_list_parse_json(libxl__gc *gc, const libxl__json_object *o, --=20 2.39.5