Message ID | 20210202175517.28729-2-peter.maydell@linaro.org |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=cixYe0bH; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DVXkD20myz9t9b for <incoming@patchwork.ozlabs.org>; Wed, 3 Feb 2021 05:03:48 +1100 (AEDT) Received: from localhost ([::1]:54620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1l701i-0004Zu-4v for incoming@patchwork.ozlabs.org; Tue, 02 Feb 2021 13:03:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1l6ztw-0005O8-RX for qemu-devel@nongnu.org; Tue, 02 Feb 2021 12:55:44 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:54467) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1l6ztc-0002Ee-EB for qemu-devel@nongnu.org; Tue, 02 Feb 2021 12:55:43 -0500 Received: by mail-wm1-x335.google.com with SMTP id w4so2004190wmi.4 for <qemu-devel@nongnu.org>; Tue, 02 Feb 2021 09:55:22 -0800 (PST) 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=gzWlxwGPzoms0Ug6rgP3MPwoGWfsZNay/8PJUHAGy4o=; b=cixYe0bHwHdpbppCYtukVdUNyDeAs//yejnhN2GSY9CRms7GHzayOh9GoTFcSNZ/+K 3ZXTDA1vrArMpDat7gQOHwrgE4p+7TBG5uaRjpOmWE142xqZt/iZHnv5H/sO8bHraLSS n37M5fqQrV5fQwmhtc541HofSqeb1Io9UKgAMM0MvY+Iljat9ddGNUIrcfBO7agffsrK c62FoDc3N4EEScTd4kSlIFqFz+SyeYk+w4mgPYW8oCBryu1BTSzJDRY0VAN3tzRKYx6F C4kWblr4ltkQV2+ekrkZgn110ivXqeyF9Gg76DoLqY7vpg0eg39K4K6bM6/4ErbNoI2g bdFg== 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=gzWlxwGPzoms0Ug6rgP3MPwoGWfsZNay/8PJUHAGy4o=; b=SDSZYJ1Hv4kwhrEZlBvRn+PIF8NuKSFsxysiXvHnfaI3MRGJ3fBjVKkFDUordCKbyE /sOrr7buMT57NU3ohtp/v4H3aOkqo5izyzW+DHJZqfWOSSwCZC32TzSTHpYQvVRWDMCT fINs5REXZw0bjGSyAJYbCLcgfOZhD9igN3UxJ7wXOWSuHC93ba/qOCGw34jwQYsZBBPR zTM9bnU2+TyDuGezToImq2uVAUmYhgutFrUJvBBVGYju56DTqHOIGM4Gs54FFU++9wqN LZDhTQoxi/tSmPR88LoIJrOfJ7ws1oIlWAWpm2gM6iTY/9j0XIsvBAo1eunLJ+qSpXp/ 8gjg== X-Gm-Message-State: AOAM533K1vNR25sqzwuiyRYkiBOHYXgDYC9IAu7aqNdqmQoK41fdIbmt d2nrsWi7ysa+rNqrIlt3wAKavb6ErhC6bw== X-Google-Smtp-Source: ABdhPJxCjGyJQAv5lRTgFv941XhRi6XuHbgLHqsccG2LL9sYFDIlM7iNsvTscRJEklndlDgGroeDzQ== X-Received: by 2002:a1c:4ca:: with SMTP id 193mr4693839wme.178.1612288521096; Tue, 02 Feb 2021 09:55:21 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id q6sm4142283wmj.32.2021.02.02.09.55.20 for <qemu-devel@nongnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 09:55:20 -0800 (PST) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Subject: [PULL 01/21] hw/intc/arm_gic: Allow to use QTest without crashing Date: Tue, 2 Feb 2021 17:54:57 +0000 Message-Id: <20210202175517.28729-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210202175517.28729-1-peter.maydell@linaro.org> References: <20210202175517.28729-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x335.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.23 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/21] hw/intc/arm_gic: Allow to use QTest without crashing
|
expand
|
diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index af41e2fb448..c33b1c8c4bc 100644 --- a/hw/intc/arm_gic.c +++ b/hw/intc/arm_gic.c @@ -28,6 +28,7 @@ #include "qemu/module.h" #include "trace.h" #include "sysemu/kvm.h" +#include "sysemu/qtest.h" /* #define DEBUG_GIC */ @@ -57,7 +58,7 @@ static const uint8_t gic_id_gicv2[] = { static inline int gic_get_current_cpu(GICState *s) { - if (s->num_cpu > 1) { + if (!qtest_enabled() && s->num_cpu > 1) { return current_cpu->cpu_index; } return 0;