From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164555883298742.89262238243191; Tue, 22 Feb 2022 11:40:32 -0800 (PST) Received: from localhost ([::1]:56196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMb1T-0006NZ-F7 for importer@patchew.org; Tue, 22 Feb 2022 14:40:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMaw5-0003JE-9i for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:34:59 -0500 Received: from [2a00:1450:4864:20::52e] (port=35520 helo=mail-ed1-x52e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMaw3-0006pb-69 for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:34:56 -0500 Received: by mail-ed1-x52e.google.com with SMTP id bq11so18137335edb.2 for ; Tue, 22 Feb 2022 11:34:54 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.34.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:34:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j83vZx9j76L8zhdtWP/y92HPoOpjGy8BlkZclh4n+Cc=; b=coCAh/e3x0xamJYI3tAfmUnQcj8zuqxqT6QTJBB1H8NuDCbKD6jFqooIoEG22ssRtn uQNcVB3sNBGf6tKXevAsnWgi8RTdWzU1ERclA7RhvL+q6elX+HZtZf/FZk2DLVGkcCZF d7pkbTaa+dVNpxvmR4rVCqIKARyyZOlO7QH66UvHvCAgUbm5l+aFqI/0N8tZ7zEPesO5 VCSN7/y4YBGbCKs24kdyqstWXlcyvlspGFq4oIR5eZxgJAfqHmP1eiQf2dHW+C+zkE5p W/1zBHzMiA03JAff0bURs+WFGUy70ax6+NV+fQcr3qnY4AvWmQuWmetYSDuSQ3HTGw23 y2sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=j83vZx9j76L8zhdtWP/y92HPoOpjGy8BlkZclh4n+Cc=; b=ZUz5EU0luRtzMfSlScnRV9+ezhKuGbySo4br8OHmBC91chOlMT2taNLTyEe0XaJDH5 FOLlkv86EcwtZ1ztbG2NiE9R2ybUJDPKeYXqu67OAGuyHOF4d0uTug8/Rl/lP9UWWChl /Cn8OgApTrgTLHeWsJmhI2Be+UErcbfnDIgyn0dS2GdsZFn1xhA12TeS3diDB3EBJtvj 9lOawsDHXvNqpRNr2jcET7pPKvm9QiwcNSRi8wuUpukkqEAGfZjId2Epr+IMLPm77Bqw a6AJchBW8mYB33Zi4AnxPAJt5aPDfiEgPo4udENySqyrycQ6ghNTpNMv4RO0ROvgSOaW R13g== X-Gm-Message-State: AOAM530mSFrsqJ8VuAwJEw+oDjgaDsuV4Whom1mLv/bUWAXDuGoSpM4C 7t1sZud+q9USOkAssmgelc0qeltKlqY= X-Google-Smtp-Source: ABdhPJz0r7NIVJ8foX/tIm2sBZ9Wu+Oxs1ZOgTj8uVa8rxbvQcw19Brw/2QyLLIj81MpPN8I7m896Q== X-Received: by 2002:a05:6402:1e8b:b0:410:6085:4a4a with SMTP id f11-20020a0564021e8b00b0041060854a4amr28770655edf.452.1645558493515; Tue, 22 Feb 2022 11:34:53 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 01/22] hw/rtc/mc146818rtc: QOM'ify IRQ number Date: Tue, 22 Feb 2022 20:34:25 +0100 Message-Id: <20220222193446.156717-2-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52e (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=shentey@gmail.com; helo=mail-ed1-x52e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Paolo Bonzini , Bernhard Beschow , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1645558833757100001 Content-Type: text/plain; charset="utf-8" Exposing the IRQ number as a QOM property not only allows it to be configurable but also to be printed by standard QOM mechanisms. This allows isabus_dev_print() to be retired eventually. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/piix4.c | 2 +- hw/rtc/mc146818rtc.c | 13 +++++++++++-- include/hw/rtc/mc146818rtc.h | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 0fe7b69bc4..cb291d121c 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -197,7 +197,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp) if (!qdev_realize(DEVICE(&s->rtc), BUS(isa_bus), errp)) { return; } - isa_init_irq(ISA_DEVICE(&s->rtc), &s->rtc.irq, RTC_ISA_IRQ); + isa_init_irq(ISA_DEVICE(&s->rtc), &s->rtc.irq, s->rtc.isairq); =20 piix4_dev =3D dev; } diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index e61a0cced4..eda9af65c4 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -911,6 +911,11 @@ static void rtc_realizefn(DeviceState *dev, Error **er= rp) s->base_year =3D 0; } =20 + if (s->isairq >=3D ISA_NUM_IRQS) { + error_setg(errp, "Maximum value for \"irq\" is: %d", ISA_NUM_IRQS = - 1); + return; + } + rtc_set_date_from_host(isadev); =20 switch (s->lost_tick_policy) { @@ -956,15 +961,17 @@ ISADevice *mc146818_rtc_init(ISABus *bus, int base_ye= ar, qemu_irq intercept_irq) { DeviceState *dev; ISADevice *isadev; + RTCState *s; =20 isadev =3D isa_new(TYPE_MC146818_RTC); dev =3D DEVICE(isadev); + s =3D MC146818_RTC(isadev); qdev_prop_set_int32(dev, "base_year", base_year); isa_realize_and_unref(isadev, bus, &error_fatal); if (intercept_irq) { qdev_connect_gpio_out(dev, 0, intercept_irq); } else { - isa_connect_gpio_out(isadev, 0, RTC_ISA_IRQ); + isa_connect_gpio_out(isadev, 0, s->isairq); } =20 object_property_add_alias(qdev_get_machine(), "rtc-time", OBJECT(isade= v), @@ -975,6 +982,7 @@ ISADevice *mc146818_rtc_init(ISABus *bus, int base_year= , qemu_irq intercept_irq) =20 static Property mc146818rtc_properties[] =3D { DEFINE_PROP_INT32("base_year", RTCState, base_year, 1980), + DEFINE_PROP_UINT32("irq", RTCState, isairq, RTC_ISA_IRQ), DEFINE_PROP_LOSTTICKPOLICY("lost_tick_policy", RTCState, lost_tick_policy, LOST_TICK_POLICY_DISCARD), DEFINE_PROP_END_OF_LIST(), @@ -1010,6 +1018,7 @@ static void rtc_reset_hold(Object *obj) =20 static void rtc_build_aml(ISADevice *isadev, Aml *scope) { + RTCState *s =3D MC146818_RTC(isadev); Aml *dev; Aml *crs; =20 @@ -1020,7 +1029,7 @@ static void rtc_build_aml(ISADevice *isadev, Aml *sco= pe) crs =3D aml_resource_template(); aml_append(crs, aml_io(AML_DECODE16, RTC_ISA_BASE, RTC_ISA_BASE, 0x01, 0x08)); - aml_append(crs, aml_irq_no_flags(RTC_ISA_IRQ)); + aml_append(crs, aml_irq_no_flags(s->isairq)); =20 dev =3D aml_device("RTC"); aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0B00"))); diff --git a/include/hw/rtc/mc146818rtc.h b/include/hw/rtc/mc146818rtc.h index 5b45b22924..c7586589ad 100644 --- a/include/hw/rtc/mc146818rtc.h +++ b/include/hw/rtc/mc146818rtc.h @@ -26,6 +26,7 @@ struct RTCState { uint8_t cmos_data[128]; uint8_t cmos_index; int32_t base_year; + uint32_t isairq; uint64_t base_rtc; uint64_t last_update; int64_t offset; --=20 2.35.1 From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164555905052148.706039085005045; Tue, 22 Feb 2022 11:44:10 -0800 (PST) Received: from localhost ([::1]:36466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMb4z-0003kw-DT for importer@patchew.org; Tue, 22 Feb 2022 14:44:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46560) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMaw5-0003JF-Ni; Tue, 22 Feb 2022 14:34:59 -0500 Received: from [2a00:1450:4864:20::531] (port=46938 helo=mail-ed1-x531.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMaw3-0006pg-Ut; Tue, 22 Feb 2022 14:34:57 -0500 Received: by mail-ed1-x531.google.com with SMTP id s1so6332065edd.13; Tue, 22 Feb 2022 11:34:55 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.34.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:34:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PhyuktrkWy4e5TMw2cdB1vt2X+4+1uiUI5Kq4ZX1GHU=; b=JRoSC7uZ1OzLniBubmDdh4zh5ea0HdbH/A4JpGsGR96E257YeCG3f+JvF154yygdxV VzJoz6fnUyQM3kROjihzC62/HBVpOW4C9404O1XBosxTTXOAY3AkF0p4xBlU5gfl117q 0us+2iStGniI4ts4Tpl471NPMEksEH0p/s3g5Yo/3elUOBTaBz5t8wdNXiwr8v98dliV 8XUkwBt5xT7C75UF+8t0BCxRNX/CXvLpOt6cSm1ppgeNyANGw5l4WLuJuz6NBiMNBYXT DLgP1sid37UxyKMehC2uVopdF+W3LysM3bGBQ1nFDZrugpaGz5T3x69UNJJUZn7FXkfE wasQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PhyuktrkWy4e5TMw2cdB1vt2X+4+1uiUI5Kq4ZX1GHU=; b=36epW2cdYWZLItSkHgqtQE46D0vTPdDGJHXT+ItWbiOJVN/tIp0SnoKssU3ddr7DRm dIfaOcf5y+XTau/YUbd7pZ2iRKlzL9HwugX6eMz6b3KCU8Q6fxUK/HVuEUzsV1VYsf4C fUOSW0nciCA98JY5s4IW8yrLguclsLqnxiNm1/L9nRrVBGVcjQs3QUd1aXnMk5l+Vik+ oWyCo6UmKhbSvRZIyXlb/eFT9mCQNZ/6B0TxUh1gzZmnoPfJnr7eFN4dOu9xamj5W7dD N6hTanIqHsnIWBt+yhwxy/bPf4UKp3uFpwH89MuWghv6+MAEv8nNQSHUgd1S9Uf/GWUq TEtg== X-Gm-Message-State: AOAM530MQOVWRu4SFfXMT5/cTWY0/8KPlhkkBAqKynsa8bLcokMGGBmq aCZw8UshSs4YPNOCBqeWRU6nhjjRAgk= X-Google-Smtp-Source: ABdhPJxA8P4OyxP7IaV/yN1IekL1xUfMEWvcldcPZbuo7W0UMjEBde6AbvLmF9mXzn6NODKJueEXXg== X-Received: by 2002:a05:6402:128d:b0:410:f204:6ec2 with SMTP id w13-20020a056402128d00b00410f2046ec2mr28392025edv.104.1645558494312; Tue, 22 Feb 2022 11:34:54 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 02/22] hw/rtc/m48t59-isa: QOM'ify IRQ number Date: Tue, 22 Feb 2022 20:34:26 +0100 Message-Id: <20220222193446.156717-3-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::531 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::531; envelope-from=shentey@gmail.com; helo=mail-ed1-x531.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "open list:PReP" , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Bernhard Beschow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1645559051719100001 Content-Type: text/plain; charset="utf-8" Exposing the IRQ number as a QOM property not only allows it to be configurable but also to be printed by standard QOM mechanisms. This allows isabus_dev_print() to be retired eventually. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/rtc/m48t59-isa.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/hw/rtc/m48t59-isa.c b/hw/rtc/m48t59-isa.c index dc21fb10a5..cd63138e1e 100644 --- a/hw/rtc/m48t59-isa.c +++ b/hw/rtc/m48t59-isa.c @@ -42,6 +42,7 @@ struct M48txxISAState { ISADevice parent_obj; M48t59State state; uint32_t io_base; + uint32_t isairq; MemoryRegion io; }; =20 @@ -79,6 +80,7 @@ static void m48txx_isa_toggle_lock(Nvram *obj, int lock) static Property m48t59_isa_properties[] =3D { DEFINE_PROP_INT32("base-year", M48txxISAState, state.base_year, 0), DEFINE_PROP_UINT32("iobase", M48txxISAState, io_base, 0x74), + DEFINE_PROP_UINT32("irq", M48txxISAState, isairq, 8), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -97,9 +99,14 @@ static void m48t59_isa_realize(DeviceState *dev, Error *= *errp) M48txxISAState *d =3D M48TXX_ISA(dev); M48t59State *s =3D &d->state; =20 + if (d->isairq >=3D ISA_NUM_IRQS) { + error_setg(errp, "Maximum value for \"irq\" is: %d", ISA_NUM_IRQS = - 1); + return; + } + s->model =3D u->info.model; s->size =3D u->info.size; - isa_init_irq(isadev, &s->IRQ, 8); + isa_init_irq(isadev, &s->IRQ, d->isairq); m48t59_realize_common(s, errp); memory_region_init_io(&d->io, OBJECT(dev), &m48t59_io_ops, s, "m48t59"= , 4); if (d->io_base !=3D 0) { --=20 2.35.1 From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1645558906883692.5563317244236; Tue, 22 Feb 2022 11:41:46 -0800 (PST) Received: from localhost ([::1]:59672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMb2f-0000Nd-TO for importer@patchew.org; Tue, 22 Feb 2022 14:41:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMaw6-0003JG-RE for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:34:59 -0500 Received: from [2a00:1450:4864:20::536] (port=39445 helo=mail-ed1-x536.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMaw4-0006pq-NK for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:34:58 -0500 Received: by mail-ed1-x536.google.com with SMTP id u18so39468741edt.6 for ; Tue, 22 Feb 2022 11:34:56 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.34.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:34:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E5v9sJdRuSNl5R0k0qPpSkgaDz6Zboi7ncKx9yCtn1w=; b=RWsEdDLtI1krnjdDLB3+U0/cF/iy2v4Ol7f9zRCHOlTB4JXzZBbBBsQQWLag8nZsi0 RmE/zVbupfQNL6hWe7mEQPkcp8S/V1N37DcS3RwjXVHYvCrvsgA75qXcqatYbao53hyZ XHyIo54v6bMQTTFd2jNgVsBKTkScGsDaDLOkuIVhhKHH1Rkr4ivljaCcoL+0o16yzu7G KsX+YPMnpI4t8UfqmLy2obDteUKD5yJOzB/EtMphVSQi0+TSbL3Xj2mLutoaSPsAKqit lyIu1G/3/LBtS+8lNHhqiZ7g8t42lOoSxHNdT1rPTLzSJdCj/AkGgYe+fodH4MtljGTj Ji9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E5v9sJdRuSNl5R0k0qPpSkgaDz6Zboi7ncKx9yCtn1w=; b=EXQ+A6bGFUB6nYeJYmqn1rZIGQu7x9L/6ZHBDBDIOFiGIds9gTzlzEqzZekBgkXuM3 DG6SrmuthlCdJAZl7AtsBgA9S+zBFx6S41wzgpLE8WJA93Rz+RrLUMJFOh2+R/eDZaXz z9BFXHuIUzWeRMNLSSGbL8tt6evwINMa7fuG0MitU2TEhs9SCN4YGWeevlAZ0UoAcpNt RGBgxouPBQ4nSVNZtnbyyf9oYCf6B/rxnNo5p137/l3JupDnzwQlAlbb2I9WvhG8zBnR e8D1WYpTNhnwWrBCwYowrDQeESrIslZaWzkEyZ6Qcio0n7N4SjTLWemUEgoqGn5Cdxvt Og0A== X-Gm-Message-State: AOAM531l0wSIalMmPCBxdPBXfX5EeVqoGRXiscP/GulFE8pCvceeV0jY btvyFlAcaId9sEqPKwqGgbC6T1IFERA= X-Google-Smtp-Source: ABdhPJzCEsulX7hDfP+0i6PBA5KIECYo9Euz4ypV1yNX2UhujsZZCf2MIcXq7BGSzrmaBiq3PB78Wg== X-Received: by 2002:a05:6402:5248:b0:410:a105:49 with SMTP id t8-20020a056402524800b00410a1050049mr28124323edd.214.1645558495328; Tue, 22 Feb 2022 11:34:55 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 03/22] hw/input/pckbd: QOM'ify IRQ numbers Date: Tue, 22 Feb 2022 20:34:27 +0100 Message-Id: <20220222193446.156717-4-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::536 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=shentey@gmail.com; helo=mail-ed1-x536.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Bernhard Beschow , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1645558908454100001 Content-Type: text/plain; charset="utf-8" Exposing the IRQ numbers as a QOM properties not only allows them to be configurable but also to be printed by standard QOM mechanisms. This allows isabus_dev_print() to be retired eventually. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/input/pckbd.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index baba62f357..56c55c5768 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -26,6 +26,7 @@ #include "qemu/error-report.h" #include "qemu/log.h" #include "qemu/timer.h" +#include "qapi/error.h" #include "hw/isa/isa.h" #include "migration/vmstate.h" #include "hw/acpi/aml-build.h" @@ -671,6 +672,8 @@ struct ISAKBDState { KBDState kbd; bool kbd_throttle; MemoryRegion io[2]; + uint32_t kbd_irq; + uint32_t mouse_irq; }; =20 void i8042_isa_mouse_fake_event(ISAKBDState *isa) @@ -734,8 +737,20 @@ static void i8042_realizefn(DeviceState *dev, Error **= errp) ISAKBDState *isa_s =3D I8042(dev); KBDState *s =3D &isa_s->kbd; =20 - isa_init_irq(isadev, &s->irq_kbd, 1); - isa_init_irq(isadev, &s->irq_mouse, 12); + if (isa_s->kbd_irq >=3D ISA_NUM_IRQS) { + error_setg(errp, "Maximum value for \"kbd-irq\" is: %d", + ISA_NUM_IRQS - 1); + return; + } + + if (isa_s->mouse_irq >=3D ISA_NUM_IRQS) { + error_setg(errp, "Maximum value for \"mouse-irq\" is: %d", + ISA_NUM_IRQS - 1); + return; + } + + isa_init_irq(isadev, &s->irq_kbd, isa_s->kbd_irq); + isa_init_irq(isadev, &s->irq_mouse, isa_s->mouse_irq); =20 isa_register_ioport(isadev, isa_s->io + 0, 0x60); isa_register_ioport(isadev, isa_s->io + 1, 0x64); @@ -754,6 +769,7 @@ static void i8042_realizefn(DeviceState *dev, Error **e= rrp) =20 static void i8042_build_aml(ISADevice *isadev, Aml *scope) { + ISAKBDState *isa_s =3D I8042(isadev); Aml *kbd; Aml *mou; Aml *crs; @@ -761,7 +777,7 @@ static void i8042_build_aml(ISADevice *isadev, Aml *sco= pe) crs =3D aml_resource_template(); aml_append(crs, aml_io(AML_DECODE16, 0x0060, 0x0060, 0x01, 0x01)); aml_append(crs, aml_io(AML_DECODE16, 0x0064, 0x0064, 0x01, 0x01)); - aml_append(crs, aml_irq_no_flags(1)); + aml_append(crs, aml_irq_no_flags(isa_s->kbd_irq)); =20 kbd =3D aml_device("KBD"); aml_append(kbd, aml_name_decl("_HID", aml_eisaid("PNP0303"))); @@ -769,7 +785,7 @@ static void i8042_build_aml(ISADevice *isadev, Aml *sco= pe) aml_append(kbd, aml_name_decl("_CRS", crs)); =20 crs =3D aml_resource_template(); - aml_append(crs, aml_irq_no_flags(12)); + aml_append(crs, aml_irq_no_flags(isa_s->mouse_irq)); =20 mou =3D aml_device("MOU"); aml_append(mou, aml_name_decl("_HID", aml_eisaid("PNP0F13"))); @@ -783,6 +799,8 @@ static void i8042_build_aml(ISADevice *isadev, Aml *sco= pe) static Property i8042_properties[] =3D { DEFINE_PROP_BOOL("extended-state", ISAKBDState, kbd.extended_state, tr= ue), DEFINE_PROP_BOOL("kbd-throttle", ISAKBDState, kbd_throttle, false), + DEFINE_PROP_UINT32("kbd-irq", ISAKBDState, kbd_irq, 1), + DEFINE_PROP_UINT32("mouse-irq", ISAKBDState, mouse_irq, 12), DEFINE_PROP_END_OF_LIST(), }; =20 --=20 2.35.1 From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1645558833412509.6204414965862; Tue, 22 Feb 2022 11:40:33 -0800 (PST) Received: from localhost ([::1]:56192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMb1T-0006NU-JA for importer@patchew.org; Tue, 22 Feb 2022 14:40:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMaw8-0003K4-ON; Tue, 22 Feb 2022 14:35:03 -0500 Received: from [2a00:1450:4864:20::630] (port=40490 helo=mail-ej1-x630.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMaw6-0006q4-66; Tue, 22 Feb 2022 14:35:00 -0500 Received: by mail-ej1-x630.google.com with SMTP id p15so45936317ejc.7; Tue, 22 Feb 2022 11:34:57 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.34.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:34:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U03uat2K/JdNuPwOAoEK+Plxb6frNDBLdlFpMsBFliQ=; b=hjy780DN8mmFiEC2w+xzvCylGRow5+jhZby8vzclLBizPSpX0NKMucqvbKG7QUSHnq TaodmjpaWrnS+1mOH9mW9WkjckC2iufkBOmhXW6nZMcl01GJwpSdhkxG6jlcIUkfRlMb 0LlIwQlEc6BUWbR8vH7tKDJE9f4vpX9Xd/y8dDYaElUOfDxmHKnrAP3ADfyeWxxGGOa8 Mymt3K20luX3BLX3kHImb3s45z4X4A6HFv6Mf480qoiOJbO0u9gGAPxHJWlN8CFTLpZM M4Z/Kqp3II5OaMozUswQU9hYqhZ1BbVBCSwiYQEZiZKlfrpW+4X7FMZZKDI1Ynvb+xvb 5D3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U03uat2K/JdNuPwOAoEK+Plxb6frNDBLdlFpMsBFliQ=; b=1BR2uI8X7vealoJZxHub+JZgjAUBpTzsb9BFlneml7V36WLCXKwrzYa/JPGX7pDS3p EuIkfrEXcYdXlfZy3JicgAHX87rpuyYIuNAea6WnQKpBzMgbWGZKLYLUfTqig+EhbbNV kRTShFH13iWI96Ang5NDQN+Slc4ciLqu0mbK5TvuCmuQ/eAkRLeUcT/jCvYLgwAbbPi4 08GZQnpwBW46lSx0Ip7tO6et/dVnbQLr+dM08CoJPZXv3Iu2CtF0mRlmc5L8BKIzSskC pmq3gAafkypnec1KDMarMOO1zv5L9GOpDLhYrn5uCRTVc9qaK/FYQzK+NbY1lq+9ETU6 Gweg== X-Gm-Message-State: AOAM531KbBgd+LXG+UypTK9Zb1fidzjBTXK+SGrwkhxxJEobamqLjX4e 8dgtMYQhGA3tvwYeH5lYoKPS7d9u5Tk= X-Google-Smtp-Source: ABdhPJyQiqk6xL/IJ2xjc+YkQxClzUuFEAbhEtrfvzm/SwJCK+vpDIs+ST0F1McDwEhEwxA1Qj9oRg== X-Received: by 2002:a17:907:954f:b0:6ad:3614:73e6 with SMTP id ex15-20020a170907954f00b006ad361473e6mr20712148ejc.731.1645558496306; Tue, 22 Feb 2022 11:34:56 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 04/22] hw/isa/isa-bus: Remove isabus_dev_print() Date: Tue, 22 Feb 2022 20:34:28 +0100 Message-Id: <20220222193446.156717-5-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::630 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::630; envelope-from=shentey@gmail.com; helo=mail-ej1-x630.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Hanna Reitz , Bernhard Beschow , "open list:Block layer core" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1645558835436100003 Content-Type: text/plain; charset="utf-8" All isabus_dev_print() did was to print up to two IRQ numbers per device. This is redundant if the IRQ numbers are present as QOM properties (see e.g. the modified tests/qemu-iotests/172.out). Now that the last devices relying on isabus_dev_print() had their IRQ numbers QOM'ified, the contribution of this function ultimately became redundant. Remove it. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/isa-bus.c | 16 ---------------- tests/qemu-iotests/172.out | 26 -------------------------- 2 files changed, 42 deletions(-) diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index 6c31398dda..af5add6a26 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -21,21 +21,18 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "qapi/error.h" -#include "monitor/monitor.h" #include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "hw/isa/isa.h" =20 static ISABus *isabus; =20 -static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent); static char *isabus_get_fw_dev_path(DeviceState *dev); =20 static void isa_bus_class_init(ObjectClass *klass, void *data) { BusClass *k =3D BUS_CLASS(klass); =20 - k->print_dev =3D isabus_dev_print; k->get_fw_dev_path =3D isabus_get_fw_dev_path; } =20 @@ -222,19 +219,6 @@ void isa_build_aml(ISABus *bus, Aml *scope) } } =20 -static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent) -{ - ISADevice *d =3D ISA_DEVICE(dev); - - if (d->isairq[1] !=3D -1) { - monitor_printf(mon, "%*sisa irqs %d,%d\n", indent, "", - d->isairq[0], d->isairq[1]); - } else if (d->isairq[0] !=3D -1) { - monitor_printf(mon, "%*sisa irq %d\n", indent, "", - d->isairq[0]); - } -} - static void isabus_bridge_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); diff --git a/tests/qemu-iotests/172.out b/tests/qemu-iotests/172.out index 4cf4d536b4..9479b92185 100644 --- a/tests/qemu-iotests/172.out +++ b/tests/qemu-iotests/172.out @@ -15,7 +15,6 @@ Testing: fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -43,7 +42,6 @@ Testing: -fda TEST_DIR/t.qcow2 fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -81,7 +79,6 @@ Testing: -fdb TEST_DIR/t.qcow2 fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -135,7 +132,6 @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2 fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -190,7 +186,6 @@ Testing: -fdb fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -230,7 +225,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -268,7 +262,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2,ind= ex=3D1 fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -322,7 +315,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -dr= ive if=3Dfloppy,file=3DTEST_DIR/t fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -380,7 +372,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -devi= ce floppy,drive=3Dnone0 fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -418,7 +409,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -devi= ce floppy,drive=3Dnone0,unit=3D1 fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -456,7 +446,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -driv= e if=3Dnone,file=3DTEST_DIR/t.qco fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -520,7 +509,6 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -575,7 +563,6 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -630,7 +617,6 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -685,7 +671,6 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -749,7 +734,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -dr= ive if=3Dnone,file=3DTEST_DIR/t.q fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -804,7 +788,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -dr= ive if=3Dnone,file=3DTEST_DIR/t.q fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -865,7 +848,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -glob= al floppy.drive=3Dnone0 -device fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -933,7 +915,6 @@ Testing: -device floppy fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -958,7 +939,6 @@ Testing: -device floppy,drive-type=3D120 fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -983,7 +963,6 @@ Testing: -device floppy,drive-type=3D144 fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -1008,7 +987,6 @@ Testing: -device floppy,drive-type=3D288 fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -1036,7 +1014,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,drive-t fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -1074,7 +1051,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,drive-t fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -1115,7 +1091,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,logical fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" @@ -1153,7 +1128,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,physica fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" - isa irq 6 bus: floppy-bus.0 type floppy-bus dev: floppy, id "" --=20 2.35.1 From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16455592417571001.6773271223735; Tue, 22 Feb 2022 11:47:21 -0800 (PST) Received: from localhost ([::1]:45340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMb84-0001MU-No for importer@patchew.org; Tue, 22 Feb 2022 14:47:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMaw8-0003K5-Ud; Tue, 22 Feb 2022 14:35:01 -0500 Received: from [2a00:1450:4864:20::52b] (port=37674 helo=mail-ed1-x52b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMaw7-0006qK-58; Tue, 22 Feb 2022 14:35:00 -0500 Received: by mail-ed1-x52b.google.com with SMTP id q17so39658277edd.4; Tue, 22 Feb 2022 11:34:58 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.34.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:34:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XDgj4joug7f4HE4WKfuyWjX5As+7XR/H8T7Cnx16Sm4=; b=Uk4Dx+ry0+Xt/6Yw8JQEp4so2xBU5HPWqCMjAs7948QQxJyFOzmz0oEE8F0lIkWTRK VNdbjYNOxKtqYyow7Vz5VBXc7w81o+rBuusMgyI93PM23BWZSvCa4VJmQVH5luHklHnG JO+JvW4ag9jHoTCIOIuiL1cLrqPNruAnIpBxVk3sab+VFhVUHAVicg0N8/bueZvD+UqX TmG6m0g/ndEI5Nbb3VCfyHFqgSxAio0zJa9LQsN0KG8gt0rv+UUZ/B0I6qrS6hiKfVx8 hJjLNWY5luy39gEIlziu4G/3c9FabkW8oBxpRenNhO96otLXW2mObRJCaPvSx9uNmoZp 92yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XDgj4joug7f4HE4WKfuyWjX5As+7XR/H8T7Cnx16Sm4=; b=J1Q+2WA+hpnZTaVmL0UOXklt6n1pHyxgOYR2bfaTURJxijObjLA8t5PxE+PHTrirgc MmWcgOMTVkgsx2FbuXudOBOyYqYUD4JuEvtdzW3QqdMejTohKxf6HQBukgrC7rURBMBh djlsHpmcDR0nbyYQv0wCK2SoBg+1HEwNzQPilS6V/CUrmHFcQs7mgGTVWAXOsLSQEivg EAHcfYlQpJGgRtxc3CW1kdXSyIavVRwHNuC0+G5+oMCFO23eGx91/MpsA3SOGSUq5ypY WZuFKGGrnlevXJRFxYSuKfyVgSpSbKkVIqkuH7flzoP4YfUgGIYE3z3ClgUJQfzMjuxh YSmg== X-Gm-Message-State: AOAM532m7+ZATqCvgQwMb/MNNcWkEghhmyiXIPgZQLCmaTySFpZjXnMP YoXtURwFx6JnSR/O2lM4aY1ZqU0To7M= X-Google-Smtp-Source: ABdhPJwgJ4+i5A45xPbmsguqQCfYNyXPOYF4ScwElZCoAG7tjB9I3zs9hfcZySGKO4vgKgNj3g2OCA== X-Received: by 2002:a05:6402:2748:b0:408:c807:8db7 with SMTP id z8-20020a056402274800b00408c8078db7mr27926572edd.4.1645558497479; Tue, 22 Feb 2022 11:34:57 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 05/22] hw/ppc/pnv: Determine ns16550's IRQ number from QOM property Date: Tue, 22 Feb 2022 20:34:29 +0100 Message-Id: <20220222193446.156717-6-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52b (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52b; envelope-from=shentey@gmail.com; helo=mail-ed1-x52b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "open list:PowerNV Non-Virt..." , Bernhard Beschow , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1645559244125100001 Content-Type: text/plain; charset="utf-8" Determine the IRQ number in the same way as for isa-ipmi-bt. This resolves the last usage of ISADevice::isairq[] which allows it to be removed. Signed-off-by: Bernhard Beschow Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/pnv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 837146a2fb..1e9f6b0690 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -380,9 +380,12 @@ static void pnv_dt_serial(ISADevice *d, void *fdt, int= lpc_off) cpu_to_be32(io_base), cpu_to_be32(8) }; + uint32_t irq; char *name; int node; =20 + irq =3D object_property_get_int(OBJECT(d), "irq", &error_fatal); + name =3D g_strdup_printf("%s@i%x", qdev_fw_name(DEVICE(d)), io_base); node =3D fdt_add_subnode(fdt, lpc_off, name); _FDT(node); @@ -394,7 +397,7 @@ static void pnv_dt_serial(ISADevice *d, void *fdt, int = lpc_off) =20 _FDT((fdt_setprop_cell(fdt, node, "clock-frequency", 1843200))); _FDT((fdt_setprop_cell(fdt, node, "current-speed", 115200))); - _FDT((fdt_setprop_cell(fdt, node, "interrupts", d->isairq[0]))); + _FDT((fdt_setprop_cell(fdt, node, "interrupts", irq))); _FDT((fdt_setprop_cell(fdt, node, "interrupt-parent", fdt_get_phandle(fdt, lpc_off)))); =20 --=20 2.35.1 From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1645559417; cv=none; d=zohomail.com; s=zohoarc; b=ALCqbPpE7h1eU1bDMdUyJvmPt4xssKCNBp3E6TAxlkYkoRyfCzA0Ry3uA1/7FPlMRfN1DMgxaVGdBZmyzqu0Mt9KhCIbok1wOMh0vuvU07MzhKG4AZvjobEw3ybx+sLESXEiCEwScTvkuY5r8m8RJUpAfQ4Cwi0z3Rh5lEETMAk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645559417; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NSkH+rZ7LIEEh7cIevAxKcBEWeFcCPnBblGfAJiA4f4=; b=CVk4eB6CNaWjHxT2BtNGcY9RYGgBUM4zpQGBGEnnE/F1jZ/5k9QSk3kwFgpf++cBSopbDq5J9JHrioHB4du/c5b2KU7U2rZVPKhxDKYqYuaOa3l4y50Y10/SHaSHcDjfKnQnaKZLLqXmIhn1/5XbjkBFuOrh1O7Yc7mDTMpK7Rw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1645559417193254.55587866783117; Tue, 22 Feb 2022 11:50:17 -0800 (PST) Received: from localhost ([::1]:53534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMbAu-0006nF-5B for importer@patchew.org; Tue, 22 Feb 2022 14:50:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMaw9-0003KA-NA for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:03 -0500 Received: from [2a00:1450:4864:20::62b] (port=46943 helo=mail-ej1-x62b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMaw7-0006qW-Oc for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:01 -0500 Received: by mail-ej1-x62b.google.com with SMTP id qx21so45965009ejb.13 for ; Tue, 22 Feb 2022 11:34:59 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.34.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:34:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NSkH+rZ7LIEEh7cIevAxKcBEWeFcCPnBblGfAJiA4f4=; b=nYl/o2iyEuQGBlrJTGT9d8EK/cjnRcuQod1VLAwuHmy5I4d9sCqdD0lTwMHcRjXfO0 czbb+QFrCgH1xzr4tMiRO8uTdW+h3kr4bOd0hJrhP6nAL7YeNpc1+qveOLTo2pZHeHmu LBo71KaB5u+aULMSOjIJjE3o0TTIpCq0E7713dm58JgeLSikTgPQYCk3iXLmPNGoOLOF k+UXpD3lKjxcFvrYZJH+7JGkPb3ipVfJSrU8PzBYjMIVJRQwbF57AzmNleYFEyOWvdXf uzMyZdBzEe8ejl1OPSGTSqmUl/PyHBzhVMHAxEY+wUfmi9w66euP8NfclYGn76PKykgy KUGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NSkH+rZ7LIEEh7cIevAxKcBEWeFcCPnBblGfAJiA4f4=; b=yWtdyiktEZjDjrnLR1wf/k1ZeJKqL8OhUjFoyFyGDElH1BZ6wPQQqWxR3bLw9ZozB0 KU38KrBVH58DHsNbz08PvSDZ+Icq+GUFx8ZHCcPbJrESDpAqj1SyXqhIAUApoGOEDRlm hAmhsMgZUwLkRTtuZHecmrlc99iEpX4CV0y/u9J6jRLUtAZTB+fakR9/ke+5E1uNDyLI tAm/O7LxnMQCacZHfOvxcUgY8C6icAymDHdvPhcLokw2GqE2S7tOp3yN/G4JaiNYg1bn 4xRU6UaunQUKNVehWGcp+IlaE9ucc4JQanUtLYLlPD0ODAHSF52b3LwzwK+9wo22mxyL bKmw== X-Gm-Message-State: AOAM5333uiQxEhR/yifRa1Q0C6Q8tFe1aT1KJtFY747aZo7sYdhxN3bx nj3n8Bxh1bxxtXtwn2HNhV6TbUqudtw= X-Google-Smtp-Source: ABdhPJwYLWqVnrq9jcPvD4VCJETVS++WNedlUmGm5VYQNvXqgyg2iA1i3Y+bRCDiSSKFnLDEnpIm8A== X-Received: by 2002:a17:906:95d5:b0:6b3:2e97:25ab with SMTP id n21-20020a17090695d500b006b32e9725abmr20892951ejy.322.1645558498348; Tue, 22 Feb 2022 11:34:58 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 06/22] isa: Drop unused attributes from ISADevice Date: Tue, 22 Feb 2022 20:34:30 +0100 Message-Id: <20220222193446.156717-7-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62b (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=shentey@gmail.com; helo=mail-ej1-x62b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernhard Beschow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1645559418627100001 Content-Type: text/plain; charset="utf-8" Now that the last users of ISADevice::isairq[] have been resolved during the previous commits, it can be removed for good. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/isa-bus.c | 13 ------------- include/hw/isa/isa.h | 2 -- 2 files changed, 15 deletions(-) diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index af5add6a26..c64a14120b 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -87,11 +87,7 @@ qemu_irq isa_get_irq(ISADevice *dev, unsigned isairq) =20 void isa_init_irq(ISADevice *dev, qemu_irq *p, unsigned isairq) { - assert(dev->nirqs < ARRAY_SIZE(dev->isairq)); - assert(isairq < ISA_NUM_IRQS); - dev->isairq[dev->nirqs] =3D isairq; *p =3D isa_get_irq(dev, isairq); - dev->nirqs++; } =20 void isa_connect_gpio_out(ISADevice *isadev, int gpioirq, unsigned isairq) @@ -150,14 +146,6 @@ int isa_register_portio_list(ISADevice *dev, return 0; } =20 -static void isa_device_init(Object *obj) -{ - ISADevice *dev =3D ISA_DEVICE(obj); - - dev->isairq[0] =3D -1; - dev->isairq[1] =3D -1; -} - ISADevice *isa_new(const char *name) { return ISA_DEVICE(qdev_new(name)); @@ -244,7 +232,6 @@ static const TypeInfo isa_device_type_info =3D { .name =3D TYPE_ISA_DEVICE, .parent =3D TYPE_DEVICE, .instance_size =3D sizeof(ISADevice), - .instance_init =3D isa_device_init, .abstract =3D true, .class_size =3D sizeof(ISADeviceClass), .class_init =3D isa_device_class_init, diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index d4417b34b6..d80cab5b79 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -83,8 +83,6 @@ struct ISADevice { DeviceState parent_obj; /*< public >*/ =20 - int8_t isairq[2]; /* -1 =3D unassigned */ - int nirqs; int ioport_id; }; =20 --=20 2.35.1 From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1645559237; cv=none; d=zohomail.com; s=zohoarc; b=Iek5bYYbNRCVYHSg+nQWOO6mch46TIuYnySSWT6OsU6nPLC11B0N3tn0dDAlHcBywkBvEjPUHpf0kmqe3kLVpAikXiQWGUMh2HvoBpiIcBH8FobvfRP5RS3pFDLB2EFNQfb9N4iqXpi12CWE1Dg0OOrvx6pBbf67UT1YM2zDgR0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645559237; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=v+v6TfEZmb9wwuiX3YkPxG5IdVxlkTReFcgd8M252ME=; b=RggggdYRs4SYtsRzAxQYRXXbS900/WriHIvDyiTTNmnra2zx4jbbTDKWpqh9FC0vRLXxpxZnO0wIM8qMJSk2swf8WDAC0LGVOvhaoz/ZzM1bRfRUhp+cc7NjlFK15wFCe5bB326ig3tmzuM9T24OMZq2KzZmYkrdkciDkaT+eeI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1645559237163155.48836581800606; Tue, 22 Feb 2022 11:47:17 -0800 (PST) Received: from localhost ([::1]:45018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMb80-0001A7-5X for importer@patchew.org; Tue, 22 Feb 2022 14:47:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMawA-0003KC-IQ for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:04 -0500 Received: from [2a00:1450:4864:20::52c] (port=42684 helo=mail-ed1-x52c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMaw8-0006qd-CX for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:02 -0500 Received: by mail-ed1-x52c.google.com with SMTP id i11so37726597eda.9 for ; Tue, 22 Feb 2022 11:35:00 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.34.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:34:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v+v6TfEZmb9wwuiX3YkPxG5IdVxlkTReFcgd8M252ME=; b=Osg8/QJBtE8CqZXdEDhq3Zkh60kO1DwG+Ns0KrWkUV+I3eLmcDI5+4NRj8646VW4hU XHlybaRxnDQcJZ9myulfx9BXlKqGEtNiKZafxao4KzuoytmJ7tuovuSLTymxdrAaMAs0 snEmL4LWz9JhAyYLDkg8rM3fsJkhenf22j/VIHbBLAwrNMj38SQUNi+B8M6ZWwR2OAV3 xOiGYyL8YSDbeGbNwbc3LiRBvHX3d19Xuunz/JVx4X2WFppifVzt6/VxzB9VW9pzF0pC 3IAMbNQ/OgtmM8QIRB/S75PSwVhwllAkTgLd0R8iLu0b3chFsgwww+mLTaDfZqKv9Gm9 olgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=v+v6TfEZmb9wwuiX3YkPxG5IdVxlkTReFcgd8M252ME=; b=RcvbliJk8JHCW3ddEJYIhGjxoaUKKGPb4oLv1rSAAk4pOJYXvzNOVoNWOFwPB8qwXW yLqvQORU9EfK5ddRnvzannT+DzEaUTLLuw7DsSz67WjGws65k6gdMEj1Le+4if0ZOff6 yQ+6naABYzfQ3WRg9xicl8vK8wheIT+h3WE8HAty9wbDLWSmgCq22uQOn8KE4FV9tzjj snPXRz29+dtKGgOC+LFtOKpN7PkC/jY32teYv9I4T7LN6uSCvTcG1Saf9er24fGebs7m FFXzYE6hcZEYKAlAwUv5WuHxWPw+o2jaJByko0VbyJ0vfMEt5D9smkBxFY28pste0M4s o7yA== X-Gm-Message-State: AOAM533uFrcVppY43CBZCdeL3SlBJXAE3jG9wJKID6udQJ3G62kBca6w WDsfR3qg0PO28z2nKSbq6H6WZ3ctsbA= X-Google-Smtp-Source: ABdhPJyLYnGVJ9A4g8pzIRy7jKasvB1Iygd9w4UjRwl0dB3+0s1GWzoxl2wTMQp6KeEmqt8fVU3VQw== X-Received: by 2002:a05:6402:144b:b0:410:b990:a68a with SMTP id d11-20020a056402144b00b00410b990a68amr28012976edx.25.1645558499105; Tue, 22 Feb 2022 11:34:59 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 07/22] hw/audio/cs4231a: Disuse isa_init_irq() Date: Tue, 22 Feb 2022 20:34:31 +0100 Message-Id: <20220222193446.156717-8-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52c (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=shentey@gmail.com; helo=mail-ed1-x52c.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernhard Beschow , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1645559238119100001 Content-Type: text/plain; charset="utf-8" isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually. Signed-off-by: Bernhard Beschow Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/audio/cs4231a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c index 7d60ce6f0e..0723e39430 100644 --- a/hw/audio/cs4231a.c +++ b/hw/audio/cs4231a.c @@ -677,7 +677,7 @@ static void cs4231a_realizefn (DeviceState *dev, Error = **errp) return; } =20 - isa_init_irq(d, &s->pic, s->irq); + s->pic =3D isa_get_irq(d, s->irq); k =3D ISADMA_GET_CLASS(s->isa_dma); k->register_channel(s->isa_dma, s->dma, cs_dma_read, s); =20 --=20 2.35.1 From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1645559111; cv=none; d=zohomail.com; s=zohoarc; b=aznS7Y2DC0sKKq6vDIrOo7No8AOy6mTXmhrR5mfuOd1ETzC3Kkc9M4jA65ePEx9yJSS/Ir3niqTDfwikuZPmb2sSY0p/8fVAlbaPCyKM6LCWcoJOkWPWZfDSwnNwf5axp9YVHEHlxB4orwqPWBiu2kSgAap6PFNhZzKNaSS/gDw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645559111; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CmvV1KBAyLb40CrSZESm4OuVCUBSwXaZp8sAs9w/www=; b=foKc5Doofs0LUtEEbmeT7XfmbGjQlaYjEh0xMiqWXzSRMcHGof0LuXA8h2YEMmN+2WiGLm45BN/HwOlrqA6fL5ZNSM6N5loJXWmB5BlSr3M8JF1mgtQWc1ZC0yJYsJZ6oB3vFxkXNFQzDao55UDSv7hejSqrfbQSqmDglpjMlCQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1645559111050286.6025822399139; Tue, 22 Feb 2022 11:45:11 -0800 (PST) Received: from localhost ([::1]:40020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMb5y-00067K-44 for importer@patchew.org; Tue, 22 Feb 2022 14:45:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMawB-0003KD-53 for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:04 -0500 Received: from [2a00:1450:4864:20::632] (port=46950 helo=mail-ej1-x632.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMaw9-0006qq-AL for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:02 -0500 Received: by mail-ej1-x632.google.com with SMTP id qx21so45965151ejb.13 for ; Tue, 22 Feb 2022 11:35:00 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.34.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:34:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CmvV1KBAyLb40CrSZESm4OuVCUBSwXaZp8sAs9w/www=; b=X3LQF2WeT7RC8qAvQGavLZolJU73UOAttU0npTkfKeezDKZ8IkfJC/4WlYUZigWzLe H14fueU3r33eSbtQPJbChZlb0oW3N4QIRE1NaZ5xtMc7PQ3nZKB66CsA97uvLbOmZ62A a+VAmbh72rfLCM59nXvVT/2mEmWkz5GbKqcK0bJvP5EGabGOMt6v+WwJap252sNyZQwd ZZVgP0c/gArwQ/YYfZ7R6+cQOkIZHIB8HsbONSappV6MZIbH0IuKI0dlw+VhqTVYIRzN rHJOwhxqP2FXUGyKQDmLuF1rCpslyftfVlW7mDoDaTdvMMM7gedAEJLE64GUIJcW8x4d fh6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CmvV1KBAyLb40CrSZESm4OuVCUBSwXaZp8sAs9w/www=; b=Apcx57pK929mjR5dcq1sn1VsPgliI2BMnwRPnWT8ViusNZV0lstd01rCCAb4/szGGe qatLUFLmZoyas5xN9cQuHvlKIfsQFclkAWl/HCEM2ECxcomKmljIas7nvXRe5pVT4FIW wPaGZB4eVS3FqGhXJ4D2Pv4TTzvzGd2Ziz4rSffJQhU2djxFBHZqLYfWyzvzvugW7tR7 ZoJV/A3nh7tdsv85Fmwx2CaYcrIKGS+uY9m1//ZW6IKiGtC4eXc1YV6tgwIj0WuClruG nHOlFxTtQrxFGqsw7X1kWoBRvDhhiyhD7fHxxClnKZM3cMgw6lxcCGxlxHb9eHOSzLIc TUjQ== X-Gm-Message-State: AOAM531nUxFNhWQDVPRBlQAl8C45HJ/5uOT2f7xRtPKyi+iTc+yAwToR GNTg0FKDta0dXZ/TpSpZZxlOv25oYl8= X-Google-Smtp-Source: ABdhPJz3XXVxoxrZgoGgcrz2rHTX3jJ7KHkXibYm2LlwAF/NFqjDxpnmRKPJ0vTucd1iLJe74gMVjg== X-Received: by 2002:a17:906:e08c:b0:6bb:6f89:7d59 with SMTP id gh12-20020a170906e08c00b006bb6f897d59mr20040911ejb.85.1645558499789; Tue, 22 Feb 2022 11:34:59 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 08/22] hw/audio/gus: Disuse isa_init_irq() Date: Tue, 22 Feb 2022 20:34:32 +0100 Message-Id: <20220222193446.156717-9-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::632 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=shentey@gmail.com; helo=mail-ej1-x632.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernhard Beschow , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1645559112012100001 Content-Type: text/plain; charset="utf-8" isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually. Signed-off-by: Bernhard Beschow Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/audio/gus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/audio/gus.c b/hw/audio/gus.c index e8719ee117..42f010b671 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -282,7 +282,7 @@ static void gus_realizefn (DeviceState *dev, Error **er= rp) s->emu.himemaddr =3D s->himem; s->emu.gusdatapos =3D s->emu.himemaddr + 1024 * 1024 + 32; s->emu.opaque =3D s; - isa_init_irq (d, &s->pic, s->emu.gusirq); + s->pic =3D isa_get_irq(d, s->emu.gusirq); =20 AUD_set_active_out (s->voice, 1); } --=20 2.35.1 From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1645559053; cv=none; d=zohomail.com; s=zohoarc; b=YnL8NrTYIO1zxzGtMXPqA811X0MIDX6HiSbxEC84WEsYyLd5lScP/VcyEofrtXnCQSMp8FC13SUc19jgQZQjVePd6dC97H73dsEjWmkG6uZVUfl7uxR/O69kJTQwxF0whljFiRvbMkWz2AxCtOmUClrh8OLL2N5TysgrhJLSooo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645559053; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yYCWkHPOuJ94dyXJk+F5NkE0t29yoLIYoBmG6Tsv8gE=; b=eQDYCpSxjMxddhCSRfHUS3Z+q2ep99+AL5hFyT5Xq+6nyCFmNDpR5+BLiFrs47Xvd547GGAzl2b0Y25GEgcKpuK8haK2sWv33pGBlSh1Yyn4IaGzBPM+jR4zFBg6YzdkIMlx1ta8tb0OHM89zrdy/Vh+jMBJiCxH7G2BrdRhgqw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1645559053519353.6799565508079; Tue, 22 Feb 2022 11:44:13 -0800 (PST) Received: from localhost ([::1]:36742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMb52-0003vu-Bf for importer@patchew.org; Tue, 22 Feb 2022 14:44:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMawC-0003KH-7c for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:04 -0500 Received: from [2a00:1450:4864:20::629] (port=46942 helo=mail-ej1-x629.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMawA-0006rQ-F0 for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:03 -0500 Received: by mail-ej1-x629.google.com with SMTP id qx21so45965275ejb.13 for ; Tue, 22 Feb 2022 11:35:02 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.34.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:35:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yYCWkHPOuJ94dyXJk+F5NkE0t29yoLIYoBmG6Tsv8gE=; b=mMND920gbBSFh5hlh3ginXE4RCrmnvdYRTb01TeSCZVmti3zvyEM48RqppHxnGdkF8 ErKcQv7j3DGy/qygIMTSuu/ul1Fl9XIe0aLgKmsVDTogqZ4s73FSLcSnOzxgaxlRdaXI GXrmAvnV9/uvHJ24gasLXaeNNXxfJO+6GT6ZUXmZYAA4E0TsEQ9oeoVbvZALH2dxovXv P8tYeMMIGtMrpZMnPvBHT8MCBY9RcMGAcSYBI4ElYZ0FMMV3gQdPRF0tICWTD+jPcntG OEsd+iKijAFi4c4Pb4MuDgX8y220yXfO2o7ymivByFLZeVmpKARVDnD4Wze2SZBhnEtv Eziw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yYCWkHPOuJ94dyXJk+F5NkE0t29yoLIYoBmG6Tsv8gE=; b=CYrq4J5Xq2ZR3ypeR+6nUf1CPr4T8bGnXzgvCScbgFB4bTOY4Mwd90p2Qyw37V5S8J 5n9yIqC/OZViaWIt/n2b00I+l/dWgSWsbhhbFfj1pPXbSOK4Zw/SeMGfWXneWk0bCIVF yLm+0DSikZ34CU6oqHigd1RvZtsvyVumEVEiS/P3DPTUQ2QakKK8sSooG4zXEi+CrLwE x035UtMYh1Dk4f20EHmhrr66OruKljnWB9sNyFLZf23xahR1iNzfPnbxgyjLKMJeDkCa Zro/kGjXj2BYZEvne8ieWCBWUYgkv1/Oy3AtQDz7ONSvS0DMGRegnxcqM+/zeABqAIZ4 3GmA== X-Gm-Message-State: AOAM531CY09EUXVq1Apc0qZcV/6HJ1KEnVnXIEnBVyDojH1p1KJw8aNT KfPIcOvLGAkmPdhV5Tsk7bbJFNKyQ/g= X-Google-Smtp-Source: ABdhPJx1WBzPMIXxUEWCq9EBxHTbmwNI0AlyDgHzDKfW345MwcH9pon4k5BF4Oav2uJSFLKKiE1ZbA== X-Received: by 2002:a17:906:2608:b0:6c9:b248:4dcf with SMTP id h8-20020a170906260800b006c9b2484dcfmr20054080ejc.320.1645558500929; Tue, 22 Feb 2022 11:35:00 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 09/22] hw/audio/sb16: Disuse isa_init_irq() Date: Tue, 22 Feb 2022 20:34:33 +0100 Message-Id: <20220222193446.156717-10-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::629 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=shentey@gmail.com; helo=mail-ej1-x629.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernhard Beschow , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1645559055446100001 Content-Type: text/plain; charset="utf-8" isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually. Signed-off-by: Bernhard Beschow Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/audio/sb16.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c index 60f1f75e3a..2215386ddb 100644 --- a/hw/audio/sb16.c +++ b/hw/audio/sb16.c @@ -1408,7 +1408,7 @@ static void sb16_realizefn (DeviceState *dev, Error *= *errp) return; } =20 - isa_init_irq (isadev, &s->pic, s->irq); + s->pic =3D isa_get_irq(isadev, s->irq); =20 s->mixer_regs[0x80] =3D magic_of_irq (s->irq); s->mixer_regs[0x81] =3D (1 << s->dma) | (1 << s->hdma); --=20 2.35.1 From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1645559762685694.5410253600021; Tue, 22 Feb 2022 11:56:02 -0800 (PST) Received: from localhost ([::1]:37596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMbGT-0006dV-5c for importer@patchew.org; Tue, 22 Feb 2022 14:56:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46740) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMawE-0003Lh-Pc; Tue, 22 Feb 2022 14:35:10 -0500 Received: from [2a00:1450:4864:20::534] (port=35527 helo=mail-ed1-x534.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMawC-0006se-0F; Tue, 22 Feb 2022 14:35:06 -0500 Received: by mail-ed1-x534.google.com with SMTP id bq11so18138184edb.2; Tue, 22 Feb 2022 11:35:03 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.35.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:35:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EeijvT97pxct3XtQrY7wd6pgmajnCOIp6/PW1V9+uSs=; b=Zp6Fh1qF7HC7ykNIoErj9+K/Gjzov3JKBYHUAwrSL0ir6PfjRm8gaDKzLG/1AvkxWA XGHEatWJb6kMW6lWyLEbeO33Sz2Xth34iiGw6R4Krf57uZWxhH+zV6bllqyCKTe3xuI8 yZ/TePO5vYh8lQMx7xrz6MjTOBVGi+dL4OSUCus3L93sbVGuBGulmsVeaCFxVp2954kZ cCmYxG/tJRecgoKIKkKCGfO+05G5n+k4N3DcWov/nhWDvU2rT4KysHC4h5TXKqRDQXH9 dMCKFcFyXE4eZ5PNZeZk9vUD/RiQIeVOTqebpYa21f/EpvuB9SRz/lbItO1M+L0/k0vn lhJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EeijvT97pxct3XtQrY7wd6pgmajnCOIp6/PW1V9+uSs=; b=nbaWEK2WM5Hu9TyOZHwz+nmoMcI3F6H4gGwp53oVupDPt1xA++SEtVM0oCGLAO38pB ZnJhleUrWpPipiEB4ggrjBEHAxQ5VTp347bb5QDqpGm0psybyVg0GNZZ7cSPnmSJGstR fOOyfFoEeNPKqm77De0mb3NV08y5dOyi4lPyIJzVsDWSDiIKFZBpUrqK8hoOJhMwXIjy Xvmi/hTakvG4Dj+WfyCHLzUXl+GTBlfDpqg77/w84mbFS6a9OI6Tww98H7PCL7Qe5cs7 rYFFaUt1MJmZ1/b+FVy4VjYJV+CoHqj9HMGIk0m5RLduhgBShyhWMHEAmu+cQcSIfXBW U8VQ== X-Gm-Message-State: AOAM530qp5A0ZqhodJ0iTEFtzJd+gUEktURD/eQ5tAp/Ai3WgZGEgEas q9A+qyj3McGaZNvVFU5xW/4kitli4fM= X-Google-Smtp-Source: ABdhPJy+1u0dTwGsG02z+fdZXHDkXh9TUBxQxdUZNhD1p3weZO/+Rn7Md8zS7EUXZXqgjfZgCfle0g== X-Received: by 2002:a05:6402:198:b0:410:83e3:21d7 with SMTP id r24-20020a056402019800b0041083e321d7mr28454796edv.159.1645558502064; Tue, 22 Feb 2022 11:35:02 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 10/22] hw/block/fdc-isa: Disuse isa_init_irq() Date: Tue, 22 Feb 2022 20:34:34 +0100 Message-Id: <20220222193446.156717-11-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::534 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=shentey@gmail.com; helo=mail-ed1-x534.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , John Snow , Hanna Reitz , Bernhard Beschow , "open list:Floppy" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1645559764778100001 Content-Type: text/plain; charset="utf-8" isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually. Signed-off-by: Bernhard Beschow Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/fdc-isa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c index ab663dce93..fa20450747 100644 --- a/hw/block/fdc-isa.c +++ b/hw/block/fdc-isa.c @@ -94,7 +94,7 @@ static void isabus_fdc_realize(DeviceState *dev, Error **= errp) isa->iobase, fdc_portio_list, fdctrl, "fdc"); =20 - isa_init_irq(isadev, &fdctrl->irq, isa->irq); + fdctrl->irq =3D isa_get_irq(isadev, isa->irq); fdctrl->dma_chann =3D isa->dma; if (fdctrl->dma_chann !=3D -1) { IsaDmaClass *k; --=20 2.35.1 From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1645559327393287.1347580586706; Tue, 22 Feb 2022 11:48:47 -0800 (PST) Received: from localhost ([::1]:48652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMb9S-0003Wt-DK for importer@patchew.org; Tue, 22 Feb 2022 14:48:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMawG-0003Lo-9g for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:10 -0500 Received: from [2a00:1450:4864:20::52c] (port=42685 helo=mail-ed1-x52c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMawC-000700-8Y for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:07 -0500 Received: by mail-ed1-x52c.google.com with SMTP id i11so37726952eda.9 for ; Tue, 22 Feb 2022 11:35:03 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.35.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:35:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rI52xLFwbXQFqfgLnwofbV81YzDkaqrpGEFiKBHgqXU=; b=mOUIUCiEMMsAcD0BEzCsieFRqUIjoSf2JGAsZ/P7qlHGyXvUHIPyu41IuRwAKu5eZa zONphB1vMrwnonFcxqHkbc6pXho/4L+X4QdoajQ2cAEpAOWs3sH6NdqGPUBjs2R+EX6D dREZbMfNznqKtUPaSzK7WHUQd264v1q6OWw0zZ7qXs/h0dBb+qYy8KGZL4tssquWA+sZ UKf4VM/2PZG1vSPuoFEfe9+D7/vGgG44hMHqwbCW+erU4sSQkZ3HObNFtIvatBG4UNHn YaxrDb7bSXqeZ+rDYEbZ13R1a8G6OSUEa6mKXHOG/e55DJL42I0GR5Eq/tPjQWTx1+Tk Nq/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rI52xLFwbXQFqfgLnwofbV81YzDkaqrpGEFiKBHgqXU=; b=w46PHDdpWcJLyjG4dARAvamxmG+h0hSDxZZvYHEEM1hkHAUc1PL/zSkNp/cD/AtdH8 VidAkBnEd2FT6PTtXwsDCrlOtA8KJyaEHfcDjYbL342v4jEV289LyFrrkxv0qVKTDozM 03VCeI+pM1rVPXQATXs63gTXw/Kf4m9PrU7Sx6ArOsmUDfL+qV9G0boWczVpK8GO3NAI WraPUoSzZDOTdiFCKvMOs96oasANOfLg4jXmKPPPxhwOomIWFcZmN9jgzJ3LRFRDFSXz YGBvz5cmJA/arM8Fa2vY5jfD7vlpsgpCYYVq7jQ26VIZAdBOsHu9/cuL33r3jvIJ/K6e JxGg== X-Gm-Message-State: AOAM5302LCv/VZSaf9iXKG4tnKqejN6Ydxw4sFNj3ZaJ8JrhwndiRrJ/ Jyj3sYYmkjLWfVOBHeh4jdot1M1Z3SM= X-Google-Smtp-Source: ABdhPJxSDSybqQPWqJ0W2d8BoBSB92weJqZJNaGUz2aESf6Am+VH5J4eivOgFUazChJJx/b9TDskwA== X-Received: by 2002:a05:6402:42ca:b0:408:ed7:b011 with SMTP id i10-20020a05640242ca00b004080ed7b011mr27399469edc.6.1645558502983; Tue, 22 Feb 2022 11:35:02 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 11/22] hw/char/parallel: Disuse isa_init_irq() Date: Tue, 22 Feb 2022 20:34:35 +0100 Message-Id: <20220222193446.156717-12-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52c (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=shentey@gmail.com; helo=mail-ed1-x52c.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Bernhard Beschow , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1645559328679100001 Content-Type: text/plain; charset="utf-8" isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually. Signed-off-by: Bernhard Beschow Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/parallel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/char/parallel.c b/hw/char/parallel.c index b45e67bfbb..adb9bd9be3 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -553,7 +553,7 @@ static void parallel_isa_realizefn(DeviceState *dev, Er= ror **errp) index++; =20 base =3D isa->iobase; - isa_init_irq(isadev, &s->irq, isa->isairq); + s->irq =3D isa_get_irq(isadev, isa->isairq); qemu_register_reset(parallel_reset, s); =20 qemu_chr_fe_set_handlers(&s->chr, parallel_can_receive, NULL, --=20 2.35.1 From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164555960995249.11417371670302; Tue, 22 Feb 2022 11:53:29 -0800 (PST) Received: from localhost ([::1]:33516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMbE1-0003vb-0t for importer@patchew.org; Tue, 22 Feb 2022 14:53:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMawG-0003Lp-B9 for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:10 -0500 Received: from [2a00:1450:4864:20::52a] (port=33765 helo=mail-ed1-x52a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMawD-00072f-Ts for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:08 -0500 Received: by mail-ed1-x52a.google.com with SMTP id s14so22067994edw.0 for ; Tue, 22 Feb 2022 11:35:05 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.35.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:35:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Khkty+gm2SXPwPmKhEricJRnhM6YQl7su7I42HaaWvw=; b=i7kP2WMZQ5qeunfhUVkU1qhSky1tF//XW+Qpm9fpLqxZt5UKlTo2K0EIDBVL9t8zEk GYVzKla5hdWGPRCdbI0xCUt748ctLp2bpz6jY9QsGNwtnXDsKjbMDJyUayXVBBvjnhnp xYqM3is5gBPIKXfTAx+qhw/YsQb66JizcAZF8dcaGNbVDV8s1u2TbLafWyiwnCiaLD8y b1JFme3pb22YylmcMM+OxSrNFxMRtlD1bEW5xA2QIFY1+/jDyL5puSTyvN7DvfGoANTf 1Qukm3kpGaEwBYMtCnKdPxoHqD2AyMZypKlzYg5MByIImSZbrubrQj/R0GF4uN95pAcL A9iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Khkty+gm2SXPwPmKhEricJRnhM6YQl7su7I42HaaWvw=; b=kOZqWGF0U15Mo9gyKbIlGYPXtBY//7IlGSdNPbny5CfdEBe98ikjMTtJszSaNtnVg6 YCYv6sTKVk/+xmKK2LLLFSAQreeaogUwtrQNd3YgoMuq9BeAhpQPk13reoWlPtGviyqX Grz/qgCHHLT8XFKWSWtAn8Y6qKhJmcU3r3d4O13OKeQHWfl6h/NHQzcL8SWO47NaatOr Zkz4pEdCzLU3+UjZAvxwBfDSyIUztAf0MvneYzgxl0ZXGgKeiSf9EOVZaWTL3ZY4LAW2 4zmhGJVuU5Lkg/vpneIFhHMX16523FY0vor+XuQHrdggcsXSxuK3f+zljC+fZp2W1d25 QtwA== X-Gm-Message-State: AOAM533nKBWRwt2lnsV7z8togB8MzueTMBOalioUOr+LeYtnJbPZB1MG xfwUFEaHJVv3rWxG6jom+HW/2sLflDI= X-Google-Smtp-Source: ABdhPJy37CyAwLD7Gk8bIxmi7g7VS4tIs1qOrxWdZyeHEU0PxDlu5C3f8vRfkWT5Y8fyQnpmx0JY+g== X-Received: by 2002:aa7:d64e:0:b0:410:f19a:2966 with SMTP id v14-20020aa7d64e000000b00410f19a2966mr28321294edr.415.1645558504036; Tue, 22 Feb 2022 11:35:04 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 12/22] hw/char/serial-isa: Disuse isa_init_irq() Date: Tue, 22 Feb 2022 20:34:36 +0100 Message-Id: <20220222193446.156717-13-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52a (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=shentey@gmail.com; helo=mail-ed1-x52a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Bernhard Beschow , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1645559611976100001 Content-Type: text/plain; charset="utf-8" isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually. Signed-off-by: Bernhard Beschow Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/serial-isa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c index 1b8b303079..7a7ed239cd 100644 --- a/hw/char/serial-isa.c +++ b/hw/char/serial-isa.c @@ -75,7 +75,7 @@ static void serial_isa_realizefn(DeviceState *dev, Error = **errp) } index++; =20 - isa_init_irq(isadev, &s->irq, isa->isairq); + s->irq =3D isa_get_irq(isadev, isa->isairq); qdev_realize(DEVICE(s), NULL, errp); qdev_set_legacy_instance_id(dev, isa->iobase, 3); =20 --=20 2.35.1 From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1645559929967780.560909312032; Tue, 22 Feb 2022 11:58:49 -0800 (PST) Received: from localhost ([::1]:46128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMbJA-00040N-Rk for importer@patchew.org; Tue, 22 Feb 2022 14:58:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMawG-0003Ls-MP; Tue, 22 Feb 2022 14:35:10 -0500 Received: from [2a00:1450:4864:20::536] (port=36400 helo=mail-ed1-x536.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMawE-00072y-Sm; Tue, 22 Feb 2022 14:35:08 -0500 Received: by mail-ed1-x536.google.com with SMTP id cm8so29845879edb.3; Tue, 22 Feb 2022 11:35:05 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.35.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:35:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hODc348sDBOJP+v8u2lpOm8duN5QJTp75AGojk1OzEo=; b=iMQ+2BebXmeemEq7qYIKlZTSSYQ7ibxs9dpG0JSQHqczMmvEm160B4VsCyWLW35cN5 c/6mcC6rVDpZZ4jRGycsh1Guh74D/WmERxCCbC5IJS3bywPxSLNqhoq5uVWKURJ7lKZU MGHb4ydnerJ8q20DwBBCMRXPsDt31ZH32PIdeSaUv7FTfTXtD5p+pVsCfo6kyh2I0bvK EDi31242+RYcEV4a3xMyuNeYbg3/xygdN5cABkxOiHKyJ2Wc5FSX5hBNl3PTfkI4GDcn FjNoAAt5sZNtlrega2BRo23rcY9yB1q7UabJPsaGgt6Yx7oTWYKIXDBkQi83TH//x/c5 Q1Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hODc348sDBOJP+v8u2lpOm8duN5QJTp75AGojk1OzEo=; b=YnWNKjT9drkUQODOEjOFuoruTMBmqUYgClfXDoz/HfV+W8hVmvpBqbDmzLtkO8NIYK 0vKtrtNMAcJWUvkhAFZmhtzkXf1YloHcyY3Vjzdht0H8Z7c83YQ2wLO6kD940YH28bfD uDe+6b5vqju+6rgIwIsu3NeQJBgripIn6mgiec18EhAJA6shdR1ok0l+aeBjszemqHKc nU+CTq7+QZxHJmiagaimyMqn98no8YqhYbZAhr3qlRUT3FQk3gxFpdxG3AvMRGgCjrir JJh2RsXnvgicHFvYKGELv6is+nZQJdfn2YZEOLIpBnD8WHbPy4aa8uNTYx+dvESqD1xU vdcQ== X-Gm-Message-State: AOAM530gTZ4Y7nkIu6Ba/SheufFie+o+1PYc9L6wgCiGGPIt0imTqFvn zyQmFxDIybzdE0xKpc5r/xjs5adM9m0= X-Google-Smtp-Source: ABdhPJwbNwRzvuhOb0L0xwQl6k/tXWKcXJ0wj11YPwO/kBPA75Z3Yv040O0FJ+Rc6ZzVyjlW9YAE/w== X-Received: by 2002:a50:c048:0:b0:410:a2e6:eb66 with SMTP id u8-20020a50c048000000b00410a2e6eb66mr28586520edd.156.1645558504825; Tue, 22 Feb 2022 11:35:04 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 13/22] hw/ide/isa: Disuse isa_init_irq() Date: Tue, 22 Feb 2022 20:34:37 +0100 Message-Id: <20220222193446.156717-14-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::536 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=shentey@gmail.com; helo=mail-ed1-x536.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: John Snow , Bernhard Beschow , "open list:IDE" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1645559931787100001 Content-Type: text/plain; charset="utf-8" isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually. Signed-off-by: Bernhard Beschow Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/ide/isa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 24bbde24c2..8bedbd13f1 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -75,7 +75,7 @@ static void isa_ide_realizefn(DeviceState *dev, Error **e= rrp) =20 ide_bus_init(&s->bus, sizeof(s->bus), dev, 0, 2); ide_init_ioport(&s->bus, isadev, s->iobase, s->iobase2); - isa_init_irq(isadev, &s->irq, s->isairq); + s->irq =3D isa_get_irq(isadev, s->isairq); ide_init2(&s->bus, s->irq); vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_isa, s); ide_register_restart_cb(&s->bus); --=20 2.35.1 From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1645559535267878.7539819067975; Tue, 22 Feb 2022 11:52:15 -0800 (PST) Received: from localhost ([::1]:57184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMbCn-0000nm-T5 for importer@patchew.org; Tue, 22 Feb 2022 14:52:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMawH-0003Lt-Dc for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:10 -0500 Received: from [2a00:1450:4864:20::62d] (port=45865 helo=mail-ej1-x62d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMawE-00073B-UK for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:09 -0500 Received: by mail-ej1-x62d.google.com with SMTP id lw4so46077646ejb.12 for ; Tue, 22 Feb 2022 11:35:06 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.35.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:35:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c6cdzjjbLoYOkQYojNxxx+ivRGMWbBCNjSa2aZRS9GE=; b=CMQ1xJ1rM7yYSIlFF04h4Xy3XI8Ze1qs37CxsIZ8x96l/OcBGuMZH4UjPil42ecs85 b4LRd04bynIqM1crbSC76BPC2NujsCvLJ6VzHudiHCK6XVmvikf9C0eDkztTFg3GIRya wGRHepFAcsbqysbkmluQ2MmA15PUW1sbwGiGs4ZeVpz+9hdEKBc2iFGiAYprnmE0qd3q 4R5uM6pNH2WIsT2cOIsVorIo/gdPrOOIiioqao98lpnwauT8yzeQoWpC2kXZnx+7GVGG OUTFjf/lirhLCWdnpuMqTHMD1E4v6qLHLuYkQ85bYcYUlUeq/G41URBXFoqC6lGUQlZz 7Fag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=c6cdzjjbLoYOkQYojNxxx+ivRGMWbBCNjSa2aZRS9GE=; b=CUqlP5hC6tCARDtBmaijaJtTLlMj+cnNOrhTP/DU9jt+28Wq1dDjWXgQ41gHjlIPuI OV7f/WXR7C9oqgTvlmDCvDl4+AkDuuA588P1TXQnDtpKl4HJ5dhqD7AT2azhprHywfju izsvWghvwr94+wK2rgjmGX4MGUkoOponM8aFEbWwnY7jSuiNBaml9bI1kuvO7La3xwqZ jTAn4PHd3TEpFm4wCC/8gUKAvJuwNuVFFToYxn22Lt/emfD+U+qll2DbjXRIPwlVHla+ 06IlOqGbOqeNfq4bSQS17E7alz0vG73dyIMjJfjislods7n1OgNeliB7+fHtFahsmD2P SOhw== X-Gm-Message-State: AOAM532oAYA6yudH9sWFOx6Rl1dvYXSKHyYhQ5M+CKoiSoE8qiIKbhYA v/qWv4p9lJiZ82PjPP2/HLHiiVxySOw= X-Google-Smtp-Source: ABdhPJzNxzNHpyy3+F7JHqpwPSakDAWFBLZA0PmrpwYGBB0fS4jiLQxhBIbX9ZOqyIJEvuxwAPkD6w== X-Received: by 2002:a17:906:19c6:b0:6ce:98a4:5ee6 with SMTP id h6-20020a17090619c600b006ce98a45ee6mr19773735ejd.567.1645558505640; Tue, 22 Feb 2022 11:35:05 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 14/22] hw/input/pckbd: Disuse isa_init_irq() Date: Tue, 22 Feb 2022 20:34:38 +0100 Message-Id: <20220222193446.156717-15-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62d (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=shentey@gmail.com; helo=mail-ej1-x62d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Bernhard Beschow , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1645559537013100001 Content-Type: text/plain; charset="utf-8" isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually. Signed-off-by: Bernhard Beschow Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/input/pckbd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 56c55c5768..4988403f7c 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -749,8 +749,8 @@ static void i8042_realizefn(DeviceState *dev, Error **e= rrp) return; } =20 - isa_init_irq(isadev, &s->irq_kbd, isa_s->kbd_irq); - isa_init_irq(isadev, &s->irq_mouse, isa_s->mouse_irq); + s->irq_kbd =3D isa_get_irq(isadev, isa_s->kbd_irq); + s->irq_mouse =3D isa_get_irq(isadev, isa_s->mouse_irq); =20 isa_register_ioport(isadev, isa_s->io + 0, 0x60); isa_register_ioport(isadev, isa_s->io + 1, 0x64); --=20 2.35.1 From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1645559105; cv=none; d=zohomail.com; s=zohoarc; b=ZNByMq+9FcF4dn6wBc83Fzf7irSOKLbYfqJBsAMvDxbWgM59kv+YzNqh2/xEy/X/UGlvBX7XL0w48fgyME3Ybq7NyGEghBYU1CgRriUYEOO3G00mNcgialKJopyj6cLuDRYcLYzhHn0A8EYtm04JrlRxdeFEdEqrAUxsxHdT3lU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645559105; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OuZTr6rv/jwpyEGm5IkqFfaSg0z98+rElW1EZeduKOw=; b=EamM1+pF4vwf6/x3R73KXg8GBVEzD7DJuFrZjIXgEsur4eegfF30spFKaWsb2rbpb4XdKVo2v6UCFGHor0VvBolxjUUd8Hv3/yB0w8229kOwBtahROCejYTU6MQfQviF0E1lLn1Aid/Vy+KGI4RDCTfvspUdfNJ0yzMv6HzhqS0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1645559105027432.4950859198025; Tue, 22 Feb 2022 11:45:05 -0800 (PST) Received: from localhost ([::1]:39892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMb5r-00062M-WB for importer@patchew.org; Tue, 22 Feb 2022 14:45:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMawI-0003Lu-4O for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:10 -0500 Received: from [2a00:1450:4864:20::629] (port=39819 helo=mail-ej1-x629.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMawG-00073Y-1a for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:09 -0500 Received: by mail-ej1-x629.google.com with SMTP id p9so46083204ejd.6 for ; Tue, 22 Feb 2022 11:35:07 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.35.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:35:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OuZTr6rv/jwpyEGm5IkqFfaSg0z98+rElW1EZeduKOw=; b=Ldp8N4v/GKXxR7vQZVjhCstjMJQD7xmPWyoxedQRYNfQca18lFgizP6nh09CY4PT1w DyUP5oKMltrVHyS4Vfn0TOcmZ74NSD2mqWy7QlrzKdV1r8uqEpwEt1wvDFdpgXtrzA0W TJOrUM9iFNFtXXGW65oUfgkte1Bh1YiHSpnqsvamRtuTZDoofJVIG0FVUm7zr1vs4n+R TOvOwgQOUuEsYCm8oM15N5PgfM1YKCm2sQKLk3S5hi3UkRMjs5ieoHb5AmSdIBpKF0yo aZ8cCO9YFz05JcJB1TMYYAK7DTWsRG/KDuCiHXUdmezZsy5qF88VBgoUwak2OGqjfRi3 41Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OuZTr6rv/jwpyEGm5IkqFfaSg0z98+rElW1EZeduKOw=; b=ulfxuoVl7WRJqVfnNN5MIrhJDp/fQyBbQXExOWElHX3avLxVzd1uhwmevcxI07hw67 Vpto6xFhtxC/gQLtar0Qp2b6U09MYfNjf/BP61jxQMnv2uVsevDzqH5VL59ZObNMTCKM DjNylAhCfv+X052QMZuAwe3PBZ+a1cGvbLyDdBCBEWBHBZOZsnGjiWCG2ZnHFnIr7S6r jeGyr0VppwIC93PUHqL/F+IFIvukqo0NnYHF8AWPQhb7KaE+mrJZjLtCM062Bnsp9+l0 i+PQjTtsA/bthC38S/zIEbmb/qKGY1lkjEf3UFCYeMnZIlfTYGLkUKp5hDrNjiauMKgO QJHQ== X-Gm-Message-State: AOAM530zYLTpHIc+3iYNWCsjy5ppCusNK5e1LunU7Z8Q2+sVeLkwdEJo deqfAkVkkDO91LCO29iuLfxkGuVkJjA= X-Google-Smtp-Source: ABdhPJyx8ZhDm9qiouh5Gsxu2ZPwqYIR5Es3kIt1I8cuIPlalUo+mQnmZt+ciBO7yFOGj04BTWJ4WA== X-Received: by 2002:a17:906:af79:b0:6cf:6b3f:5b3b with SMTP id os25-20020a170906af7900b006cf6b3f5b3bmr20698798ejb.14.1645558506494; Tue, 22 Feb 2022 11:35:06 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 15/22] hw/ipmi/isa_ipmi_bt: Disuse isa_init_irq() Date: Tue, 22 Feb 2022 20:34:39 +0100 Message-Id: <20220222193446.156717-16-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::629 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=shentey@gmail.com; helo=mail-ej1-x629.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernhard Beschow , Corey Minyard Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1645559105770100001 Content-Type: text/plain; charset="utf-8" isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually. Signed-off-by: Bernhard Beschow Acked-by: Corey Minyard Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/ipmi/isa_ipmi_bt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c index 02625eb94e..88aa734e9e 100644 --- a/hw/ipmi/isa_ipmi_bt.c +++ b/hw/ipmi/isa_ipmi_bt.c @@ -92,7 +92,7 @@ static void isa_ipmi_bt_realize(DeviceState *dev, Error *= *errp) } =20 if (iib->isairq > 0) { - isa_init_irq(isadev, &iib->irq, iib->isairq); + iib->irq =3D isa_get_irq(isadev, iib->isairq); iib->bt.use_irq =3D 1; iib->bt.raise_irq =3D isa_ipmi_bt_raise_irq; iib->bt.lower_irq =3D isa_ipmi_bt_lower_irq; --=20 2.35.1 From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1645560085; cv=none; d=zohomail.com; s=zohoarc; b=DWCLA3cMBGaiqNhAilWGEECg595qXVrEv+UUG7WZJgtveLr6amiuHdaRezYHEjtXvK6kkrpzxhPGphRe23EnzDuU5RkGG0RT25eL3ZkylB1x5upXeEDk2eMQMDzKe5JC62JCMzcdLkjaqQZjsFwqs5tGayTlnqaEH4ZJve3LA5Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645560085; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zjmSFcMWhfofmPFxlk/r2EeC0P+Uw+dEJELYLF9MjVo=; b=Yw0arXEK+soMi3b5EyN4JrmoBkfVcnnXyAYMk2iFPDSz78/Pb73fFk6MyZmh2TL24u2N8ZRy9lxb51G6e16MtAbUx5Xmr2+tYranKRn04ypLmWRVpFRmsLBU++Bn4sWHQTBhpJ4QYLJATV+6ogFJRZ3ahdcMH7yiQ8nfHuhHtD4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1645560085968871.7172910342898; Tue, 22 Feb 2022 12:01:25 -0800 (PST) Received: from localhost ([::1]:54768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMbLg-0001P4-BX for importer@patchew.org; Tue, 22 Feb 2022 15:01:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMawI-0003MQ-OU for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:10 -0500 Received: from [2a00:1450:4864:20::62b] (port=44779 helo=mail-ej1-x62b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMawG-00073i-KF for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:10 -0500 Received: by mail-ej1-x62b.google.com with SMTP id p14so45963164ejf.11 for ; Tue, 22 Feb 2022 11:35:08 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.35.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:35:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zjmSFcMWhfofmPFxlk/r2EeC0P+Uw+dEJELYLF9MjVo=; b=QzdP5bVXL3QMwH6VngtYWeflY53x8h+jNGHy5y1QaLqJ/ry8j78qn45T8jZOEbBCsm VIKIozL+VBnAW/RF/x6yTE8rcmzam3oRs8wOqs0nXdarqnTOQPgzC/yTAKcytE8MMeDI o8l3Gxzr25Ylu+j1uqFiQUnEu4EGjhhfIDBcjuvesc6Wf3Tkg/thf/P9457LFIO7A+QU crJhwwfZNKwLb9wREFDMKp/lrA2b6qs0xSGoWOX/TQAk6dMDvKL23HsXEnhbZzQ/r0iY XlJbCZZskuYsQB7PeSpfnkWG6FNx6zTb7/gju/+r3RxPFa8yqqN6UUQ4xAa3qQJ/x6g8 eIFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zjmSFcMWhfofmPFxlk/r2EeC0P+Uw+dEJELYLF9MjVo=; b=ZBLCoOQsuomicCxdiH4Fm+Wl2fUr5gtlpxXU3/6Nu5//qnDdRP+TJ1cpDaCjVghkhj L1+OEIQGz63PH4MnCp0xvVdEP0eH8t0ZXIVA6GrHLsou20IT54QpTj+PnIInpj63pwjp zs9Hrsb8Ksa+lVqd/P3hvf5RqXebAVDx5Sk+XXNOG4Y55qgn0bR7Q4jCNO8HXWuCzDBC Sic0pthEMfshM5krcPsqpnbCk1JCV0u+MZKQd4rCj1/gSGhHJbzR4O+iIeBnjwDLnpjA qZvOiX1ZbORrvBj603/QuE/f/tZwwtd8jzA3xe3ThcYxgAGYPYy58MisZ0TyIzJX/VFO OaiA== X-Gm-Message-State: AOAM532TQDi/VN+CRU27KyUQAZ3R7MFZUOTr+f60g4FCoBXZvQvbD1qe m98AQiWSR70EQt2GTnUyPcfjEvmarl4= X-Google-Smtp-Source: ABdhPJwvxIIPr1fP8GJcSBBa3nrw4/aliHZcZr0+i2PGUaSwhXvTDRD1Q/AHvjnqsGicQ4lCnTC+vw== X-Received: by 2002:a17:906:6158:b0:6ce:61d6:f243 with SMTP id p24-20020a170906615800b006ce61d6f243mr20249958ejl.268.1645558507321; Tue, 22 Feb 2022 11:35:07 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 16/22] hw/ipmi/isa_ipmi_kcs: Disuse isa_init_irq() Date: Tue, 22 Feb 2022 20:34:40 +0100 Message-Id: <20220222193446.156717-17-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62b (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=shentey@gmail.com; helo=mail-ej1-x62b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernhard Beschow , Corey Minyard Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1645560087163100001 Content-Type: text/plain; charset="utf-8" isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually. Signed-off-by: Bernhard Beschow Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/ipmi/isa_ipmi_kcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c index 3b23ad08b3..afabb95ebe 100644 --- a/hw/ipmi/isa_ipmi_kcs.c +++ b/hw/ipmi/isa_ipmi_kcs.c @@ -91,7 +91,7 @@ static void ipmi_isa_realize(DeviceState *dev, Error **er= rp) } =20 if (iik->isairq > 0) { - isa_init_irq(isadev, &iik->irq, iik->isairq); + iik->irq =3D isa_get_irq(isadev, iik->isairq); iik->kcs.use_irq =3D 1; iik->kcs.raise_irq =3D isa_ipmi_kcs_raise_irq; iik->kcs.lower_irq =3D isa_ipmi_kcs_lower_irq; --=20 2.35.1 From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1645559774272814.1386806797863; Tue, 22 Feb 2022 11:56:14 -0800 (PST) Received: from localhost ([::1]:38024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMbGf-0006wZ-8o for importer@patchew.org; Tue, 22 Feb 2022 14:56:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMawJ-0003Oe-No for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:13 -0500 Received: from [2a00:1450:4864:20::635] (port=46955 helo=mail-ej1-x635.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMawH-000748-Jp for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:11 -0500 Received: by mail-ej1-x635.google.com with SMTP id qx21so45966154ejb.13 for ; Tue, 22 Feb 2022 11:35:09 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.35.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:35:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/3j29R7lXMdrMKGnt5++sE1+VglPHaZYEgL5oGNi9kU=; b=G5ps2Ug6i1TeGmXMFb8EWZksfkoK1GrvrS8E/LRDGfIJxJTAMmW9fLvBk+n4FsEqcG Y6IoG9fwJEti3tJAVaK/pEXNquWgColYeGyAO3R63b2/dqU5KnLwZ9W3kRSBy8tITPLQ B8VqQj+pNbNtXmY3wIW4l8QK8whMnuSCyeLs+ojmTf09qM84ArNA5QsNbbtt+BwloD6z dHjRCjUVBSJaGzKIPJ3uanZZRTc1PQ1ULE9WmZEyjFcBtRdhW5k030WYM8VqdrqB2yIz fFrKIvb9Q6RQXeeNumMkHTwDNhGd6Hq7KcnWxX3GxVccDhFIUFY1q4Lq16hy9xKoksEG isXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/3j29R7lXMdrMKGnt5++sE1+VglPHaZYEgL5oGNi9kU=; b=ML08XVATSmsaKgT/xCABFgjG8MpGPUFgeMEbV+Q3PxC1URzszbEdsRk0euZtPMkgGw /srB7ZyG19PGsmzN51PrFk/DlMIFZGL4+sJh9vVqNpHfUjD5UGq0OwIhx5f24e0CUqy/ 5iHWJYmC26k8kYVKAXnS+mHw10//6TlHsDlKE6E8LgMIZ9HoMReCXMpGQ9Ds0mp0fmKA Q434ekbzafDjwV1b2zeA1eoqannsgVScT2kWsinHrUfzoits6mRTzdtIGZOXBhF4FYAT 07da1aT1FpJWOp2zZdMvMOWLWmYfMdwkvVgBejSA1WSVPilZE/Yo0RWC7OsDf+9khzb0 NMEw== X-Gm-Message-State: AOAM531Go7N3t36j0ceyCZ4KI/XJLVhGjlG7dBnpN0GKVpKq2vxuocZB zQZvEFQWPtp9kN+OkT7vKJ6HHG4l7Uk= X-Google-Smtp-Source: ABdhPJxX00lVbOpHzuMj79FIFA74Uty8nc1peB1bt72w7qzk219EdisjBdSnM8GPePlDSSw5uZCrvg== X-Received: by 2002:a17:906:364d:b0:6cd:9109:cfd4 with SMTP id r13-20020a170906364d00b006cd9109cfd4mr20402697ejb.198.1645558508242; Tue, 22 Feb 2022 11:35:08 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 17/22] hw/isa/piix4: Disuse isa_init_irq() Date: Tue, 22 Feb 2022 20:34:41 +0100 Message-Id: <20220222193446.156717-18-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::635 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=shentey@gmail.com; helo=mail-ej1-x635.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Bernhard Beschow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1645559776718100001 Content-Type: text/plain; charset="utf-8" isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually. Signed-off-by: Bernhard Beschow Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/piix4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index cb291d121c..0fd6756dcf 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -197,7 +197,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp) if (!qdev_realize(DEVICE(&s->rtc), BUS(isa_bus), errp)) { return; } - isa_init_irq(ISA_DEVICE(&s->rtc), &s->rtc.irq, s->rtc.isairq); + s->rtc.irq =3D isa_get_irq(ISA_DEVICE(&s->rtc), s->rtc.isairq); =20 piix4_dev =3D dev; } --=20 2.35.1 From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164555987321415.71033382255257; Tue, 22 Feb 2022 11:57:53 -0800 (PST) Received: from localhost ([::1]:42120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMbIG-0001LV-2x for importer@patchew.org; Tue, 22 Feb 2022 14:57:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMawK-0003Oo-Lb for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:13 -0500 Received: from [2a00:1450:4864:20::632] (port=42908 helo=mail-ej1-x632.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMawI-00074L-H4 for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:12 -0500 Received: by mail-ej1-x632.google.com with SMTP id hw13so45829926ejc.9 for ; Tue, 22 Feb 2022 11:35:10 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.35.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:35:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M0VwRAVUenlZUvRbc1a5N4xtILg9Nv9mnMQHhVnmjwI=; b=OQy7tOKkZx/Tue37ieC6XXMXrqFyoKkOvZNRec/V8jizzbw/WQtPhg1dQnmhTaY5XM 5PPidRcph+L8SxALIEYchgkx1EnlcZsHu6lxbDYiUDifJ1gwOo3LiOpBML2CrT6h04Yj 8GQMV05cptmOMrEw6gOXdbq+6V7/6xXuEvTIoQwmwrZVheqxW8mYPI7lLQ0j0brgX2e3 MAzr58JM5t0OAEyRdyAkajPRtWB88TkN3xkhTGrmGlkNLAwRHylqTOh0Jlc/T2WTrYuG lkP0xRfKM82DKAjxvkdQ8OaXWoEOKMsvV3Yut4mRgzWGWrV1NhGllrPJ5SawjdSBbuJy RRzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M0VwRAVUenlZUvRbc1a5N4xtILg9Nv9mnMQHhVnmjwI=; b=qq3lwQ1c/L8sYtgODNMvP2+Z4fN8EDodJi9QmGiOHa0sQSBI3lsXl32og2ICw+EzvK mKBG/1RnSHT+xK9en/NZPbbj7Qh9H7WmVMVKynYLoHLfdZQ+lwGtp/RONzH+kfjq7nxe B1Ba6oRdWYgvMliRA6KFIQM2Wav1jIXe4AYBEwPVIfWyTl2yIv9qQ4EJzUoZNCkgdvbJ i6v5b+ySvSPGwVXmoJu4G3xtOFU07Lj+TbYXiOciLvgvlaLMSqhOVh8Q9Kqgr8RI5G+1 oBq+t7+OfTdKDMZ+UzgZESXd49JJWoN09YA4XAoFprLt3w1LF55ydB0HEKjDqIoBDTuz lHHQ== X-Gm-Message-State: AOAM530Jjjq2+XbSazzcyiRzHfXD0nz6itVnHyOzHSaSg2dhv30tlaRZ 8FFwyfvMdDU92vQPG99v5M8XDz3IvtY= X-Google-Smtp-Source: ABdhPJzKFiLzdzJ9Dplzp3+JxjddBNiyUW0sSw5hY2Ctbv3oshCfxo42X19AcPXnkZFFYmnHkxGLdw== X-Received: by 2002:a17:907:766a:b0:6cf:bb20:70c with SMTP id kk10-20020a170907766a00b006cfbb20070cmr20072612ejc.94.1645558509093; Tue, 22 Feb 2022 11:35:09 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 18/22] hw/net/ne2000-isa: Disuse isa_init_irq() Date: Tue, 22 Feb 2022 20:34:42 +0100 Message-Id: <20220222193446.156717-19-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::632 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=shentey@gmail.com; helo=mail-ej1-x632.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , Bernhard Beschow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1645559875625100001 Content-Type: text/plain; charset="utf-8" isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually. Signed-off-by: Bernhard Beschow Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/ne2000-isa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c index dd6f6e34d3..6ced6775ff 100644 --- a/hw/net/ne2000-isa.c +++ b/hw/net/ne2000-isa.c @@ -68,7 +68,7 @@ static void isa_ne2000_realizefn(DeviceState *dev, Error = **errp) ne2000_setup_io(s, DEVICE(isadev), 0x20); isa_register_ioport(isadev, &s->io, isa->iobase); =20 - isa_init_irq(isadev, &s->irq, isa->isairq); + s->irq =3D isa_get_irq(isadev, isa->isairq); =20 qemu_macaddr_default_if_unset(&s->c.macaddr); ne2000_reset(s); --=20 2.35.1 From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1645559539487666.0354761148157; Tue, 22 Feb 2022 11:52:19 -0800 (PST) Received: from localhost ([::1]:57620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMbCs-00018T-9q for importer@patchew.org; Tue, 22 Feb 2022 14:52:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMawL-0003Op-Gs; Tue, 22 Feb 2022 14:35:13 -0500 Received: from [2a00:1450:4864:20::530] (port=44984 helo=mail-ed1-x530.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMawJ-00074h-Nh; Tue, 22 Feb 2022 14:35:13 -0500 Received: by mail-ed1-x530.google.com with SMTP id x5so39337329edd.11; Tue, 22 Feb 2022 11:35:10 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.35.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:35:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I7puGt2s3b15Sv26Fv0lRYePOTVn0bOsnqCEUxcw0JI=; b=bTuebAb5eNwsmNAFKp2HUpAvGgnfwjE468lOlitrrCGsBANVJ6U8vR0/5z8HOR0dt+ 4DojKPKL9mVyYT0y2cR/4ijeuPS76l8quSVTmEQvU/xYIgVmtQXLk2E+e0VGVV46y+CM brIQ+PyPUIKDvbeF0nSRuK6VN9WNtpWUhA+zz6DUkCKGRFng9d8WL5dAGCN8aLjCehgS CJ1oHZqqji8UEU4sgo01jllgdzwvPAMYrKImHyIcNIy+ci8+uFqpJz5jgxr+aChvjytK kWmI/PZ1JYxKvFcQeOP232VGTT33FHOQhBMpPecz2JA7iEAOmeYtAPoMgH3Fxk/lSQ1m FsXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I7puGt2s3b15Sv26Fv0lRYePOTVn0bOsnqCEUxcw0JI=; b=fogsPrGpwuDhy/sorM80FjN+hOrn92cqnPnHtez8Kf2OGE9Pbmg8JtFgw93hd9hKCZ PqbiJOTMKlhA1IUpM6c3dSQvzp6pbELExG1SDgipJO+h8V6Z8/KxjCEFlJmiparni5nR /EMYNp84eCdp6cDoJuPhZKe6dC93XtWPVkd3mZAKCM/MmFT2/gmvq/3GuFEgdmKwgICA vSUHoMVXJ/65dwmjG0L+/9Fznalh31CWiiAkTE06TCWVlXfog7JY6fFJqzFZEV0Vd9Qa 8i82SUZeIFK34x8vDdF6FA0rQNkyI7k1UsizYR9WVufC8WAhfKQ1YFqp8tJoCGaQaf1A AYXQ== X-Gm-Message-State: AOAM532iIPeibw97qudkX/Pz0MSJ1Bo+DDW1VFpEhU83TX2CStXDulur VZMehBJJnrUBxwXxJU5WwsBvUe23ii4= X-Google-Smtp-Source: ABdhPJy8P7kplq9JM4YhPbvbzp+2Qf6PzRvuKW4JEQVP/A06HdyZlR/iywCZfFqSOZQ9rx82asJq/Q== X-Received: by 2002:a05:6402:13cb:b0:410:820f:4e8 with SMTP id a11-20020a05640213cb00b00410820f04e8mr27151645edx.352.1645558509937; Tue, 22 Feb 2022 11:35:09 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 19/22] hw/rtc/m48t59-isa: Disuse isa_init_irq() Date: Tue, 22 Feb 2022 20:34:43 +0100 Message-Id: <20220222193446.156717-20-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::530 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=shentey@gmail.com; helo=mail-ed1-x530.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "open list:PReP" , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Bernhard Beschow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1645559541003100001 Content-Type: text/plain; charset="utf-8" isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually. Signed-off-by: Bernhard Beschow Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/rtc/m48t59-isa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/rtc/m48t59-isa.c b/hw/rtc/m48t59-isa.c index cd63138e1e..990ea15bce 100644 --- a/hw/rtc/m48t59-isa.c +++ b/hw/rtc/m48t59-isa.c @@ -106,7 +106,7 @@ static void m48t59_isa_realize(DeviceState *dev, Error = **errp) =20 s->model =3D u->info.model; s->size =3D u->info.size; - isa_init_irq(isadev, &s->IRQ, d->isairq); + s->IRQ =3D isa_get_irq(isadev, d->isairq); m48t59_realize_common(s, errp); memory_region_init_io(&d->io, OBJECT(dev), &m48t59_io_ops, s, "m48t59"= , 4); if (d->io_base !=3D 0) { --=20 2.35.1 From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1645559933; cv=none; d=zohomail.com; s=zohoarc; b=g1GQlA+lB/QEqIxAK6WqkTtHNU+Jhn1TOPEmubE6EUFrK7WATVUimKEN40wSMq7Y56WwVg+Z2Dl87i6b62dLxZENc/NUWOzEFO9DBkLAkeOGW+UjMXG2iwwjgMELyHwmx50xEN+zHUfnU98VetGZsEyCzTAUHGWaOz3wWYyMFq4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645559933; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=i9gsYbLS+oFxHUewZXteoSpkAOteqQtXYimRXD0P1Ec=; b=jVp0k8ykwjmqB+CrbD9JHkCX4U5zwxrvy9VKx74iTxZfpcqbGnF8vT6rSoOt79VoH42nu0DmH2jxJ8lBATMnwopwJDLZZfjcp/ZVKyBFIrJbhOUkYgBfCqG5Gza4xp0l6KzrkL/MK5GF3bT3UcfDKuYqZxkML9zewuECDzX4CHU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1645559933969133.12051859931023; Tue, 22 Feb 2022 11:58:53 -0800 (PST) Received: from localhost ([::1]:46604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMbJF-0004JS-0z for importer@patchew.org; Tue, 22 Feb 2022 14:58:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMawM-0003Pu-BU for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:15 -0500 Received: from [2a00:1450:4864:20::632] (port=44787 helo=mail-ej1-x632.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMawK-000759-9L for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:14 -0500 Received: by mail-ej1-x632.google.com with SMTP id p14so45963669ejf.11 for ; Tue, 22 Feb 2022 11:35:11 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.35.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:35:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=i9gsYbLS+oFxHUewZXteoSpkAOteqQtXYimRXD0P1Ec=; b=CeyTrCEUZxu7JjXGW3XMN0TdC4JtPLd7GzYpQpashWeiOxSCDCKKStNPf/1yC4aVdB qqZIcx0HJMPLJkpvgxP5tLMMFP1AyYbmV/x6fpRhISfe8Wk3qzyg9cDIzGQ6zKka1Jlx kfDIiUTAdtDpciL91tCuJ98d2Cet9zN0PlSw//MxlQc1WqdRUIvXygrvPvN2LdDZxuFR 289gtAccJ6pLT5fiJvdtc1OMN3poF2HO/CJdEb0pzNibU6a6QDbTgd6Sdw/MVs6Em7QX QlVrjBTgy6U78s+SE+QBsZjH0SrJlaJRErRQ+13c/TJq0dHC4+eMxOhsLv66Ha/nNIhy cgEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=i9gsYbLS+oFxHUewZXteoSpkAOteqQtXYimRXD0P1Ec=; b=b2ABRIAhnWaI/7d8iucOjKIhOFjrnCWW3z00V6tpp/+hUNhH3Z02U2hRsdaX1cyAxf 7AILfoDDaBTxofxK5creWkrvcjtD+sq2nIzjNxeVi5iecleoKIGrIEiMTlirkgpHyxmz IQ7fn/eKHG25IEaotATTlLn2EAlnesNKV0UGS909khyss/UHNkufx7QWMut4E9Brq3vQ 4kK/lL5sQxB3YtKmA6h6FwltKKK9BGrPpPU8IEMJ3uOc80Y/LY1zhtRh/HNI0ttkcHS5 D9ytrHfAiMkzQeZOPYZa/w2efPQ57up75NMcyF0H22qExcWTgd2RbkIje11yD+M4syFi waMg== X-Gm-Message-State: AOAM530GVBLOQRa2FOX9Rl2GhQstDqYoGruRnsJf1h8Ixu8T08vaoE5U su0GOk6drKFWvsyXs5WinEzGlXHnWos= X-Google-Smtp-Source: ABdhPJxV0B9ON9jtbddBSa4Rxd/5vfIQN1pKrJ3pkdGe4b+5XjK9iJ1lIqe0a2D9/0viB70s4K6sXw== X-Received: by 2002:a17:906:b287:b0:6ce:98af:3f6e with SMTP id q7-20020a170906b28700b006ce98af3f6emr19629246ejz.216.1645558510975; Tue, 22 Feb 2022 11:35:10 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 20/22] hw/tpm/tpm_tis_isa: Disuse isa_init_irq() Date: Tue, 22 Feb 2022 20:34:44 +0100 Message-Id: <20220222193446.156717-21-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::632 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=shentey@gmail.com; helo=mail-ej1-x632.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernhard Beschow , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1645559935840100001 Content-Type: text/plain; charset="utf-8" isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually. Signed-off-by: Bernhard Beschow Reviewed-by: Stefan Berger Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/tpm/tpm_tis_isa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/tpm/tpm_tis_isa.c b/hw/tpm/tpm_tis_isa.c index 10d8a14f19..3477afd735 100644 --- a/hw/tpm/tpm_tis_isa.c +++ b/hw/tpm/tpm_tis_isa.c @@ -127,7 +127,7 @@ static void tpm_tis_isa_realizefn(DeviceState *dev, Err= or **errp) return; } =20 - isa_init_irq(ISA_DEVICE(dev), &s->irq, s->irq_num); + s->irq =3D isa_get_irq(ISA_DEVICE(dev), s->irq_num); =20 memory_region_add_subregion(isa_address_space(ISA_DEVICE(dev)), TPM_TIS_ADDR_BASE, &s->mmio); --=20 2.35.1 From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1645559332; cv=none; d=zohomail.com; s=zohoarc; b=mU4GbF4HzpbgL0hwC5FEpHYQQICsi9VlW9Dtw3qXfG1UsOHot3hAGlO8U0CrSAdLCNR2LJvKJ1vIgB/HcCF+LYBNJDCnvEorRxnnumAGaUWqE1s+qjP3nV+L/h9ocJcnpoDipqUeVU76w5rRHFEwvC0uSmhcHyNV5W/gIYAxSKU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645559332; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HbYju84CvG42z6Al6B5zdxO5OIvmYAHPnRzWM1yGA1k=; b=jlDiNXeEubN3xQ8+BNLxQeMpajG2qouUT8F7Zx6At92b2O0LewX9PSB7MwWONQNllgEuZs89LkW/MLkkkxT/xpQB8SM5+pdnuRp0u8gcYCe43b01j+g+mE7gLbXHVC3rWtxhXg7wyzqS3vJM+590E5sSZDgm+/vzJyOy7A7G6aA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1645559332300632.9073760882386; Tue, 22 Feb 2022 11:48:52 -0800 (PST) Received: from localhost ([::1]:49194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMb9X-0003ss-9z for importer@patchew.org; Tue, 22 Feb 2022 14:48:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMawN-0003Pv-2N for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:15 -0500 Received: from [2a00:1450:4864:20::62b] (port=34544 helo=mail-ej1-x62b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMawK-00075M-W8 for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:14 -0500 Received: by mail-ej1-x62b.google.com with SMTP id gb39so46186049ejc.1 for ; Tue, 22 Feb 2022 11:35:12 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.35.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:35:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HbYju84CvG42z6Al6B5zdxO5OIvmYAHPnRzWM1yGA1k=; b=fEqeUmFNzvGcyTgPxm+ZcuZ/5PBztDqLY+3e/Jkzo4WUVfIfnstjuKYXT1Sj7JnqaE gKr/a0H6jSLUwk5is+R5V+tN8kH4KEuR1A9lO909JIMT7Uv/cUGJy1cuuhSY5MR0HXWL 1fOlMhHdSs1dX5ug0j/JNAF/tV4S1GD9TU/o62m5eUqsmeOKoi/+wIMdYMtf+3M4Qa60 lCXtLl8WmWDNynbzGBhCS+iQHnCB+NuWpO1PBcbi29tHyyNbaUG18Ao6DIyxVOxaGRPU 9AiT4s5YYDBLFHsVO+K9NK5Gh23myUZh0c2skMjSOBtTCr+rRnvn1FbrpAdnF61/2b7i oYQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HbYju84CvG42z6Al6B5zdxO5OIvmYAHPnRzWM1yGA1k=; b=O+9ssvFJi1LHEYo5syDMf+mXG39QSq6u1/nr1WbkdEcro1RIG4hLhpF/P239Y3jGeJ 8y3HtFUOwZ6CY/2f8SvJ/9TbYcil03ALZX6DgTrVLAi5M0TRrPcCoLkpyyz6tIEQx+/Z BJgM7GxTP3A2TFvtFP9JAWg0qmC901LC35RI5IdIVbCoIPGwWs1XGp5J3ksVXk3kt/xm +5GT7vlsySp18ESVjSQzTnLIlk+Q0Ma1TSGuzRYksKoNnlqlQkQzFfEmM3FIuJ6Nrq+A 19rIPlVP9xVOWQN+1LGxVIemAPOJ5nkhbM1jQ69WJUVXfc9ge4tf8MHJXmV7y91J69Pk pl8w== X-Gm-Message-State: AOAM533cR5swbRPJdH3yLThevYmgcSlck6YRZZMJnWbyd8ypTCzZBeg4 IXCMYlQhmpxxTXHFXUowkRSmrzk3qxQ= X-Google-Smtp-Source: ABdhPJzu+mfE7Nfv0OpkWBsjHWENnIsSUx5sDrGroD+rPTi4jRCAubADG3TA0XqukO/Fts/qmXS++g== X-Received: by 2002:a17:907:72c3:b0:6ce:5256:1125 with SMTP id du3-20020a17090772c300b006ce52561125mr20234032ejc.697.1645558511722; Tue, 22 Feb 2022 11:35:11 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 21/22] hw/isa/isa-bus: Disuse isa_init_irq() Date: Tue, 22 Feb 2022 20:34:45 +0100 Message-Id: <20220222193446.156717-22-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62b (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=shentey@gmail.com; helo=mail-ej1-x62b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernhard Beschow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1645559334759100001 Content-Type: text/plain; charset="utf-8" isa_init_irq() has become a trivial one-line wrapper for isa_get_irq(). Use the original instead such that isa_init_irq() can be removed eventually. Signed-off-by: Bernhard Beschow Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/isa-bus.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index c64a14120b..1e8c102177 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -92,8 +92,7 @@ void isa_init_irq(ISADevice *dev, qemu_irq *p, unsigned i= sairq) =20 void isa_connect_gpio_out(ISADevice *isadev, int gpioirq, unsigned isairq) { - qemu_irq irq; - isa_init_irq(isadev, &irq, isairq); + qemu_irq irq =3D isa_get_irq(isadev, isairq); qdev_connect_gpio_out(DEVICE(isadev), gpioirq, irq); } =20 --=20 2.35.1 From nobody Wed May 15 09:11:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1645560096; cv=none; d=zohomail.com; s=zohoarc; b=RfPZ2CLccTDb1bJ32v3f3CFGx5Wifn2XUbnB39XRkZJpIdSBpb2yG3gaPXErltKwNf+9GRflYOYMJVUuVFYW+zKRCmymbfLxiPfekQ0in7kx20qpmQUtTg4/7+7FqWv01yEueCXcHjZhydQ8vKq7kNI3CHWutCITqlVFNL0QB5I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1645560096; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0PkugM/nmdz5ZSPWNwtFAXt+z4ki/4C47OuH3ieIYfs=; b=AjA9IzCRKUPY4BHJNpCUXVx5gix3VDxCGEPemR0KUhU4b9Q7kt4sJkCrHxziCnG74FAZZtVQZTn6EnCq6m3zke8w4O1AicsC1jFU+emHhYb42vMdTQcbctF1p8inFDj6XIT5VnXH5136A/XTTbnhuOSxdtSU1Dgf0eiP3mLmTyU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1645560096580920.7384457506198; Tue, 22 Feb 2022 12:01:36 -0800 (PST) Received: from localhost ([::1]:55076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMbLr-0001bO-IX for importer@patchew.org; Tue, 22 Feb 2022 15:01:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMawN-0003R1-V7 for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:17 -0500 Received: from [2a00:1450:4864:20::62c] (port=39823 helo=mail-ej1-x62c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMawM-00075b-5F for qemu-devel@nongnu.org; Tue, 22 Feb 2022 14:35:15 -0500 Received: by mail-ej1-x62c.google.com with SMTP id p9so46083933ejd.6 for ; Tue, 22 Feb 2022 11:35:13 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id i1sm766532edj.84.2022.02.22.11.35.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 11:35:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0PkugM/nmdz5ZSPWNwtFAXt+z4ki/4C47OuH3ieIYfs=; b=KhwDai9vdDS9RJjORTQz1DQ4dSsWAoXoG5We0FHGklr5NBzgQxpzDD0bHllTdlwyxM TDhMHG2WA8Tsm0Wk8YPX2QtPaYOPwFoS91fjkevq5cykcANMtL7JD4YA9eQAhQjSwOEq BPXKD/Q/F+uQ0IviIk5vuzQSjAGyC4OQqEvS2h8PiiqX9MBeoq6zoiaHd4MdHx83lVMv sm9RGVfwiuoy3C99fBpF4W4T5gef9jAJr9p9S0m6mAwFuClvR0vQghUNBZlKBW4y0AuA L+dZyA7oZel4RvHu6ugSoBKLHN36pgKcox7BtnrCjmTPrg3j5QIGaA5IbFKKf/uaR5XV 51ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0PkugM/nmdz5ZSPWNwtFAXt+z4ki/4C47OuH3ieIYfs=; b=61/WGtVx+K4lMObYwdw4HUTTMXiw5uOEUd1A0L896Z5WCRVIaRz0SSvEQo3nL86rEC PYj/s6e6O5sgcAPtmM9gHR9KLgmzk/xNbOp6hJIdLBFVYFMxK3uboWYqxIP6oN0HE0ub YUY26vcSYaU3VC20mBKJ6Uc/0JPPC77KyDmzToMNuSDcs1ng1/+F9ITvwrdIvoKu/J1F uo48718/8G6IRXYuvxcwmjqhE6jHQCuw6io9MX4czq4MIzEfwH1xhhy3ev77UG8wcX/4 izl8pa6U4eVhKxcmSd6SuKMFLhEImahpVhsOlzXL+HEBGvlekbGkqy7QOOdo+oX+wawR B0Ig== X-Gm-Message-State: AOAM530nlJHD0uCnvs3iku68NNCSPi78Mb1Wus9o8AJybtHNn5afwQ6M dVBE92R/4QdFpBxqSR9/MaBXji3O1QE= X-Google-Smtp-Source: ABdhPJxO+t27yi7W6jlmgeN+bikA1EqtYyUHjBQLiPxOYA21dKgH4z5SoisAizzO4JOv1JRRy3dmgg== X-Received: by 2002:a17:906:c12:b0:6cd:795c:9803 with SMTP id s18-20020a1709060c1200b006cd795c9803mr22023651ejf.593.1645558512666; Tue, 22 Feb 2022 11:35:12 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH v2 22/22] isa: Remove unused isa_init_irq() Date: Tue, 22 Feb 2022 20:34:46 +0100 Message-Id: <20220222193446.156717-23-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222193446.156717-1-shentey@gmail.com> References: <20220222193446.156717-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62c (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=shentey@gmail.com; helo=mail-ej1-x62c.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernhard Beschow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1645560097313100001 Content-Type: text/plain; charset="utf-8" isa_init_irq() had become a trivial one-line wrapper for isa_get_irq(). The previous commits resolved all usages in favor of isa_get_irq(). isa_init_irq() can therefore be removed. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/isa-bus.c | 5 ----- include/hw/isa/isa.h | 1 - 2 files changed, 6 deletions(-) diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index 1e8c102177..0ad1c5fd65 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -85,11 +85,6 @@ qemu_irq isa_get_irq(ISADevice *dev, unsigned isairq) return isabus->irqs[isairq]; } =20 -void isa_init_irq(ISADevice *dev, qemu_irq *p, unsigned isairq) -{ - *p =3D isa_get_irq(dev, isairq); -} - void isa_connect_gpio_out(ISADevice *isadev, int gpioirq, unsigned isairq) { qemu_irq irq =3D isa_get_irq(isadev, isairq); diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index d80cab5b79..034d706ba1 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -90,7 +90,6 @@ ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *addre= ss_space, MemoryRegion *address_space_io, Error **errp); void isa_bus_irqs(ISABus *bus, qemu_irq *irqs); qemu_irq isa_get_irq(ISADevice *dev, unsigned isairq); -void isa_init_irq(ISADevice *dev, qemu_irq *p, unsigned isairq); void isa_connect_gpio_out(ISADevice *isadev, int gpioirq, unsigned isairq); void isa_bus_dma(ISABus *bus, IsaDma *dma8, IsaDma *dma16); IsaDma *isa_get_dma(ISABus *bus, int nchan); --=20 2.35.1