From patchwork Thu Jan 19 14:58:32 2023 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: 644086 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp256962pvb; Thu, 19 Jan 2023 06:59:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXuMZl6elpXW/Qb0awa8mq1MvNI4F4kG2ov03oDkttl+M5u9Bs2dT+3YX/zSdNyiUvxpDPNC X-Received: by 2002:ac8:718d:0:b0:3b2:4393:62ce with SMTP id w13-20020ac8718d000000b003b2439362cemr15522577qto.21.1674140399491; Thu, 19 Jan 2023 06:59:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674140399; cv=none; d=google.com; s=arc-20160816; b=dLiCUxizWCKidhofrdX6O3jJ9Cw9Pe1cocvOXKUbV6spshEz0Q9NYNwL+UHe3BuQvb LBavX+4ZP++DCLlPWd7DP1T2LrDUi6qPCMjZAeVUISKkzMyrkMmxjerLdCVeWqEYnJc3 Eaqb4DOSbgs7EuPMw/wBIz5cmDBCNS5alLUB0VpUmu2fxCW6o50UCOZIy5qDpCe6jLra m8Z80CyajaPC0HJlOQmIqGygkFZxWzAtLwpxPqtK7W7plg4LjPts2Wq1DrvjNK25w4uQ y9FsnlvZMZ584x6c3A781zEZYBU72T08Sw6osBZSCKIfW8slGOI5aSuZhidxhAIguNfG LlGg== 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:cc:to :from:dkim-signature; bh=9MjqM2w9hw3LWgeDOmCQX9tZeJS1teSf33PVNVZfRuA=; b=AsjcM570g4NpSQi6hmePTv8F7JLqR7YVV5LsjzqX3n7Dvm8JlsS3ti6W1UhqOaPQvf i4R7FyQenlKfs1FnrJ3wOODGBBjYxUCFJgoZdxsvGkagW8PI34JX4hFPkvbyGN7FJC4f 9dX4Ncp+ZHvT3eG8VNikKac1z8fETuc+f/t0nIVo2tRIHHMbnEyOU8+O5j8iUOhGNE8I R9+6EZGPcDfDBcgEvp3HcTukCHJ90CxN/AD/gwg6fp4A4A7FdiWqlMqgJQ421dl9QBMH uVJ/OLaOCZB5VCMsRciSxykkCd171Rk/EqSfvxAQlGcwGgP7yhiyqnYyQ7XVJ5GTOXuV KG/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oGv1leY4; 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 bj7-20020a05620a190700b00706ab1c6e8fsi5147156qkb.542.2023.01.19.06.59.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jan 2023 06:59:59 -0800 (PST) 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=oGv1leY4; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIWNj-0006Jw-Kl; Thu, 19 Jan 2023 09:59:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pIWNh-0006Ia-Ew for qemu-devel@nongnu.org; Thu, 19 Jan 2023 09:59:09 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pIWNe-0003Z2-Sm for qemu-devel@nongnu.org; Thu, 19 Jan 2023 09:59:09 -0500 Received: by mail-wr1-x42d.google.com with SMTP id bk16so2113489wrb.11 for ; Thu, 19 Jan 2023 06:59:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9MjqM2w9hw3LWgeDOmCQX9tZeJS1teSf33PVNVZfRuA=; b=oGv1leY41kTrRW2rwI6qM6gjAqfHsvkfBcPUqeJBS6mrskxptcHLv+f+XSyX1U73r3 zuKKd/4RatU6xOXRNlXg3Ds9U4Uh3ZeWGue5MhL3hOAVohOi+reoHg9aqvhJXh56gdT2 5o69d9eqinktB2+RXaMwt3zFreg6sniGMTK6zB1IeHHtdro/WITVKhhwkqp3gpWY4+3d eyUaQ8qdEas5T8iZmYaadB2PiB/re+O51ATNalxDAvMkvCBz/0iUrct6HNDMT4ECewDh 36yDEiPl/R2h8jpu1rxaHaDvNX+3tJCE8en0rQW508pjijs/qq4+glkuJFPAQc6aV4+N j1uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9MjqM2w9hw3LWgeDOmCQX9tZeJS1teSf33PVNVZfRuA=; b=QTgy3HjWSo71tFGheoMF1y7C5mePbf5f8lu2ahpa/6HVfgkjDRPlXO0gVCVBFHdWsW Trd8ZxeU9g7rndh6F6IP1jeGMl0kU3ICNUs49SFjmGYSBl1EoNfqC0SbldDf2/iyAd94 iasgh59MHk6AoFYwdF6WmCcRfVYvPoQb4xM/ZBZ5cKJoUlJ8uB+7tHAxfS4aDZVD8mhz d2C8C7PT/wZj1p9UZHtDV/vCcjbEQ6zLWR8odvEa2KbV0Ubf01/Ae7mDIwywGoo8PEDR 41/zsEgZKeHWe2ouEPhilpVKMNuGd9APz51g7zLj1pSRSkCYUz5/bVaGGWBqsCLWXS/O tClw== X-Gm-Message-State: AFqh2kqoSH+sU882ERvtgsZ4qooP4Exg1+VuodUg1Cl6V+qFkWWLUigL ZNbqUrzzDD6Qpi9N8Nq65ir8CQE2CarEUVsF X-Received: by 2002:a5d:6581:0:b0:2bb:dad4:9525 with SMTP id q1-20020a5d6581000000b002bbdad49525mr9162698wru.10.1674140345186; Thu, 19 Jan 2023 06:59:05 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id c8-20020a5d4cc8000000b002bdeb0cf706sm14689742wrt.65.2023.01.19.06.59.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Jan 2023 06:59:04 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Juan Quintela , Laurent Vivier , Paolo Bonzini , "Dr. David Alan Gilbert" , qemu-arm@nongnu.org, Fabiano Rosas , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 05/11] tests/qtest/migration-test: Inverse #ifdef'ry ladders Date: Thu, 19 Jan 2023 15:58:32 +0100 Message-Id: <20230119145838.41835-6-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230119145838.41835-1-philmd@linaro.org> References: <20230119145838.41835-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This slighly simplify the logic, and eases the following conversion. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- tests/qtest/migration-test.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index dbde726adf..8beeda4686 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -647,15 +647,15 @@ static int test_migrate_start(QTestState **from, QTestState **to, } if (!getenv("QTEST_LOG") && args->hide_stderr) { -#ifndef _WIN32 - ignore_stderr = "2>/dev/null"; -#else +#ifdef _WIN32 /* * On Windows the QEMU executable is created via CreateProcess() and * IO redirection does not work, so don't bother adding IO redirection * to the command line. */ ignore_stderr = ""; +#else + ignore_stderr = "2>/dev/null"; #endif } else { ignore_stderr = "";