From patchwork Wed Jul 14 14:59:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476753 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp654685jao; Wed, 14 Jul 2021 08:06:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYxdr7Lx7tUeka7Qwc8pCMTYz93oJtRh+4/bjCwusi6AUgPxjNUbi6RvM3vNi5z6Lv3MFJ X-Received: by 2002:ab0:482c:: with SMTP id b41mr14553135uad.97.1626275170396; Wed, 14 Jul 2021 08:06:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275170; cv=none; d=google.com; s=arc-20160816; b=03al7u+8oGmyhuBpLyLFoV3bIHX/hrHEQVGGJ1rJQ74NjAHddgzOPbT1wdT3mMKR5j 1bdWSUsZRwv91iv1BeTo8d39UwAcT9FGeviUjmZGBOpNx1Hkb5avUCzMo7o0dCoSVFy3 IegGebqDe9jA1heTKdyJv4MT/x+/DE7cNHlsB6pNobjOZptNP3ncnVopaHQtECIkromO U5xrm8BlyEnI/YSKYa/jAvajbGb76KLDVDzc+T4v5DcAMzrE0nRyTtIJctKeIbzKtiY2 4e8DMJ/1Z5uU3jEOEfsgUhZGlVxif3rC7T494hSjXOS/2YYiiCxnoGeUBwiIWx9eTwvA +/OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=DuryBtZsGIpH+0YGBnwUe0xZi9F+YMWFw6SViL1REe0=; b=0CE9SltvRz/j16I4X5pYEupvtceruM3KBvspMVNMDj6JgRy67U9Pm/q6fqtmr3+SAo zR5gQwQe26IgNLVQL8J/JTt8/kv7kkcYBCVVheB/oryG0FJIIdg2g7mlIvrWgXCu821A qI+D9a8QwBIGmVywwp+OvgNPG7sL94nILDJKB70pbB1+2GmbSvsSTZn4iVmuky3M2tZ0 iSvjBVSWBDUQY/96Fpw6khSH96pwFtU8Pu80ouquypGCYmeQ6fMmsJLF/3hpbllSX24u +kkjxwfsG8xmP0SXEdKTMQ1HxQaqyfCiLZ1nbZMOHDWweORhvRCw3Dkcf/2ZkaGyvuoH qxjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VynwIIa5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j193si3061061vkj.30.2021.07.14.08.06.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:06:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VynwIIa5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gSf-0007f6-AO for patch@linaro.org; Wed, 14 Jul 2021 11:06:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49352) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gNa-0007CV-16 for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:54 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:45975) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gNY-0007VI-AH for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:53 -0400 Received: by mail-wr1-x434.google.com with SMTP id t5so3580821wrw.12 for ; Wed, 14 Jul 2021 08:00:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DuryBtZsGIpH+0YGBnwUe0xZi9F+YMWFw6SViL1REe0=; b=VynwIIa5ZUGYdHqWJG2iyWY17zq7ytpSsQSoZ2p7zZgosDcEqDqh3tcrrMge0mU5M2 WdUyDlzceBxwUO74ZjFWOlaSNjNonUmICS1XIEzKKXixRfhb/VJx4WfTZcdxih3UgiHX iZ/kMY8YpgJ4n4SVARS7oVyQh2qinq/IdIqsyhKbjnjCJJlYPOMo/yG+Gw2c6RJVcl6k eGt09hoXOThH3rHOmgHLxQjpuR2TmeU6/Wxf38KJUU8nZk21SETNX6KLUSEZiBIkywr3 UxTS7Owu3ewsQ5HG5NNVemg2oAjE121YnF9bbRwAmM+bS+Dk647GHTCd6CAy5cKaT/BK F80Q== 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=DuryBtZsGIpH+0YGBnwUe0xZi9F+YMWFw6SViL1REe0=; b=ZCveyLWOWGFvsSOEL8CgATml0aTcCn8arEjFXRcHJmG4Vr9GJ/8N1vvI/hf9c6/zMT bldgJKHBNcQS03rOYyfeW0EVGkX/WCSXqaaEavwA33JrCBA1hYXaLatqnbDFF1TXiRDj vSg0jr3OyPLPToXmAYFiLL0LnuFgG9jpbC1fQhJpHWHfs+sMvSHYW9+5xu08DocQwh2o B/8HgzFeeZHM2+Cwz56sTdkh4E2k/dLY81Lnowotu9D0JugZBsQLdS4dduaLqa5Sa9tI FgHxyByKt3MRTJs3CpwtkKegL53w+ZwKQre4NSmYBqcOxouPgcj2HUUsWOZ3HCrjGeGc cGPA== X-Gm-Message-State: AOAM532Z8qvEWIzRlOT7RdhggTrAku9dL3n2bwwm8FXXsXNPUxQD9UmP N9oo7YJXKzII5wXuyYtygmG9eA== X-Received: by 2002:adf:f305:: with SMTP id i5mr13622221wro.122.1626274850939; Wed, 14 Jul 2021 08:00:50 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p11sm2756104wro.78.2021.07.14.08.00.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:00:42 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 569141FF92; Wed, 14 Jul 2021 16:00:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 06/44] meson: fix condition for io_uring stubs Date: Wed, 14 Jul 2021 15:59:58 +0100 Message-Id: <20210714150036.21060-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini CONFIG_LINUX_IO_URING is not included in config-host.mak and therefore is not usable in "when" clauses. Check the availability of the library, which matches the condition for the non-stubbed version block/io_uring.c. At this point, the difference between libraries that have config-host.mak entries and those that do not is quite confusing. The remaining ~dozen should be converted in 6.2. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210712151810.508249-1-pbonzini@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/stubs/meson.build b/stubs/meson.build index 2e79ff9f4d..d3fa8646b3 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -15,7 +15,9 @@ stub_ss.add(files('fdset.c')) stub_ss.add(files('fw_cfg.c')) stub_ss.add(files('gdbstub.c')) stub_ss.add(files('get-vm-name.c')) -stub_ss.add(when: 'CONFIG_LINUX_IO_URING', if_true: files('io_uring.c')) +if linux_io_uring.found() + stub_ss.add(files('io_uring.c')) +endif stub_ss.add(files('iothread-lock.c')) stub_ss.add(files('isa-bus.c')) stub_ss.add(files('is-daemonized.c'))