From patchwork Fri Jan 22 20:44:30 2021 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: 12040473 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A99DC433DB for ; Fri, 22 Jan 2021 20:52:02 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 04ED223B06 for ; Fri, 22 Jan 2021 20:52:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 04ED223B06 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l33PV-0002l4-3C for qemu-devel@archiver.kernel.org; Fri, 22 Jan 2021 15:52:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l33Id-0004tv-Gh for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:44:55 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:36619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l33Ic-0002Ty-0O for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:44:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611348293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XmHD1gd1pwAPsPix2HJSRrv+P+pZSRHHJkPZZ/B/00s=; b=Eu3h0mFaORU0tC4gPQWHTly0Rpbnb2oeMRGyN2/YUDWEaCd5tqRAvbfO7P3N559NVWi8zs j8Xs4vGA4Vd8R4at32pN7xof0jSZTlFWBarGj/lS8AgVlKmm7UgxRqRGhwc6b7+PgzwQU0 F0qGYH/mTlJ6dcgNf89317OFu6w/oy8= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-2-Ic2C7noLPS2ehe9S1VUyqw-1; Fri, 22 Jan 2021 15:44:51 -0500 X-MC-Unique: Ic2C7noLPS2ehe9S1VUyqw-1 Received: by mail-ej1-f71.google.com with SMTP id ox17so2682541ejb.2 for ; Fri, 22 Jan 2021 12:44:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XmHD1gd1pwAPsPix2HJSRrv+P+pZSRHHJkPZZ/B/00s=; b=Usi4r68B40AYgMUIgvpMU9HrMQ/WT8VDjhITPu/D+uFX+hIdSk9lGYnMPeDSOsuC5a AUNDBYjjkWkx4wM0wwH86UAmYTeWvNW+j5yyAaR7XMkO15heV4AMqDglHTikwv2a8k9r Z9JMiDr3agj3s7jl94JclfOqHuCvHMrcqJ5rWO5DHz55nKXKv7f62Mpxa043sr7QGxWb UYPQJKCuYLY6B8jpepUbZXW5T9fvmmfeb/7tAx4yNlrESRTNLzuXmvIjtcM1dqcabaL8 LUeE+QBGxXNPBEFenvGyV+7PL7GUgwp19uBf4+GGZbd8KTcizB1hDt8tM/C9FrC4Iajw whOA== X-Gm-Message-State: AOAM530JfjPoYlU8pNEuKsEdIXwTlEXHOT//WgSIl7EIMTz4RdRS1rUA FDK3WnB4HNhALq5BTH2AtMLdkfkgpA0e6AeXPjervPIxy5ouqsSvrI8qLUMYamRzDvuZX1evG+i 6hzoqCUMVZoQwbGAJ9z5ygFUlD2vsk4ZicJRg16pdc8e/Aihqdz/adh0Ew7VpTexP X-Received: by 2002:a17:906:fc5:: with SMTP id c5mr3723750ejk.538.1611348289719; Fri, 22 Jan 2021 12:44:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJxK02+JJY99Q9rKGjKUMGnd+sQwdHmgZS+DP00uahWImMj3GkxvoiD/XqpboHLzOJhICFb4wQ== X-Received: by 2002:a17:906:fc5:: with SMTP id c5mr3723731ejk.538.1611348289522; Fri, 22 Jan 2021 12:44:49 -0800 (PST) Received: from x1w.redhat.com (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id s1sm5227798ejx.25.2021.01.22.12.44.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 12:44:48 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH v2 01/12] configure: Only check for audio drivers if system-mode is selected Date: Fri, 22 Jan 2021 21:44:30 +0100 Message-Id: <20210122204441.2145197-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210122204441.2145197-1-philmd@redhat.com> References: <20210122204441.2145197-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.182, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Michael Roth , Markus Armbruster , Claudio Fontana , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Acked-by: Gerd Hoffmann Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée --- configure | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configure b/configure index 6f6a319c2f6..a4476d457e0 100755 --- a/configure +++ b/configure @@ -2324,6 +2324,12 @@ if test -z "$want_tools"; then fi fi +########################################## +# Disable features only meaningful for system-mode emulation +if test "$softmmu" = "no"; then + audio_drv_list="" +fi + ########################################## # Some versions of Mac OS X incorrectly define SIZE_MAX cat > $TMPC << EOF From patchwork Fri Jan 22 20:44:31 2021 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: 12040435 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1740C433E0 for ; Fri, 22 Jan 2021 20:48:09 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 3A01323AA1 for ; Fri, 22 Jan 2021 20:48:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3A01323AA1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l33Lk-0006in-7G for qemu-devel@archiver.kernel.org; Fri, 22 Jan 2021 15:48:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l33Il-0004xV-HO for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:45:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:49919) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l33Ih-0002WZ-Se for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:45:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611348299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3kJMWGCGaFHbWyDMXV2iCwU8iAJqoNy1I3FHk8D4w/0=; b=ZZrhPVvDtcwD6SKLLGxZU9xDlsdyUAuOS7MFF7st8Hkzu6lfa4ybFqX2IzwHQd27BaMDS+ EgnoVo5rXHEpJsx7K5E1WXysFUt63j6WUP1zEZS7Vemkj0OB1npQewSqQeSBMk2uGRWsFI 2H2eqsI6kPKCI2eGl183WhQtQtJQlrw= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-97-FUu8okfbN02SAMa6KAr3ig-1; Fri, 22 Jan 2021 15:44:56 -0500 X-MC-Unique: FUu8okfbN02SAMa6KAr3ig-1 Received: by mail-ed1-f70.google.com with SMTP id g6so3504354edw.13 for ; Fri, 22 Jan 2021 12:44:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3kJMWGCGaFHbWyDMXV2iCwU8iAJqoNy1I3FHk8D4w/0=; b=jsk2MRJ2jL5k+Vk66zTApqINDiAS1Ttut41ElAMx8arhBgT1MonA6FHn8TQnaq+nwE R0bWPmOABecHmwB6PyGOTVSI4Vq8ZFIu2wm7o1EZ/h3mQfdGnS1HN0Xy9g/cUhx2wTxv m27gN/oN4w3EiCn2246LhbcEX3ZZIzVN4pJOa6L7nvTTOLTatHnpN4z0HH6zhZRhdw8E cy/RXw6pKm4Rsw7tHtb/VSjAv//gkJpdtcL4wcCiJK+5ylx9UpfX9huYdPo8IBvYXYva G1LDu5pPALMYdHZu3Jm8tGZQpg/96tf5wPKLNzhawqljtCeWTVEuhYALjZj7SOcYn0dx jOzQ== X-Gm-Message-State: AOAM533UUd5Iq+LYM5x2kJjuCSKaMKpr76E+msVnQppj1y4dkoMyrh+5 2nL+IGNe55jiOzkyaHAypz87EzaS5vLODhHR8svh8B3iqoLTiKqF9CI/wWY4bVildOhtBM5eA9U vHyLz+9zTnT4YARse5Uaf1BeGaXBZWKetewJg3qwYFOfdWQq6PMdoB6KuLEe3q7wX X-Received: by 2002:a17:906:ae9b:: with SMTP id md27mr4270851ejb.357.1611348295304; Fri, 22 Jan 2021 12:44:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJwc642aJvC0q5QJajZDAaPfQ3oxWQ4aIYakUZbpfOomXvlP0MG8L6eynOJteXDf6SKw4rYKWQ== X-Received: by 2002:a17:906:ae9b:: with SMTP id md27mr4270834ejb.357.1611348295162; Fri, 22 Jan 2021 12:44:55 -0800 (PST) Received: from x1w.redhat.com (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id g25sm5182357ejf.15.2021.01.22.12.44.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 12:44:54 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH v2 02/12] tests/meson: Only build softfloat objects if TCG is selected Date: Fri, 22 Jan 2021 21:44:31 +0100 Message-Id: <20210122204441.2145197-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210122204441.2145197-1-philmd@redhat.com> References: <20210122204441.2145197-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.182, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Michael Roth , Richard Henderson , Markus Armbruster , =?utf-8?q?Alex_Benn=C3=A9e?= , "Emilio G . Cota" , Claudio Fontana , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée --- Cc: Richard Henderson Cc: Alex Bennée Cc: Emilio G. Cota --- tests/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/meson.build b/tests/meson.build index 29ebaba48d2..6f1ff926d26 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -276,7 +276,9 @@ workdir: meson.current_source_dir() / 'decode', suite: 'decodetree') -subdir('fp') +if 'CONFIG_TCG' in config_all + subdir('fp') +endif if not get_option('tcg').disabled() if 'CONFIG_PLUGIN' in config_host From patchwork Fri Jan 22 20:44:32 2021 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: 12040477 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF54BC433E0 for ; Fri, 22 Jan 2021 20:54:39 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 4C61623B06 for ; Fri, 22 Jan 2021 20:54:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4C61623B06 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l33S2-0006L1-9z for qemu-devel@archiver.kernel.org; Fri, 22 Jan 2021 15:54:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l33Io-0004xo-TU for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:45:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:58238) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l33Im-0002Z0-L5 for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:45:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611348304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3kURzPHbdlK3pgCJTiRRaYFTKsXwjZMTK1ZXIH+DPao=; b=J/gytzk2KbdlVIIaIht59Vlnqanw64DKSs5uh+PuHo7Yhf6jMw/QCQzqZqGlmrQHoE/oFT UWlONKr2iBy0RZkZHAS7klthbnpiq1nKk3nU9FKt3qnJY7Jov64VXlHxo+2tt2tZodB44a 9glcHT8aEecubAYHCAJPRwRezrPq6Ds= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-570-cVud7Qa_Ntacn2LS5u92bg-1; Fri, 22 Jan 2021 15:45:02 -0500 X-MC-Unique: cVud7Qa_Ntacn2LS5u92bg-1 Received: by mail-ed1-f72.google.com with SMTP id u19so3009994edr.1 for ; Fri, 22 Jan 2021 12:45:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3kURzPHbdlK3pgCJTiRRaYFTKsXwjZMTK1ZXIH+DPao=; b=eUPBI56kFkiHa8Jyw8DOdzK6tnB69k4+AuiEZg4LupHOueeiEj6PVoW8SUTI4FJAuJ PfLiKgVxUthG+FckuG7fpfw6LTUgvn9cpo3xNF2lYvH8cI4iAD6M/7NvW45IHeA650gn AULv5gXJAdOt6gzv3lTiQjNGRoKufg5VJLN2mWI0u877xoSgMegv4jdvA3k7BAGp9Mnx WTddfGZJi7le28YzPzzqLZAwBxMYByPc4Xp9TmSYaqogo5q+6/i4+5/m/P8cB41Vrji3 OzC9D0Qo6OZ/JfONaSbTDMzcZbHrJgyNL9/AS0R4hUN1dBD+AZQMwj2GrTfSMqcsOh7b ocrw== X-Gm-Message-State: AOAM530XBu84U0Aj1Vk+E0GG35yC0+brdg1aYKxSU5jkLFWveKgj3oTl GbA1FkTe16pqpg5dWxLD5pZK9yrXhHRAGudTs2Ph/8JuBxDwlfVk9XZnAytYL9OSt/K6MnmxeGA PqDl8M/f5rl3FwVOeaeLCTqNe4LGrVxSxLRElVLKwre6cS35emFsM7drhZnF4yb1j X-Received: by 2002:a17:906:7948:: with SMTP id l8mr4217804ejo.550.1611348300745; Fri, 22 Jan 2021 12:45:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJzls3OSuF/1kperLWd+fSlt1DW0u3sCAM6CW9/FGOBc4y7bXj06+znAUR1F9A6OtkAJIe7vkA== X-Received: by 2002:a17:906:7948:: with SMTP id l8mr4217789ejo.550.1611348300582; Fri, 22 Jan 2021 12:45:00 -0800 (PST) Received: from x1w.redhat.com (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id b26sm6142250edy.57.2021.01.22.12.44.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 12:44:59 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH v2 03/12] pc-bios/meson: Only install EDK2 blob firmwares with system emulation Date: Fri, 22 Jan 2021 21:44:32 +0100 Message-Id: <20210122204441.2145197-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210122204441.2145197-1-philmd@redhat.com> References: <20210122204441.2145197-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.182, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Michael Roth , Markus Armbruster , Claudio Fontana , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- pc-bios/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/pc-bios/meson.build b/pc-bios/meson.build index fab323af84e..68705d405ce 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -16,6 +16,7 @@ foreach f : fds custom_target(f, + build_by_default: have_system, output: f, input: '@0@.bz2'.format(f), capture: true, From patchwork Fri Jan 22 20:44:33 2021 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: 12040437 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B3DAC433DB for ; Fri, 22 Jan 2021 20:48:24 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id BBCA323AA1 for ; Fri, 22 Jan 2021 20:48:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BBCA323AA1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l33Ly-0006mb-R2 for qemu-devel@archiver.kernel.org; Fri, 22 Jan 2021 15:48:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l33Iv-0004zE-1l for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:45:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:22156) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l33It-0002cJ-Bl for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:45:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611348310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BS4UgVi6YkcI9gALuOcfQ485tajLCMcuiC5E8yTwxc8=; b=GI7bW+tIY/owxhkuu+/ui42Gj8XInljKY5LF3e3PFd9jy5hjPBhQO/WTXvLiXWz2SSeUkc 7GGcYknT/QzixeS4u66958RPRa8qnSRNPXdc2y7paUdYG5v7ClymyG6Gx8v0z8D699V3nO oN7Ag+/JV/MNoO1l0NlveFmurOzlnz0= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-175-EvJwCvmSMRi67S0lNvN8LA-1; Fri, 22 Jan 2021 15:45:07 -0500 X-MC-Unique: EvJwCvmSMRi67S0lNvN8LA-1 Received: by mail-ej1-f72.google.com with SMTP id p1so2677189ejo.4 for ; Fri, 22 Jan 2021 12:45:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BS4UgVi6YkcI9gALuOcfQ485tajLCMcuiC5E8yTwxc8=; b=PMTQmPZ8A6dw6spg95Js8+aaxLXVrVzi3D8yquZDf2mEWsoXyLf/IYAbvcNMTEeBV1 DuoLsHcS3tpvFFYBc40yBtf1GSj9/rutGtT0PBfRC6eXetevfH7JFT5KpWvQfbygbeFx SQCgGykur+3xFRSwabCKWDB5vjTeKf6A1htK2ZcRPwsIvVShx/qUzlCpKVodE+ahsVZe DSQ6y6T37XWnEM9KaIkJe7wnayK2aqq3yWDG+gsTPaPetOHMg11mw88gTkrxuQcxxsDz 2FN12xaHvz0M3pJwXiPX060sDvN07Io6+zQJAM24Q/9UuC1EQsKlCgurkrxPnVDs4Tqo zOxg== X-Gm-Message-State: AOAM530ruJAEeLpvOvD49VsKSbIRTL3hmuj3xWUpIPfjSUk6cqRi9dMg Jxns8pP0ZYN9DnX3NYK0Eembllzpr0LZXM8++pfQJfWGxMwNjcQa2Jc5oFkQGwzZ3Y5HejIPdGP zl7yI13Wu7GdG6Lme0w7o6JgQ2Zd69do6NWr4sKZBwetRjsR/alWLhBm1LcfqEXib X-Received: by 2002:a05:6402:14b:: with SMTP id s11mr4439530edu.214.1611348306238; Fri, 22 Jan 2021 12:45:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJx0dHMcfgaUDK4+Odqgy3SMUCdFjQbcUtB1rngABW4hdqxEvRvMmbiv+iSd+O6gBYRYwHyDNA== X-Received: by 2002:a05:6402:14b:: with SMTP id s11mr4439509edu.214.1611348306083; Fri, 22 Jan 2021 12:45:06 -0800 (PST) Received: from x1w.redhat.com (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id m22sm6236571edp.81.2021.01.22.12.45.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 12:45:05 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH v2 04/12] meson: Do not build optional libraries by default Date: Fri, 22 Jan 2021 21:44:33 +0100 Message-Id: <20210122204441.2145197-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210122204441.2145197-1-philmd@redhat.com> References: <20210122204441.2145197-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.182, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Michael Roth , Markus Armbruster , Claudio Fontana , Samuel Thibault , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The following libraries will be selected if a feature requires it: - capstone - fdt - SLiRP Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- Cc: Marc-André Lureau Cc: David Gibson Cc: Samuel Thibault --- meson.build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meson.build b/meson.build index a1e1eb318a5..61cbb89cd44 100644 --- a/meson.build +++ b/meson.build @@ -1446,6 +1446,7 @@ ] libcapstone = static_library('capstone', + build_by_default: false, sources: capstone_files, c_args: capstone_cargs, include_directories: 'capstone/include') @@ -1523,6 +1524,7 @@ slirp_inc = include_directories('slirp', 'slirp/src') libslirp = static_library('slirp', + build_by_default: false, sources: slirp_files, c_args: slirp_cargs, include_directories: slirp_inc) @@ -1568,6 +1570,7 @@ fdt_inc = include_directories('dtc/libfdt') libfdt = static_library('fdt', + build_by_default: false, sources: fdt_files, include_directories: fdt_inc) fdt = declare_dependency(link_with: libfdt, From patchwork Fri Jan 22 20:44:34 2021 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: 12040475 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9DFC7C433DB for ; Fri, 22 Jan 2021 20:52:12 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 34FD423B06 for ; Fri, 22 Jan 2021 20:52:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 34FD423B06 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l33Pf-0003Ap-9V for qemu-devel@archiver.kernel.org; Fri, 22 Jan 2021 15:52:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l33J1-00057W-Na for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:45:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:51367) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l33Iy-0002fD-Go for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:45:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611348315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GydJH9WUvPPt/ZHf2nL4t32IBhhMcFqNk+W+P5HZBSw=; b=RG1yqFUpY/zklr3/5XHJpFx/L7jd/SI47ObGqzlYv9VUZsk0Mc6YPXtq7ejmid0PeaYncH DXCuW2doGZusosPWmCQravIZlbnzpwznMDkXtddALSteRwJ6/Zk2i6IDUWvOYvnotJHrO/ hZqCWBtxI8q2muIjlbUA6qTNZCjFccM= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-538-B0zRL1DLOXOLby7AINQtAw-1; Fri, 22 Jan 2021 15:45:13 -0500 X-MC-Unique: B0zRL1DLOXOLby7AINQtAw-1 Received: by mail-ed1-f72.google.com with SMTP id n18so3509155eds.2 for ; Fri, 22 Jan 2021 12:45:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GydJH9WUvPPt/ZHf2nL4t32IBhhMcFqNk+W+P5HZBSw=; b=fl1i20ubqB+EnKSvFR4k2ThuLfOUCa/54mfbo1wpREp50fFQ62s7Sr0+ztFE/mQTkH UlyYtUcnAbg/AaU6ipcI8mStA5DJ5jbMrHBbzFKX6YgsinsNL8R8/s1kKSmkKvRMMf22 YhpkaS38szw2RmyWNp/jNvqsDY8VY4m89ot7Ke9V8e46+N67Ldoo1nqPlVjQKFuPzHRj jUtnlc6ru6d0ODbQgPjGhezaFUvYv2BSxbNm63fHPFxdwFuNTE2cuqMzaDUHJXYBEqIB TdNN7buOyr3S6hkW5rVmZS+B9F1W5oVbsTY3CIMorqOats/b2ute2dP5lUsLZ1g/ofeB skKg== X-Gm-Message-State: AOAM531zxhcCDJcNaPg+rS/zlWKaKqGoxkNpRQ9XOgX1Lkz89M4no3Kt xroBmeJpT89/x+8jb8bTIhNXo6GDIadNO4kvMW6HfDNgGM+d+AtA84IRZPCTs9DiZ4j7EOal3UW CClvgBlgj3SHGA/nWbhkTNb8pkWwV9LIa7APTS3vbKGU9ei40Wsaihj/X+Br1Q8/p X-Received: by 2002:a05:6402:104e:: with SMTP id e14mr1119995edu.316.1611348311770; Fri, 22 Jan 2021 12:45:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJzjuas0tORPJ2oQr+NbjgaaeWf35m/gryQH1uCP+H++dgJ4ILLPMgRwzJcRh2+QYN7ixyqKIg== X-Received: by 2002:a05:6402:104e:: with SMTP id e14mr1119973edu.316.1611348311563; Fri, 22 Jan 2021 12:45:11 -0800 (PST) Received: from x1w.redhat.com (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id i13sm6234856edu.22.2021.01.22.12.45.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 12:45:10 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH v2 05/12] meson: Restrict block subsystem processing Date: Fri, 22 Jan 2021 21:44:34 +0100 Message-Id: <20210122204441.2145197-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210122204441.2145197-1-philmd@redhat.com> References: <20210122204441.2145197-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.182, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , qemu-block@nongnu.org, Michael Roth , Markus Armbruster , Claudio Fontana , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Avoid generating module_block.h and block-gen.c if we are not going to use them. Signed-off-by: Philippe Mathieu-Daudé --- Cc: qemu-block@nongnu.org --- meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 61cbb89cd44..181f8795f5a 100644 --- a/meson.build +++ b/meson.build @@ -1829,7 +1829,9 @@ subdir('nbd') subdir('scsi') -subdir('block') +if have_block + subdir('block') +endif blockdev_ss.add(files( 'blockdev.c', From patchwork Fri Jan 22 20:44:35 2021 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: 12040537 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A711C433DB for ; Fri, 22 Jan 2021 20:58:07 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 78D3223433 for ; Fri, 22 Jan 2021 20:58:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 78D3223433 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l33VN-0000qv-De for qemu-devel@archiver.kernel.org; Fri, 22 Jan 2021 15:58:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l33J5-0005Ck-3Q for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:45:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:33620) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l33J3-0002ko-9d for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:45:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611348320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yHJ2XuVci3FGNiQY5SlEo5RMP1UZeE27p+2I+95wtjY=; b=VW1qnztRSLM4yLrlC/8aKH4n+ttyrl22ZMu9DtxMqZPnflA190YGmXcYerYtk99NlLjzf6 cU6oNTgntphbcp5vUw9/nKy97ycOQbLtCrAdYIvzpKz2VKg62kB93/dHZjTlPitlk6tl7P 5O2OAfoC25/UadD6XRFHne9e5BjDteA= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-524-fg7BHoPONh6HaHs8QtfslQ-1; Fri, 22 Jan 2021 15:45:18 -0500 X-MC-Unique: fg7BHoPONh6HaHs8QtfslQ-1 Received: by mail-ed1-f71.google.com with SMTP id dg17so3515712edb.11 for ; Fri, 22 Jan 2021 12:45:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yHJ2XuVci3FGNiQY5SlEo5RMP1UZeE27p+2I+95wtjY=; b=ODxKhxYR+uE/458SVrmq3K2DwjbiPYljM8qny3B5B9huT4VIjNps55PbMyLJ/gvbhr whUhQZWQVv1A9HLXAH373pzpqdK3Y18C1c2ogbbhCFC6ZuwGBwy5BYrziPSqugDvRVKM jTfYs7Up9fkRuhC38dN91UvK+Xe0fmRzB13qMr52Kxmsf7ECWiKxTIy5KKWkTHAEarK3 1/nFJ+vtDbqrZD1llmeXgQTYWYm6Qr9nPi/ZZha7CO+EKcfPj2+YQdADNNCIkyTPpJJb pEeGubZwAppl+SJBfL1s2aD9mM2r6Y7UJ/h7rKnRutKri7R7C3prwmRdFV4R6Bw01/jo RglA== X-Gm-Message-State: AOAM530hVcvcRpJK8DiC7/7gmcZJaSwph51APpu9lO59+obfkA+GcKxv zIbZCvfql6LyWxSLqDSVjLcBP3KTkdsDwxji+t5crGwfO+Pj8QPOpAwgKTyvIyh79ZnRAcjrvoo z55cT35NmSzO3hh//BW/+Nx1GWJE7Pxfs8hH/3wR/tJLyA5ERuJqqDvnBfvPd8WIh X-Received: by 2002:a17:906:97c5:: with SMTP id ef5mr51923ejb.347.1611348317113; Fri, 22 Jan 2021 12:45:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJzH6IHk7jyHHQV3mNKNbE3OWPCYK0fV1QLoAClzW6rGtGMJMa1BylO9Gdb/NxojsBx+twpZTg== X-Received: by 2002:a17:906:97c5:: with SMTP id ef5mr51907ejb.347.1611348316970; Fri, 22 Jan 2021 12:45:16 -0800 (PST) Received: from x1w.redhat.com (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id k6sm5171423ejb.84.2021.01.22.12.45.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 12:45:16 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH v2 06/12] meson: Merge trace_events_subdirs array Date: Fri, 22 Jan 2021 21:44:35 +0100 Message-Id: <20210122204441.2145197-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210122204441.2145197-1-philmd@redhat.com> References: <20210122204441.2145197-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.182, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Michael Roth , Markus Armbruster , Claudio Fontana , Stefan Hajnoczi , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The trace_events_subdirs array is split in two different locations, merge it as one. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Claudio Fontana --- Cc: Stefan Hajnoczi --- meson.build | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index 181f8795f5a..c43538a1523 100644 --- a/meson.build +++ b/meson.build @@ -1686,7 +1686,20 @@ 'accel/kvm', 'accel/tcg', 'crypto', + 'hw/core', + 'qapi', + 'qom', 'monitor', + 'target/arm', + 'target/hppa', + 'target/i386', + 'target/i386/kvm', + 'target/mips', + 'target/ppc', + 'target/riscv', + 'target/s390x', + 'target/sparc', + 'util', ] if have_user trace_events_subdirs += [ 'linux-user' ] @@ -1759,21 +1772,6 @@ 'ui', ] endif -trace_events_subdirs += [ - 'hw/core', - 'qapi', - 'qom', - 'target/arm', - 'target/hppa', - 'target/i386', - 'target/i386/kvm', - 'target/mips', - 'target/ppc', - 'target/riscv', - 'target/s390x', - 'target/sparc', - 'util', -] vhost_user = not_found if 'CONFIG_VHOST_USER' in config_host From patchwork Fri Jan 22 20:44:36 2021 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: 12040479 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB980C433DB for ; Fri, 22 Jan 2021 20:55:00 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 2892C23B08 for ; Fri, 22 Jan 2021 20:55:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2892C23B08 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l33SN-0006dh-Ae for qemu-devel@archiver.kernel.org; Fri, 22 Jan 2021 15:54:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l33J9-0005GY-Pe for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:45:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45886) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l33J8-0002o2-7D for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:45:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611348325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BM5TUfzZBhZVJYVYCyN6f9pu4TxdGbS+7Z5pCr1lfwo=; b=erljCbauCZZZuGZ2aNyOAa5ILmQ2iSWvMvc3ApRuo4BBb1fkDnnXEEAX4vawlyfPHqvs2h o6xbg7gOx3oEPabwLHCVxIhVnNjqBK4Xk4Ie4S+DmWDjNErNjIPPoOUXFlYbMqV1D2HcOn DRY+CzuCYO9o7JVp7NvyxdTDxJw/op0= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-585-uK5OqKuzNCio7M1Xbobsdw-1; Fri, 22 Jan 2021 15:45:23 -0500 X-MC-Unique: uK5OqKuzNCio7M1Xbobsdw-1 Received: by mail-ej1-f69.google.com with SMTP id jg11so2685991ejc.23 for ; Fri, 22 Jan 2021 12:45:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BM5TUfzZBhZVJYVYCyN6f9pu4TxdGbS+7Z5pCr1lfwo=; b=eL4lQUZeQdRpvBtsG6pdAeEX55PJezGgWC/QftIaNCuIEhxCkVZj8LU867dSJQOSoC zY5CEb+odMGLnkm72Q9OexnbT6TM3GF9Sk/z/EtHtX5yktkIKGib102XgCbxG229IPXu m4Xs8MNVHkqZ2lLfDhqRY5FuL9DEapwRgbEeglRtGOZrcqubKnvZ5QYoJ2Wb5cKohsSJ qUUiuXCtafGPMQTuUhCux4mAVBlhYTq26WbtEKpy+yaqzUw9Xy3RnQ/pviyaJnPc4vwV dbS6ndOYQp+h3espZMCFs1ECgbQCAtaeRGu4GCohuGVhY/+TTzZIz9cEAAJTYlopAExt hKSA== X-Gm-Message-State: AOAM531zxqx7DfTk2i5HYDhBP1I01jMV0BE4IYBdD7Jk0pNLA+NYSyUR YzERD1ZZi0TJP2+DqP8bz/a/mHkL4uhKBIkUCRHpyuvAI+zsTinh68IgBVtME3Lz6TGnhnY/Jbk sYnsJnUlVFDTMUKcuYPXMOGtklBQ50b48T2PnvquRD2IMWGIlHhU04RuT7WHYQrlv X-Received: by 2002:a05:6402:c87:: with SMTP id cm7mr4656539edb.69.1611348322487; Fri, 22 Jan 2021 12:45:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJwuAFvNzUzaUzyRhGhuinu8LddMO61Om9+4KpS/GsacCuf65wp6bnoo3nu0IY4xX6cM4IBNjA== X-Received: by 2002:a05:6402:c87:: with SMTP id cm7mr4656518edb.69.1611348322287; Fri, 22 Jan 2021 12:45:22 -0800 (PST) Received: from x1w.redhat.com (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id v25sm5235145ejw.21.2021.01.22.12.45.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 12:45:21 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH v2 07/12] meson: Restrict some trace event directories to user/system emulation Date: Fri, 22 Jan 2021 21:44:36 +0100 Message-Id: <20210122204441.2145197-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210122204441.2145197-1-philmd@redhat.com> References: <20210122204441.2145197-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.182, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Michael Roth , Markus Armbruster , Claudio Fontana , Stefan Hajnoczi , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- Cc: Stefan Hajnoczi --- meson.build | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/meson.build b/meson.build index c43538a1523..396ea3aa19b 100644 --- a/meson.build +++ b/meson.build @@ -1683,22 +1683,10 @@ # TODO: add each directory to the subdirs from its own meson.build, once # we have those trace_events_subdirs = [ - 'accel/kvm', - 'accel/tcg', 'crypto', - 'hw/core', 'qapi', 'qom', 'monitor', - 'target/arm', - 'target/hppa', - 'target/i386', - 'target/i386/kvm', - 'target/mips', - 'target/ppc', - 'target/riscv', - 'target/s390x', - 'target/sparc', 'util', ] if have_user @@ -1715,6 +1703,7 @@ endif if have_system trace_events_subdirs += [ + 'accel/kvm', 'audio', 'backends', 'backends/tpm', @@ -1772,6 +1761,21 @@ 'ui', ] endif +if have_system or have_user + trace_events_subdirs += [ + 'accel/tcg', + 'hw/core', + 'target/arm', + 'target/hppa', + 'target/i386', + 'target/i386/kvm', + 'target/mips', + 'target/ppc', + 'target/riscv', + 'target/s390x', + 'target/sparc', + ] +endif vhost_user = not_found if 'CONFIG_VHOST_USER' in config_host From patchwork Fri Jan 22 20:44:37 2021 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: 12040539 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41877C433E0 for ; Fri, 22 Jan 2021 20:58:15 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id C522A23433 for ; Fri, 22 Jan 2021 20:58:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C522A23433 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l33VV-00015D-Tb for qemu-devel@archiver.kernel.org; Fri, 22 Jan 2021 15:58:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l33JG-0005Mk-9q for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:45:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:47291) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l33JE-0002r2-Ka for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:45:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611348332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1sSVJPiFM/HMkCEdAbnP7bBtVMLTKlt4k6iyXw4vLl4=; b=CVMrQQBkiKImwb0u9jsRCABt2VG+uXyU13pIbW4Jiwwp5lUWidvePViQxDWi9gJxtxaLjq 6zJOvUIPf8u+ywTBGhl07aYCD3wSa/WdLdfkTMZcY4eziBHdUxh6zmJl2SY+WuybOsC2na 0TwcdRI37B3uPxZ/OuoTrDXM8miRDbk= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-391-ckBIqQGtP16r3NbNiKxgFA-1; Fri, 22 Jan 2021 15:45:29 -0500 X-MC-Unique: ckBIqQGtP16r3NbNiKxgFA-1 Received: by mail-ed1-f70.google.com with SMTP id e25so3498946edq.6 for ; Fri, 22 Jan 2021 12:45:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1sSVJPiFM/HMkCEdAbnP7bBtVMLTKlt4k6iyXw4vLl4=; b=RBXS2xkyWzeTHCG6FFNx1S3rczZr/CvpzO34LcypYtB++LTwSVuDNtdci/S/iuTbTC sRFCbp2J6fe9uCXgsL4SkhiQI/WfK0LDNpJENzbMK0EzakKt6sMthqyuFlKy87DrfSXP zG6QQZmyHvtKynqRA84EvxPEb+k0+P5vNlodDlD4GvwbUFASeGWvQAjjnnIa2FrhNC3j XXj+gtorZL2eIYO6NJP6B5hfS7QmdsC+6fUcWpIWVC7efC0fkMt4m+S/iHOvuVUQ96yQ bKKoYqRctFCVh9rkNH9f4k/mbq3cMzwivKeLCG3aeWPkFH7nXvjuL0LQrfQ5UGg5DMO3 ChbQ== X-Gm-Message-State: AOAM532DAUh5kVr03DuILUh6PTNsig1tqPKqEKITu8nK9d8uWkUSkNSa rTcNfEQpmDhTVybBXEQO2ZcTQXENtH8pz2rEqPMao/QNpNGasNVfg5gFR1asW5x7ikNnICEPiB2 0f67dYSJV275ob2DnObt623pk9L7A18ySA0gXWRHBQ0+q1qnv4ZKxccnlfIorq8zx X-Received: by 2002:a17:906:b09a:: with SMTP id x26mr4311199ejy.199.1611348327909; Fri, 22 Jan 2021 12:45:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJwSSSUc6ccllUsuxt4KcqxtQeWLqsB8IQLj0oz3GIvQz1nechOU3/BDjygXDKw/Xhp9Vh/aPg== X-Received: by 2002:a17:906:b09a:: with SMTP id x26mr4311182ejy.199.1611348327712; Fri, 22 Jan 2021 12:45:27 -0800 (PST) Received: from x1w.redhat.com (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id co6sm6272491edb.96.2021.01.22.12.45.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 12:45:27 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH v2 08/12] meson: Restrict emulation code Date: Fri, 22 Jan 2021 21:44:37 +0100 Message-Id: <20210122204441.2145197-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210122204441.2145197-1-philmd@redhat.com> References: <20210122204441.2145197-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.182, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Michael Roth , Richard Henderson , Markus Armbruster , Claudio Fontana , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- Cc: Richard Henderson --- meson.build | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 396ea3aa19b..b5afa2923b3 100644 --- a/meson.build +++ b/meson.build @@ -1809,16 +1809,18 @@ qemuutil = declare_dependency(link_with: libqemuutil, sources: genh + version_res) -decodetree = generator(find_program('scripts/decodetree.py'), - output: 'decode-@BASENAME@.c.inc', - arguments: ['@INPUT@', '@EXTRA_ARGS@', '-o', '@OUTPUT@']) +if have_system or have_user + decodetree = generator(find_program('scripts/decodetree.py'), + output: 'decode-@BASENAME@.c.inc', + arguments: ['@INPUT@', '@EXTRA_ARGS@', '-o', '@OUTPUT@']) + subdir('libdecnumber') + subdir('target') +endif subdir('audio') subdir('io') subdir('chardev') subdir('fsdev') -subdir('libdecnumber') -subdir('target') subdir('dump') block_ss.add(files( From patchwork Fri Jan 22 20:44:38 2021 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: 12040443 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21F96C433DB for ; Fri, 22 Jan 2021 20:51:23 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id A75B423B06 for ; Fri, 22 Jan 2021 20:51:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A75B423B06 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:55932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l33Or-0002G0-G8 for qemu-devel@archiver.kernel.org; Fri, 22 Jan 2021 15:51:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l33JR-0005TQ-8j for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:45:45 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:42103) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l33JL-0002tC-GT for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:45:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611348338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cxJdntCxJ3BjqvkWrgOloscdbx5pYTRX48FDf3Cb8HY=; b=N1xJppUZdvMalv7/8hhrDra/PbyYJ3+qM0NCvxHQ8zPrLeWCP1vSgkEylTaJzKKzb2pmRu QizGbQf5PkGdcRJAQb+pWqr1qJ9QKoUA4/Yp/p7gbmIrSTIivxD+U4pEemMu5aaaFpCJhB qmM0MKm/33DLz4NZE/OYIfActE/SMfw= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-186--MMTNVxoM3uTna0SueucZw-1; Fri, 22 Jan 2021 15:45:37 -0500 X-MC-Unique: -MMTNVxoM3uTna0SueucZw-1 Received: by mail-ed1-f71.google.com with SMTP id a24so3495067eda.14 for ; Fri, 22 Jan 2021 12:45:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cxJdntCxJ3BjqvkWrgOloscdbx5pYTRX48FDf3Cb8HY=; b=iuE7t9gxWSEGGHshmFyUI8DE3DeUcvVx/pPxTq7qUNBQAVshigPQMV2MAg+N4PAxui MqKZ12z89MyKPq+2ksSBqH1iXF/c2+2OT7/cgnX2VddqOiHP0G8FpMjcf3S87F5jl6J3 v/I20IDtB5Z0G95dwOca7TjTcANEy4MXWT/VPDWjMzHe1zrSsiUjIPr3eQINJ7dXpHW7 bjc9Hd+5GgYT8lWKTcvWzw3i6flGryaG8wLYSl6uB4uJ+BVVnfsvFRjHBaiOJJFG91o6 N25d/La4lyJhrzrAv987aPWsS01rqYgN9XaPOtvWpINQDH0zhLNT1KFbn4aXumRuHt6f Eqbw== X-Gm-Message-State: AOAM532U5kZUQzGM5lKE3kVYdIG3/Ay0wXl84gaXpieDI5lhKXKtIN54 smmyV4g2DOiWfzSxUMvi8aMponZ+TYMzedzmMHNYoUYMG9IiofehYK3HkOOLrQN/z1CAdZcJL4A aJXxYlFn9+tnXwPUiDmn035NkOwO/3uXxZgMG21V4FPAfVZiZZ96oZRk7I5LqG7rY X-Received: by 2002:a05:6402:3553:: with SMTP id f19mr4648167edd.271.1611348333321; Fri, 22 Jan 2021 12:45:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJylG3PQPMZ+pmhjaJnFVCvdbv4ETZsUHLRN7de/wqP9aSq+Sp3Aq6Nu3qOMsUHoUuX5l2j/Eg== X-Received: by 2002:a05:6402:3553:: with SMTP id f19mr4648148edd.271.1611348333137; Fri, 22 Jan 2021 12:45:33 -0800 (PST) Received: from x1w.redhat.com (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id f9sm6171331edm.6.2021.01.22.12.45.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 12:45:32 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH v2 09/12] qapi/meson: Restrict qdev code to system-mode emulation Date: Fri, 22 Jan 2021 21:44:38 +0100 Message-Id: <20210122204441.2145197-10-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210122204441.2145197-1-philmd@redhat.com> References: <20210122204441.2145197-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.182, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Michael Roth , Markus Armbruster , Laurent Vivier , Claudio Fontana , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Beside a CPU device, user-mode emulation doesn't access anything else from qdev subsystem. Tools don't need anything from qdev. Signed-off-by: Philippe Mathieu-Daudé --- Cc: Laurent Vivier Cc: Eduardo Habkost --- stubs/qdev.c | 23 +++++++++++++++++++++++ MAINTAINERS | 1 + qapi/meson.build | 6 +++++- stubs/meson.build | 2 ++ 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 stubs/qdev.c diff --git a/stubs/qdev.c b/stubs/qdev.c new file mode 100644 index 00000000000..92e61431344 --- /dev/null +++ b/stubs/qdev.c @@ -0,0 +1,23 @@ +/* + * QOM stubs + * + * Copyright (c) 2021 Red Hat, Inc. + * + * Author: + * Philippe Mathieu-Daudé + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qapi/qapi-events-qdev.h" + +void qapi_event_send_device_deleted(bool has_device, + const char *device, + const char *path) +{ + /* Nothing to do. */ +} diff --git a/MAINTAINERS b/MAINTAINERS index 34359a99b8e..d2dd7c24228 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2523,6 +2523,7 @@ F: qapi/qom.json F: qapi/qdev.json F: scripts/coccinelle/qom-parent-type.cocci F: softmmu/qdev-monitor.c +F: stubs/qdev.c F: qom/ F: tests/check-qom-interface.c F: tests/check-qom-proplist.c diff --git a/qapi/meson.build b/qapi/meson.build index ab68e7900e4..2839871b478 100644 --- a/qapi/meson.build +++ b/qapi/meson.build @@ -35,7 +35,6 @@ 'misc-target', 'net', 'pragma', - 'qdev', 'pci', 'qom', 'rdma', @@ -49,6 +48,11 @@ 'ui', 'yank', ] +if have_system + qapi_all_modules += [ + 'qdev', + ] +endif qapi_storage_daemon_modules = [ 'block-core', diff --git a/stubs/meson.build b/stubs/meson.build index 1a656cd0704..a054d5877fb 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -53,4 +53,6 @@ if have_system stub_ss.add(files('semihost.c')) stub_ss.add(files('xen-hw-stub.c')) +else + stub_ss.add(files('qdev.c')) endif From patchwork Fri Jan 22 20:44:39 2021 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: 12040439 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F7BDC433E0 for ; Fri, 22 Jan 2021 20:48:43 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id F010723B06 for ; Fri, 22 Jan 2021 20:48:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F010723B06 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l33MI-0007Hv-1W for qemu-devel@archiver.kernel.org; Fri, 22 Jan 2021 15:48:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l33JV-0005W8-Nc for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:45:51 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:20955) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l33JP-0002up-EG for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:45:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611348342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FH8ITvmhiqWIcEFqVfmtpDiHqCMBIm0BPSKhlXQCGao=; b=Yd31iRRgmmjNhbINVVspem7ms/V/edB1Wk9DVTaH7M7PvythefxppiGUzSaSTj3PUhUXag ug8RPkuUZ1eb9CQ+IpRgXDpVjI6yhsiRhIgV41L+PhtgXMTktZDxmiWxBvvgHDXr3lxHW1 kTh1bMFxEDNdySSxami8s6Ehf5qnxzU= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-212-_aEqUKXLMRqQVk_ye2UKiQ-1; Fri, 22 Jan 2021 15:45:40 -0500 X-MC-Unique: _aEqUKXLMRqQVk_ye2UKiQ-1 Received: by mail-ed1-f72.google.com with SMTP id a24so3495122eda.14 for ; Fri, 22 Jan 2021 12:45:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FH8ITvmhiqWIcEFqVfmtpDiHqCMBIm0BPSKhlXQCGao=; b=RNG9JRGz4+UVCdrifClMr3poGw0Zre/+wmebWsHAUw0D/X+2/H6kR4KmuBTDTf/Zp4 q+Rfd59/dRbfG/3dcXrkym0Eq9WP5Hh3v/1BHG0SvhCbN39u8+SsEreniUi9kKMCU0Ue 0fy6LP10P+ulZ6BriMV61MD7W2iEkSApeNJpBv4HfW3hSpwYmuLoN9gYN3vd8LVJ5tYF ZXNa6SboOgMGRpbu9qiUvzTVqrwK9SHgFreUNLlhr2lHwCQgITYapUTLS+I0VPHuiily EJNvMtOovIKmDNiFhXLiwVpHqa2Z4QLe5bcHkVQVc8t6ITCMwuYFwrR7aT1ATZwEB9/c qsgQ== X-Gm-Message-State: AOAM533HBNrAqG8KkKotfkEznvqAmxQVdbBBzrgo15JtTcigZbUOwwSD T+OkSaNVzDPGASytivtiZNqfTmQs+OqZUlr63qeXLAE5S5thnJE90YirYfzBrshZ4QOa8qGWuCq FYS5QhfQNPaTfRXRJCSKyLetgY6DmjRFQ9lCahMLwqYD/kxpCA05QzfzRRR/u7Qvb X-Received: by 2002:aa7:cb8f:: with SMTP id r15mr4702815edt.130.1611348338807; Fri, 22 Jan 2021 12:45:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJyHVka1HJCXZBVomJ7SAEb4/fnnBOWk8Ba1xYuQP5rtHIFUKVsOU4/Sr6E+MXqOOKwipHMofQ== X-Received: by 2002:aa7:cb8f:: with SMTP id r15mr4702790edt.130.1611348338648; Fri, 22 Jan 2021 12:45:38 -0800 (PST) Received: from x1w.redhat.com (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id bk2sm5306366ejb.98.2021.01.22.12.45.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 12:45:38 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH v2 10/12] qapi/meson: Remove QMP from user-mode emulation Date: Fri, 22 Jan 2021 21:44:39 +0100 Message-Id: <20210122204441.2145197-11-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210122204441.2145197-1-philmd@redhat.com> References: <20210122204441.2145197-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.182, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Michael Roth , Markus Armbruster , Laurent Vivier , Claudio Fontana , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- Cc: Laurent Vivier --- qapi/meson.build | 10 +++++++--- tests/meson.build | 7 ++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/qapi/meson.build b/qapi/meson.build index 2839871b478..b301a46f04a 100644 --- a/qapi/meson.build +++ b/qapi/meson.build @@ -4,14 +4,18 @@ 'qapi-dealloc-visitor.c', 'qapi-util.c', 'qapi-visit-core.c', - 'qmp-dispatch.c', - 'qmp-event.c', - 'qmp-registry.c', 'qobject-input-visitor.c', 'qobject-output-visitor.c', 'string-input-visitor.c', 'string-output-visitor.c', )) +if have_system or have_tools + util_ss.add(files( + 'qmp-dispatch.c', + 'qmp-event.c', + 'qmp-registry.c', + )) +endif qapi_all_modules = [ 'acpi', diff --git a/tests/meson.build b/tests/meson.build index 6f1ff926d26..7d7da6a6364 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -86,7 +86,6 @@ 'test-qobject-input-visitor': [testqapi], 'test-string-input-visitor': [testqapi], 'test-string-output-visitor': [testqapi], - 'test-qmp-event': [testqapi], 'test-opts-visitor': [testqapi], 'test-visitor-serialization': [testqapi], 'test-bitmap': [], @@ -117,6 +116,12 @@ 'test-qapi-util': [], } +if have_system or have_tools + tests += { + 'test-qmp-event': [testqapi], + } +endif + test_deps = { 'test-qht-par': qht_bench, } From patchwork Fri Jan 22 20:44:40 2021 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: 12040541 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE466C433DB for ; Fri, 22 Jan 2021 20:59:50 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 8D8B223B09 for ; Fri, 22 Jan 2021 20:59:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8D8B223B09 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l33X3-0002tJ-NZ for qemu-devel@archiver.kernel.org; Fri, 22 Jan 2021 15:59:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57418) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l33Jh-0005ZA-3U for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:46:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:34868) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l33JV-0002xI-Em for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:45:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611348347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=akWBsUKGoDy+pi5x2giqOPLb20R9HBrXt/LABrN7Sgo=; b=jSBmAdetehFVxNzTcHBwNoT9VlRFNvFM9reraaGAQi9HHlNFJ74dhgZBwO7iPFmH1d7c+X vAd2HxGzHWVn/3mEQ8WaA7DDm7Bn8qXhqSEOiuhn2em4om9bQI3DMKi1FcbnJE0wiy6sAd aXy8ClPbjL1bUm1z5WsBdupul0Sg5fA= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-25-ORtq220TPmKORJ3f118Cnw-1; Fri, 22 Jan 2021 15:45:45 -0500 X-MC-Unique: ORtq220TPmKORJ3f118Cnw-1 Received: by mail-ej1-f71.google.com with SMTP id h4so2694735eja.12 for ; Fri, 22 Jan 2021 12:45:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=akWBsUKGoDy+pi5x2giqOPLb20R9HBrXt/LABrN7Sgo=; b=EpKFAnMhUCrTSn3B3YPtnxh7NnQs3EWuw5waCta4mI/nTqRlX3mdwSEOs6YBanVoQw FWLgywR6ERhKsWWuteyvgcYzCRzCG3/R6a/fXau9cBknhr+JnlMqYwoWxB5tF6b2jYiA GvcOWAZxR3MdBXqXP2/XMC9Zt8Xc7nJl2Es0590htfrH0Bpl3HJ9QbKCP/HfuebXIhEP IO+ylMfXGNvZh7/ZehbDPng/+IPnidzJrsrBz58aG63Bilfe1ISZ+d1fXx960/WqGQsM DHbnkDTsslG4FibPnTLmOQhyWUX2qn3qtxMRfo5pe6WiVlmYfBa9TYE2ujUTuK9VGu74 QhVQ== X-Gm-Message-State: AOAM531AP4DL2mYhAvy1GlVMuFWwOKynv5sly50WBNJ+sOKqK32kdiyP Ze9gmSmfiPAuosGan8SgoORIsrlPATqTiseLSqgS9nDQ9/Kj9TfpdXbMVvcwx9Xa9UuYDs2G+Bw 5+UEW9ChhaFYhwMq0gtDEAgnTHjamhL9Us2q9B0Vsed64zmlk9rADodhpOLZ76/Y+ X-Received: by 2002:a17:906:d62:: with SMTP id s2mr516683ejh.61.1611348344381; Fri, 22 Jan 2021 12:45:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJyiqsyxPx+NUGXJhRSj4NU1nM/4+PTYSiRDqN+q1RCxiXeqH7GVJEGEBGPYrna8dSSWX2hacw== X-Received: by 2002:a17:906:d62:: with SMTP id s2mr516664ejh.61.1611348344150; Fri, 22 Jan 2021 12:45:44 -0800 (PST) Received: from x1w.redhat.com (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id dm6sm4979020ejc.32.2021.01.22.12.45.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 12:45:43 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH v2 11/12] qapi/meson: Restrict system-mode specific modules Date: Fri, 22 Jan 2021 21:44:40 +0100 Message-Id: <20210122204441.2145197-12-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210122204441.2145197-1-philmd@redhat.com> References: <20210122204441.2145197-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.182, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Michael Roth , Markus Armbruster , Claudio Fontana , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- qapi/meson.build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/qapi/meson.build b/qapi/meson.build index b301a46f04a..7aca8d50484 100644 --- a/qapi/meson.build +++ b/qapi/meson.build @@ -18,8 +18,6 @@ endif qapi_all_modules = [ - 'acpi', - 'audio', 'authz', 'block', 'block-core', @@ -39,14 +37,10 @@ 'misc-target', 'net', 'pragma', - 'pci', 'qom', - 'rdma', 'replay', - 'rocker', 'run-state', 'sockets', - 'tpm', 'trace', 'transaction', 'ui', @@ -54,7 +48,13 @@ ] if have_system qapi_all_modules += [ + 'acpi', + 'audio', 'qdev', + 'pci', + 'rdma', + 'rocker', + 'tpm', ] endif From patchwork Fri Jan 22 20:44:41 2021 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: 12040471 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B85DC433DB for ; Fri, 22 Jan 2021 20:51:39 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id AF34923B06 for ; Fri, 22 Jan 2021 20:51:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AF34923B06 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l33P7-0002X4-HL for qemu-devel@archiver.kernel.org; Fri, 22 Jan 2021 15:51:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l33Jm-0005aI-T1 for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:46:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:25756) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l33JZ-00031O-AS for qemu-devel@nongnu.org; Fri, 22 Jan 2021 15:46:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611348352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+V5qKqyf7/u56SKdLLMT+Z/AdFCEFXdvjYBi9ApYL8w=; b=Gp5irIW/6/r4lmWdxnS3BnkOo5qyMDGe4nLVn8S64ILx3k7HPZs9LAhmJ2vjRdJHItTvpJ dSSehDkdCqrJvuVErhIyc0MiEPQn/kGUfqwo4pIKUKKGcZ2CuC1HwWhR+ouaNKI4dShEt9 LuzRCHuqG9nV/8mTdULpfHvk5xwFZY4= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-293-sAUOVm0oO9mfcaMs2p917A-1; Fri, 22 Jan 2021 15:45:51 -0500 X-MC-Unique: sAUOVm0oO9mfcaMs2p917A-1 Received: by mail-ed1-f69.google.com with SMTP id f21so3509586edx.23 for ; Fri, 22 Jan 2021 12:45:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+V5qKqyf7/u56SKdLLMT+Z/AdFCEFXdvjYBi9ApYL8w=; b=BqxeCbwozY2bgAHPYbcMu/I2ycjw+g5WbA4GFrxY2B6fKVs5hjruasu3nBCQBePKTY tqwxId9EKauDHrDgckNuknKhGQ0lJvG0cAOT5609oLdc3Px5Yg9CVtsGltkuD+wglL9G 7UXBMeDipZir2rufn/duGmPaQd0FTmttBPLQqLQN3Tu9R2rku9mADBbAsrNPnr7U+CeV stgK324tp96qrZD8vsk94wkFjbpCK6qnyIWNDqkibiIvRegUhsZIseDKtvYRlrVltLSe 8QMgllGOqEyvV+IsFaX8FeEB2QRLQjxorZmOKYJ5eUgoQ+yeJMjSPh+XgNDzSY9cBigM cr1Q== X-Gm-Message-State: AOAM533OdvyaQ9AgrXnbrANhqh4gju53pH3SKOPLbG66bsqgz+vGO/ke ufFJFtLI/ndVuXmdvU+FlxxhCvVFWXpQvM22GhdJVeowopMSpH8SGD+DP/HnvvjeOuarLlsaAhm xxY64/F4pWLiaveKCHaFmY+1TiAVXbX+FvqNeRUc0391fQUZG1xkyl+V6r7EiP1Jo X-Received: by 2002:a17:906:3b92:: with SMTP id u18mr619947ejf.7.1611348349772; Fri, 22 Jan 2021 12:45:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJzVR3tKFQAhsOTp1eLCIlHklkTvwzEx8RyPKb9ns4pCqTKqMATTfJnePilPqKo10+9hxM7MGg== X-Received: by 2002:a17:906:3b92:: with SMTP id u18mr619929ejf.7.1611348349577; Fri, 22 Jan 2021 12:45:49 -0800 (PST) Received: from x1w.redhat.com (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id g21sm6373605edh.20.2021.01.22.12.45.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 12:45:48 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH v2 12/12] qapi/meson: Restrict UI module to system emulation and tools Date: Fri, 22 Jan 2021 21:44:41 +0100 Message-Id: <20210122204441.2145197-13-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210122204441.2145197-1-philmd@redhat.com> References: <20210122204441.2145197-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.182, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Michael Roth , Markus Armbruster , Claudio Fontana , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- Cc: Gerd Hoffmann --- qapi/meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qapi/meson.build b/qapi/meson.build index 7aca8d50484..0652569bc43 100644 --- a/qapi/meson.build +++ b/qapi/meson.build @@ -43,7 +43,6 @@ 'sockets', 'trace', 'transaction', - 'ui', 'yank', ] if have_system @@ -57,6 +56,11 @@ 'tpm', ] endif +if have_system or have_tools + qapi_all_modules += [ + 'ui', + ] +endif qapi_storage_daemon_modules = [ 'block-core',