From nobody Tue Feb 10 11:56:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.208.45 as permitted sender) client-ip=209.85.208.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1620706005; cv=none; d=zohomail.com; s=zohoarc; b=T/jKj0y+3NMQAF8rtdxJn5JC8mAqw5v+5z8WCt0pB0tS1ZsYlE6o/uqhpcpwnBuPqwQcJBATkayrc0aKuUapohME9W2MlocTAFfCemo8ssdbWaLsodBtWz/0e0I4OhRlPnNBgJ/phWREuDTAbnPuhIKfb1LFr5Xa6Pbm0G564XA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620706005; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hns+6A5PyzY0RjxyiODZSOeQ1IcjbT0qFjGtVPHu0KY=; b=C2Y5D2Kb+mOkCPwbUBrylI8F4I20Ak4VOxJ5pF16dJJlnPA5QTP2Wrpj6+56Hh4kRnHavR4f60rh1rYyRFetgdvSG5T7xLhtYGFCsrFo8UmfiuCp0a/sMsWO+EZE+nl6svfa6u7DD0G1P9kVmhUGppnJQH9ry6LJGFOz6by75kM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by mx.zohomail.com with SMTPS id 1620706005086266.1684940913834; Mon, 10 May 2021 21:06:45 -0700 (PDT) Received: by mail-ed1-f45.google.com with SMTP id n25so21205813edr.5 for ; Mon, 10 May 2021 21:06:44 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id n21sm10601825ejx.74.2021.05.10.21.06.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 21:06:42 -0700 (PDT) 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=hns+6A5PyzY0RjxyiODZSOeQ1IcjbT0qFjGtVPHu0KY=; b=owJ3kv4wAoJ7sVpZlOtpHZ6ym6KtQ6mpbg5WRBmFAw1cfERfzbj4oVBgSwmOzwJt56 vHfZbsmbEFOGzLqnSPzArYXMLvvp+JNmN8o/0s9i2g15DPdigYYAwxi7vUtZPaEC8i26 4T8bLj6VjVBdvBj4CoNJq9z+r+j4BPKlPUUw4cyNzVgYmruedomhkrVHTd0lp1tRAmLF 0Mo9bcsrid/9e+LvJ4IoX23nnjhQTyjfku1ccMJMqJOQS0oMho3lUxDswhRTZrfu7aGb VQ2DsxGi6mc9lKZ3oDqMU7P3yQOjJg2etQmD37LuGSRYSbiX7I1U9rgNH9/Vr3XRtsIX lGkg== 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=hns+6A5PyzY0RjxyiODZSOeQ1IcjbT0qFjGtVPHu0KY=; b=FetGY1gjmk55f4TmKNxnLeb2rzVVbDJNbtC0Dh5oM0iGyfF79223NxgrA4WfBErmuy CBG3PSc52xbHIXAaCRa+BKXQKsGd/YbJAMdqWG5kf+/ueDM4XsTFEjm5f745l4lSdukd l7YURfZ9HSFPkVXx4TRQovb6zgH6r3L1xrPhuOdBBTwzvBGnlacXFWDYyerwLGOeDqhh Xoou8lvpZwd1gEnaTKc5+U9xZQrvXl0ZsIQlWqFy8XwaRKQ9di73G3qiM3Po2n9ZwmSd HHXWAFTI2BKb4oNM7VM+QlVbOerczn3Z09NZKhJQkMlKZD/hB3Xdljguh9thWzAPPk+j WaDQ== X-Gm-Message-State: AOAM5336Tjl0vKXVns7BIaEFcUYAR6sv/VWgaVgqr0cov8OD6sKNlw8d bYOdTnN7KWbaw2joGnlHlk0= X-Google-Smtp-Source: ABdhPJyVAnueCpOEJA5/6jR99YSb5iuVPDLCVGLCZ/+L+doPz4ZPTKnrMYqCS1NIxP/veStUNE9DRw== X-Received: by 2002:a05:6402:1547:: with SMTP id p7mr33688077edx.319.1620706003287; Mon, 10 May 2021 21:06:43 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , BALATON Zoltan , Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Aurelien Jarno , David Gibson , Jiaxun Yang , Greg Kurz , qemu-ppc@nongnu.org Subject: [PATCH v2 3/4] hw/isa/i82378: Rename output IRQ variable Date: Tue, 11 May 2021 06:06:20 +0200 Message-Id: <20210511040621.2736981-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210511040621.2736981-1-f4bug@amsat.org> References: <20210511040621.2736981-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The i82378 has 2 output IRQs: "INT" and "NMI". We do not model the NMI, so simplify I82378State by removing the unused IRQ. To avoid keeping an array of one element, remove the array and rename the variable. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/i82378.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index 817eca47053..164d6c65f64 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -32,7 +32,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(I82378State, I82378) struct I82378State { PCIDevice parent_obj; =20 - qemu_irq out[2]; + qemu_irq intr; qemu_irq *i8259; MemoryRegion io; }; @@ -88,7 +88,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp) */ =20 /* 2 82C59 (irq) */ - s->i8259 =3D i8259_init(isabus, s->out[0]); + s->i8259 =3D i8259_init(isabus, s->intr); isa_bus_irqs(isabus, s->i8259); =20 /* 1 82C54 (pit) */ @@ -106,7 +106,7 @@ static void i82378_init(Object *obj) DeviceState *dev =3D DEVICE(obj); I82378State *s =3D I82378(obj); =20 - qdev_init_gpio_out_named(dev, s->out, "intr", 1); + qdev_init_gpio_out_named(dev, &s->intr, "intr", 1); qdev_init_gpio_in(dev, i82378_request_pic_irq, 16); } =20 --=20 2.26.3