From nobody Tue Feb 10 01:30:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 151379257889429.685559105959214; Wed, 20 Dec 2017 09:56:18 -0800 (PST) Received: from localhost ([::1]:60802 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRib0-0004v1-Uw for importer@patchew.org; Wed, 20 Dec 2017 12:55:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRhya-0004s2-G2 for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:16:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eRhyZ-0007Ls-Gq for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:16:16 -0500 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:44484) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eRhyZ-0007Lg-9d for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:16:15 -0500 Received: by mail-wm0-x241.google.com with SMTP id t8so11243600wmc.3 for ; Wed, 20 Dec 2017 09:16:15 -0800 (PST) Received: from 640k.lan (dynamic-adsl-78-12-251-125.clienti.tiscali.it. [78.12.251.125]) by smtp.gmail.com with ESMTPSA id f125sm2751101wme.45.2017.12.20.09.16.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Dec 2017 09:16:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GHHhNZMzjbi0wJlxeV8JX+CEWFaBBmVpCb4Mx637cWk=; b=kc333bPD9tGYIHcXW5YX17d9nxwDgicd9G12PaUtX6cBUH+f5D049+20YCAJ2VhA8G dm/Px2OC6FhuFY7dz2I6rBuRUlrAuyfUlZUMUgtfU6HjeTo38/1WvPumsHQPaHAdW3ac jAjwVrUyPFK8hbzH01NTb84XOcfLuJ0AHP+hdlYnojnjTZBbY0hu7puZFvlNQeo7CQ1s eKtn8nG18kr0F2Q3LUMd3nLpx8oJCmKZEoD422HfgUayh3A5J+StcaJkRlQkOa9EIYIU 97jyQCXwMsQ0ngJRJLkeuJU0GVDWtA5OhpRj2LehtFm59aGcjpyg9QZRujOi4AzYbHgJ 99zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GHHhNZMzjbi0wJlxeV8JX+CEWFaBBmVpCb4Mx637cWk=; b=lUYxDXx0TtuNXPDhu9zpkik/JZGY8LsoCqtvnjvxH1HMYEKTMxS8XM2GsABJZHOTQ4 bCIDkslVcorlF0M2CH1KjA3EJeFPOkVld+sbmULu4l1xBxLrmi1jEgMTQgDp4gdbi9ag An9wQ0AKK3TAtOACAttk6lhQsRriEhQdHKR2IYg4F/djd20DlDJEUeOy64FqpikqDX1C FkE6ip/3N8TOGx+mjI9D4J8Mm3QbAwsTlx2Hww20CH+woh9noDXqs7m+P5SqfLb4OebM yea3XP8XOoclIxYz6idc336ScL9Ttb/sICRSOeYb5PAUCtZC/qQueKVk5mVGdMjyaXBi OAaQ== X-Gm-Message-State: AKGB3mJClnsWjHXviayxVn+1z2O8gQnEfys5KCUh6Soeo1JEhlSuG5jM 6NtP5W85JAF8XwoS0br20ocC17Kg X-Google-Smtp-Source: ACJfBouodnttshoNYTdKFf07TwzuYSOZy9j4IGKrQ7tvpL0MPwD6cpyjoHX78SiCgaPzXYEEVcA/0Q== X-Received: by 10.28.102.6 with SMTP id a6mr6887717wmc.63.1513790174000; Wed, 20 Dec 2017 09:16:14 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 20 Dec 2017 18:14:48 +0100 Message-Id: <1513790098-9815-37-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1513790098-9815-1-git-send-email-pbonzini@redhat.com> References: <1513790098-9815-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PULL 36/46] i8259: use DEBUG_IRQ_COUNT always 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 Xu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Peter Xu It's not really scary to even enable it forever. After all it's i8259, and it's even not the kernel one. Then we can remove quite a few of lines to make it cleaner. And "info irq" will always work for it. Signed-off-by: Peter Xu Message-Id: <20171210063819.14892-3-peterx@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- hw/intc/i8259.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c index f12e0b2..20c9d0a 100644 --- a/hw/intc/i8259.c +++ b/hw/intc/i8259.c @@ -36,7 +36,6 @@ //#define DEBUG_PIC =20 //#define DEBUG_IRQ_LATENCY -//#define DEBUG_IRQ_COUNT =20 #define TYPE_I8259 "isa-i8259" #define PIC_CLASS(class) OBJECT_CLASS_CHECK(PICClass, (class), TYPE_I8259) @@ -52,12 +51,8 @@ typedef struct PICClass { DeviceRealize parent_realize; } PICClass; =20 -#if defined(DEBUG_PIC) || defined(DEBUG_IRQ_COUNT) static int irq_level[16]; -#endif -#ifdef DEBUG_IRQ_COUNT static uint64_t irq_count[16]; -#endif #ifdef DEBUG_IRQ_LATENCY static int64_t irq_time[16]; #endif @@ -128,24 +123,17 @@ static void pic_set_irq(void *opaque, int irq, int le= vel) { PICCommonState *s =3D opaque; int mask =3D 1 << irq; - -#if defined(DEBUG_PIC) || defined(DEBUG_IRQ_COUNT) || \ - defined(DEBUG_IRQ_LATENCY) int irq_index =3D s->master ? irq : irq + 8; -#endif =20 trace_pic_set_irq(s->master, irq, level); =20 -#if defined(DEBUG_PIC) || defined(DEBUG_IRQ_COUNT) if (level !=3D irq_level[irq_index]) { irq_level[irq_index] =3D level; -#ifdef DEBUG_IRQ_COUNT if (level =3D=3D 1) { irq_count[irq_index]++; } -#endif } -#endif + #ifdef DEBUG_IRQ_LATENCY if (level) { irq_time[irq_index] =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); @@ -253,12 +241,8 @@ static bool pic_get_statistics(InterruptStatsProvider = *obj, PICCommonState *s =3D PIC_COMMON(obj); =20 if (s->master) { -#ifdef DEBUG_IRQ_COUNT *irq_counts =3D irq_count; *nb_irqs =3D ARRAY_SIZE(irq_count); -#else - return false; -#endif } else { *irq_counts =3D NULL; *nb_irqs =3D 0; --=20 1.8.3.1