From nobody Tue Feb 10 11:34:02 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1634511243; cv=none; d=zohomail.com; s=zohoarc; b=MMfJlq53R4S3mK+8kxy3bD10FIGHb+SyaMqTakbdwb1TWRfG8MQ4E77juZhGxQZaM7BZtp3mZK6kFAbc2bMgg3LamECfD0wWl/V525eJaUTm821a/rFmRQcAnWJpd8oOWhEAKArY11G2UDgLyENrEYz0NlFv/SuOI+dat62d7OY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634511243; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HT2y45thDApYFYQhE//tKIiE8Gj9xsHtdBaSSlAZAp0=; b=FxOD/Ej7oLSV5/sW7YFmD5D1/1w7m9oVUfzaAiHxhabUtzLolWNkC6WkDaDe/trtQh5rUKpvGBjQ3iCiDXnksPu4USFF5AiWuH+lVQbJ46I4AZ9excHcGS4aVQZiM0nI5sqQXJLWl8f+7pAcM3b92m9qMzCpfWaghIlbpc238sk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1634511243356369.7347955436094; Sun, 17 Oct 2021 15:54:03 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id y3so37971968wrl.1 for ; Sun, 17 Oct 2021 15:54:02 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (213.red-81-36-146.dynamicip.rima-tde.net. [81.36.146.213]) by smtp.gmail.com with ESMTPSA id c7sm13530647wmq.13.2021.10.17.15.54.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Oct 2021 15:54:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HT2y45thDApYFYQhE//tKIiE8Gj9xsHtdBaSSlAZAp0=; b=KScBiuuRAxYL498OkjbjC/hpKcjLQm8LawQUqXixE6J1MCvB675BwkFSXNzuYWm00U eX9kUOaysAubgag6z6n2x3GI0ys2pWGjZIi1q3PgFT5FfoFfAAGJY7cGrApgp7b7GFUu xR4/oW6s3btGrAhDnDJbO5TyHi6Qe+VZ3+p3S5l3JiP71wa05E7iaN/Gt5g/D6CyatGu lSX3RDNjYqs21B1vxD2R9++/rih7EioP/INXABzUFuDbYwK9eoTyrg5J56d4+cZMqfup gFesed3VhDFDY9W+tucP9QzZe+khprsWpRd+OKDvlzJqqCOVUOqgogEI3U8UMEBt8jlS TUHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=HT2y45thDApYFYQhE//tKIiE8Gj9xsHtdBaSSlAZAp0=; b=6iqbbwpJzJs92/wdpK4voG0zuQfJSryap23E2oVk57COijyeIHTI3FPkJAmjvlCIlF rfx7SuJeH3afQF/4cO6yZ9yqKQaX1ujTls2jQlqN7U25ZBhzYIVdqrEuT5sDrs3PCie/ yPCcnxks5NOiDI/cNygdHFXOhDC+GkHxa1UoIizAYmwTCOyLSHf9BMhAetzA34Mr3mck NA3Cdad6fi89NBnIUZ9+Z1qeoYbBd49mq9sbwYFPJbryodxkE5NXBeNOKKUMVZLJpBrR maDVYEUqT2cFAM11MZLjbGFDe1MQfMeMvZbpeJ3et/OnOoWx86EDC7u9gbDmgfenxuZR K+3A== X-Gm-Message-State: AOAM532hwDQ5BQ6dDrsC6ouUL5SvwKW8KKEfD/XbwthJNjsj6kHft7RN uk6Hkyj48LB2RJSRDl8+4bI= X-Google-Smtp-Source: ABdhPJzn3Rfd8WUfGtzYuDhhrAUDqULmyYe6ggC4rjcbp1BYyGDpoaopo7vFH77/LsZ2B+yYlLshDQ== X-Received: by 2002:a05:6000:1567:: with SMTP id 7mr31799648wrz.408.1634511241556; Sun, 17 Oct 2021 15:54:01 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , BALATON Zoltan Subject: [PULL 15/17] vt82c686: Move common code to via_isa_realize Date: Mon, 18 Oct 2021 00:52:43 +0200 Message-Id: <20211017225245.2618892-16-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211017225245.2618892-1-f4bug@amsat.org> References: <20211017225245.2618892-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1634511243850100001 From: BALATON Zoltan The vt82c686b_realize and vt8231_realize methods are almost identical, factor out the common parts to a via_isa_realize function to avoid code duplication. Signed-off-by: BALATON Zoltan Reviewed-by: Jiaxun Yang Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <7cb7a16ff4daf8f48d576246255bea1fd355207c.1634259980.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 67 ++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 38 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index f57f3e70679..5b41539f2cd 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -542,6 +542,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(ViaISAState, VIA_ISA) struct ViaISAState { PCIDevice dev; qemu_irq cpu_intr; + ISABus *isa_bus; ViaSuperIOState *via_sio; }; =20 @@ -572,6 +573,29 @@ static void via_isa_request_i8259_irq(void *opaque, in= t irq, int level) qemu_set_irq(s->cpu_intr, level); } =20 +static void via_isa_realize(PCIDevice *d, Error **errp) +{ + ViaISAState *s =3D VIA_ISA(d); + DeviceState *dev =3D DEVICE(d); + qemu_irq *isa_irq; + int i; + + qdev_init_gpio_out(dev, &s->cpu_intr, 1); + isa_irq =3D qemu_allocate_irqs(via_isa_request_i8259_irq, s, 1); + s->isa_bus =3D isa_bus_new(dev, get_system_memory(), pci_address_space= _io(d), + &error_fatal); + isa_bus_irqs(s->isa_bus, i8259_init(s->isa_bus, *isa_irq)); + i8254_pit_init(s->isa_bus, 0x40, 0, NULL); + i8257_dma_init(s->isa_bus, 0); + mc146818_rtc_init(s->isa_bus, 2000, NULL); + + for (i =3D 0; i < PCI_CONFIG_HEADER_SIZE; i++) { + if (i < PCI_COMMAND || i >=3D PCI_REVISION_ID) { + d->wmask[i] =3D 0; + } + } +} + /* TYPE_VT82C686B_ISA */ =20 static void vt82c686b_write_config(PCIDevice *d, uint32_t addr, @@ -610,27 +634,10 @@ static void vt82c686b_isa_reset(DeviceState *dev) static void vt82c686b_realize(PCIDevice *d, Error **errp) { ViaISAState *s =3D VIA_ISA(d); - DeviceState *dev =3D DEVICE(d); - ISABus *isa_bus; - qemu_irq *isa_irq; - int i; =20 - qdev_init_gpio_out(dev, &s->cpu_intr, 1); - isa_irq =3D qemu_allocate_irqs(via_isa_request_i8259_irq, s, 1); - isa_bus =3D isa_bus_new(dev, get_system_memory(), pci_address_space_io= (d), - &error_fatal); - isa_bus_irqs(isa_bus, i8259_init(isa_bus, *isa_irq)); - i8254_pit_init(isa_bus, 0x40, 0, NULL); - i8257_dma_init(isa_bus, 0); - s->via_sio =3D VIA_SUPERIO(isa_create_simple(isa_bus, + via_isa_realize(d, errp); + s->via_sio =3D VIA_SUPERIO(isa_create_simple(s->isa_bus, TYPE_VT82C686B_SUPERIO)); - mc146818_rtc_init(isa_bus, 2000, NULL); - - for (i =3D 0; i < PCI_CONFIG_HEADER_SIZE; i++) { - if (i < PCI_COMMAND || i >=3D PCI_REVISION_ID) { - d->wmask[i] =3D 0; - } - } } =20 static void vt82c686b_class_init(ObjectClass *klass, void *data) @@ -691,26 +698,10 @@ static void vt8231_isa_reset(DeviceState *dev) static void vt8231_realize(PCIDevice *d, Error **errp) { ViaISAState *s =3D VIA_ISA(d); - DeviceState *dev =3D DEVICE(d); - ISABus *isa_bus; - qemu_irq *isa_irq; - int i; =20 - qdev_init_gpio_out(dev, &s->cpu_intr, 1); - isa_irq =3D qemu_allocate_irqs(via_isa_request_i8259_irq, s, 1); - isa_bus =3D isa_bus_new(dev, get_system_memory(), pci_address_space_io= (d), - &error_fatal); - isa_bus_irqs(isa_bus, i8259_init(isa_bus, *isa_irq)); - i8254_pit_init(isa_bus, 0x40, 0, NULL); - i8257_dma_init(isa_bus, 0); - s->via_sio =3D VIA_SUPERIO(isa_create_simple(isa_bus, TYPE_VT8231_SUPE= RIO)); - mc146818_rtc_init(isa_bus, 2000, NULL); - - for (i =3D 0; i < PCI_CONFIG_HEADER_SIZE; i++) { - if (i < PCI_COMMAND || i >=3D PCI_REVISION_ID) { - d->wmask[i] =3D 0; - } - } + via_isa_realize(d, errp); + s->via_sio =3D VIA_SUPERIO(isa_create_simple(s->isa_bus, + TYPE_VT8231_SUPERIO)); } =20 static void vt8231_class_init(ObjectClass *klass, void *data) --=20 2.31.1