From patchwork Fri Feb 4 15:29:21 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: 12735230 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 35B3DC433EF for ; Fri, 4 Feb 2022 15:37:54 +0000 (UTC) Received: from localhost ([::1]:51512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG0en-0004Di-2t for qemu-devel@archiver.kernel.org; Fri, 04 Feb 2022 10:37:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG0X9-0003tt-K6 for qemu-devel@nongnu.org; Fri, 04 Feb 2022 10:29:59 -0500 Received: from [2607:f8b0:4864:20::1032] (port=42641 helo=mail-pj1-x1032.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG0X8-0004DA-1f for qemu-devel@nongnu.org; Fri, 04 Feb 2022 10:29:59 -0500 Received: by mail-pj1-x1032.google.com with SMTP id my12-20020a17090b4c8c00b001b528ba1cd7so6470214pjb.1 for ; Fri, 04 Feb 2022 07:29:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vViy72WIqKVDTBMZhoKE8b8CYqiaPsCIpqcsGPJantY=; b=IID5SAkPY4u+Ew6oYfIlhL4sEW4KywMUvMoN6+sUegBGXLgGvs9JcoK7//c6/f94HH rWeFrnBRdvjuyiT4A9Df6bKz4txAr+JnJL4R6hcZ3H0y1Ei6KSD8dH3m+Rh5AC0rbTlW 1yfPuIGBrOVcm5PlWBiv7MuBTyg1AJo6mFPPu/SabHGDdMjDlCM0ZyXGvQnXOgwrtaD6 7Hd7rWY3FAjoFUgPIaf7s8Wq+ZvrDeAn3lbsgNqIMZ6WaQkfF8LdHqF8X1DZxYreEpzO y5Z9CAxebdGL5+Q7WRKLrUp2I107OUP1xXwmDkaN3451QFDHxl2meY43qb4xYpmK3jIc PpUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vViy72WIqKVDTBMZhoKE8b8CYqiaPsCIpqcsGPJantY=; b=qRsCk9TTrhx1GLrMUlmymZfNuUeyort+SH6bue3eIH+857imLdC3gfvTpbEArXWXfq vxgitWNIl68jjePMSnNX7OOCW1B9tiC5CosZlRY7+aONLyYWedIeYgVWLDA2c+yHrOoc lNLcbQdY48iJ7o/Sieb6gUY/y7woThaJC7zFH1tJ6+9xtuauTTG9Ud/phUoGX+k0XuwQ tfyIOkHwSM2VkUSCOG/lY30JxuxIcgK8JpRDf0fWfxAA1Etv+TlEF7nyIlRupnqoXLWa K9WmukExtGrakoZ6/70D8dXLdXppHcjX1R4xYsQwGwwqrtNj62g/3AhoHLnUIcaVM3lj EUVg== X-Gm-Message-State: AOAM531/2ideJLYnRBdrapP89Mp7qe55OkhtoOPaABGaE/cEMDpw7Zza INaSQJcFHSomVLyK7fm2ltbIHaciUbY= X-Google-Smtp-Source: ABdhPJy3SGnRY4dDsowxPMeZI4AJ4X49/uSAr8XnP5awhjrELwe/U1lZ8EG05QM91RiRp8rnIAbKPg== X-Received: by 2002:a17:902:d918:: with SMTP id c24mr3476259plz.1.1643988579843; Fri, 04 Feb 2022 07:29:39 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id m20sm3114019pfk.215.2022.02.04.07.29.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 04 Feb 2022 07:29:39 -0800 (PST) To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth , Paolo Bonzini , Markus Armbruster , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH 1/4] configure: Restrict TCG to emulation Date: Fri, 4 Feb 2022 16:29:21 +0100 Message-Id: <20220204152924.6253-2-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220204152924.6253-1-f4bug@amsat.org> References: <20220204152924.6253-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1032 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::1032; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pj1-x1032.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= If we don't need to emulate any target, we certainly don't need TCG. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- configure | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 9f40d60196..4002f81ac9 100755 --- a/configure +++ b/configure @@ -370,7 +370,7 @@ slirp="auto" default_devices="true" # 3. Automatically enable/disable other options -tcg="enabled" +tcg="auto" cfi="false" # 4. Detection partly done in configure @@ -1777,7 +1777,7 @@ EOF fi fi -if test "$tcg" = "enabled"; then +if test "$tcg" != "disabled"; then git_submodules="$git_submodules tests/fp/berkeley-testfloat-3" git_submodules="$git_submodules tests/fp/berkeley-softfloat-3" fi @@ -1819,6 +1819,14 @@ case " $target_list " in ;; esac +if test "$tcg" = "auto"; then + if test -z "$target_list"; then + tcg="disabled" + else + tcg="enabled" + fi +fi + feature_not_found() { feature=$1 remedy=$2 From patchwork Fri Feb 4 15:29:22 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: 12735229 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4758EC433EF for ; Fri, 4 Feb 2022 15:37:41 +0000 (UTC) Received: from localhost ([::1]:50336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG0ea-0003O2-5B for qemu-devel@archiver.kernel.org; Fri, 04 Feb 2022 10:37:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG0XA-0003uE-4a for qemu-devel@nongnu.org; Fri, 04 Feb 2022 10:30:00 -0500 Received: from [2607:f8b0:4864:20::102d] (port=40663 helo=mail-pj1-x102d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG0X8-0004Df-1p for qemu-devel@nongnu.org; Fri, 04 Feb 2022 10:29:59 -0500 Received: by mail-pj1-x102d.google.com with SMTP id p22-20020a17090adf9600b001b8783b2647so220172pjv.5 for ; Fri, 04 Feb 2022 07:29:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eha/TYHzse5/9u/DYqXS1oHE24NywDNmpUOtiVb/8oo=; b=HwpOEHdHf5XzrwtZEZ5mkQp4mFlmMtXShEDH226AIHDnjTvSWNoskm6iFHKmYdlH1e 8DeW6qgwlsKTx19k/0DfvKXts+REkHbsz2tuEpnVS0gHLFblcdhVQvCcUZMiwpqylfxh USxKOK325e2LXAJrgC452ZVIWYlXSPcXBEDMvzuXzE15h6FEYQUNsGQ+YRXlqJjbPsaS oyirWLU3JOkfIGN1ghgqnEtf9jaaliJwsjoMY4Bo92lG1W/ydBRk9Sjth5uKAYRFiieh uU70n8dMcVDNuYKn72AfFR74bGFJNGFVLkM+2OkGEGbCxDsZniLVa1Zo7gTHg5pNBDZD 7aVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=eha/TYHzse5/9u/DYqXS1oHE24NywDNmpUOtiVb/8oo=; b=m+coYoG+QX3ceD7jGOs47SMQDn6NO7N2S+UCxqDJeTlVo6wEW4CS9SdXjBm/QrzlDU y+n8uvGL/3xmqMnrfLsU29e1WLcWxJhYgisUu/LNjROfwV/vEYvwptzzCWOD2hI+l2OP a0CKiWvIuugH4dT9/tWRWopJjWyfvNh4MonPV4OgTPE7WtHg8g6q/1x+e8ZMsFbwLwnj Bh+NyXjg7LqaUfOuetxwb/TkmamMmkqGtk/VxkoHQ51T85Jcih8qsJpA2UyYeQRkzaN2 CZMFlBokiNc0hasa/SphtBCv7aaMOaTYQmAwMEobGw7v6GERsf4ukK36ogCZdqEfEzz3 ZK8w== X-Gm-Message-State: AOAM530QMQyXqlK1dSUzZPgaETDz5XSykC9N03+0aIMK+Ftc5oFelYWI PvDJv9el2J7Hlm3O9/NsPgvyH2TAYCk= X-Google-Smtp-Source: ABdhPJwsJVVdJTNvl5yfvaBtHBDTkz/2ufjiPROW61adtPaYP3yc7B733m4j8OLo3zWN/i20hS35dg== X-Received: by 2002:a17:90a:5984:: with SMTP id l4mr3751872pji.80.1643988588179; Fri, 04 Feb 2022 07:29:48 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id m14sm3135816pfc.170.2022.02.04.07.29.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 04 Feb 2022 07:29:47 -0800 (PST) To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth , Paolo Bonzini , Markus Armbruster , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH 2/4] tests/fp: Do not build softfloat3 tests if TCG is disabled Date: Fri, 4 Feb 2022 16:29:22 +0100 Message-Id: <20220204152924.6253-3-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220204152924.6253-1-f4bug@amsat.org> References: <20220204152924.6253-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::102d (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::102d; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pj1-x102d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Technically we don't need the TCG accelerator to run the softfloat3 tests. However it is unlikely an interesting build combination. Developers using softfloat3 likely use TCG too. Similarly, developers disabling TCG shouldn't mind much about softfloat3 tests. This reduces a non-TCG build by 474 objects! Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- tests/fp/meson.build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/fp/meson.build b/tests/fp/meson.build index 59776a00a7..60843fce85 100644 --- a/tests/fp/meson.build +++ b/tests/fp/meson.build @@ -1,3 +1,6 @@ +if 'CONFIG_TCG' not in config_all + subdir_done() +endif # There are namespace pollution issues on Windows, due to osdep.h # bringing in Windows headers that define a FLOAT128 type. if targetos == 'windows' From patchwork Fri Feb 4 15:29:23 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: 12735228 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 00BF9C433EF for ; Fri, 4 Feb 2022 15:33:47 +0000 (UTC) Received: from localhost ([::1]:43084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG0ao-0006mU-Ih for qemu-devel@archiver.kernel.org; Fri, 04 Feb 2022 10:33:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG0XE-0003vE-Lp for qemu-devel@nongnu.org; Fri, 04 Feb 2022 10:30:08 -0500 Received: from [2607:f8b0:4864:20::430] (port=38636 helo=mail-pf1-x430.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG0X8-0004Dp-3T for qemu-devel@nongnu.org; Fri, 04 Feb 2022 10:30:01 -0500 Received: by mail-pf1-x430.google.com with SMTP id e28so5400067pfj.5 for ; Fri, 04 Feb 2022 07:29:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c9ntEH4Bl9l8+RDYaNgJ6bnn3J0oNz9TjchIJzcfklw=; b=CcQ12CnIkc+JvkzdfVZpkxla8UL2LL9iC4mLbCcunaq6Ti/+pCaptamaBal6y72vCO 0BLwmfXXiRcnFE2xLjJ057LgF4ekYRHQwFXjyCJBUAyXH5Ewtf+Hf73QRzFn3XsoEchF pOkRxB0ege3No2LXsnzc2dK5B1Zm7D1EmRzZiNqLsD2AgB34WlOUrkchygz9AtN3+LJ3 eRJbHOE3PyhvT3XDbJw2r4KNq1KaamIZxSggT+xlIrEAl527Rj4eTh31R0LdryxTy7Df BqiXDeRFLuMe66CBt+Kiy0m1SlDFVwlaYdWPmr33C5sby+DaNHY/kTTNEsVb+LDjwoFz r3JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=c9ntEH4Bl9l8+RDYaNgJ6bnn3J0oNz9TjchIJzcfklw=; b=H2EL0A1aF8Eg8Ffth66/kyHJb8494Pw8Hol7I1YZ6AKjocC9ib1QhvBwGMaJmKZgam tLwON/7QRO4bUvsK0D+VHjUBKyXGAND8ooK8Wuc7h10x2ZDpYcLrUwchG/CzIyjTOsgN 891GzQYqUtaY7dwqunsYqpO+wwKw6hp7VjfG4ErbiGkUrwm5h+JqR8N7McWicON0eM+C HxbatVlUCnbJ7/1VKe7xfpOtpJLV1do4iSeB13pL3itApVmFTDIZBVDx6QpN62WzfY2N GUkKHBFRh/Q76lxS2fO02m3vFTZGouS0KEw1p3dKZs4eaSqNLHmpbyFduMz6HZFuPS5P pCUA== X-Gm-Message-State: AOAM530lZ+NHCW2oHmOm10DiFQLBqMebFUZeCb3SzW5cbKpYf3ipQWUs Y3EirE27cTrVTne0dZsR+SHHsT2NIq4= X-Google-Smtp-Source: ABdhPJxzYCVXb3KV3+FyFniQoMz53AZqVRru+jjPX9KdiZywY3ro6pQDjVCdIy+5z07b3jLTptzQiA== X-Received: by 2002:a05:6a00:b54:: with SMTP id p20mr3608208pfo.49.1643988596667; Fri, 04 Feb 2022 07:29:56 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id y20sm3042144pfi.78.2022.02.04.07.29.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 04 Feb 2022 07:29:56 -0800 (PST) To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth , Paolo Bonzini , Markus Armbruster , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH 3/4] qom: Remove user-creatable objects from user emulation Date: Fri, 4 Feb 2022 16:29:23 +0100 Message-Id: <20220204152924.6253-4-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220204152924.6253-1-f4bug@amsat.org> References: <20220204152924.6253-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::430 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::430; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pf1-x430.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= user-mode don't use user-creatable objects. Restrict it to sysemu / tools. Add a stub to avoid a link failure with the global callback: /usr/bin/ld: libqom.fa(qom_object.c.o): in function `object_initialize_child_with_propsv': ../qom/object.c:578: undefined reference to `user_creatable_complete' /usr/bin/ld: libqom.fa(qom_object.c.o): in function `object_new_with_propv': ../qom/object.c:801: undefined reference to `user_creatable_complete' collect2: error: ld returned 1 exit status Signed-off-by: Philippe Mathieu-Daudé --- qom/meson.build | 7 ++++++- qom/user_creatable-stub.c | 8 ++++++++ tests/unit/meson.build | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 qom/user_creatable-stub.c diff --git a/qom/meson.build b/qom/meson.build index 062a3789d8..afc60cc19d 100644 --- a/qom/meson.build +++ b/qom/meson.build @@ -2,9 +2,14 @@ qom_ss.add(genh) qom_ss.add(files( 'container.c', 'object.c', - 'object_interfaces.c', 'qom-qobject.c', )) +if have_system or have_tools + qom_ss.add(files('object_interfaces.c')) +else + qom_ss.add(files('user_creatable-stub.c')) +endif + qmp_ss.add(files('qom-qmp-cmds.c')) softmmu_ss.add(files('qom-hmp-cmds.c')) diff --git a/qom/user_creatable-stub.c b/qom/user_creatable-stub.c new file mode 100644 index 0000000000..cc3638e20d --- /dev/null +++ b/qom/user_creatable-stub.c @@ -0,0 +1,8 @@ +#include "qemu/osdep.h" + +#include "qom/object_interfaces.h" + +bool user_creatable_complete(UserCreatable *uc, Error **errp) +{ + g_assert_not_reached(); +} diff --git a/tests/unit/meson.build b/tests/unit/meson.build index 64a5e7bfde..2cdcd136c9 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -39,7 +39,6 @@ tests = { 'test-bitcnt': [], 'test-qgraph': ['../qtest/libqos/qgraph.c'], 'check-qom-interface': [qom], - 'check-qom-proplist': [qom], 'test-qemu-opts': [], 'test-keyval': [testqapi], 'test-logging': [], @@ -51,6 +50,7 @@ tests = { if have_system or have_tools tests += { + 'check-qom-proplist': [qom], 'test-qmp-event': [testqapi], } endif From patchwork Fri Feb 4 15:29:24 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: 12735231 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 65B98C433EF for ; Fri, 4 Feb 2022 15:37:57 +0000 (UTC) Received: from localhost ([::1]:51706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG0eq-0004Ll-AA for qemu-devel@archiver.kernel.org; Fri, 04 Feb 2022 10:37:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG0XI-0003vX-JH for qemu-devel@nongnu.org; Fri, 04 Feb 2022 10:30:12 -0500 Received: from [2607:f8b0:4864:20::434] (port=37864 helo=mail-pf1-x434.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG0XG-0004SO-Kz for qemu-devel@nongnu.org; Fri, 04 Feb 2022 10:30:08 -0500 Received: by mail-pf1-x434.google.com with SMTP id y5so4460309pfe.4 for ; Fri, 04 Feb 2022 07:30:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SzSHzBRaLzUc/OsWxhuHRT0KLPEmSG5yNxwfYiyeLmU=; b=XOCwofR1TEnm5wqUPh+8/9HVDpULe5k+mHA4s/VcnZ4pM0YKp4KXVwnVKM51/opH1c RdCjHq4gnuYcIaPsscbyoh25kn3/mocKMQkIwryRuZEYN6mEzDniayHGF8KBqm1CaXiw tapJvjHystLMRNWVwHfiLUhOmmAHC6QwiJImnvSR9lhqBL/dy3umDvtn713Fqrfq7qU7 sYn+z963Y0rFkHDZmwoZntZ+zeC1u9LFKFr5k0E+flCwGWVO5/EDo+1wFFCZp3VJiEQ8 n1ypOVbxH9eGbspE42CmKWzsQtny80CkX+3ttDZ5uwfINlvKoKr9DrcaJUxydEmoxOLf amvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=SzSHzBRaLzUc/OsWxhuHRT0KLPEmSG5yNxwfYiyeLmU=; b=yE7xUVWv4IgcDG9PwC5X3W+9fG62JYxDbPIlCYcvmVKXJL9tPmDbjYjOimV7jOx6Sz cZNwQCPwqSI3cld82NChsI8p+ayb5zPBf7TmsjnxqXB+rDyhRRs3Hq1/Tf1Z1bFlBQz5 tlDSbXiYjWht5mMOZZ1Pq/0miJb8TFPXtrWUQh5jpqRijieeVfPad6S0/mthHu1peDUz oLmfFvpSRacCpGPhC2kVGXtbPsGK9QPdljQL1NaHK7eEOVgFeg9J+FA9EkYtkXYgLjHk aXshHyDZj+aNZozJ4tf736W+TvCVvmueMHHPB6Owo3JgTvOEMRF3oUZ9MyYW2v0J4etH s8ew== X-Gm-Message-State: AOAM530PXSiBUAPDie2N3zJ19xdDTWy+kDF+99Ig8VBxsZLlXKbPPjRX BOhHO+JozhE5wuRJanXj4EM5KjrrEa4= X-Google-Smtp-Source: ABdhPJyjwJ5l8rVYGbjRS7+eq0HQlWY7HI5iiAZod/LlFygsuB5/8IR4JhSf7GLyDIp/U0sjHrCUjw== X-Received: by 2002:a05:6a00:1382:: with SMTP id t2mr3537568pfg.31.1643988605241; Fri, 04 Feb 2022 07:30:05 -0800 (PST) Received: from localhost.localdomain (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id z21sm1879925pge.17.2022.02.04.07.30.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 04 Feb 2022 07:30:04 -0800 (PST) To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth , Paolo Bonzini , Markus Armbruster , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH 4/4] qapi/meson: Restrict machine-specific objects to sysemu Date: Fri, 4 Feb 2022 16:29:24 +0100 Message-Id: <20220204152924.6253-5-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220204152924.6253-1-f4bug@amsat.org> References: <20220204152924.6253-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::434 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-pf1-x434.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= machine/ and net/ are only useful to machines; block/ and migration/ to machine or tools. Note we need to keep building machine.json generated sources on all targets because some want to access X86CPUFeatureWordInfo from any architecture ¯\_(ツ)_/¯ Otherwise we get on all but x86 targets: /usr/bin/ld: libqemu-i386-linux-user.fa.p/target_i386_cpu.c.o: in function `x86_cpu_get_feature_words': ../target/i386/cpu.c:4587: undefined reference to `visit_type_X86CPUFeatureWordInfoList' collect2: error: ld returned 1 exit status Signed-off-by: Philippe Mathieu-Daudé --- qapi/meson.build | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/qapi/meson.build b/qapi/meson.build index 656ef0e039..38b01f3083 100644 --- a/qapi/meson.build +++ b/qapi/meson.build @@ -23,10 +23,6 @@ endif qapi_all_modules = [ 'authz', - 'block', - 'block-core', - 'block-export', - 'char', 'common', 'compat', 'control', @@ -35,26 +31,23 @@ qapi_all_modules = [ 'error', 'introspect', 'job', - 'machine', - 'machine-target', + 'machine', # x86 is considered multiarch by some 'migration', 'misc', 'misc-target', - 'net', 'pragma', - 'qom', 'replay', 'run-state', 'sockets', 'trace', - 'transaction', - 'yank', ] if have_system qapi_all_modules += [ 'acpi', 'audio', 'qdev', + 'machine-target', + 'net', 'pci', 'rdma', 'rocker', @@ -63,7 +56,14 @@ if have_system endif if have_system or have_tools qapi_all_modules += [ + 'block', + 'block-core', + 'block-export', + 'char', + 'qom', 'ui', + 'transaction', + 'yank', ] endif