From patchwork Mon Jul 13 14:10:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 235417 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp2884010ilg; Mon, 13 Jul 2020 07:21:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrHzJs/OdjVM7vdqg70c5oJaT+w4kx0dYF/ltR7ieDRK12AV37bsX64Ebg1dwSwiifAOGj X-Received: by 2002:a25:253:: with SMTP id 80mr418583ybc.42.1594650069168; Mon, 13 Jul 2020 07:21:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594650069; cv=none; d=google.com; s=arc-20160816; b=Ld78B/jwBgAN/RFYg9FkfaWTAYV0fU0Uq/ck+srpdMfkxhtKLsTXftc3FeOl/9/GZR EH1YLquNRTryHLTdkUzzkoX5y+P5fhJDMtpqT/MTDEew5xCKEEwNGnFu4QilDJkcr8hJ UeF8TWMJJvay9tApHeKq32W8HiXOz0odp4LDAnm5JKoW18Pl2SldOpHaICwZYO8MM5XD OVbpa3lr1dCSFNdHM7ob+NV+45tI+opmRM0LLXUHCWMHHtffzn2H8VwamnLW4h+0VMrP j//r5lZd3vmpKBpAQThbOlVRJTaVhgQyvzluMMJAGzN/7XakwEurEPx276cHJHWlHZxp xN/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=74P0QPv7N4CwWIZNwbGdxlAllKsjgzH/XuRXK1wCbsM=; b=j+rfTBlIipUcEu8mM4P0OnbhxCD+HUAEvDg3zRmM75FOyqmQVZxwFQbBSNDrkZG72/ FtWBQgl/I5qIKjdoH9/xJYze3f9vE3reIpg8ewL5vxs4VtwLlWh0PYAffmUx2dvJSRHz PyVqdNajo0yowBJxE0s0koRfCXPWi5dBB9CcipmzfpPdVlkrPiLVToAAc2AogzHTkHq9 jQM/4WKzzh2c7K12hFd3ii8kgSE8mf1cktcb+m2YxfbLGAIHBPTreDO+a1DOAV5lkjcR +RMs+pLkkMBH2r7nyv2zKpkNw7Jp6V3F63A66ZvKyPoGEQA4yoI4BfOh0Xo7wX0uwnva HGDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JDUik88I; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 22si14968506ybc.322.2020.07.13.07.21.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jul 2020 07:21:09 -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=pass header.i=@linaro.org header.s=google header.b=JDUik88I; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33770 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzKO-0005mu-I3 for patch@linaro.org; Mon, 13 Jul 2020 10:21:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzAz-0005QT-U5 for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:25 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:52849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzAy-0006eF-AP for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:25 -0400 Received: by mail-wm1-x343.google.com with SMTP id q15so13461959wmj.2 for ; Mon, 13 Jul 2020 07:11:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=74P0QPv7N4CwWIZNwbGdxlAllKsjgzH/XuRXK1wCbsM=; b=JDUik88I33XScCsoKOTAyMSzOzlE7JHbDELuA95WO/GYjRhlCixYgSeQkPPnL0O2IF FHxTlBU6M9Km4T3Dvzaa4l//LuJCdToG96PDCqsuYEl1oc4HyFnqpBa8LuM+6Kq5jxWE apcHfzp+wDeoHViwXs2J/rZy6YN+V9+iT5q2ejmuPnwpKp0nVbVCuROQ+bAOAkpoMDVC ukGaXHCp5tycC/YaohPwziBl11V9tNkpXOAhPjXhGOuKpxBi4nMSuqnTSYVk5kalltIR h0MGVnJByNeq3n7SVSsc7sjf+vGII6QXO6X+oQBd8EucADve+PyPNQzi+EEYuBNaw/ZE +FxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=74P0QPv7N4CwWIZNwbGdxlAllKsjgzH/XuRXK1wCbsM=; b=pPfKe9E30yFgB1XvX2p5Gc4FI1Bw1cLx9ZyK5LUkHnyxaww5xmSI+RMPiwbgJ4hhF8 vrFL7R85/lW7DPy1xckAh6qqMyzQmzdiW6H29B0oQAGxppERtXL1KzXkiWC1yZOyEG+/ aage55hytipv1Y//MJ1ldWAMHBiG+re2prjDwvRGO6AzGdm1gez33gg/X4yHvwFdSJiU GYqQPH01DYMaZcLZrSA1TCpcHMlSRmneW523EIYWUf+ZqxDnBgwR38+4LqngUsdP5pCr X4OVCdbLJ7WmQg/YgEm4Jqu00vkJf3gsfDP0UGgReKmYoLZ+lwpuyLZBSA8TjM+uGNu7 W8Zw== X-Gm-Message-State: AOAM532ZzQr3M3GCyWu5RgC7T3XLI+PB7cjlA7+EK9UZS0ezI0nvnqvg UVUwyw+cWRVyRkoCRt9lygHP5++T4cS3yA== X-Received: by 2002:a7b:cc85:: with SMTP id p5mr184351wma.18.1594649482708; Mon, 13 Jul 2020 07:11:22 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:22 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 14/25] util/compatfd.c: Only include if CONFIG_SIGNALFD Date: Mon, 13 Jul 2020 15:10:53 +0100 Message-Id: <20200713141104.5139-15-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: David CARLIER util/compatfd.c includes so that the CONFIG_SIGNALFD code can use SYS_signalfd. Guard the #include with CONFIG_SIGNALFD to avoid portability issues on hosts like Haiku which do not provide that header file. Signed-off-by: David Carlier Reviewed-by: Peter Maydell Reviewed-by: Thomas Huth Signed-off-by: Peter Maydell Message-id: 20200703145614.16684-8-peter.maydell@linaro.org [PMM: Expanded commit message] Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- util/compatfd.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.20.1 diff --git a/util/compatfd.c b/util/compatfd.c index c296f55d148..ee47dd80897 100644 --- a/util/compatfd.c +++ b/util/compatfd.c @@ -16,7 +16,9 @@ #include "qemu/osdep.h" #include "qemu/thread.h" +#if defined(CONFIG_SIGNALFD) #include +#endif struct sigfd_compat_info {