From nobody Tue Feb 10 01:35:29 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552206574198338.0949812081111; Sun, 10 Mar 2019 00:29:34 -0800 (PST) Received: from localhost ([127.0.0.1]:41681 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2tps-0002B1-Ta for importer@patchew.org; Sun, 10 Mar 2019 04:29:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42393) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2tnm-0000dO-6L for qemu-devel@nongnu.org; Sun, 10 Mar 2019 04:27:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2tnk-000146-Od for qemu-devel@nongnu.org; Sun, 10 Mar 2019 04:27:22 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:40197) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h2tnk-00011t-Ab; Sun, 10 Mar 2019 04:27:20 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 44HDqk0z4qz9sDn; Sun, 10 Mar 2019 19:27:13 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1552206434; bh=v2oNQOgcsaRZxC79M4tx3FkBMk5bcW66yqnNKVe/wcY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q5o6URIxaZ1Pa70pXt65mW892pS1R+nTujiJAR84PlCmPZCjDItIgJ4UGuluPldjD 1l2KmDHG1VzmQF9V4Cm/3KEUrMuu91/9G3cLrytUGKmq4qKL/lSavXFJF9PUAZ7amK AMrHzdkTNZisW3y5HcBHWykNBgIGyvJcMd/gJ6aE= From: David Gibson To: peter.maydell@linaro.org Date: Sun, 10 Mar 2019 19:26:07 +1100 Message-Id: <20190310082703.1245-5-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190310082703.1245-1-david@gibson.dropbear.id.au> References: <20190310082703.1245-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 04/60] 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: lvivier@redhat.com, Thomas Huth , qemu-devel@nongnu.org, Michael Roth , groug@kaod.org, qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Greg Kurz Commit b8165118f52c broke CPU hotplug tests for old machine types: $ QTEST_QEMU_BINARY=3Dppc64-softmmu/qemu-system-ppc64 ./tests/cpu-plug-test= -m=3Dslow /ppc64/cpu-plug/pseries-3.1/device-add/2x3x1&maxcpus=3D6: OK /ppc64/cpu-plug/pseries-2.12-sxxm/device-add/2x3x1&maxcpus=3D6: OK /ppc64/cpu-plug/pseries-3.0/device-add/2x3x1&maxcpus=3D6: OK /ppc64/cpu-plug/pseries-2.10/device-add/2x3x1&maxcpus=3D6: OK /ppc64/cpu-plug/pseries-2.11/device-add/2x3x1&maxcpus=3D6: OK /ppc64/cpu-plug/pseries-2.12/device-add/2x3x1&maxcpus=3D6: OK /ppc64/cpu-plug/pseries-2.9/device-add/2x3x1&maxcpus=3D6: OK /ppc64/cpu-plug/pseries-2.7/device-add/2x3x1&maxcpus=3D6: ** ERROR:/home/thuth/devel/qemu/hw/ppc/spapr_events.c:313:rtas_event_log_to_so= urce: assertion failed: (source->enabled) Broken pipe /home/thuth/devel/qemu/tests/libqtest.c:143: kill_qemu() detected QEMU deat= h 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 =20 @@ -132,11 +131,6 @@ bool spapr_ovec_test(sPAPROptionVector *ov, long bitnr) g_assert(ov); g_assert(bitnr < OV_MAXBITS); =20 - /* support memory unplug for qtest */ - if (qtest_enabled() && bitnr =3D=3D OV5_HP_EVT) { - return true; - } - return test_bit(bitnr, ov->bitmap) ? true : false; } =20 --=20 2.20.1