From patchwork Tue Dec 20 11:57:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 635453 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2868819pvb; Tue, 20 Dec 2022 04:00:16 -0800 (PST) X-Google-Smtp-Source: AA0mqf6WlzGcxHCYFcXD/oIyWHz3AU5T2IphZvKWfPeSHMV2HhSdGGbHOIyeBKqw+rB9z2ZA1d85 X-Received: by 2002:ac8:6714:0:b0:3a8:15e2:a068 with SMTP id e20-20020ac86714000000b003a815e2a068mr48978623qtp.4.1671537615943; Tue, 20 Dec 2022 04:00:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671537615; cv=none; d=google.com; s=arc-20160816; b=te5HUm0RxMSWjFQFgWcQj+dhszSX8Vl4qTfYLwaYXdwFkzgo+BX9lPxAkp3S20yXR4 cf0p6z4EmKDzk+TmargxTHrZD4iCLkBwO8oBSgWaZSF/+QozHB+gGmal8oNpFCjOKpD7 lQhm1A2Kk/QK8fCBLrQsYPUFwY545NdAWVEOvpBgC18SZjExfkRmBFzyZ+3ShlpBxz2/ IFiaN4fktX+ZxwIF17TTecv60pyBL630jybjC3JTcRiCatybpu7qJt2LArzGlmIGzbaG D/fxHfLkqiHmM+Ko8tVXPHcrvEqlcXxhZ8h4CoZZYadxEoq5MzFLz3S1TZug/DxnbKJ/ trTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=v0nh9CGZDn5x2efbNBsbQ0pIsuz5St351PYmG6HGCMs=; b=S+W3yIDY8aGygFjGi3jpLFkn2SV16OOGxX0ZCkYH/hBOBccB7mfAoWAfKMNUjEam1T rUe9p3LKEqQM73yZpAMoKd1rwarJsLPmAGiWjdK3Au7tvrZ5yCdz7pqsj4lMAWqxlg5I 60FYveprW6PzBRe2Jin86qtBt+isO6ROwiOJIj8N0PgnszDVFl8Sl26LMHrvSixbC3Aw aDGjhpd7dyLqzbDwQnT1Zg/v06FBwXFbEdLMn6t5vUidT6bl/xjP0tVuUFtG17KfzIWK UPW9bXKU4lQdWYaPfrrescnzK4koHNd5qoCQklnPD1UJUYziXiAX31ILCnN9GuD0z5uo MefA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zaSLfP7y; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t4-20020ac87384000000b003a4f6a6c4e4si5013696qtp.101.2022.12.20.04.00.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Dec 2022 04:00:15 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zaSLfP7y; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7bFG-0006Di-AS; Tue, 20 Dec 2022 06:57:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p7bFE-0006D5-93 for qemu-devel@nongnu.org; Tue, 20 Dec 2022 06:57:16 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7bFC-000434-Fd for qemu-devel@nongnu.org; Tue, 20 Dec 2022 06:57:15 -0500 Received: by mail-wm1-x32d.google.com with SMTP id v7so8554153wmn.0 for ; Tue, 20 Dec 2022 03:57:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=v0nh9CGZDn5x2efbNBsbQ0pIsuz5St351PYmG6HGCMs=; b=zaSLfP7yZa+lDYYUhzkxEteDUdjTiBySFyRJw7JxoDLS6Z+F5pY1SRABlKx5JitPrE DwB6zEmunM5MPdn3t9nVsP63aL7y1CD39sVBUrv9w/DDRLeNs1JhJ58mnTlj+JeyQ1ZJ 4UwcByDO2I+tKoTb2fhwflDp2FEh5mpZvEuL+XqxHVSq7FHRnQxN7AWXHrY2A9FwY7Yo eVPjGOAOlchFJjON1Y+QbTMD3xyDIbWPKBLh818Q80bIHDJ5lWUgdOG6eJp7pOW/N9jw lmAku2JY41eMVHP5DmfsrPTDD4UDwPBjBZ4RJln8vLWkDced39A3wsBJ9LE+GjDSrEo1 19Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=v0nh9CGZDn5x2efbNBsbQ0pIsuz5St351PYmG6HGCMs=; b=vj2dO5ta3QuUVHjaNhQ/g0Qoti5sXVpS4CY5Jy80K9FjKbjiBtPAtBfY+zq3PHpin0 HGayG3gjYnYItZPGJA2nBrBL5opDU7N8Lay4VEh6wSBi019pXeDpds8u4xro5VBJ7Z7r 8t5ZYU0C8iB9biNXkofFwq07bv4JJrAEv7pCecyZ3tGH2nW+n+MvSFzytPrrO4yi6HOF RLvtgtKHGzLQKoEBS0SjGhYdOKgE9ZFyTE5cEspRgQCJrXik8TzwdoI/gwlAXNN0CKkS l4h/WO3kve83g/QrEpLRkJqZScaefzdCUE8uqXSSnlswh6yK5r0IrIo5x8lCLzq1+HnI kfmw== X-Gm-Message-State: AFqh2kp3L1EsRxkGSak1vo3/r1fDEFMg2gdW+jeRPAji2nXXwOjc41l+ LBjKc8uxuWibFj+de8svaAzLVIGcrj7yjuWpw5c= X-Received: by 2002:a05:600c:5010:b0:3d3:56ce:5693 with SMTP id n16-20020a05600c501000b003d356ce5693mr5654107wmr.17.1671537432367; Tue, 20 Dec 2022 03:57:12 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id bi7-20020a05600c3d8700b003d1e051f671sm15253234wmb.9.2022.12.20.03.57.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 20 Dec 2022 03:57:11 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Paolo Bonzini , Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH] qom/object_interfaces: Fix QAPI headers included Date: Tue, 20 Dec 2022 12:57:09 +0100 Message-Id: <20221220115709.18508-1-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Since commit a0e61807a3 ("qapi: Remove QMP events and commands from user-mode builds") we don't generate the "qapi-commands-qom.h" header in a user-emulation-only build. Commit f375026606 ("qom: Factor out user_creatable_process_cmdline") incorrectly added a dependency on this "qapi/qapi-commands-qom.h" header (the QMP handlers are still defined in qom/qom-qmp-cmds.c). Remove it, and add "qapi/qmp/qobject.h" which declares qobject_unref. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- qom/object_interfaces.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index f94b6c3193..7d31589b04 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -2,8 +2,8 @@ #include "qemu/cutils.h" #include "qapi/error.h" -#include "qapi/qapi-commands-qom.h" #include "qapi/qapi-visit-qom.h" +#include "qapi/qmp/qobject.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qjson.h"