[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 42/63] lasi_i82596: Rename SYSBUS_I82596 to LASI_82596
From: |
Eduardo Habkost |
Subject: |
[PATCH 42/63] lasi_i82596: Rename SYSBUS_I82596 to LASI_82596 |
Date: |
Wed, 2 Sep 2020 18:42:50 -0400 |
Make the type checking macro name consistent with the TYPE_*
constant.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Cc: Richard Henderson <rth@twiddle.net>
Cc: Jason Wang <jasowang@redhat.com>
Cc: qemu-devel@nongnu.org
---
include/hw/net/lasi_82596.h | 2 +-
hw/net/lasi_i82596.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/hw/net/lasi_82596.h b/include/hw/net/lasi_82596.h
index 7b62b04833..6b94726652 100644
--- a/include/hw/net/lasi_82596.h
+++ b/include/hw/net/lasi_82596.h
@@ -14,7 +14,7 @@
#define TYPE_LASI_82596 "lasi_82596"
typedef struct SysBusI82596State SysBusI82596State;
-DECLARE_INSTANCE_CHECKER(SysBusI82596State, SYSBUS_I82596,
+DECLARE_INSTANCE_CHECKER(SysBusI82596State, LASI_82596,
TYPE_LASI_82596)
struct SysBusI82596State {
diff --git a/hw/net/lasi_i82596.c b/hw/net/lasi_i82596.c
index 820b63f350..20f85946a1 100644
--- a/hw/net/lasi_i82596.c
+++ b/hw/net/lasi_i82596.c
@@ -109,7 +109,7 @@ static const VMStateDescription vmstate_lasi_82596 = {
static void lasi_82596_realize(DeviceState *dev, Error **errp)
{
- SysBusI82596State *d = SYSBUS_I82596(dev);
+ SysBusI82596State *d = LASI_82596(dev);
I82596State *s = &d->state;
memory_region_init_io(&s->mmio, OBJECT(d), &lasi_82596_mem_ops, d,
@@ -128,7 +128,7 @@ SysBusI82596State *lasi_82596_init(MemoryRegion *addr_space,
qemu_check_nic_model(&nd_table[0], TYPE_LASI_82596);
dev = qdev_new(TYPE_LASI_82596);
- s = SYSBUS_I82596(dev);
+ s = LASI_82596(dev);
s->state.irq = lan_irq;
qdev_set_nic_properties(dev, &nd_table[0]);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
@@ -141,14 +141,14 @@ SysBusI82596State *lasi_82596_init(MemoryRegion
*addr_space,
static void lasi_82596_reset(DeviceState *dev)
{
- SysBusI82596State *d = SYSBUS_I82596(dev);
+ SysBusI82596State *d = LASI_82596(dev);
i82596_h_reset(&d->state);
}
static void lasi_82596_instance_init(Object *obj)
{
- SysBusI82596State *d = SYSBUS_I82596(obj);
+ SysBusI82596State *d = LASI_82596(obj);
I82596State *s = &d->state;
device_add_bootindex_property(obj, &s->conf.bootindex,
--
2.26.2
- [PATCH 36/63] can: Rename PCM3680i_PCI_DEV to PCM3680_PCI, (continued)
- [PATCH 36/63] can: Rename PCM3680i_PCI_DEV to PCM3680_PCI, Eduardo Habkost, 2020/09/02
- [PATCH 37/63] ccid-card-emulated: Rename EMULATED_CCID_CARD to EMULATED_CCID, Eduardo Habkost, 2020/09/02
- [PATCH 38/63] ccid-card-passthru: Rename PASSTHRU_CCID_CARD to CCID_PASSTHRU, Eduardo Habkost, 2020/09/02
- [PATCH 39/63] esp: Rename ESP_STATE to ESP, Eduardo Habkost, 2020/09/02
- [PATCH 41/63] lance: Rename SYSBUS_PCNET to LANCE, Eduardo Habkost, 2020/09/02
- [PATCH 40/63] filter-rewriter: Rename FILTER_COLO_REWRITER to FILTER_REWRITER, Eduardo Habkost, 2020/09/02
- [PATCH 42/63] lasi_i82596: Rename SYSBUS_I82596 to LASI_82596,
Eduardo Habkost <=
- [PATCH 43/63] pvpanic: Rename ISA_PVPANIC_DEVICE to PVPANIC, Eduardo Habkost, 2020/09/02
- [PATCH 44/63] renesas: Rename RCMT to RENESAS_CMT, Eduardo Habkost, 2020/09/02
- [PATCH 46/63] renesas: Rename RTMR to RENESAS_TMR, Eduardo Habkost, 2020/09/02
- [PATCH 45/63] renesas: Rename RSCI to RENESAS_SCI, Eduardo Habkost, 2020/09/02
- [PATCH 47/63] rs6000_mc: Rename RS6000MC_DEVICE to RS6000MC, Eduardo Habkost, 2020/09/02
- [PATCH 49/63] stm32f205: Rename STM32F2XXTIMER to STM32F2XX_TIMER, Eduardo Habkost, 2020/09/02