From patchwork Wed Dec 16 15:02:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1417215 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=G5W8de7u; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4Cwz1g4ltGz9s1l for ; Thu, 17 Dec 2020 02:04:39 +1100 (AEDT) Received: from localhost ([::1]:41236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpYM1-0007Pd-Lw for incoming@patchwork.ozlabs.org; Wed, 16 Dec 2020 10:04:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpYJh-0004KY-U4 for qemu-devel@nongnu.org; Wed, 16 Dec 2020 10:02:13 -0500 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]:35026) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpYJf-0007S6-Tz for qemu-devel@nongnu.org; Wed, 16 Dec 2020 10:02:13 -0500 Received: by mail-ed1-x52c.google.com with SMTP id u19so25164410edx.2 for ; Wed, 16 Dec 2020 07:02:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7RAuAOiHtCEg/kAzL1aVWGDPXJpz9DMSzL+PQoGrz8I=; b=G5W8de7uLVvuKdaGFeEDlF4yB3fzXtgq2G89T8rH8LlRaoOqti0PPSdFqUDBMzmvRw 0L8klMMxntQhu69TxszZoYcGFYome2yjyhcSnNL4g0znonYHexu7hGAxL8isiOlMt3TN vF/kHfuptu5sYOuyGF86u+teSlmsrGmCAHj4M43J3Lpk0fdjzZHYc3z5xLuoRgJhmdeh rc+AI9szQxUTmwFNZyx5Bu+7eomp3YXmI2Eq3jtP7PjGXBNTlV4REpBK02cQcODwpnH1 HOjzXDHhdeRQuj7Wya/r3QLuMHxuFL21dCFX6fbTWPH8hx3KLSFErDc+cTAty5xmB3Ek fGQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7RAuAOiHtCEg/kAzL1aVWGDPXJpz9DMSzL+PQoGrz8I=; b=f+Iz8vv4Gx3orwXW3u9Wt/XN/Aj6kh4mPN6oooRGRJ1hN3N4iQu/eSekgcT8gSbqKd V6cu4Uk3nqvGXKwGGLmAM3oeTwUQVP8LqsQRa2u99WY8/PE6FK8MHxZB3vPUTtR3SmwP MVz6bMu0fYalCCmU4SyYUHMAMvPpMQGuAaDwNhmAGWFj8gR1V5Ryd9x0Ds/i/xeZDC4P hqBLRHHAXiMQKbWSLXmOtnpcOOHkUakWk3RE7WeVAMLdFvcUSgXVg5yBCpojWNchDg7/ 17FtzPpzpLxS+bOTSabFoXb8DnOsTL/rC1+PhZKRecTz0oVvr52NGuA0aLoBS8bl6m+Q Fhgg== X-Gm-Message-State: AOAM532QcLJ0lNcxPtgftT3WFviArtfJ9M4t7iGHuZzGB5aoe5vllNRe yIsApBCp7qPC/VXf7rRZVc5V9am2Mu8= X-Google-Smtp-Source: ABdhPJy/7harrTUUdAyEYSPcMnt/d6uLc4BsXUPz3i5naWNRzSxKvHgtyl+DEDaWio8fi+5hKwJ1QA== X-Received: by 2002:a05:6402:40e:: with SMTP id q14mr1400334edv.85.1608130930153; Wed, 16 Dec 2020 07:02:10 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id v24sm21397059edw.23.2020.12.16.07.02.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 07:02:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 1/7] Makefile: add dummy target for build.ninja dependencies Date: Wed, 16 Dec 2020 16:02:01 +0100 Message-Id: <20201216150207.431437-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201216150207.431437-1-pbonzini@redhat.com> References: <20201216150207.431437-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The dummy targets ensure that incremental build can be done after deleting a meson.build file. Signed-off-by: Paolo Bonzini --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 76dbb917f5..fb9923ff22 100644 --- a/Makefile +++ b/Makefile @@ -133,6 +133,7 @@ Makefile.ninja: build.ninja # A separate rule is needed for Makefile dependencies to avoid -n build.ninja: build.ninja.stamp +$(build-files): build.ninja.stamp: meson.stamp $(build-files) $(NINJA) $(if $V,-v,) build.ninja && touch $@ endif From patchwork Wed Dec 16 15:02:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1417218 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=tviQD6hJ; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4Cwz3Y2LRSz9s1l for ; Thu, 17 Dec 2020 02:06:17 +1100 (AEDT) Received: from localhost ([::1]:45656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpYNb-0000pk-AD for incoming@patchwork.ozlabs.org; Wed, 16 Dec 2020 10:06:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpYJm-0004TJ-KU for qemu-devel@nongnu.org; Wed, 16 Dec 2020 10:02:18 -0500 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]:43121) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpYJh-0007TA-4l for qemu-devel@nongnu.org; Wed, 16 Dec 2020 10:02:18 -0500 Received: by mail-ed1-x535.google.com with SMTP id q16so25117769edv.10 for ; Wed, 16 Dec 2020 07:02:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8/RVYQc5F8sqm0EKxAYHKWrSyoP3ucjT0ePZdg6QJ0c=; b=tviQD6hJRpiRzBmoJjS/VWbBgkoi7XMXt1UcHaEYDrQWyJEs31ijzMPlgeAZa/wjMt ZfvOr9f/8GesBA/6bi3CwCuvRfiPPGQe3XCXhMPyv26Q4gDBrsN0tfZSzLSSl/2W1JJ+ KfDs7GqiLVTIUiayu4TcuaPD4GVXj65mcL5c9d4x0W/IVXmZVCwemPoZGD4mgcc9Rz9Z 4GYSe/uRhVNlVzearrOjoepxZFfjgAbPnnmMdYic8x4s4XLNtObRyT+idAZiKMDCX7Yr WyTb62hrsBHfzNp66pJh6A0pjrot4U8fH66R//LoM5oxXD/Po+5bkHxm6Ws2ecQjEEjw VjWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8/RVYQc5F8sqm0EKxAYHKWrSyoP3ucjT0ePZdg6QJ0c=; b=mTtotCD8O1I9RDWxx4zhMcA2OsLomtUrjPOT0VGqZBZG3J+eSg30TAAPOdeMu9rA0q ezPmiocu6RGZlWtPXs5pDKDJ6MNORhyHaejTcCCcwxqTOaWsucQdcS3e4ZFxNG5i164d Tfup3Rd4hfPmMoXEyAvKhylLCOP2AcI7rZDVVQ5xt3rfrW9cSFpT0HfTDvwI9q+EW+II 9RQby80ac+8MnJPYCaUaZnAUDv/Bq/h7YL2C+EQ4HQsQsN6eqDeR2GGFZGBz/LAEReXf J9hogjzeA+gyJIif63NMwFHOAxO7FEYeaz+M81bZoR9WW7nbRN2mZVBodDjpclmqDe7g PF6Q== X-Gm-Message-State: AOAM533SBElrUspEgZXsV4ZJr9WGJ/gKSfOT2R2xAUQFqwgRV9uds2B1 Vvmqs70WGbIckWZc1wOTbJPK9LjknI0= X-Google-Smtp-Source: ABdhPJxuqCXfM+A9r8vsxGQ2qSZECayu88xKrr6hYLYSaINJIRUUysDGjh7L58mhM/9Bfz97jCeTsg== X-Received: by 2002:aa7:d297:: with SMTP id w23mr20541681edq.374.1608130931164; Wed, 16 Dec 2020 07:02:11 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id v24sm21397059edw.23.2020.12.16.07.02.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 07:02:10 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 2/7] meson: update submodule to 0.56.0 Date: Wed, 16 Dec 2020 16:02:02 +0100 Message-Id: <20201216150207.431437-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201216150207.431437-1-pbonzini@redhat.com> References: <20201216150207.431437-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::535; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x535.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Paolo Bonzini --- configure | 2 +- meson | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 6317964997..8d12b715e3 100755 --- a/configure +++ b/configure @@ -1938,7 +1938,7 @@ python_version=$($python -c 'import sys; print("%d.%d.%d" % (sys.version_info[0] python="$python -B" if test -z "$meson"; then - if test "$explicit_python" = no && has meson && version_ge "$(meson --version)" 0.55.3; then + if test "$explicit_python" = no && has meson && version_ge "$(meson --version)" 0.56.0; then meson=meson elif test -e "${source_path}/.git" && test $git_update = 'yes' ; then meson=git diff --git a/meson b/meson index 776acd2a80..f16d31607e 160000 --- a/meson +++ b/meson @@ -1 +1 @@ -Subproject commit 776acd2a805c9b42b4f0375150977df42130317f +Subproject commit f16d31607eb3cd0f281758bd0944e206ef6be387 From patchwork Wed Dec 16 15:02:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1417219 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=lVnnt1Se; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4Cwz3Z0Q16z9s1l for ; Thu, 17 Dec 2020 02:06:18 +1100 (AEDT) Received: from localhost ([::1]:45640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpYNc-0000pJ-0y for incoming@patchwork.ozlabs.org; Wed, 16 Dec 2020 10:06:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpYJj-0004Mt-MA for qemu-devel@nongnu.org; Wed, 16 Dec 2020 10:02:15 -0500 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]:45578) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpYJh-0007UH-GB for qemu-devel@nongnu.org; Wed, 16 Dec 2020 10:02:15 -0500 Received: by mail-ej1-x635.google.com with SMTP id qw4so33104067ejb.12 for ; Wed, 16 Dec 2020 07:02:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/MzUl6qav6DlTh4FgD5iqMGZ7LoRhAPDQS1hxgDUNfM=; b=lVnnt1SeY24Y5PYQjMoX9dMSrcXWOZFkhHF9tOO39DG4fAQYg1j4ETCgO8BXca/IPc aFIDtbSDynFDv/gL9AVMTEAx8lZtMjINKjiUePyHf/8M4Ry5jlKYYUA7koKbdA0rcMh0 Tm9e1THJh+D5++BA3KSm/JYjx37QYENnN1bmkGJ+H/0WxzkgD/+VmsbAUraU8amTO9o8 cHuLHXza2kBQlJ6+fHDnxb4tXNvr1sHU2qyJxD08AcWQuXlCImuxzouS3OyseQmqvHlN rQxh4OldjuRRxHNXfiCO09Q5e+hs4Daj2VBxR3xYddzJeZrDSN6DET8wd369dNzIt0vM Zf2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/MzUl6qav6DlTh4FgD5iqMGZ7LoRhAPDQS1hxgDUNfM=; b=dv87cXwL6w7rFIO4MZrVo0npkKWovIcEUUIrQS+nyHWRJ1Yh8IF9qJo4zkWk9/yIym w+9o5kHNhjDqHtjR40pZUYP9KZFT5yTvtt9gxZX8YNy0BUz9rdieGkcN2O1caTNtSVn8 BhEfP8RRjKiDF1EyLCe/UXIjWwd0KOKzxAaYborgClZ2Hq8KEw/TElx1TboEtIVaBS0c CS+GUlUI21u4qTn8M3/UwAE2AgxlPN+cHrEnQkySO3xJo9fHn2v3xr6KUuI6wUSXuHXv P1YdQ0BfziF1ajZKvPolh7MRnSBeiJN9DG2VtI2A41lhQfkSCuebsxUWu99zv38jkHwI cCmg== X-Gm-Message-State: AOAM533G9OR+EaQJBtcdPy90Xiae01nmVivUyzkzCScp5zAZhE2YJNhd wdjy1McpKay/uv+qi5eqm0aZNfKYKDw= X-Google-Smtp-Source: ABdhPJxEw5nD31OmEW9zUeIYKxb+GPmBJi+DV4gd95G4+AtX/hbOSscQ8rk//XqtR7adO47x7aRNEQ== X-Received: by 2002:a17:906:4bd2:: with SMTP id x18mr30574035ejv.464.1608130932059; Wed, 16 Dec 2020 07:02:12 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id v24sm21397059edw.23.2020.12.16.07.02.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 07:02:11 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 3/7] meson: switch minimum meson version to 0.56.0 Date: Wed, 16 Dec 2020 16:02:03 +0100 Message-Id: <20201216150207.431437-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201216150207.431437-1-pbonzini@redhat.com> References: <20201216150207.431437-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x635.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Meson 0.56.0 does not need b_staticpic=$pie anymore, and has stabilized the keyval module. Remove the workaround and use a few replacements for features deprecated in that release cycle. Signed-off-by: Paolo Bonzini --- configure | 5 ---- docs/meson.build | 12 ++++---- meson.build | 54 ++++++++++++++++------------------- plugins/meson.build | 4 +-- tests/meson.build | 2 +- tests/qapi-schema/meson.build | 4 +-- tests/qtest/meson.build | 2 +- trace/meson.build | 4 +-- 8 files changed, 39 insertions(+), 48 deletions(-) diff --git a/configure b/configure index 8d12b715e3..708cf365f0 100755 --- a/configure +++ b/configure @@ -6965,10 +6965,6 @@ fi mv $cross config-meson.cross rm -rf meson-private meson-info meson-logs -unset staticpic -if ! version_ge "$($meson --version)" 0.56.0; then - staticpic=$(if test "$pie" = yes; then echo true; else echo false; fi) -fi NINJA=$ninja $meson setup \ --prefix "$prefix" \ --libdir "$libdir" \ @@ -6988,7 +6984,6 @@ NINJA=$ninja $meson setup \ -Dwerror=$(if test "$werror" = yes; then echo true; else echo false; fi) \ -Dstrip=$(if test "$strip_opt" = yes; then echo true; else echo false; fi) \ -Db_pie=$(if test "$pie" = yes; then echo true; else echo false; fi) \ - ${staticpic:+-Db_staticpic=$staticpic} \ -Db_coverage=$(if test "$gcov" = yes; then echo true; else echo false; fi) \ -Db_lto=$lto -Dcfi=$cfi -Dcfi_debug=$cfi_debug \ -Dmalloc=$malloc -Dmalloc_trim=$malloc_trim -Dsparse=$sparse \ diff --git a/docs/meson.build b/docs/meson.build index bb8fe4c9e4..4e88ed7516 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -38,12 +38,12 @@ endif if build_docs SPHINX_ARGS += ['-Dversion=' + meson.project_version(), '-Drelease=' + config_host['PKGVERSION']] - sphinx_extn_depends = [ meson.source_root() / 'docs/sphinx/depfile.py', - meson.source_root() / 'docs/sphinx/hxtool.py', - meson.source_root() / 'docs/sphinx/kerneldoc.py', - meson.source_root() / 'docs/sphinx/kernellog.py', - meson.source_root() / 'docs/sphinx/qapidoc.py', - meson.source_root() / 'docs/sphinx/qmp_lexer.py', + sphinx_extn_depends = [ meson.current_source_dir() / 'sphinx/depfile.py', + meson.current_source_dir() / 'sphinx/hxtool.py', + meson.current_source_dir() / 'sphinx/kerneldoc.py', + meson.current_source_dir() / 'sphinx/kernellog.py', + meson.current_source_dir() / 'sphinx/qapidoc.py', + meson.current_source_dir() / 'sphinx/qmp_lexer.py', qapi_gen_depends ] configure_file(output: 'index.html', diff --git a/meson.build b/meson.build index 77ac9ec01b..39fc9b7143 100644 --- a/meson.build +++ b/meson.build @@ -1,14 +1,10 @@ -project('qemu', ['c'], meson_version: '>=0.55.0', - default_options: ['warning_level=1', 'c_std=gnu99', 'cpp_std=gnu++11', 'b_colorout=auto'] + - (meson.version().version_compare('>=0.56.0') ? [ 'b_staticpic=false' ] : []), - version: run_command('head', meson.source_root() / 'VERSION').stdout().strip()) +project('qemu', ['c'], meson_version: '>=0.56.0', + default_options: ['warning_level=1', 'c_std=gnu99', 'cpp_std=gnu++11', 'b_colorout=auto', + 'b_staticpic=false'], + version: run_command('head', meson.project_source_root() / 'VERSION').stdout().strip()) not_found = dependency('', required: false) -if meson.version().version_compare('>=0.56.0') - keyval = import('keyval') -else - keyval = import('unstable-keyval') -endif +keyval = import('keyval') ss = import('sourceset') fs = import('fs') @@ -1372,21 +1368,21 @@ genh += configure_file(output: 'config-host.h', configuration: config_host_data) hxtool = find_program('scripts/hxtool') shaderinclude = find_program('scripts/shaderinclude.pl') qapi_gen = find_program('scripts/qapi-gen.py') -qapi_gen_depends = [ meson.source_root() / 'scripts/qapi/__init__.py', - meson.source_root() / 'scripts/qapi/commands.py', - meson.source_root() / 'scripts/qapi/common.py', - meson.source_root() / 'scripts/qapi/error.py', - meson.source_root() / 'scripts/qapi/events.py', - meson.source_root() / 'scripts/qapi/expr.py', - meson.source_root() / 'scripts/qapi/gen.py', - meson.source_root() / 'scripts/qapi/introspect.py', - meson.source_root() / 'scripts/qapi/parser.py', - meson.source_root() / 'scripts/qapi/schema.py', - meson.source_root() / 'scripts/qapi/source.py', - meson.source_root() / 'scripts/qapi/types.py', - meson.source_root() / 'scripts/qapi/visit.py', - meson.source_root() / 'scripts/qapi/common.py', - meson.source_root() / 'scripts/qapi-gen.py' +qapi_gen_depends = [ meson.current_source_dir() / 'scripts/qapi/__init__.py', + meson.current_source_dir() / 'scripts/qapi/commands.py', + meson.current_source_dir() / 'scripts/qapi/common.py', + meson.current_source_dir() / 'scripts/qapi/error.py', + meson.current_source_dir() / 'scripts/qapi/events.py', + meson.current_source_dir() / 'scripts/qapi/expr.py', + meson.current_source_dir() / 'scripts/qapi/gen.py', + meson.current_source_dir() / 'scripts/qapi/introspect.py', + meson.current_source_dir() / 'scripts/qapi/parser.py', + meson.current_source_dir() / 'scripts/qapi/schema.py', + meson.current_source_dir() / 'scripts/qapi/source.py', + meson.current_source_dir() / 'scripts/qapi/types.py', + meson.current_source_dir() / 'scripts/qapi/visit.py', + meson.current_source_dir() / 'scripts/qapi/common.py', + meson.current_source_dir() / 'scripts/qapi-gen.py' ] tracetool = [ @@ -1894,14 +1890,14 @@ foreach target : target_dirs if target.endswith('-softmmu') execs = [{ 'name': 'qemu-system-' + target_name, - 'gui': false, + 'win_subsystem': 'console', 'sources': files('softmmu/main.c'), 'dependencies': [] }] if targetos == 'windows' and (sdl.found() or gtk.found()) execs += [{ 'name': 'qemu-system-' + target_name + 'w', - 'gui': true, + 'win_subsystem': 'windows', 'sources': files('softmmu/main.c'), 'dependencies': [] }] @@ -1910,7 +1906,7 @@ foreach target : target_dirs specific_fuzz = specific_fuzz_ss.apply(config_target, strict: false) execs += [{ 'name': 'qemu-fuzz-' + target_name, - 'gui': false, + 'win_subsystem': 'console', 'sources': specific_fuzz.sources(), 'dependencies': specific_fuzz.dependencies(), }] @@ -1918,7 +1914,7 @@ foreach target : target_dirs else execs = [{ 'name': 'qemu-' + target_name, - 'gui': false, + 'win_subsystem': 'console', 'sources': [], 'dependencies': [] }] @@ -1933,7 +1929,7 @@ foreach target : target_dirs link_language: link_language, link_depends: [block_syms, qemu_syms] + exe.get('link_depends', []), link_args: link_args, - gui_app: exe['gui']) + win_subsystem: exe['win_subsystem']) } if 'CONFIG_TRACE_SYSTEMTAP' in config_host diff --git a/plugins/meson.build b/plugins/meson.build index e77723010e..d58efc980e 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -1,7 +1,7 @@ if 'CONFIG_HAS_LD_DYNAMIC_LIST' in config_host - plugin_ldflags = ['-Wl,--dynamic-list=' + (meson.build_root() / 'qemu-plugins-ld.symbols')] + plugin_ldflags = ['-Wl,--dynamic-list=' + (meson.project_build_root() / 'qemu-plugins-ld.symbols')] elif 'CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST' in config_host - plugin_ldflags = ['-Wl,-exported_symbols_list,' + (meson.build_root() / 'qemu-plugins-ld64.symbols')] + plugin_ldflags = ['-Wl,-exported_symbols_list,' + (meson.project_build_root() / 'qemu-plugins-ld64.symbols')] else plugin_ldflags = [] endif diff --git a/tests/meson.build b/tests/meson.build index 1fa068f27b..0b8c3c6f32 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -113,7 +113,7 @@ tests = { 'test-keyval': [testqapi], 'test-logging': [], 'test-uuid': [], - 'ptimer-test': ['ptimer-test-stubs.c', meson.source_root() / 'hw/core/ptimer.c'], + 'ptimer-test': ['ptimer-test-stubs.c', meson.project_source_root() / 'hw/core/ptimer.c'], 'test-qapi-util': [], } diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index 304ef939bd..26588396d2 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -1,5 +1,5 @@ test_env = environment() -test_env.set('PYTHONPATH', meson.source_root() / 'scripts') +test_env.set('PYTHONPATH', meson.project_source_root() / 'scripts') test_env.set('PYTHONIOENCODING', 'utf-8') schemas = [ @@ -240,7 +240,7 @@ if build_docs # clutter up the build dir with the cache. command: [SPHINX_ARGS, '-b', 'text', '-E', - '-c', meson.source_root() / 'docs', + '-c', meson.project_source_root() / 'docs', '-D', 'master_doc=doc-good', meson.current_source_dir(), meson.current_build_dir()]) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 6a67c538be..450af3e51c 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -237,7 +237,7 @@ foreach dir : target_dirs qtest_env.set('QTEST_QEMU_IMG', './qemu-img') test_deps += [qemu_img] endif - qtest_env.set('G_TEST_DBUS_DAEMON', meson.source_root() / 'tests/dbus-vmstate-daemon.sh') + qtest_env.set('G_TEST_DBUS_DAEMON', meson.project_source_root() / 'tests/dbus-vmstate-daemon.sh') qtest_env.set('QTEST_QEMU_BINARY', './qemu-system-' + target_base) foreach test : target_qtests diff --git a/trace/meson.build b/trace/meson.build index b19309b327..012d0dbceb 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -2,7 +2,7 @@ specific_ss.add(files('control-target.c')) trace_events_files = [] foreach dir : [ '.' ] + trace_events_subdirs - trace_events_file = meson.source_root() / dir / 'trace-events' + trace_events_file = meson.project_source_root() / dir / 'trace-events' trace_events_files += [ trace_events_file ] group_name = dir == '.' ? 'root' : dir.underscorify() group = '--group=' + group_name @@ -68,7 +68,7 @@ foreach d : [ ] gen = custom_target(d[0], output: d[0], - input: meson.source_root() / 'trace-events', + input: meson.project_source_root() / 'trace-events', command: [ tracetool, '--group=root', '--format=@0@'.format(d[1]), '@INPUT@' ], capture: true) specific_ss.add(when: 'CONFIG_TCG', if_true: gen) From patchwork Wed Dec 16 15:02:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1417214 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Iv5EBKwB; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4CwyzX1jrBz9s1l for ; Thu, 17 Dec 2020 02:02:48 +1100 (AEDT) Received: from localhost ([::1]:33822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpYKE-0004QP-2P for incoming@patchwork.ozlabs.org; Wed, 16 Dec 2020 10:02:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpYJk-0004O3-8P for qemu-devel@nongnu.org; Wed, 16 Dec 2020 10:02:16 -0500 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]:36424) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpYJi-0007UU-IA for qemu-devel@nongnu.org; Wed, 16 Dec 2020 10:02:15 -0500 Received: by mail-ed1-x529.google.com with SMTP id b2so25163399edm.3 for ; Wed, 16 Dec 2020 07:02:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2rZGYORyv9W21igfeV17FlgKIscLvsjmR+GC11LOjM4=; b=Iv5EBKwBbn9Ab6UTbjSrEq0RikArbklrJMGuJHZIaZfHHxHgzybT2iyVOGv0XysOrY EMqubqO3fcYf2E23MZWxSK1Sz40R8VdW9JgQ2OUPFHbIro0aTIQeJIL8/RznPfoslJxA VtStDvt8Sm7wrVI78X75FW1edpQSnsJmVk8qRk0vfO40ManmR9u7ZFWE0krObf9dRAqN Z4CN4q5Iw9hDLp36OxaRt5ZQgFv5K7X3X5fyvv858+OqOPSO8T5y2GUuO/gmXafOVj5+ wtyksSfM7RYQ2lYWH1lPka7DVNpbCFnhUZBQ88ynFIdbfPmH/suLkugQOToWB7fi+fNF MZqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2rZGYORyv9W21igfeV17FlgKIscLvsjmR+GC11LOjM4=; b=LgRMx+odHUj7UVNcCh1dll+tNhOPXDhCFESA/MEMu32AlMmbkQF8UOAs0EMILtONPI /+nbG8ZMeB49G0KrHitCafCZ5UrFeoOgZ+V3ZSnYmch+XL1DPhugM0vKoWZranPepL3d zUe6KRJ6ENl/S6AM+DKqqNqdYVGgrlOnvF+J24/lfkA/GFrZSUIbCG25r57rUMgC7/ZV Ut1tM1aSpAZuSyO40a1EwdEHkSMX9Q22DOcOj8158CFdEDlCpl+yKsmfY2S0VYtPGd8s 38ib3n5Lv8RYmauihwP6fB9TsMlXwgw4B0thJw6Xx1wkw9Gw15r+KaE2IGy03B1UUae5 lAHQ== X-Gm-Message-State: AOAM533x2PYUl2I99IdZrr8qlBApdEYZ9XzXXpG8f8O2FebQhnP5S5k5 u1oDOglZ0rjO3+pSWqyKJV+zZfmh344= X-Google-Smtp-Source: ABdhPJxOajUuKs1FzE1e3JzreJP1MYi5RxagzmRRxoscYpE45gQH66RIgVIESjx4jX5e0V1it8ExDw== X-Received: by 2002:a05:6402:318f:: with SMTP id di15mr34256357edb.237.1608130932892; Wed, 16 Dec 2020 07:02:12 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id v24sm21397059edw.23.2020.12.16.07.02.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 07:02:12 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 4/7] meson: fix detection of curses with pkgconfig Date: Wed, 16 Dec 2020 16:02:04 +0100 Message-Id: <20201216150207.431437-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201216150207.431437-1-pbonzini@redhat.com> References: <20201216150207.431437-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::529; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x529.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Paolo Bonzini --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 39fc9b7143..ab622ae8bd 100644 --- a/meson.build +++ b/meson.build @@ -500,16 +500,16 @@ if have_system and not get_option('curses').disabled() endif endforeach msg = get_option('curses').enabled() ? 'curses library not found' : '' + curses_compile_args = ['-DNCURSES_WIDECHAR'] if curses.found() - if cc.links(curses_test, dependencies: [curses]) - curses = declare_dependency(compile_args: '-DNCURSES_WIDECHAR', dependencies: [curses]) + if cc.links(curses_test, args: curses_compile_args, dependencies: [curses]) + curses = declare_dependency(compile_args: curses_compile_args, dependencies: [curses]) else msg = 'curses package not usable' curses = not_found endif endif if not curses.found() - curses_compile_args = ['-DNCURSES_WIDECHAR'] has_curses_h = cc.has_header('curses.h', args: curses_compile_args) if targetos != 'windows' and not has_curses_h message('Trying with /usr/include/ncursesw') From patchwork Wed Dec 16 15:02:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1417222 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Mog/mIHN; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4Cwz5v3sk3z9sRf for ; Thu, 17 Dec 2020 02:08:18 +1100 (AEDT) Received: from localhost ([::1]:50918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpYPX-00034j-08 for incoming@patchwork.ozlabs.org; Wed, 16 Dec 2020 10:08:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpYJk-0004Of-Mz for qemu-devel@nongnu.org; Wed, 16 Dec 2020 10:02:16 -0500 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]:44509) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpYJj-0007Ue-1V for qemu-devel@nongnu.org; Wed, 16 Dec 2020 10:02:16 -0500 Received: by mail-ed1-x52c.google.com with SMTP id p22so25091661edu.11 for ; Wed, 16 Dec 2020 07:02:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pMAHW/lOSnDs+tvYYnVBZJWjJu+36lZF4Eh2q1Iet6M=; b=Mog/mIHNOpbWPB0rAcwbjXeBcZFINaeLUJmoGl4tS/JpqbbZzfSouMAjuIALAM2l8e NtF0NLQMUB1YdVIa/HtxENlnD5noG0I3OVBVACJn16FsU0azWhpZPqLbAhWCyLfSNd7H YYxNqIzcgcx3E5gaG90Eppu5ClRiDV8CcfAJDWkr6mZ3we+ZtR62cUAeApxy8EVpVOib fgGhvRclenQEgTYx/RDZo4nzdesYZ/zf7auq9VH6ougWvuXKU1pUFFpUllwtg+R9RziN tLo26+MaYvkv9eT2z10DfavP9tpBkAeSKmPBkxDPr8v5iFSVZer4Qs2v6AuqsT0Lke3Q 3plQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=pMAHW/lOSnDs+tvYYnVBZJWjJu+36lZF4Eh2q1Iet6M=; b=t4DtV5Zv369iBxEuRPa1U2fn78ymhjy4B/ZOXAw/yjQM3E06sxFdTVu6S1UaL3v0IW xDMrLQyxqQ1jtdLufI2ILCegQqNBQnewGRH6QVzYkhAakWgMI8JbwnV0fjZx/TAXqLSm 3XBvOxxqXkW4j3YrCwjsMfcgbrOWYwjadTtSCGt4jSegMQ65wISgG6u0upkZuIwi14PX zCN2663LBUGh4/hEWkKRPf6ImRabNhoppcqlNzE77vrJFblPomuPEYJZ+RA6zhXiPjTm 2aYYzd+Rs0NiUL3kdK5LwujveIrD0IbPYrORWvwYrO8vSL9R/BDBYfF/DDsSIx/uJ7ph 5Mgg== X-Gm-Message-State: AOAM533zHZqidik4pv5w4AGIkOSsNEQ3oRFjvmmTocmi1OQ9UWq3/emc Bd2oprfNzJ4PeFiCmPyfvYpqaAbE9uY= X-Google-Smtp-Source: ABdhPJwVoOBSeiig5gi5rBA/mtmRF/lpW6FugBaZGaaMSVvSA23ex/FE4vobefydKQuGs5YZWseb6Q== X-Received: by 2002:a05:6402:388:: with SMTP id o8mr33867801edv.359.1608130933716; Wed, 16 Dec 2020 07:02:13 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id v24sm21397059edw.23.2020.12.16.07.02.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 07:02:13 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 5/7] meson: use pkg-config method for libudev Date: Wed, 16 Dec 2020 16:02:05 +0100 Message-Id: <20201216150207.431437-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201216150207.431437-1-pbonzini@redhat.com> References: <20201216150207.431437-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Do not bother asking CMake, this is a pkg-config dependency. Signed-off-by: Paolo Bonzini --- meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/meson.build b/meson.build index ab622ae8bd..0b36fb38f1 100644 --- a/meson.build +++ b/meson.build @@ -399,6 +399,7 @@ endif libudev = not_found if targetos == 'linux' and (have_system or have_tools) libudev = dependency('libudev', + method: 'pkg-config', required: get_option('libudev'), static: enable_static) endif From patchwork Wed Dec 16 15:02:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1417216 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=OPVMmZPb; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4Cwz1h43nxz9sSs for ; Thu, 17 Dec 2020 02:04:39 +1100 (AEDT) Received: from localhost ([::1]:41238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpYM1-0007Pe-CQ for incoming@patchwork.ozlabs.org; Wed, 16 Dec 2020 10:04:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpYJl-0004Qm-Mf for qemu-devel@nongnu.org; Wed, 16 Dec 2020 10:02:17 -0500 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]:36211) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpYJk-0007Ul-07 for qemu-devel@nongnu.org; Wed, 16 Dec 2020 10:02:17 -0500 Received: by mail-ej1-x62b.google.com with SMTP id lt17so33174260ejb.3 for ; Wed, 16 Dec 2020 07:02:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fVM1InpNhRI/g9ZYU2u7pE3PbR6QDiLKhPiZwnr0RDE=; b=OPVMmZPb7sReRfnxVwqlZdMXW9tKrPQKNxV7KVXIgg+e6IHhyCRNvgGp13Mht6G5SU fuzp7+AAuMNwkc3AcrmAGfK6Go7Npe5MjSb+Xpje5747//6XsYCbIkwKzCV+ZUTf5FjC /D3OBva87GJLYEKOAVOQIApVAlxEQJQpVim4ofXm1lKCeY8iTb5EOmSZ6q3B3AdNSD5f 83BXFi50dB3QbWtYUr+bviVManpmIwLka89RHBCNKpsQfQZAxCqYOUcbpeqs2BQUkDO/ tkjFAJYIaqv2x43hUPk05pWPljPb7w3wicQAkrL+bNf2IBLTsWNjgbQVqa+77gab3+e6 E7BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=fVM1InpNhRI/g9ZYU2u7pE3PbR6QDiLKhPiZwnr0RDE=; b=PjrsA25/UIBXbZnEZFiAy0isMVIo8136qOVPuri835yoK7hvtwInwa9Y/UKZTokEy6 7wBLTa8rlMbfwcu/phLPbWDDoRBX7Zff7aZNoLiz8pB1HN+gbNP5/KJLp7NJ3wAOgKZq DLOHHlqCi+RzNGDrPP1XPKMNj/fzCmSixxbunzUwEuKAz7tcNUoGYE/w0q7OWYtLlr27 8cm5cB439flBdNuewqEl4e28f58EAXwR3TPmNHA+ItRXhyDlhYpdanP3yg0TYnOnQSqe 9xfrXbyNJYDy6I/h9i8eaIAnQEpq4/Wr1VXlGk71RYEpheOjRNjgrw47yI0Rtw7YmLvp oirQ== X-Gm-Message-State: AOAM533Z1JALjxCEKuhEYJ+bW0v3hcYwcfy0iNqVaTIWxGMA2A9N/jPq vNSneX7r+/U8EVRE1K5LcJteLJMzYjk= X-Google-Smtp-Source: ABdhPJz/5xdqFMuc+TkH7zYgfcDwLPiwUXFzuHhx3yoT4bw/6j2GV8Cxik2AL2XPJSn+bIiSOtNfHA== X-Received: by 2002:a17:906:f0cc:: with SMTP id dk12mr13571450ejb.480.1608130934523; Wed, 16 Dec 2020 07:02:14 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id v24sm21397059edw.23.2020.12.16.07.02.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 07:02:14 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 6/7] meson: use dependency to gate block modules Date: Wed, 16 Dec 2020 16:02:06 +0100 Message-Id: <20201216150207.431437-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201216150207.431437-1-pbonzini@redhat.com> References: <20201216150207.431437-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62b.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This will allow converting the dependencies to meson options one by one, because moving the tests to meson.build will get rid of the symbols in config-host.mak. Signed-off-by: Paolo Bonzini --- block/meson.build | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/block/meson.build b/block/meson.build index 5dcc1e5cce..b02cb14aad 100644 --- a/block/meson.build +++ b/block/meson.build @@ -70,14 +70,14 @@ block_modules = {} modsrc = [] foreach m : [ - ['CONFIG_CURL', 'curl', [curl, glib], 'curl.c'], - ['CONFIG_GLUSTERFS', 'gluster', glusterfs, 'gluster.c'], - ['CONFIG_LIBISCSI', 'iscsi', libiscsi, 'iscsi.c'], - ['CONFIG_LIBNFS', 'nfs', libnfs, 'nfs.c'], - ['CONFIG_LIBSSH', 'ssh', libssh, 'ssh.c'], - ['CONFIG_RBD', 'rbd', rbd, 'rbd.c'], + [curl, 'curl', [curl, glib], 'curl.c'], + [glusterfs, 'gluster', glusterfs, 'gluster.c'], + [libiscsi, 'iscsi', libiscsi, 'iscsi.c'], + [libnfs, 'nfs', libnfs, 'nfs.c'], + [libssh, 'ssh', libssh, 'ssh.c'], + [rbd, 'rbd', rbd, 'rbd.c'], ] - if config_host.has_key(m[0]) + if m[0].found() if enable_modules modsrc += files(m[3]) endif @@ -90,10 +90,10 @@ endforeach # those are not exactly regular block modules, so treat them apart if 'CONFIG_DMG' in config_host foreach m : [ - ['CONFIG_LZFSE', 'dmg-lzfse', liblzfse, 'dmg-lzfse.c'], - ['CONFIG_BZIP2', 'dmg-bz2', [glib, libbzip2], 'dmg-bz2.c'] + [liblzfse, 'dmg-lzfse', liblzfse, 'dmg-lzfse.c'], + [libbzip2, 'dmg-bz2', [glib, libbzip2], 'dmg-bz2.c'] ] - if config_host.has_key(m[0]) + if m[0].found() module_ss = ss.source_set() module_ss.add(when: m[2], if_true: files(m[3])) block_modules += {m[1] : module_ss} From patchwork Wed Dec 16 15:02:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1417221 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=XjdT140v; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4Cwz5k2JgJz9s1l for ; Thu, 17 Dec 2020 02:08:10 +1100 (AEDT) Received: from localhost ([::1]:50538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpYPQ-0002vB-Am for incoming@patchwork.ozlabs.org; Wed, 16 Dec 2020 10:08:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpYJm-0004Tv-QW for qemu-devel@nongnu.org; Wed, 16 Dec 2020 10:02:18 -0500 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]:34809) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpYJk-0007Uv-PX for qemu-devel@nongnu.org; Wed, 16 Dec 2020 10:02:18 -0500 Received: by mail-ed1-x531.google.com with SMTP id dk8so25164340edb.1 for ; Wed, 16 Dec 2020 07:02:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u8na5XyV6Q3dO/cfg5nIyrTRUkt6ipTXcWtK/AtR680=; b=XjdT140veIHbDnUh68U383NqDK8WbjrIsTFEzntPeDXUbZdPhCXEXaMyVKQGxEwa5g 29VComgQ/PTlODR+cT6cH0Kr5cis4rLnezu3wvf1b8jq8HEjbtgpeec776oqfXb2zHLJ ZGpIrFj572bsximEepVj8DfDgxXHS6JVAOAA6yRJb7MymM7Gp1SS+6iY7irS+KNZ0gPT P3kTnS57uthHJmDcR2WG4iZO3NV5fiQaEHSWywVysxsrq72zvPtJ+X49imIyU5sqPlFX 9RKEjhmwPBDelrIzKWf2VWDafp230PqRV8Dl5nM6qam1zqokaA+7M44b1n2nsBnuUj7r AzUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=u8na5XyV6Q3dO/cfg5nIyrTRUkt6ipTXcWtK/AtR680=; b=elSN2pkHPmRSuQGo5mvNSJWf+LpniTVt9HauEac2EBucQ5lYLscjOOBcDrSmVFXlTH dVhQYmlL2DE3DnPy6ezsub+uo28hVKba7h/Ml/HmBGrGNMWIEZqrKRUpYsnUrlC4JdLb lxIYVTtulrQZGZh+ynQEcstQt6bdq4/yhUR49jgBcSNFEF4CQn1xN3FN6AtommpwIEQ+ Kn12qza+Y3kXGn9Gwu1oNADMe4xJjmWkN9193qv4mtZQLLQtd6ud62gL5whjbr5l0fBQ ruhu2t5k0J1Eu7oEoS/kB55aTIjcEF66+J7pRupjBFe/c3P+AL2zs+1E8+xTWvwLRQ8e tZ9w== X-Gm-Message-State: AOAM533y0uSIg3JASDJClBqlEL+HD0Ak3EPQgSCAQicuCmyUVGE6Vi4F Rzmq0WBJMo9doYvqaYB5CsdhFamVqlw= X-Google-Smtp-Source: ABdhPJypoEZMpy+xv1/nYL5KXlf/qk7Z3ANhBlK2VAjTPkwwUCZsIegGqODQQURIdPE2d8QjaY9sGA== X-Received: by 2002:a05:6402:1692:: with SMTP id a18mr33592189edv.321.1608130935367; Wed, 16 Dec 2020 07:02:15 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id v24sm21397059edw.23.2020.12.16.07.02.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 07:02:14 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 7/7] meson: cleanup Kconfig.host handling Date: Wed, 16 Dec 2020 16:02:07 +0100 Message-Id: <20201216150207.431437-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201216150207.431437-1-pbonzini@redhat.com> References: <20201216150207.431437-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::531; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x531.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Build the array of command line arguments coming from config_host once for all targets. Add all accelerators to accel/Kconfig so that the command line arguments for accelerators can be computed easily in the existing "foreach sym: accelerators" loop. Signed-off-by: Paolo Bonzini --- accel/Kconfig | 9 +++++++++ docs/devel/kconfig.rst | 19 +++++++++---------- meson.build | 43 +++++++++++++++++------------------------- 3 files changed, 35 insertions(+), 36 deletions(-) diff --git a/accel/Kconfig b/accel/Kconfig index 2ad94a3839..461104c771 100644 --- a/accel/Kconfig +++ b/accel/Kconfig @@ -1,3 +1,12 @@ +config WHPX + bool + +config HAX + bool + +config HVF + bool + config TCG bool diff --git a/docs/devel/kconfig.rst b/docs/devel/kconfig.rst index 336ba0e8e5..cb2d7ffac0 100644 --- a/docs/devel/kconfig.rst +++ b/docs/devel/kconfig.rst @@ -288,21 +288,20 @@ they will include all these symbols and some help text on what they do. ---------------- In some special cases, a configurable element depends on host features -that are detected by QEMU's configure script; for example some devices -depend on the availability of KVM or on the presence of a library on -the host. +that are detected by QEMU's configure or ``meson.build`` scripts; for +example some devices depend on the availability of KVM or on the presence +of a library on the host. These symbols should be listed in ``Kconfig.host`` like this:: - config KVM + config TPM bool -and also listed as follows in the top-level Makefile's ``MINIKCONF_ARGS`` +and also listed as follows in the top-level meson.build's host_kconfig variable:: - MINIKCONF_ARGS = \ - $@ $*/config-devices.mak.d $< $(MINIKCONF_INPUTS) \ - CONFIG_KVM=$(CONFIG_KVM) \ - CONFIG_SPICE=$(CONFIG_SPICE) \ - CONFIG_TPM=$(CONFIG_TPM) \ + host_kconfig = \ + ('CONFIG_TPM' in config_host ? ['CONFIG_TPM=y'] : []) + \ + ('CONFIG_SPICE' in config_host ? ['CONFIG_SPICE=y'] : []) + \ + ('CONFIG_IVSHMEM' in config_host ? ['CONFIG_IVSHMEM=y'] : []) + \ ... diff --git a/meson.build b/meson.build index 0b36fb38f1..bb198f792a 100644 --- a/meson.build +++ b/meson.build @@ -954,21 +954,19 @@ if link_language == 'cpp' } endif -kconfig_external_symbols = [ - 'CONFIG_KVM', - 'CONFIG_XEN', - 'CONFIG_TPM', - 'CONFIG_SPICE', - 'CONFIG_IVSHMEM', - 'CONFIG_OPENGL', - 'CONFIG_X11', - 'CONFIG_VHOST_USER', - 'CONFIG_VHOST_VDPA', - 'CONFIG_VHOST_KERNEL', - 'CONFIG_VIRTFS', - 'CONFIG_LINUX', - 'CONFIG_PVRDMA', -] +host_kconfig = \ + ('CONFIG_TPM' in config_host ? ['CONFIG_TPM=y'] : []) + \ + ('CONFIG_SPICE' in config_host ? ['CONFIG_SPICE=y'] : []) + \ + ('CONFIG_IVSHMEM' in config_host ? ['CONFIG_IVSHMEM=y'] : []) + \ + ('CONFIG_OPENGL' in config_host ? ['CONFIG_OPENGL=y'] : []) + \ + ('CONFIG_X11' in config_host ? ['CONFIG_X11=y'] : []) + \ + ('CONFIG_VHOST_USER' in config_host ? ['CONFIG_VHOST_USER=y'] : []) + \ + ('CONFIG_VHOST_VDPA' in config_host ? ['CONFIG_VHOST_VDPA=y'] : []) + \ + ('CONFIG_VHOST_KERNEL' in config_host ? ['CONFIG_VHOST_KERNEL=y'] : []) + \ + ('CONFIG_VIRTFS' in config_host ? ['CONFIG_VIRTFS=y'] : []) + \ + ('CONFIG_LINUX' in config_host ? ['CONFIG_LINUX=y'] : []) + \ + ('CONFIG_PVRDMA' in config_host ? ['CONFIG_PVRDMA=y'] : []) + ignored = [ 'TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_ARCH' ] default_targets = 'CONFIG_DEFAULT_TARGETS' in config_host @@ -1003,7 +1001,7 @@ foreach target : target_dirs } endif - have_accel = false + accel_kconfig = [] foreach sym: accelerators if sym == 'CONFIG_TCG' or target in accelerator_targets.get(sym, []) config_target += { sym: 'y' } @@ -1011,10 +1009,10 @@ foreach target : target_dirs if sym == 'CONFIG_XEN' and have_xen_pci_passthrough config_target += { 'CONFIG_XEN_PCI_PASSTHROUGH': 'y' } endif - have_accel = true + accel_kconfig += [ sym + '=y' ] endif endforeach - if not have_accel + if accel_kconfig.length() == 0 if default_targets continue endif @@ -1068,13 +1066,6 @@ foreach target : target_dirs configuration: config_target_data)} if target.endswith('-softmmu') - base_kconfig = [] - foreach sym : kconfig_external_symbols - if sym in config_target or sym in config_host - base_kconfig += '@0@=y'.format(sym) - endif - endforeach - config_devices_mak = target + '-config-devices.mak' config_devices_mak = configure_file( input: ['default-configs/devices' / target + '.mak', 'Kconfig'], @@ -1083,7 +1074,7 @@ foreach target : target_dirs capture: true, command: [minikconf, config_host['CONFIG_MINIKCONF_MODE'], config_devices_mak, '@DEPFILE@', '@INPUT@', - base_kconfig]) + host_kconfig, accel_kconfig]) config_devices_data = configuration_data() config_devices = keyval.load(config_devices_mak)