From nobody Tue Feb 10 23:14:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1612899594; cv=none; d=zohomail.com; s=zohoarc; b=OciYrP+qSc/Jr3xsxT7Vfj+3O22n3N9XgOUudt83P3a17XX/xOmMqGsI7GDoVNlhinUaBjIxJvXMQ9dld3H8SBu4fGMK+IYtNFEVuELgu6FUZFySvLyt0Q4kd/gDDb4MuiDSanD7EUzU/8UpOGlI0ocN3PM06zZdRocznqHysJ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612899594; h=Content-Transfer-Encoding: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=egRUHtYnGQj6WnWGXXGbRj65jJDX7l9sgjcPaWlOwmw=; b=KdA+j6hOfjKcgJgS/GVJ4zWr7OEuojQ8tzIvlWhMUR64d4+Vls50JhR7KKJVUqNk+zDrtY6wG9HmFgoeaQJ1OPLOc8wLjDHYjpuTj09l1ziSrAZK86am9YmEcbfm0J11fWTqzg+EoBMMPfixBfz4e0smr411MpQtpUla2+dzG+g= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16128995944244.5572483928415295; Tue, 9 Feb 2021 11:39:54 -0800 (PST) Received: from localhost ([::1]:40242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9YrZ-0004kf-C0 for importer@patchew.org; Tue, 09 Feb 2021 14:39:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9Yio-0003k7-PD for qemu-devel@nongnu.org; Tue, 09 Feb 2021 14:30:50 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:56744 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9Yie-00020l-8p for qemu-devel@nongnu.org; Tue, 09 Feb 2021 14:30:49 -0500 Received: from host109-153-84-1.range109-153.btcentralplus.com ([109.153.84.1] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l9Yix-0007pt-03; Tue, 09 Feb 2021 19:31:03 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, pbonzini@redhat.com, fam@euphon.net, laurent@vivier.eu Date: Tue, 9 Feb 2021 19:29:38 +0000 Message-Id: <20210209193018.31339-3-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210209193018.31339-1-mark.cave-ayland@ilande.co.uk> References: <20210209193018.31339-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 109.153.84.1 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 02/42] esp: rename existing ESP QOM type to SYSBUS_ESP X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) 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=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" Content-Type: text/plain; charset="utf-8" The existing ESP QOM type currently represents a sysbus device with an embe= dded ESP state. Rename the type to SYSBUS_ESP accordingly. Signed-off-by: Mark Cave-Ayland Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/dma/sparc32_dma.c | 4 ++-- hw/m68k/q800.c | 4 ++-- hw/mips/jazz.c | 4 ++-- hw/scsi/esp.c | 8 ++++---- hw/sparc/sun4m.c | 2 +- include/hw/scsi/esp.h | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c index b643b413c5..03bc500878 100644 --- a/hw/dma/sparc32_dma.c +++ b/hw/dma/sparc32_dma.c @@ -295,13 +295,13 @@ static void sparc32_espdma_device_init(Object *obj) memory_region_init_io(&s->iomem, OBJECT(s), &dma_mem_ops, s, "espdma-mmio", DMA_SIZE); =20 - object_initialize_child(obj, "esp", &es->esp, TYPE_ESP); + object_initialize_child(obj, "esp", &es->esp, TYPE_SYSBUS_ESP); } =20 static void sparc32_espdma_device_realize(DeviceState *dev, Error **errp) { ESPDMADeviceState *es =3D SPARC32_ESPDMA_DEVICE(dev); - SysBusESPState *sysbus =3D ESP(&es->esp); + SysBusESPState *sysbus =3D SYSBUS_ESP(&es->esp); ESPState *esp =3D &sysbus->esp; =20 esp->dma_memory_read =3D espdma_memory_read; diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index 2af0e2532e..af54d509ff 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -356,8 +356,8 @@ static void q800_init(MachineState *machine) =20 /* SCSI */ =20 - dev =3D qdev_new(TYPE_ESP); - sysbus_esp =3D ESP(dev); + dev =3D qdev_new(TYPE_SYSBUS_ESP); + sysbus_esp =3D SYSBUS_ESP(dev); esp =3D &sysbus_esp->esp; esp->dma_memory_read =3D NULL; esp->dma_memory_write =3D NULL; diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index 83c8086062..1a0888a0fd 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -328,8 +328,8 @@ static void mips_jazz_init(MachineState *machine, } =20 /* SCSI adapter */ - dev =3D qdev_new(TYPE_ESP); - sysbus_esp =3D ESP(dev); + dev =3D qdev_new(TYPE_SYSBUS_ESP); + sysbus_esp =3D SYSBUS_ESP(dev); esp =3D &sysbus_esp->esp; esp->dma_memory_read =3D rc4030_dma_read; esp->dma_memory_write =3D rc4030_dma_write; diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 7073166ad1..aa38acc660 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -939,7 +939,7 @@ static const struct SCSIBusInfo esp_scsi_info =3D { =20 static void sysbus_esp_gpio_demux(void *opaque, int irq, int level) { - SysBusESPState *sysbus =3D ESP(opaque); + SysBusESPState *sysbus =3D SYSBUS_ESP(opaque); ESPState *s =3D &sysbus->esp; =20 switch (irq) { @@ -955,7 +955,7 @@ static void sysbus_esp_gpio_demux(void *opaque, int irq= , int level) static void sysbus_esp_realize(DeviceState *dev, Error **errp) { SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); - SysBusESPState *sysbus =3D ESP(dev); + SysBusESPState *sysbus =3D SYSBUS_ESP(dev); ESPState *s =3D &sysbus->esp; =20 sysbus_init_irq(sbd, &s->irq); @@ -977,7 +977,7 @@ static void sysbus_esp_realize(DeviceState *dev, Error = **errp) =20 static void sysbus_esp_hard_reset(DeviceState *dev) { - SysBusESPState *sysbus =3D ESP(dev); + SysBusESPState *sysbus =3D SYSBUS_ESP(dev); esp_hard_reset(&sysbus->esp); } =20 @@ -1002,7 +1002,7 @@ static void sysbus_esp_class_init(ObjectClass *klass,= void *data) } =20 static const TypeInfo sysbus_esp_info =3D { - .name =3D TYPE_ESP, + .name =3D TYPE_SYSBUS_ESP, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(SysBusESPState), .class_init =3D sysbus_esp_class_init, diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 38ca1e33c7..312e2afaf9 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -334,7 +334,7 @@ static void *sparc32_dma_init(hwaddr dma_base, OBJECT(dma), "espdma")); sysbus_connect_irq(SYS_BUS_DEVICE(espdma), 0, espdma_irq); =20 - esp =3D ESP(object_resolve_path_component(OBJECT(espdma), "esp")); + esp =3D SYSBUS_ESP(object_resolve_path_component(OBJECT(espdma), "esp"= )); =20 ledma =3D SPARC32_LEDMA_DEVICE(object_resolve_path_component( OBJECT(dma), "ledma")); diff --git a/include/hw/scsi/esp.h b/include/hw/scsi/esp.h index 60cc3047a5..9694825e71 100644 --- a/include/hw/scsi/esp.h +++ b/include/hw/scsi/esp.h @@ -65,8 +65,8 @@ struct ESPState { void (*pdma_cb)(ESPState *s); }; =20 -#define TYPE_ESP "esp" -OBJECT_DECLARE_SIMPLE_TYPE(SysBusESPState, ESP) +#define TYPE_SYSBUS_ESP "sysbus-esp" +OBJECT_DECLARE_SIMPLE_TYPE(SysBusESPState, SYSBUS_ESP) =20 struct SysBusESPState { /*< private >*/ --=20 2.20.1