From nobody Thu Dec 18 08:10:48 2025 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=none dis=none) header.from=xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1765824185; cv=none; d=zohomail.com; s=zohoarc; b=QS4x2ucCZ8HpsOoWnVyl4VaP48n08gslE5Wjw29pzyp87M31NmdSNbWMQvLlKFNNrRAeSHEX6N1aw6OeIeSdK6BjbSpKq3nabcxfFBagv5ivy/MR0Mls7TVp3SzZnYoLOmjIXnkzf8mYNDLjoZ/9rXlpWaQDZ7rVATFfHfVndBk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765824185; 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=e12dchVFz9MNJ7K2j8AuX0whONk3kd5v2l187O07Ymg=; b=P7hqV2CRXJo6gSWrmPCTlKIeU+LHp/Rk7j55PeeWt8kK7gHtT9JQOl4rZ01/KvX5qWWVMmOrQPMDgiAoiZqNNGGeiLW60V2HpGNNGNZXc6kUIXYm5tuq6Ypw2OshS8bUa+TKSpY8MkjjdWmNrAc6FIBVkNq84ZPq9EPnZ0ZsGY4= 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=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1765824185380432.024965938459; Mon, 15 Dec 2025 10:43:05 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1187026.1508443 (Exim 4.92) (envelope-from ) id 1vV8zC-0007qD-Oj; Mon, 15 Dec 2025 13:51:38 +0000 Received: by outflank-mailman (output) from mailman id 1187026.1508443; Mon, 15 Dec 2025 13:51:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vV8zC-0007q6-MJ; Mon, 15 Dec 2025 13:51:38 +0000 Received: by outflank-mailman (input) for mailman id 1187026; Mon, 15 Dec 2025 13:51:37 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vV8zB-0007q0-Rw for xen-devel@lists.xenproject.org; Mon, 15 Dec 2025 13:51:37 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.96) (envelope-from ) id 1vV8zB-00B7yS-1F; Mon, 15 Dec 2025 13:51:37 +0000 Received: from [2a01:cb15:80df:da00:8c91:1441:8140:73df] (helo=l14.home) by xenbits.xenproject.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vV8zB-007Yk3-0i; Mon, 15 Dec 2025 13:51:37 +0000 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" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: Message-ID:Date:Subject:Cc:To:From; bh=e12dchVFz9MNJ7K2j8AuX0whONk3kd5v2l187O07Ymg=; b=c3mHbiXM1S6J9p+h/+eVwzSav8 xiWIzqVeDe2w6/T+FzErCbgJSAalzwHo4V9wZnxJYvzIDdtASfhP598LMIXSpIgle7ka3XYwUpWoD Bk+WgZCwOInMgy4zjkIdu+OKTZL2MnCZRu3bdQ3tCjg2PcmwLS97Ehg0HG+sjUK/8avU=; From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Anthony PERARD , Juergen Gross Subject: [XEN PATCH] libxl: Fix device_add QMP calls with QEMU 9.2 and newer Date: Mon, 15 Dec 2025 14:51:24 +0100 Message-ID: <20251215135124.11410-1-anthony@xenproject.org> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xenproject.org) X-ZM-MESSAGEID: 1765824187417154100 Content-Type: text/plain; charset="utf-8" From: Anthony PERARD QEMU used to ignore JSON types and do conversion string <-> integer automatically for the command "device_add", but that was removed in QEMU 9.2 (428d1789df91 ("docs/about: Belatedly document tightening of QMP device_add checking")). Fixes: 9718ab394d5d ("libxl_usb: Make libxl__device_usbctrl_add uses ev_qmp= ") Fixes: 40c7eca10a82 ("libxl_usb: Make libxl__device_usbdev_add uses ev_qmp") Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross Tested-by: Maximilian Engelhardt --- Notes: I've check other `device_add` call site which are for PCI devices and CPUs, and they both are already correct. tools/libs/light/libxl_usb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/libs/light/libxl_usb.c b/tools/libs/light/libxl_usb.c index c5ae59681c..4e7c409fe6 100644 --- a/tools/libs/light/libxl_usb.c +++ b/tools/libs/light/libxl_usb.c @@ -367,10 +367,10 @@ static int libxl__device_usbctrl_add_hvm(libxl__egc *= egc, libxl__ev_qmp *qmp, case 3: libxl__qmp_param_add_string(gc, &qmp_args, "driver", "nec-usb-xhci"); - libxl__qmp_param_add_string(gc, &qmp_args, "p2", - GCSPRINTF("%d", usbctrl->ports)); - libxl__qmp_param_add_string(gc, &qmp_args, "p3", - GCSPRINTF("%d", usbctrl->ports)); + libxl__qmp_param_add_integer(gc, &qmp_args, "p2", + usbctrl->ports); + libxl__qmp_param_add_integer(gc, &qmp_args, "p3", + usbctrl->ports); break; default: abort(); /* Should not be possible. */ @@ -411,10 +411,10 @@ static int libxl__device_usbdev_add_hvm(libxl__egc *e= gc, libxl__ev_qmp *qmp, GCSPRINTF("xenusb-%d.0", usbdev->ctrl)); libxl__qmp_param_add_string(gc, &qmp_args, "port", GCSPRINTF("%d", usbdev->port)); - libxl__qmp_param_add_string(gc, &qmp_args, "hostbus", - GCSPRINTF("%d", usbdev->u.hostdev.hostbus)); - libxl__qmp_param_add_string(gc, &qmp_args, "hostaddr", - GCSPRINTF("%d", usbdev->u.hostdev.hostaddr)); + libxl__qmp_param_add_integer(gc, &qmp_args, "hostbus", + usbdev->u.hostdev.hostbus); + libxl__qmp_param_add_integer(gc, &qmp_args, "hostaddr", + usbdev->u.hostdev.hostaddr); =20 return libxl__ev_qmp_send(egc, qmp, "device_add", qmp_args); } --=20 Anthony PERARD