From nobody Sun May 19 16:31:37 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=1684672387; cv=none; d=zohomail.com; s=zohoarc; b=nevF6r80qrXdx2bSp+ErKFpwkRNZxVYD2To7BghOcnvZDKmGhipQwy9am+5x4s/zhm4cI3LIysUrs6bW+hxemAKPgtZZuOkZt8IulU0URNwIk11BKgutFakN0dabSFlf9quh5s76uOMT6g8bCqL7CN82TjTQCyp3bFcGnedMjMc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684672387; h=Content-Type: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=Anz5dlSMRx2Ue0AdMLdpzN5IRHRJ9vVknwSj+KlouiQ=; b=a+rL5Fq/kiGPvODYKa3HgIEu/XcrPX1BXLIhpNqJ3+jH2QZQ9fB7rTkufIcXUX3Lp8KEhL8hfr+MUefl8Z8PQl6qJb6WcjN2EQHlJeu0S2SXFqdI08+BWNYgC2CzRkQhuoC/UFLVvVhsnsETebXxt2KZ5rfqgXemceIHtYWeruQ= 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 1684672387535113.4614330527105; Sun, 21 May 2023 05:33:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0iDP-0001wm-3I; Sun, 21 May 2023 08:31:11 -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 1q0iDH-0001vT-A0; Sun, 21 May 2023 08:31:03 -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 1q0iDF-0001kF-Kk; Sun, 21 May 2023 08:31:03 -0400 Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-96f588bc322so431355166b.1; Sun, 21 May 2023 05:31:00 -0700 (PDT) Received: from Provence.localdomain (dynamic-077-191-145-122.77.191.pool.telefonica.de. [77.191.145.122]) by smtp.gmail.com with ESMTPSA id b19-20020a170906729300b00965ec1faf27sm1882678ejl.74.2023.05.21.05.30.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 05:30:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684672259; x=1687264259; 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=Anz5dlSMRx2Ue0AdMLdpzN5IRHRJ9vVknwSj+KlouiQ=; b=I+MGt1x/fVUA/Vfj1B/iex59UobttsBmPNzrgWbROuH/ockZNifRfZIQYY62PbBhXu EieTpWwcoyRqrWngEjBM7G0j9QZlgWSFzXk+ApCUIyb75MH3DQvaGi6sia9ziW5tVuXH 6su5qd2WEfmW4bTwUVhx54ODTq6gSQ2O8xspMD1hRMBDWbL3uljWJBCtQc+knxT42Btl ZILE7XxBZp4eW++h6ilKG/NEJxyAx97D3HIEclIWK8qVidASArbdQKi0IuQDR6r/itP+ kVMXqsWSWT/FehaO8EEQYK6TYvg03ISIgzPywdCr2hO+IljU8OQbRz+mS2Am7P6K3ySu w8aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684672259; x=1687264259; 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=Anz5dlSMRx2Ue0AdMLdpzN5IRHRJ9vVknwSj+KlouiQ=; b=fdxsa4Y9vJ3iAUr/Zi+ct4gDnoHEh63mp1gDZ2v+YjlAJuje5Po+o6WFtgT4He/djj Vs5ZTgfRCnCacwsWTHCuWDq6G874Tn1UfQ0nJIuCJjob/FvqM4dZ7vCK13U+keVXoJ3p Ol4nAKaLNr8hbRDv0Wkkb7t/QId1XzCYSb9BAVpcjhVzc16OisBailyDU3GG0gHq6R6t DipizMprrxsA/1jekMVJKV1+H4sXchNm3JU1iDF40ZXSREdy/ZKyA6klY94l+vQwAXCS 9oOITYnBY0lU3Fwgij5Ag6TXCB62zRl5zhEZK5Fi1CGWjODGGqbtGHl2vB8USerefLLT UlTQ== X-Gm-Message-State: AC+VfDyA4W1EBkZ2XBy1qJFQ3F0VDuZ31m5/y5n0afxYGMSzaFTfo4w5 XbZCEegK7KT5VxlDZvUy0gAaoP6pNOY= X-Google-Smtp-Source: ACHHUZ78GZ3ZKHj9M/KHfRLkdL8rRVk2gcWHimYmCN5CRVsyRubKaUO61I3kFRMiqDezSXVt81L6kw== X-Received: by 2002:a17:906:58d1:b0:933:3814:e0f4 with SMTP id e17-20020a17090658d100b009333814e0f4mr8423846ejs.16.1684672258548; Sun, 21 May 2023 05:30:58 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Michael Tokarev , Laurent Vivier , Marcel Apfelbaum , qemu-trivial@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , "Michael S. Tsirkin" , Paolo Bonzini , Eduardo Habkost , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , qemu-ppc@nongnu.org, Peter Maydell , Bernhard Beschow , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/6] hw/timer/i8254_common: Share "iobase" property via base class Date: Sun, 21 May 2023 14:30:44 +0200 Message-Id: <20230521123049.312349-2-shentey@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230521123049.312349-1-shentey@gmail.com> References: <20230521123049.312349-1-shentey@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: 1684672389332100003 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 Sun May 19 16:31:37 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=1684672393; cv=none; d=zohomail.com; s=zohoarc; b=Zwa3d2/Bv9dXP4GWVKjO16ddNvJp7rJNT2AZeK59B4G5IDU0DGEXeLPPLW17lIzb/ESiOvv5XAdmBDah3hGKf45FrWWd88G50b0fHdPZdVFp6BdbkIdMll3NQYDeT+/JGOKE+okHhD6q1Sc0zARuTPG3OzGTTpMhr2LpzahrLJc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684672393; h=Content-Type: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=iS6IllWr8xotqYJ+kDfnN1bLpimUHqJGv84Pvf7+lk4=; b=WIFrQgeXtyoZrJ2EMcPA2+NUw7Zh1ZMN7H1D58+zmI0YdbI/V/hWMJAPe1bz2Oi/FxPqrzoWZlj3gozD8q+Nky2efvIqKSHNm0qbTPFxd0vN1Ef/WNG692eU98I5FDvZwd6x2bEog66tQq1c5BZbPy3mCD5H7sr5WeHA5TA3xfE= 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 1684672393222638.2002481967718; Sun, 21 May 2023 05:33:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0iDS-000237-K1; Sun, 21 May 2023 08:31:14 -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 1q0iDI-0001ve-D8; Sun, 21 May 2023 08:31:05 -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 1q0iDG-0001kP-Og; Sun, 21 May 2023 08:31:04 -0400 Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-96fab30d1e1so189865766b.0; Sun, 21 May 2023 05:31:01 -0700 (PDT) Received: from Provence.localdomain (dynamic-077-191-145-122.77.191.pool.telefonica.de. [77.191.145.122]) by smtp.gmail.com with ESMTPSA id b19-20020a170906729300b00965ec1faf27sm1882678ejl.74.2023.05.21.05.30.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 05:30:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684672260; x=1687264260; 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=iS6IllWr8xotqYJ+kDfnN1bLpimUHqJGv84Pvf7+lk4=; b=a/jNERZFkl+kJSIwUXyJzXDh4DSKma9BEljQQzTxsBjhukBUK/ysk4ZUHZK7L4NP22 8yu6odfXYDZPq3pBiL4Y2RiSRec0oHnbYQcpwTb6SwLDlhnF+tl2MpP4M475+OiLb98O DcbE//auu8+ZXtrfhaR/gFU4dPT17b/8wSU5V7TjPSZKt5bpaYy3trEa5yNqTIBXIBMy fk97INAkXGEMFWp1toN4BAC92xnriPb/S2iCo4X+rlLZS4z60Ai611xoBQsPxgTS825H fPL58gMriZ0Vl0aLf6SQudt2fXdhqHQMxe884Mrbg4oj+8Dk/Jmgi5/XFQ0dZNmcM411 /XJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684672260; x=1687264260; 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=iS6IllWr8xotqYJ+kDfnN1bLpimUHqJGv84Pvf7+lk4=; b=TCRIHZzkIFlAQAwZDiKqYU2S0tfkTukKdYYKDN9e0X3xuvGMyKxs9b1XA8113e/jQJ 4yTL+kohkDUlN2I5FK2lohJLFu8ejUvrYBBimnl0YPcQZB5YYKfI0WiIBVYvkv7vVfvL m4DI5A2xiVHayuKfXUn0LDZvOYWrpnRnkpJxOaoLGpZ2OhKOazSA5BlHECtcyQlvo7OW a41OE4u2aZ/DBx2zMU+LXptBNUTZKKeKvvSO+1j4IBNxHWHv+p7Y17XiIF6ZGzGWFY80 EnQiQ2PxQ5VAt8pEcKFwEtP1w25VsFKybHdpkWkYxKlc2QN25mOSd0f9qEmbp7G+wg/9 GluA== X-Gm-Message-State: AC+VfDyRAKrs262Q2ZfNkd4EI9Pv94PV+aDn9G2CysWO1PhXJCGAfyAD iOV7cKdAFmk7MBwn+3e3fsvHDrl/Fno= X-Google-Smtp-Source: ACHHUZ42H06+SnWQSEWDenwjJxBuXx+mHeiphUa1vfu5nOi2EHaouOvZIDLNmi6yBsjbzSgtRwqxfA== X-Received: by 2002:a17:907:1688:b0:965:d7c7:24db with SMTP id hc8-20020a170907168800b00965d7c724dbmr6541782ejc.32.1684672259921; Sun, 21 May 2023 05:30:59 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Michael Tokarev , Laurent Vivier , Marcel Apfelbaum , qemu-trivial@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , "Michael S. Tsirkin" , Paolo Bonzini , Eduardo Habkost , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , qemu-ppc@nongnu.org, Peter Maydell , Bernhard Beschow , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/6] hw/arm/omap: Remove unused omap_uart_attach() Date: Sun, 21 May 2023 14:30:45 +0200 Message-Id: <20230521123049.312349-3-shentey@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230521123049.312349-1-shentey@gmail.com> References: <20230521123049.312349-1-shentey@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: 1684672394649100009 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 Sun May 19 16:31:37 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=1684672392; cv=none; d=zohomail.com; s=zohoarc; b=Z5oTuEDjG/prsI6Ce67yIchiUYZlh0f0Us8ILUVGYQb+7b9kKimcf+r5oIAWuQesqtBYUALy6uhSJMk79rwkbKiQj6Jo9EYldww7OGteqm+5saBKaycx/vBrW5uJmOuiTE8NQEtcoxCTHHZ5UsPgO7jz7DQEZn9tdvdPGJqP5Lg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684672392; 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=s+kzg83eZnbuI0aq/ydKr/xkgLTYwwbEGaXyAFBj3HY=; b=jtpKPPc0VFK1IU21T0elN+KduKgGQcejePoR4fnzcxzCTtuL7sgbcYw+NNQavdktdLZ1LeUYDUXd9M9knjP4b/apzCFqs6aoFJ2dBpK8NUN0F3iSyUVVR3VAQKwKOe+N/eHmR9OnY3RbiHvUVmZdE7XNbYjRHceXfwDRNsvhVhQ= 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 1684672392633254.1928660155604; Sun, 21 May 2023 05:33:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0iDQ-0001yi-Ir; Sun, 21 May 2023 08:31:12 -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 1q0iDN-0001w0-Lh; Sun, 21 May 2023 08:31:09 -0400 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q0iDI-0001kq-5C; Sun, 21 May 2023 08:31:05 -0400 Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-9659e9bbff5so928451366b.1; Sun, 21 May 2023 05:31:02 -0700 (PDT) Received: from Provence.localdomain (dynamic-077-191-145-122.77.191.pool.telefonica.de. [77.191.145.122]) by smtp.gmail.com with ESMTPSA id b19-20020a170906729300b00965ec1faf27sm1882678ejl.74.2023.05.21.05.30.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 05:31:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684672261; x=1687264261; 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=s+kzg83eZnbuI0aq/ydKr/xkgLTYwwbEGaXyAFBj3HY=; b=BmgtQd0RMO9XNHqBY+gMCT+AyQVCDrENTFVH2KwG7cY+lvuYEmytLTpixcXOQPCU6F 9EUwq4lqSoKfBoTbB9xZ6rA6G6Vswzer71DYQ/e9p8gw6h8qDqqJn8iFAD2NfqMRn/50 wkej6Vsvse6AbEY2jXo0jshUyRtYapOUTCJ1azDv/OjfCc1drQ2tkGwYE7oyS7WbPNza d7KaCdizDwX3J8SrqBrz4JFkXRBngzKo27oD0y9HSW1zSixVz8ppUq39BwJL1GNR/ofq px7ReGtvwp75vTpY2Mmy3Vj1BICGY4peJHGCnirbTTOMSvBwZW4KuR+VxCJsgWkAxPoh 2VhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684672261; x=1687264261; 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=s+kzg83eZnbuI0aq/ydKr/xkgLTYwwbEGaXyAFBj3HY=; b=XcryUl2YFcMltXeKOYnTAxCehIJZUslZJLQWz2DG3I0Yac9bXH9PNxQZvYWRRR60Vy WsksOEQ2Wtb8pT0N5maaJFikyGD3U7B61Fft8IPw3mEMsPo5u62o/luuPmecxeS4543n cfha26Nwv6FvIl6/GSyf7pNvd/A39Wl08N5FaV34YaY2PnT88oLLyrhH0FWrt9F34hLZ 6Wr5S/Is2TsW6HkIStG2ZzwaQkfktdb5FIG0Kyt5MLsEhHEyB0tOLBuAP7N6Zo8xQXvO +owFPhFh4a2p3AeUmeA7/0CQLdZ3tG5+ehviYsdl2luHFaWCMcRQTv16cMGTRB7NKdc/ CgVg== X-Gm-Message-State: AC+VfDy+JZ0m8kJ0CWWl189vM9pVjwMdh7y8SWtuWmH9j11kZP5tA5XZ NLs+ef9vKbTLrQFVvrQH205fMwm9hEM= X-Google-Smtp-Source: ACHHUZ4Oy2LcvaRUIKkFK6Zn/pgNeyDkk4bjuEpAHu6aR8n2C4VxI49AgRDT/EbkEkE9I7sf1XMxnQ== X-Received: by 2002:a17:907:25c2:b0:969:edf8:f73b with SMTP id ae2-20020a17090725c200b00969edf8f73bmr6672640ejc.60.1684672261339; Sun, 21 May 2023 05:31:01 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Michael Tokarev , Laurent Vivier , Marcel Apfelbaum , qemu-trivial@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , "Michael S. Tsirkin" , Paolo Bonzini , Eduardo Habkost , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , qemu-ppc@nongnu.org, Peter Maydell , Bernhard Beschow , Mark Cave-Ayland Subject: [PATCH v2 3/6] hw/isa/i82378: Remove unused "io" attribute Date: Sun, 21 May 2023 14:30:46 +0200 Message-Id: <20230521123049.312349-4-shentey@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230521123049.312349-1-shentey@gmail.com> References: <20230521123049.312349-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::631; envelope-from=shentey@gmail.com; helo=mail-ej1-x631.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: 1684672393384100005 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 From nobody Sun May 19 16:31:37 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=1684672398; cv=none; d=zohomail.com; s=zohoarc; b=RRwJsnYspB6btvYbRndaY1PfzNKM+vgRsOy6EKwApNvigC+N5C3MXbrqoSp8lkl4FddmqqU11DTAZGGtYbHw44PB2DvP9OiiMJZaXgxLyvDlXlfthGZfTSbufRMyoV8EosxejWpOv69icd+z1srBvuuebzuJJZZ3NLlXwCP2GjI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684672398; 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=aCbv0UcSqF4ar26VgNDIWvOon/JFFKQ9y3nbL6W/zoY=; b=K+afAmFt/wEhDyBNywAZaiteYWh72RAsLrPi3VJK9oCQ/UVR4m6dcIKFeDq6vFzovG4/BBRhnyFhIwh1aPW4HtP2hxc491NzusXFMA4kKdBUqy/ivUjd5i4yZIJAYK6AwQ/r28n+jIctNQXw2TRTRYnvVllylOQQV1ziknekgbw= 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 1684672398487610.2313525441571; Sun, 21 May 2023 05:33:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0iDW-00025m-JV; Sun, 21 May 2023 08:31:18 -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 1q0iDP-0001ww-3j; Sun, 21 May 2023 08:31:11 -0400 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q0iDJ-0001l6-Dp; Sun, 21 May 2023 08:31:10 -0400 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-94a342f7c4cso945924266b.0; Sun, 21 May 2023 05:31:04 -0700 (PDT) Received: from Provence.localdomain (dynamic-077-191-145-122.77.191.pool.telefonica.de. [77.191.145.122]) by smtp.gmail.com with ESMTPSA id b19-20020a170906729300b00965ec1faf27sm1882678ejl.74.2023.05.21.05.31.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 05:31:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684672262; x=1687264262; 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=aCbv0UcSqF4ar26VgNDIWvOon/JFFKQ9y3nbL6W/zoY=; b=h9iVW4UMjUWmN7BNg9jx1lZ4f8mkdovsMysXv3X3HhCgSNgFHiJ3Ek8SLUjugVVnDP 1/0BT2xucjJhheaggwcgUzcTJNLB+yPOCTpXxaXC53eN4ePcfrcoC017YTjq/U5qh6/V tvyNysz9Wb1K3khVHdfE9hpFdptZrDmHW1lBUHpzOlUTJUFEuC6YDKhnjKHmD+o3zyWM 0HiEvioXJ0EuUJ4a12jTZvMrkD8w7N4DCd4Yk+irWfGv0n3O9ydhRJ3sRfOIvYt1jm5t tzbhLcwEnMadvVAlrocbRx8EY/0hC23yodWDAVSKCBLyKOOdZIN8NJDrzdUC3Hco16B9 FoGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684672262; x=1687264262; 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=aCbv0UcSqF4ar26VgNDIWvOon/JFFKQ9y3nbL6W/zoY=; b=f/AwImU7qzn8N42dCSdWzTXCXHbBgt4xeU7qFRkvuPFBqqzoLTOMpQNvOGQ0Ogm1zJ H5NiJdPe661UvzYPA4gF8y3o/XgHg/bXTRrkRPDy8vJxZeI2tbNs63wh8RSUpKmXNIrd iBgb6vsNq1vj5et9apambAXddlYqrwMbQaM9Nwo0rjQ/v0kkMnAdfi8jVj2TIHcHXj2x IBfCh+gEvjhQBtubKWBoSPBeucAE/BioJi0Plzo8D1yNUusSAYaMuJgFycJ2YC6aDZkb /1L5m9ATPuXpykK6e6BJxIuc0GLEf7KR3prxsCPfm/nd3YAMnFHTt3Zt5ViVOUbe05Ix QC0Q== X-Gm-Message-State: AC+VfDyT5gKMjKG0HNur8x5Jew1noRVolWE9xu+7f2F09Q6/rOwPRpkQ /J5T01mj8b4IFB/Q/xzcVQAlF69yHSM= X-Google-Smtp-Source: ACHHUZ6Yn6d9XAGBlF36u0KErwaCK4NlVPSjEL0cJMeahuP2oUPqdl+HQpSEpPXswb1u1o9vcvXs2Q== X-Received: by 2002:a17:907:9348:b0:94f:3980:bf91 with SMTP id bv8-20020a170907934800b0094f3980bf91mr7917315ejc.19.1684672262502; Sun, 21 May 2023 05:31:02 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Michael Tokarev , Laurent Vivier , Marcel Apfelbaum , qemu-trivial@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , "Michael S. Tsirkin" , Paolo Bonzini , Eduardo Habkost , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , qemu-ppc@nongnu.org, Peter Maydell , Bernhard Beschow , Mark Cave-Ayland Subject: [PATCH v2 4/6] hw/char/parallel: Export ParallelState Date: Sun, 21 May 2023 14:30:47 +0200 Message-Id: <20230521123049.312349-5-shentey@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230521123049.312349-1-shentey@gmail.com> References: <20230521123049.312349-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::632; envelope-from=shentey@gmail.com; helo=mail-ej1-x632.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: 1684672400578100001 Content-Type: text/plain; charset="utf-8" Exporting ParallelState is a precondition for exporing TYPE_ISA_PARALLEL. Suggested-by: Mark Cave-Ayland --- include/hw/char/parallel.h | 44 ++++++++++++++++++++++++++++++++++++++ hw/char/parallel.c | 42 ------------------------------------ 2 files changed, 44 insertions(+), 42 deletions(-) diff --git a/include/hw/char/parallel.h b/include/hw/char/parallel.h index 0a23c0f57e..2d4907c1fe 100644 --- a/include/hw/char/parallel.h +++ b/include/hw/char/parallel.h @@ -1,9 +1,53 @@ #ifndef HW_PARALLEL_H #define HW_PARALLEL_H =20 +#include "exec/ioport.h" +#include "exec/memory.h" #include "hw/isa/isa.h" +#include "hw/irq.h" +#include "chardev/char-fe.h" #include "chardev/char.h" =20 +/* + * These are the definitions for the Printer Status Register + */ +#define PARA_STS_BUSY 0x80 /* Busy complement */ +#define PARA_STS_ACK 0x40 /* Acknowledge */ +#define PARA_STS_PAPER 0x20 /* Out of paper */ +#define PARA_STS_ONLINE 0x10 /* Online */ +#define PARA_STS_ERROR 0x08 /* Error complement */ +#define PARA_STS_TMOUT 0x01 /* EPP timeout */ + +/* + * These are the definitions for the Printer Control Register + */ +#define PARA_CTR_DIR 0x20 /* Direction (1=3Dread, 0=3Dwrite) */ +#define PARA_CTR_INTEN 0x10 /* IRQ Enable */ +#define PARA_CTR_SELECT 0x08 /* Select In complement */ +#define PARA_CTR_INIT 0x04 /* Initialize Printer complement */ +#define PARA_CTR_AUTOLF 0x02 /* Auto linefeed complement */ +#define PARA_CTR_STROBE 0x01 /* Strobe complement */ + +#define PARA_CTR_SIGNAL (PARA_CTR_SELECT | PARA_CTR_INIT | PARA_CTR_AUTOLF= \ + | PARA_CTR_STROBE) + +typedef struct ParallelState { + MemoryRegion iomem; + uint8_t dataw; + uint8_t datar; + uint8_t status; + uint8_t control; + qemu_irq irq; + int irq_pending; + CharBackend chr; + int hw_driver; + int epp_timeout; + uint32_t last_read_offset; /* For debugging */ + /* Memory-mapped interface */ + int it_shift; + PortioList portio_list; +} ParallelState; + void parallel_hds_isa_init(ISABus *bus, int n); =20 bool parallel_mm_init(MemoryRegion *address_space, diff --git a/hw/char/parallel.c b/hw/char/parallel.c index af551e7864..522301f43a 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -27,10 +27,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "chardev/char-parallel.h" -#include "chardev/char-fe.h" #include "hw/acpi/acpi_aml_interface.h" -#include "hw/irq.h" -#include "hw/isa/isa.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" @@ -54,45 +51,6 @@ #define PARA_REG_EPP_ADDR 3 #define PARA_REG_EPP_DATA 4 =20 -/* - * These are the definitions for the Printer Status Register - */ -#define PARA_STS_BUSY 0x80 /* Busy complement */ -#define PARA_STS_ACK 0x40 /* Acknowledge */ -#define PARA_STS_PAPER 0x20 /* Out of paper */ -#define PARA_STS_ONLINE 0x10 /* Online */ -#define PARA_STS_ERROR 0x08 /* Error complement */ -#define PARA_STS_TMOUT 0x01 /* EPP timeout */ - -/* - * These are the definitions for the Printer Control Register - */ -#define PARA_CTR_DIR 0x20 /* Direction (1=3Dread, 0=3Dwrite) */ -#define PARA_CTR_INTEN 0x10 /* IRQ Enable */ -#define PARA_CTR_SELECT 0x08 /* Select In complement */ -#define PARA_CTR_INIT 0x04 /* Initialize Printer complement */ -#define PARA_CTR_AUTOLF 0x02 /* Auto linefeed complement */ -#define PARA_CTR_STROBE 0x01 /* Strobe complement */ - -#define PARA_CTR_SIGNAL (PARA_CTR_SELECT|PARA_CTR_INIT|PARA_CTR_AUTOLF|PAR= A_CTR_STROBE) - -typedef struct ParallelState { - MemoryRegion iomem; - uint8_t dataw; - uint8_t datar; - uint8_t status; - uint8_t control; - qemu_irq irq; - int irq_pending; - CharBackend chr; - int hw_driver; - int epp_timeout; - uint32_t last_read_offset; /* For debugging */ - /* Memory-mapped interface */ - int it_shift; - PortioList portio_list; -} ParallelState; - #define TYPE_ISA_PARALLEL "isa-parallel" OBJECT_DECLARE_SIMPLE_TYPE(ISAParallelState, ISA_PARALLEL) =20 --=20 2.40.1 From nobody Sun May 19 16:31:37 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=1684672358; cv=none; d=zohomail.com; s=zohoarc; b=h6YZiE/WxRLNl7GWDpw0F/fuuiVejsXAgci+HtbU7R2veU9gIz4LYWDqMJstzV/w9h5R49vqLBrymp4wCLHP+ykGTjo+wEApC2UDR/Q/8XZcSPA0DbqMZ270U41m7ZfuHLrnFh3uCTOqa4h+7fh/KaawqM58sABBXKaE8q3K0LQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684672358; 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=SUZ2glAUhNrsdqC0BDr9HkWvGwgP+iq+/9JOBD9npq4=; b=eXnKHE8zDqx2Uwu8jkveoEmP81h3OuPy2AfCWdg3zXHxbmmK8Qt/95slwo12JbnZP/peXNuWs2/As8XM8Ds9lq0rawRX/4lXNMV7j266xy+ZB9OHXGZwX32wFYYEjmSnADL1zwMdzAeNqSixA6YGse5TGTVwBQc1U8/nQf05AYU= 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 1684672358143952.3876844641409; Sun, 21 May 2023 05:32:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0iDR-000216-EH; Sun, 21 May 2023 08:31:13 -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 1q0iDP-0001wn-0r; Sun, 21 May 2023 08:31:11 -0400 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q0iDK-0001lN-H2; Sun, 21 May 2023 08:31:10 -0400 Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-510b6a249a8so9003800a12.0; Sun, 21 May 2023 05:31:05 -0700 (PDT) Received: from Provence.localdomain (dynamic-077-191-145-122.77.191.pool.telefonica.de. [77.191.145.122]) by smtp.gmail.com with ESMTPSA id b19-20020a170906729300b00965ec1faf27sm1882678ejl.74.2023.05.21.05.31.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 05:31:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684672264; x=1687264264; 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=SUZ2glAUhNrsdqC0BDr9HkWvGwgP+iq+/9JOBD9npq4=; b=e/+N6ohfben7N2MeIMuJlv90SFaxcx3bIyizp7vEEVvSw+i4e2bw+T242SsnRG4Uwx Di6zMuSaO4IVkWl7Jl5vdEIHQNZhRXcO30anZciG3bhlYTIzWppdzUdvARdP+uVYD6bc MmrJ4TPHi3Xt6toTnJZDX6Wt2aIcx4I9h698z1PBs8LeTeWg6kGITfnuPZFE+/8ELDsS 82AuHALjBbpnPoY63bspidq2FQ6dwKPbu9Hk9Kf2TV4VA3U/aGHZJsPtp47plPJPjBdk 04gnCH+pbNEJW/dBWuEbE+uPzmZ+wsvnFn9WTL5ZTfISxFcd4tMMiOjPGWUau9+8OmCj ECxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684672264; x=1687264264; 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=SUZ2glAUhNrsdqC0BDr9HkWvGwgP+iq+/9JOBD9npq4=; b=BNhLLsxQflrRCO4MOqap56RgjApt8jNFU+N+7J/RZKri2IEPQb8lcqZL2Uo1+bVETq Q49CoK6RHpwGT1xepwVqwBM/IM1/Z7Ac/rkubHjx91XjAIUpPS2prRnaOStPCbu1DRVn dd2INvSaMrQGOghj0meG7HGq2gVrovihuRUeV9V8Qf7n1ztCkCaCpBJEW1yCwn0wN6gt YjQcsYwDHCmJdbQPwtcjhkSdhIEL3c8nFuvsgRzDtrAt31iaeF2zXAIitPfdtOdQxZzR Psx5KmVtvtSczBk9JpRU2VqOrIYF9JGHQZlwOsTKqfvN+Zb0YB/AbZHVJ2zk1Vk020cO RL+g== X-Gm-Message-State: AC+VfDxpVr+PHGFtYls0TlQgsFpKmX0kFrF9uiRL1uvwJFtZz0g1slyG D8r27kza9x88/tnIpNIYX6zt982N7ZA= X-Google-Smtp-Source: ACHHUZ4LWpZTDOWLfjuXjeSRqxlCMYwIXE0TudDsSazLhUz4pCB2GDd4yZAdO0/h1YsLI+oHzJlZXQ== X-Received: by 2002:a17:907:720e:b0:94f:5847:8ac with SMTP id dr14-20020a170907720e00b0094f584708acmr8416632ejc.51.1684672263698; Sun, 21 May 2023 05:31:03 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Michael Tokarev , Laurent Vivier , Marcel Apfelbaum , qemu-trivial@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , "Michael S. Tsirkin" , Paolo Bonzini , Eduardo Habkost , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , qemu-ppc@nongnu.org, Peter Maydell , Bernhard Beschow , Mark Cave-Ayland Subject: [PATCH v2 5/6] hw/char/parallel-isa: Export ISAParallelState Date: Sun, 21 May 2023 14:30:48 +0200 Message-Id: <20230521123049.312349-6-shentey@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230521123049.312349-1-shentey@gmail.com> References: <20230521123049.312349-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::531; envelope-from=shentey@gmail.com; helo=mail-ed1-x531.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: 1684672359377100003 Content-Type: text/plain; charset="utf-8" In order to replace string literals with the TYPE_ISA_PARALLEL macro we nee= d to export the whole structure as well. Suggested-by: Mark Cave-Ayland --- include/hw/char/parallel-isa.h | 46 ++++++++++++++++++++++++++++++++++ hw/char/parallel.c | 13 +--------- 2 files changed, 47 insertions(+), 12 deletions(-) create mode 100644 include/hw/char/parallel-isa.h diff --git a/include/hw/char/parallel-isa.h b/include/hw/char/parallel-isa.h new file mode 100644 index 0000000000..27bdacf1a3 --- /dev/null +++ b/include/hw/char/parallel-isa.h @@ -0,0 +1,46 @@ +/* + * QEMU ISA Parallel PORT emulation + * + * Copyright (c) 2003-2005 Fabrice Bellard + * Copyright (c) 2007 Marko Kohtala + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + */ + +#ifndef HW_PARALLEL_ISA_H +#define HW_PARALLEL_ISA_H + +#include "parallel.h" + +#include "hw/isa/isa.h" +#include "qom/object.h" + +#define TYPE_ISA_PARALLEL "isa-parallel" +OBJECT_DECLARE_SIMPLE_TYPE(ISAParallelState, ISA_PARALLEL) + +struct ISAParallelState { + ISADevice parent_obj; + + uint32_t index; + uint32_t iobase; + uint32_t isairq; + ParallelState state; +}; + +#endif /* HW_PARALLEL_ISA_H */ diff --git a/hw/char/parallel.c b/hw/char/parallel.c index 522301f43a..d89f750cc1 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -31,6 +31,7 @@ #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" +#include "hw/char/parallel-isa.h" #include "hw/char/parallel.h" #include "sysemu/reset.h" #include "sysemu/sysemu.h" @@ -51,18 +52,6 @@ #define PARA_REG_EPP_ADDR 3 #define PARA_REG_EPP_DATA 4 =20 -#define TYPE_ISA_PARALLEL "isa-parallel" -OBJECT_DECLARE_SIMPLE_TYPE(ISAParallelState, ISA_PARALLEL) - -struct ISAParallelState { - ISADevice parent_obj; - - uint32_t index; - uint32_t iobase; - uint32_t isairq; - ParallelState state; -}; - static void parallel_update_irq(ParallelState *s) { if (s->irq_pending) --=20 2.40.1 From nobody Sun May 19 16:31:37 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=1684672392; cv=none; d=zohomail.com; s=zohoarc; b=gZLkfAyk5c7p9oQf9dfMARXv+aAnaOiVlLlX6Hr/2bILLbduj7m6U6H8rsl3f/eJLnGwEwnBmKdEXsKr3rKXmWattC8VdVFO0HWmckLDjzHlzwsV5esq8iIZPjpLjAXcpWaCcPpIN1JvOQQmSAujq/DJvMWuj4PzjNuWH2g2J+M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684672392; 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=Vj9iMJlnfsZl0y994uDUqQP8GlhWz8JYM2DM6z9egg8=; b=eKyScUgIuKkfR0vJOdL2Z0ZHVu2RPzkp7Ng5ePwMab0PEX4AGJ2z75R8zgLkVdCcxXnQKECtRWEspUudn8lBpKXdwCs/kgNJZvqf4Oe4sqDctwyULP1FT/LqFOUdMT6kT5ENGgZZcOZ0jnkv5BHo3E0trEUHBcKXvuXwCUsEJzo= 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 1684672392638246.97567918268305; Sun, 21 May 2023 05:33:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0iDS-00023C-KM; Sun, 21 May 2023 08:31:14 -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 1q0iDQ-0001yf-EB; Sun, 21 May 2023 08:31:12 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q0iDO-0001lf-FC; Sun, 21 May 2023 08:31:12 -0400 Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-96f818c48fbso358628266b.0; Sun, 21 May 2023 05:31:06 -0700 (PDT) Received: from Provence.localdomain (dynamic-077-191-145-122.77.191.pool.telefonica.de. [77.191.145.122]) by smtp.gmail.com with ESMTPSA id b19-20020a170906729300b00965ec1faf27sm1882678ejl.74.2023.05.21.05.31.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 05:31:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684672265; x=1687264265; 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=Vj9iMJlnfsZl0y994uDUqQP8GlhWz8JYM2DM6z9egg8=; b=Bsk+EFSWhN87gQmh/2YI+frpd+xI5KJ+1IvPCgVsUuxMolieHPkgC5gRZlVFox3E0y tZiQem1Q82TXamAGA9gSplTP8x3stNl84IgFq3F+7ooLncC2FF14MKOeObOIH61uJqu5 fRIvtHDM9tV3bgYj26BzVVXbuexjLqZ/OM5wu2pC0yIBgkLTHUmvqfLOFc+e3kVVqSR7 +xf+sPJ5N+MTGFWQ/qPgcS4fmXukP92tyEwTQH5xPpfgWTIjbeAtKOrIB7eNpDb/oYZo YfARHM+dF659bkIhJOyOawOzvUqlWsK09KWKbABldtUz1wN2oq5uiZ4N0rDUihvuzMsN d7FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684672265; x=1687264265; 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=Vj9iMJlnfsZl0y994uDUqQP8GlhWz8JYM2DM6z9egg8=; b=HBYE+K/bviD1o2XsJE1l0UjYpagVRD+8U9TwCPNLYObnpO9f8yxpMyh2dL4+gfr9vI 5POUNrTJuw7YCAHKMgsGTslUi/wl4NU0drwGCevOFdU4MThOm1PYLtQnh9wySGGf5HMH iHA5UrhKwhbS0ZnEgjK+uJWndjDFZITY9SgI1mVKVGx+xj9JnzKeLiCUgioBvlxz3QgL xXvhPRtt3KEP82SKtZDySE8M5kB8PRgw2kxa5nsY7xGmKQJGRKjQ0CPIdL+EXQSDnG58 wDIC8g59b4GchNRpDjk+v6cM+8xMsUy2TZRDrv95LQmus7zZ1r7bNo5aSzXwmYlEMby/ Ky6Q== X-Gm-Message-State: AC+VfDw6wK+zp12+wxbG1ng1sgmtcL0qgMqz5Lb7nbn9fyXenjbosxYE fP5V2fjCifiERCbGjVhw1m6tfPx4n+E= X-Google-Smtp-Source: ACHHUZ7BaqioxCuT/3WcbcwHkcrnEKJ0I++nnQipsDZ5PJ5ftHlNqHRlONwx3v/qTqZPehACvMfh1w== X-Received: by 2002:a17:907:72cc:b0:96f:136e:eadd with SMTP id du12-20020a17090772cc00b0096f136eeaddmr8034634ejc.66.1684672264973; Sun, 21 May 2023 05:31:04 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Michael Tokarev , Laurent Vivier , Marcel Apfelbaum , qemu-trivial@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , "Michael S. Tsirkin" , Paolo Bonzini , Eduardo Habkost , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Richard Henderson , qemu-ppc@nongnu.org, Peter Maydell , Bernhard Beschow Subject: [PATCH v2 6/6] hw/char/parallel: Replace string literals by TYPE_ISA_PARALLEL macro Date: Sun, 21 May 2023 14:30:49 +0200 Message-Id: <20230521123049.312349-7-shentey@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230521123049.312349-1-shentey@gmail.com> References: <20230521123049.312349-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::633; envelope-from=shentey@gmail.com; helo=mail-ej1-x633.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: 1684672393359100003 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/parallel-isa.c | 3 ++- hw/isa/isa-superio.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/char/parallel-isa.c b/hw/char/parallel-isa.c index 1ccbb96e70..ab0f879998 100644 --- a/hw/char/parallel-isa.c +++ b/hw/char/parallel-isa.c @@ -13,6 +13,7 @@ #include "sysemu/sysemu.h" #include "hw/isa/isa.h" #include "hw/qdev-properties.h" +#include "hw/char/parallel-isa.h" #include "hw/char/parallel.h" #include "qapi/error.h" =20 @@ -21,7 +22,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/isa/isa-superio.c b/hw/isa/isa-superio.c index c81bfe58ef..3baa9777be 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-isa.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