From nobody Thu May 16 00:14:29 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=1683972632; cv=none; d=zohomail.com; s=zohoarc; b=SKuEFHyqqs40YhJuXdcCFk8B/yhQwS7E39zvfMZs4sDNOccmLSyqYPkRzEpF/qvm81Lib8wfbf1VmPHqEF5fjqr3XlEbuxARN8G960hwHRUxjXDhdsfyLnwsHIKHFIt+0wB06VgBSyNahHFmib+kS2XyPeGX6h8krc9hLYxryMM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683972632; 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=yK2AXj3fPSIz6Utpl7jtL9tKbRJUXN66thbr8qDAiuQ=; b=BkVe8scYyafwDXvGDkg44GRIwjDnteDfh5/ROF4uxVCjOFYE/OErEINDxxdUJ8Q/PtWhREHNf9tfarKCMzhutZb0z211rBjbh/F0og+x9AeUtXMAz+egA7IZWzTQC3f/kqfqXctkgT8ycePlRobHfey1ygUCXvTqZV9nbmZ3AVY= 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 1683972632514239.4940235477353; Sat, 13 May 2023 03:10:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxmBy-0008Ho-Rr; Sat, 13 May 2023 06:09:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pxmBv-0008Fn-8b; Sat, 13 May 2023 06:09:31 -0400 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pxmBt-0004Mi-4G; Sat, 13 May 2023 06:09:30 -0400 Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-966400ee79aso1541188566b.0; Sat, 13 May 2023 03:09:25 -0700 (PDT) Received: from Provence.localdomain (dynamic-077-013-174-037.77.13.pool.telefonica.de. [77.13.174.37]) by smtp.gmail.com with ESMTPSA id jr18-20020a170906515200b00965f5d778e3sm6645285ejc.120.2023.05.13.03.09.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 03:09:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683972563; x=1686564563; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yK2AXj3fPSIz6Utpl7jtL9tKbRJUXN66thbr8qDAiuQ=; b=dM83n9nUFMaLC5GveBnX9eYbelu0mxXCc818g1/fREvWc+EdUIa6hL57y44sPuJLGO 5JNeHBUgwhuOjFjoLYGh2hw57L2DgAZe/oIiNqEyzBZGsnfu4ElFP2faTtc2BTFz5eAY gu75oYYBgq8zhH/ORLxvDeDR3wjwJAgN4KVGy1d6C5kTEt2Eq3K1Nic1mU/gwMZK2E6Q pzlPpTSrj8aVJ8HlYmnZkFMmNgzUaQlHv4V+3sObFM/iYVYPxdU+DLjNkIrLNvrgagOy PLMTF7KBaeFyybvmDU0B4OiAYZ4hor2f56HPS6ttMs+C8ygHImmxuVUaHCRra2uSasEo pxnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683972563; x=1686564563; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yK2AXj3fPSIz6Utpl7jtL9tKbRJUXN66thbr8qDAiuQ=; b=NXcHiliOtTSk69u6+ACKA/Z15mk0+NZMtpb1ZfKF2Enm7a1cBq5UwzM3iUeXhGDOCz vvFqG94djAfrBuVsXxhVMtDnvXj9ZVpviOlyes6DN/RH5UIZBzdbWr3VpSIVWTdXDiFV f7ErELFFiBEL8libB4VWLXOcdLEsLD8C8AzlBJ8TB+qNA4vT9c/7ek0poWr6NhPta4ps D1EUVWwQ/x3TrzfnGjGxD3jYuHyVl7RYlo3RQ4l3xTU+44Qhp0ssZedGXpwd36RqhoU0 kQXQDZ62zZWMQHv0z5LYQiGtD3u/kNevOHXSsRybiNsT/yOesGn1mWqeSrEbOEgEuDrR Y4Hw== X-Gm-Message-State: AC+VfDxhmeckxGkjtp3ZBa2XZlOHrGhTBq8mgj+cbLT/bMPAexB3DIvr /FasCy6DENUcbpC6muVcY77AI0U3g60= X-Google-Smtp-Source: ACHHUZ5AUaO6yiHGekRTJ8vdomzOwy/8C0TCm5WR69hATQJFsimwD7Xa0bNVx7UfBAc3Z7B7pDcnVg== X-Received: by 2002:a17:907:9606:b0:932:7f5c:4bb2 with SMTP id gb6-20020a170907960600b009327f5c4bb2mr27463391ejc.75.1683972563195; Sat, 13 May 2023 03:09:23 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , qemu-arm@nongnu.org, Marcel Apfelbaum , "Michael S. Tsirkin" , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Michael Tokarev , Laurent Vivier , Eduardo Habkost , qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Bernhard Beschow Subject: [PATCH 1/4] hw/timer/i8254_common: Share "iobase" property via base class Date: Sat, 13 May 2023 12:09:03 +0200 Message-Id: <20230513100906.46672-2-shentey@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230513100906.46672-1-shentey@gmail.com> References: <20230513100906.46672-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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::634; envelope-from=shentey@gmail.com; helo=mail-ej1-x634.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1683972634036100003 Content-Type: text/plain; charset="utf-8" Both TYPE_KVM_I8254 and TYPE_I8254 have their own but same implementation of the "iobase" property. The storage for the property already resides in PITCommonState, so also move the property definition there. Signed-off-by: Bernhard Beschow Acked-by: Michael S. Tsirkin Reviewed-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/kvm/i8254.c | 1 - hw/timer/i8254.c | 6 ------ hw/timer/i8254_common.c | 6 ++++++ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/hw/i386/kvm/i8254.c b/hw/i386/kvm/i8254.c index 191a26fa57..6a7383d877 100644 --- a/hw/i386/kvm/i8254.c +++ b/hw/i386/kvm/i8254.c @@ -301,7 +301,6 @@ static void kvm_pit_realizefn(DeviceState *dev, Error *= *errp) } =20 static Property kvm_pit_properties[] =3D { - DEFINE_PROP_UINT32("iobase", PITCommonState, iobase, -1), DEFINE_PROP_LOSTTICKPOLICY("lost_tick_policy", KVMPITState, lost_tick_policy, LOST_TICK_POLICY_DELAY), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c index c8388ea432..c235496fc9 100644 --- a/hw/timer/i8254.c +++ b/hw/timer/i8254.c @@ -350,11 +350,6 @@ static void pit_realizefn(DeviceState *dev, Error **er= rp) pc->parent_realize(dev, errp); } =20 -static Property pit_properties[] =3D { - DEFINE_PROP_UINT32("iobase", PITCommonState, iobase, -1), - DEFINE_PROP_END_OF_LIST(), -}; - static void pit_class_initfn(ObjectClass *klass, void *data) { PITClass *pc =3D PIT_CLASS(klass); @@ -366,7 +361,6 @@ static void pit_class_initfn(ObjectClass *klass, void *= data) k->get_channel_info =3D pit_get_channel_info_common; k->post_load =3D pit_post_load; dc->reset =3D pit_reset; - device_class_set_props(dc, pit_properties); } =20 static const TypeInfo pit_info =3D { diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c index 050875b497..e4093e2904 100644 --- a/hw/timer/i8254_common.c +++ b/hw/timer/i8254_common.c @@ -240,6 +240,11 @@ static const VMStateDescription vmstate_pit_common =3D= { } }; =20 +static Property pit_common_properties[] =3D { + DEFINE_PROP_UINT32("iobase", PITCommonState, iobase, -1), + DEFINE_PROP_END_OF_LIST(), +}; + static void pit_common_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -252,6 +257,7 @@ static void pit_common_class_init(ObjectClass *klass, v= oid *data) * done by board code. */ dc->user_creatable =3D false; + device_class_set_props(dc, pit_common_properties); } =20 static const TypeInfo pit_common_type =3D { --=20 2.40.1 From nobody Thu May 16 00:14:29 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=1683972668; cv=none; d=zohomail.com; s=zohoarc; b=dWTApTOM0CGnMzZpDnNLomdtcsYoLIncwZJmG1UYdS9hirGLuwbwquLNKBHwrVECf6AUaPJ3P2v8gWvRhVNRdAFQCWXIlIS2BsD1NYnfLP6e5Y8gF01a3V94lWOttC66fQVq7ednSEZKV+95uIzeZ0ydEOfWmLBlC39d2r0uKV8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683972668; 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=QAJ0NoXVVjNhpzbrMGuIQeXjVMHa9REQcHYBD4P+/Ho=; b=DNuj0HxzY76ImX0JbipJzpu0rQk9PuWhS6pGpb9UoiTokUxwOlEZyqwDlFo8Qrg4LMKOKPUQt2i4Jhc7bh1sZhlHQETWqThyWd4g1FN7Q8xCfDfUW/jmpgeZyCeTjB8aimbFBfvlaVrRJGQIGzTSZd8JrkO8rGosDoVoUaZIaZ8= 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 168397266828428.233344566005826; Sat, 13 May 2023 03:11:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxmC0-0008IP-EK; Sat, 13 May 2023 06:09:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pxmBv-0008Fo-Al; Sat, 13 May 2023 06:09:32 -0400 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pxmBt-0004Mu-5r; Sat, 13 May 2023 06:09:31 -0400 Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-965ab8ed1c0so1801364166b.2; Sat, 13 May 2023 03:09:26 -0700 (PDT) Received: from Provence.localdomain (dynamic-077-013-174-037.77.13.pool.telefonica.de. [77.13.174.37]) by smtp.gmail.com with ESMTPSA id jr18-20020a170906515200b00965f5d778e3sm6645285ejc.120.2023.05.13.03.09.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 03:09:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683972565; x=1686564565; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QAJ0NoXVVjNhpzbrMGuIQeXjVMHa9REQcHYBD4P+/Ho=; b=ieFjd9QXrPx2UZu4pB1FiSEW/Wlqyxcn3vlyYFMu3GWCI4WkW8XFOlI6c4CHlHr/vO 6n6MxfKnCYjmxq6QZqDqjqJ2vMdO/yM0P7mYs843PkWa9/XRCyijwLySTYBAgNN7Cvah xfAyCDr8XZCVe35i9yZVkik7Qf6Lm1Crz1kH0O6SbZS/NChff0hQyeFQEreoEEcf6ato p7zkfPPP7TskCT07JBaqHwTZ4pAbILAojpC9hR44MkYbq1ROWs0rW+p/AFh3W1X2h5cm jsQLqQ+ML8x6nVvMuqCfCT64iVzaOdkXepavvanpu3zbbg92olzSwen9JRKcNvhXJhWb zrNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683972565; x=1686564565; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QAJ0NoXVVjNhpzbrMGuIQeXjVMHa9REQcHYBD4P+/Ho=; b=Q8jM2fRzX2MNx5Ncz+jlKMgPLpK8Mm1+wZyCDafcNiR5AVkcxe5RTcNUfKGswRcHG4 xfI/W1ne3JFjwRcTsSuAKNgSpUSNu2xdzwOZiAr+15anRZSEBjgiguzR7BGYsKYR7Pec LINQbh2GHWWqOqjT00ENVJU8UXCJO4c7gzv02yWFiU7LJC4AdSeM3bU7DUPuWSPB+bL8 4WCLc5LysRJkA//jwfMFTTpG0JnIU98h/vRxCFeCgMcbA1gSFPSP692qgE5xnDcVLngl pJYMevID/Bikyf+LfUa3pEMmrbYMAgzOEnAbcijRRCsPDu2UjPIHxBmLWCqV7rwm7gjx MJCA== X-Gm-Message-State: AC+VfDwqDZEdqVfJBtrRcCRP3WcKa3p8+4drNY2XsklmPyp9K8M8U327 sHeXdLQScvrTbw0Wv2LRHV/wRKc9Z0s= X-Google-Smtp-Source: ACHHUZ4T9AMrPpnTskQhpisYUDPJVXS2F6wtXJn1NyPCasbmp1iWvzmKkOwN5Sx7FDRiK4uCiy9nVw== X-Received: by 2002:a17:907:9810:b0:969:f677:11b4 with SMTP id ji16-20020a170907981000b00969f67711b4mr15676753ejc.37.1683972564898; Sat, 13 May 2023 03:09:24 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , qemu-arm@nongnu.org, Marcel Apfelbaum , "Michael S. Tsirkin" , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Michael Tokarev , Laurent Vivier , Eduardo Habkost , qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Bernhard Beschow Subject: [PATCH 2/4] hw/arm/omap: Remove unused omap_uart_attach() Date: Sat, 13 May 2023 12:09:04 +0200 Message-Id: <20230513100906.46672-3-shentey@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230513100906.46672-1-shentey@gmail.com> References: <20230513100906.46672-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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::634; envelope-from=shentey@gmail.com; helo=mail-ej1-x634.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1683972669828100005 Content-Type: text/plain; charset="utf-8" The function is unused since commit bdad3654d3c55f478e538037d9eccd204e5fc8ee ('hw/arm/nseries: Remove invalid/unnecessary n8x0_uart_setup()'). Signed-off-by: Bernhard Beschow Acked-by: Michael S. Tsirkin Reviewed-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/arm/omap.h | 1 - hw/char/omap_uart.c | 9 --------- 2 files changed, 10 deletions(-) diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index c275d9b681..067e9419f7 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -724,7 +724,6 @@ struct omap_uart_s *omap2_uart_init(MemoryRegion *sysme= m, qemu_irq txdma, qemu_irq rxdma, const char *label, Chardev *chr); void omap_uart_reset(struct omap_uart_s *s); -void omap_uart_attach(struct omap_uart_s *s, Chardev *chr); =20 struct omap_mpuio_s; qemu_irq *omap_mpuio_in_get(struct omap_mpuio_s *s); diff --git a/hw/char/omap_uart.c b/hw/char/omap_uart.c index 1c890b9201..6848bddb4e 100644 --- a/hw/char/omap_uart.c +++ b/hw/char/omap_uart.c @@ -175,12 +175,3 @@ struct omap_uart_s *omap2_uart_init(MemoryRegion *sysm= em, =20 return s; } - -void omap_uart_attach(struct omap_uart_s *s, Chardev *chr) -{ - /* TODO: Should reuse or destroy current s->serial */ - s->serial =3D serial_mm_init(get_system_memory(), s->base, 2, s->irq, - omap_clk_getrate(s->fclk) / 16, - chr ?: qemu_chr_new("null", "null", NULL), - DEVICE_NATIVE_ENDIAN); -} --=20 2.40.1 From nobody Thu May 16 00:14:29 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=1683972668; cv=none; d=zohomail.com; s=zohoarc; b=Zfawrdos3hRLCK+w6vDzWxYTs4A81C5NmHktwBs0fD6o3iuSGiYXKyo1HTIwI7YP6L2wnbO4TA99kLVR5pkXVhMUbBohdflI7E8y8Ont2gxgBAIJNKcQziEYpl6z66KokI7T8GZ4oxyTWml/caibUyea0x3tESd1kNMtCYR6PjY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683972668; 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=W2cgCTCiy6rpTMmB83MFFmB8jWJpK9cx9olCbX5GQQU=; b=cgqD4CFGQMubdt5sKNL4hSw+/tbLzzgFxlva95luWEJZEBYEJMRBLnE+OgYYDA1bgFf+JqUFIWvEAnZCwALBqrLSDdmpN9NPJioi0fbP+6K40saXdO3k51ySWksM98+5AZGS5NMkThNNKXhX0KWCjjZ0SRlvGBqwCSFySOVe+sM= 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 1683972667998517.7989942401847; Sat, 13 May 2023 03:11:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxmC6-0008KT-JB; Sat, 13 May 2023 06:09:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pxmBv-0008Ft-Jq; Sat, 13 May 2023 06:09:32 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pxmBt-0004N1-Ae; Sat, 13 May 2023 06:09:31 -0400 Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-50bd2d7ba74so96527770a12.1; Sat, 13 May 2023 03:09:27 -0700 (PDT) Received: from Provence.localdomain (dynamic-077-013-174-037.77.13.pool.telefonica.de. [77.13.174.37]) by smtp.gmail.com with ESMTPSA id jr18-20020a170906515200b00965f5d778e3sm6645285ejc.120.2023.05.13.03.09.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 03:09:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683972566; x=1686564566; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=W2cgCTCiy6rpTMmB83MFFmB8jWJpK9cx9olCbX5GQQU=; b=bDa6DQr6jTb7sMeRvv8bOj5f3WIEWu0jx6geR4SI4263zTVB/TADncDmPei7FZd9Hb ipHjwHT4VA+P1MIUegw2X8pmnRewcfdMCiB5EG7WrCg5EpYUGL3hDMdQEGX3s6WjeQSI BNa3Ll5LJ3kVSxpReAjmSubaMAbrbeP1lPwWNdc1qH4Lun79uAyQ0E8Qip7uh3KDZvlM bgsPdyzMwPlqep310m4uGhjSpg5Kq1WB1s5eNafic4FaxZGsE+5b2v+PfAcwSpVfOni6 1ui5wWeYMh+zZVKpNph642yqKD+QY5Lt8TfBqo7/u3nGzyF8fc8gZ40VxGMDRjfixoYw bf+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683972566; x=1686564566; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=W2cgCTCiy6rpTMmB83MFFmB8jWJpK9cx9olCbX5GQQU=; b=Rfqws2bG+CVd7TepOVwI1IsX8jUW7EhT3a4AfANyDoSyxzv+pTBD0ryGQGBSJSPX6y wM+ayEYDeq+PaYcdEmp5dgy9AsfFL7+OJJvr6MDbZkm+nK4aTxJNKajsLCMHmnUm68/n 5f9XPS9g15fNqwmZq7YKQ63ZFyt045ZgMvJ9GGSKOI7CFz4Gh4MDQLR3kbIyYaYZeq5Y iV8RAho61uwdtSYI2F/CQnble8u/PcuSbOcpoe0FUHv/iWuoupWApk330lgSQ0sUZ0Kq mzHA6y3RAkyDBkxM+BlF2+W4wHrLIu0tq8dMpJDXLTCGyxNo4tuJ8jS7CARcGHiRKNNp YdDw== X-Gm-Message-State: AC+VfDwSt8ENY3eKtS+yfxruIDiAMA+ybtzSJdKYX9mWHZV+3iDH1sDr PIMJAAxbzkteu6QvP3yStwDSEyML6rI= X-Google-Smtp-Source: ACHHUZ6ssYp5KSkLZsa+z6QRI3na3At/5fASE+b++szLRJFguzqlGstH1T2cIvSwYclp0c0lZn+FPg== X-Received: by 2002:a17:907:1c25:b0:969:9c0c:4c97 with SMTP id nc37-20020a1709071c2500b009699c0c4c97mr16119044ejc.1.1683972566177; Sat, 13 May 2023 03:09:26 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , qemu-arm@nongnu.org, Marcel Apfelbaum , "Michael S. Tsirkin" , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Michael Tokarev , Laurent Vivier , Eduardo Habkost , qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Bernhard Beschow Subject: [PATCH 3/4] hw/char/parallel: Export TYPE_ISA_PARALLEL macro Date: Sat, 13 May 2023 12:09:05 +0200 Message-Id: <20230513100906.46672-4-shentey@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230513100906.46672-1-shentey@gmail.com> References: <20230513100906.46672-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1683972668827100001 Content-Type: text/plain; charset="utf-8" Rather than using a string literal which is prone to typos let's use a macro instead which is caught by the compiler if mistyped. Signed-off-by: Bernhard Beschow Acked-by: Michael S. Tsirkin --- include/hw/char/parallel.h | 2 ++ hw/char/parallel-isa.c | 2 +- hw/char/parallel.c | 1 - hw/isa/isa-superio.c | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/hw/char/parallel.h b/include/hw/char/parallel.h index 0a23c0f57e..29d2876d00 100644 --- a/include/hw/char/parallel.h +++ b/include/hw/char/parallel.h @@ -4,6 +4,8 @@ #include "hw/isa/isa.h" #include "chardev/char.h" =20 +#define TYPE_ISA_PARALLEL "isa-parallel" + void parallel_hds_isa_init(ISABus *bus, int n); =20 bool parallel_mm_init(MemoryRegion *address_space, diff --git a/hw/char/parallel-isa.c b/hw/char/parallel-isa.c index 1ccbb96e70..547ae69304 100644 --- a/hw/char/parallel-isa.c +++ b/hw/char/parallel-isa.c @@ -21,7 +21,7 @@ static void parallel_init(ISABus *bus, int index, Chardev= *chr) DeviceState *dev; ISADevice *isadev; =20 - isadev =3D isa_new("isa-parallel"); + isadev =3D isa_new(TYPE_ISA_PARALLEL); dev =3D DEVICE(isadev); qdev_prop_set_uint32(dev, "index", index); qdev_prop_set_chr(dev, "chardev", chr); diff --git a/hw/char/parallel.c b/hw/char/parallel.c index af551e7864..3d32589bb3 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -93,7 +93,6 @@ typedef struct ParallelState { PortioList portio_list; } ParallelState; =20 -#define TYPE_ISA_PARALLEL "isa-parallel" OBJECT_DECLARE_SIMPLE_TYPE(ISAParallelState, ISA_PARALLEL) =20 struct ISAParallelState { diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c index c81bfe58ef..53b80de0ce 100644 --- a/hw/isa/isa-superio.c +++ b/hw/isa/isa-superio.c @@ -20,6 +20,7 @@ #include "hw/isa/superio.h" #include "hw/qdev-properties.h" #include "hw/input/i8042.h" +#include "hw/char/parallel.h" #include "hw/char/serial.h" #include "trace.h" =20 @@ -51,7 +52,7 @@ static void isa_superio_realize(DeviceState *dev, Error *= *errp) } else { name =3D g_strdup_printf("parallel%d", i); } - isa =3D isa_new("isa-parallel"); + isa =3D isa_new(TYPE_ISA_PARALLEL); d =3D DEVICE(isa); qdev_prop_set_uint32(d, "index", i); if (k->parallel.get_iobase) { --=20 2.40.1 From nobody Thu May 16 00:14:29 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=1683972668; cv=none; d=zohomail.com; s=zohoarc; b=JQ+mOgBOJNq1JZKVZNLUVAPfv4ifK8CFdzFQ7W5zVuoRJje6B+qXeIhyqTL+GWqrb6CZo01Go78Ph3DcjdeEz5eaO6Ter1okJo0eN4uKFIz6/XoWcniGMh8cQWlEXRu6qTZ/T+PwhobOuTwrUtVs2Jq9hKRk1B2tsK65rNxogos= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683972668; 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=5JoEHRzJl8ppxGRgpapWnu2BXy56o3xTN1pN/oM5GCA=; b=hsHAmZ9KWDtOQHwRUoawMBDugtWF03whW0ROXBrMGiuaoOljZU3/JaaEFh7GrYDyZV9MLlF0WephGAoCgEcHZh6mWliS8O7WVLfiKY+lc7Zvn97F+42EXcpeskdxscXMOs1bW3lEiTaO2Fcp0I/2TXpgPrQhxPTlGBioojcKNNU= 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 1683972668333918.2694407994321; Sat, 13 May 2023 03:11:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxmC6-0008KG-HD; Sat, 13 May 2023 06:09:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pxmBw-0008GM-D2; Sat, 13 May 2023 06:09:32 -0400 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pxmBu-0004NB-EF; Sat, 13 May 2023 06:09:32 -0400 Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-965a68abfd4so2060899566b.2; Sat, 13 May 2023 03:09:29 -0700 (PDT) Received: from Provence.localdomain (dynamic-077-013-174-037.77.13.pool.telefonica.de. [77.13.174.37]) by smtp.gmail.com with ESMTPSA id jr18-20020a170906515200b00965f5d778e3sm6645285ejc.120.2023.05.13.03.09.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 03:09:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683972567; x=1686564567; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5JoEHRzJl8ppxGRgpapWnu2BXy56o3xTN1pN/oM5GCA=; b=dQsjrenu5PhTCwhpVL4cDMvJQkhp9vBmY3axtpESbxfAWTxBHjMOZlb2PDMTlG1dRE LUJxa0tBRY6NO80AV/9+7efG7D+CF9STBrpFpfbd3V3rmwla/tBeYfCTfHg47FJ6JOTK 0yKFGFISK2E/Wyfw0k7+Y6mpBfF7yz2hLVQpRZ9fNY9qBRATEaoBR7cRf+45QxztAns1 +cToYCNlVSzKVKeKeDUwj9MP0BQEaRy1F4xH+Y87pG2AybhPec7qAOba3q8BdpkppCyb E4+FuT4oFhH9Qa/fZZz3tj+tjZBoN3YYAK+R43ZDxRrf02WyHk461Zs4XL5KU3Lm69Q5 bhSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683972567; x=1686564567; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5JoEHRzJl8ppxGRgpapWnu2BXy56o3xTN1pN/oM5GCA=; b=N0xqCyKSpno3YiQEWSwZU/tcTNiIMDSkga2omxCCJdYWMWqBfYSOgWT9BiqGTeDcKV rHPe7lbRRpv2SxkLf3p7vCR1l0RYVsjMWWMnk0gOs9f6980PTa6AXFuspZfPYE9PympV Ru04ySTgawvGE0iHTyvzxVCwqzvR0D3CFjuCAMAbCmyOBrDTfoklRgF5/NGhbww2+lSI SzorN/XIJ2gGxW/blsx4K/phWAjzlPXzBv/6QjvNt/JVp/4HlQ4IqyyLT/nCgjOY6foL lUJLJRzpPvKlV0MV914jwtn6xOa/WOeEArpElkZhnhSygXza7TLYmg3us9dsnmNUouYZ jTYQ== X-Gm-Message-State: AC+VfDzvJCyU0CfM7VqCODQfXC4Yq1NpWFetIygg/z726Q0zCQj71bXS k/G9iZLGPRYebNAwuwPH3wiz0xiCRBg= X-Google-Smtp-Source: ACHHUZ4Z3TXj1grMuaqYvPEnYY7ARKZaaop6OS84mSOH20zEN0eHyVYjZ3f6TzhNbuiXqvrcJJASqg== X-Received: by 2002:a17:907:7e9e:b0:96a:41ed:e3fa with SMTP id qb30-20020a1709077e9e00b0096a41ede3famr10622053ejc.22.1683972567409; Sat, 13 May 2023 03:09:27 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , qemu-arm@nongnu.org, Marcel Apfelbaum , "Michael S. Tsirkin" , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Michael Tokarev , Laurent Vivier , Eduardo Habkost , qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Bernhard Beschow Subject: [PATCH 4/4] hw/isa/i82378: Remove unused "io" attribute Date: Sat, 13 May 2023 12:09:06 +0200 Message-Id: <20230513100906.46672-5-shentey@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230513100906.46672-1-shentey@gmail.com> References: <20230513100906.46672-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1683972669451100003 Content-Type: text/plain; charset="utf-8" The attribute isn't used since commit 5c9736789b79ea49cd236ac326f0a414f63b1= 015 "i82378: Cleanup implementation". Signed-off-by: Bernhard Beschow Acked-by: Michael S. Tsirkin Reviewed-by: Mark Cave-Ayland --- hw/isa/i82378.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index 5432ab5065..63e0857208 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -34,7 +34,6 @@ struct I82378State { =20 qemu_irq cpu_intr; qemu_irq *isa_irqs_in; - MemoryRegion io; }; =20 static const VMStateDescription vmstate_i82378 =3D { --=20 2.40.1