From patchwork Tue Mar 12 10:55:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10849103 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0D1761669 for ; Tue, 12 Mar 2019 11:06:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E6CDD293CD for ; Tue, 12 Mar 2019 11:06:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DAE552950D; Tue, 12 Mar 2019 11:06:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6DB30293CD for ; Tue, 12 Mar 2019 11:06:28 +0000 (UTC) Received: from localhost ([127.0.0.1]:49885 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3fEp-0002XE-L7 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Mar 2019 07:06:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3f4g-0002Zo-5P for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3f4c-0003b4-OK for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:58 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:39628) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3f4a-0003ZP-La for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:52 -0400 Received: by mail-wr1-x433.google.com with SMTP id p8so2154411wrq.6 for ; Tue, 12 Mar 2019 03:55: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=b80fiscz/M9DJJL5HBOmynP5XjnojpfOGehcC+KRDj8=; b=Beh/0g49tDgQpZZTS0a2zScz3r0qH8WwbNGThBAVILIiC1hydql5/+OBaonkKZmA6A YqUK6qrBm40w3iHRSFYtIUgaSzEEh8idv2YkBWupUoNC/Y0H/NJk3VZctFoQJuPpx1fp 7HCHhZcATUIM+DWDmriH5+deQo95DctM/Leh5i0og5NYi1g1BVBYNyZSk+/VMweEu9q3 EibbgmQxuEXdb2o1Jsrg3v1pRc59Fcp/PFRGSzKN22eH1xoK2677iXD2R8blQWVP/C1g cUHn3IYjC5bAKcqgeNsM1sZ3q2R4d6eBo26dcnXa6JV1STUVcAko8egcGlWV0nOLoEwR f40Q== 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=b80fiscz/M9DJJL5HBOmynP5XjnojpfOGehcC+KRDj8=; b=jsX5Yw7FMdrWcGWjiLykQeztEzPwMG19L6TMVpyUgAH854pN4ka60BvfuSHZwJnNAF lxZczbcnketkl9HMnB8rN0kC+KaItaOzQAbEfySIRKuda4kqI8D3ZhwLvyj3d3ZXXzcm eeRcQNn+5sbFxG6Wja3sLAuVJAzXAJoJ5LLyZp9VAG5Iht6ahpgIf2tR8P+0StT4e0Zn FP0uHhRrujsmmLJW7SwOpe2TkZ0ecj6kd/A5ec/s5oMuk/vjHt8RkXQ6tRHdEeyJjidx 4y29GoY1OwJO5HuntmJ4kZ7cSMRQrQbCabhxoZYzaTOEg2WhpLwZFIDqXXpRkB8J/fbY cOiA== X-Gm-Message-State: APjAAAU8Pr76z+03t++meYsfT0BvKdaxTLG3OVwwqVOi4ChM4WAUWmqL l3HIFu175CP458V1GrGKXnMU6w== X-Google-Smtp-Source: APXvYqzf6VKKmLOh4++6ulr+JqWbPvBGNxbmuuAZiYMVJJm0mZa6C+cEaW3QZ/NIsjbWfBzvbftgQQ== X-Received: by 2002:adf:f70c:: with SMTP id r12mr2389158wrp.54.1552388149885; Tue, 12 Mar 2019 03:55:49 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f6sm9736978wrt.87.2019.03.12.03.55.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 03:55:48 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A4BA11FF8A; Tue, 12 Mar 2019 10:55:47 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 10:55:42 +0000 Message-Id: <20190312105547.4755-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312105547.4755-1-alex.bennee@linaro.org> References: <20190312105547.4755-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::433 Subject: [Qemu-devel] [PATCH v2 2/7] Revert "spapr: support memory unplug for qtest" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Thomas Huth , David Gibson , Greg Kurz , Michael Roth Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Greg Kurz Commit b8165118f52c broke CPU hotplug tests for old machine types: $ QTEST_QEMU_BINARY=ppc64-softmmu/qemu-system-ppc64 ./tests/cpu-plug-test -m=slow /ppc64/cpu-plug/pseries-3.1/device-add/2x3x1&maxcpus=6: OK /ppc64/cpu-plug/pseries-2.12-sxxm/device-add/2x3x1&maxcpus=6: OK /ppc64/cpu-plug/pseries-3.0/device-add/2x3x1&maxcpus=6: OK /ppc64/cpu-plug/pseries-2.10/device-add/2x3x1&maxcpus=6: OK /ppc64/cpu-plug/pseries-2.11/device-add/2x3x1&maxcpus=6: OK /ppc64/cpu-plug/pseries-2.12/device-add/2x3x1&maxcpus=6: OK /ppc64/cpu-plug/pseries-2.9/device-add/2x3x1&maxcpus=6: OK /ppc64/cpu-plug/pseries-2.7/device-add/2x3x1&maxcpus=6: ** ERROR:/home/thuth/devel/qemu/hw/ppc/spapr_events.c:313:rtas_event_log_to_source: assertion failed: (source->enabled) Broken pipe /home/thuth/devel/qemu/tests/libqtest.c:143: kill_qemu() detected QEMU death from signal 6 (Aborted) (core dumped) Aborted (core dumped) The approach of faking the availability of OV5_HP_EVT causes the code to assume the hotplug event source is enabled, which is wrong for older machines. This reverts commit b8165118f52ce5ee88565d3cec83d30374efdc96. A subsequent patch will address the problem of CAS under qtest from a different angle. Reported-by: Thomas Huth Signed-off-by: Greg Kurz Message-Id: <155146875097.147873.1732264036668112686.stgit@bahia.lan> Tested-by: Michael Roth Reviewed-by: Michael Roth Signed-off-by: David Gibson --- hw/ppc/spapr_ovec.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/hw/ppc/spapr_ovec.c b/hw/ppc/spapr_ovec.c index 12510b236a..318bf33de4 100644 --- a/hw/ppc/spapr_ovec.c +++ b/hw/ppc/spapr_ovec.c @@ -16,7 +16,6 @@ #include "qemu/bitmap.h" #include "exec/address-spaces.h" #include "qemu/error-report.h" -#include "sysemu/qtest.h" #include "trace.h" #include @@ -132,11 +131,6 @@ bool spapr_ovec_test(sPAPROptionVector *ov, long bitnr) g_assert(ov); g_assert(bitnr < OV_MAXBITS); - /* support memory unplug for qtest */ - if (qtest_enabled() && bitnr == OV5_HP_EVT) { - return true; - } - return test_bit(bitnr, ov->bitmap) ? true : false; }