diff options
author | Markus Armbruster <armbru@redhat.com> | 2021-03-04 15:02:28 +0100 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2021-03-19 15:18:43 +0100 |
commit | e178113ff6465b55893c2b048b0a4be82a7bbd25 (patch) | |
tree | dccd715a994f75ca727c2c6838cd1237bcb51e3b /hw | |
parent | fe9f70a1c37d2b00c41836788cf97116a99d338b (diff) | |
download | qemu-e178113ff6465b55893c2b048b0a4be82a7bbd25.zip qemu-e178113ff6465b55893c2b048b0a4be82a7bbd25.tar.gz qemu-e178113ff6465b55893c2b048b0a4be82a7bbd25.tar.bz2 |
hw: Replace anti-social QOM type names
Several QOM type names contain ',':
ARM,bitband-memory
etraxfs,pic
etraxfs,serial
etraxfs,timer
fsl,imx25
fsl,imx31
fsl,imx6
fsl,imx6ul
fsl,imx7
grlib,ahbpnp
grlib,apbpnp
grlib,apbuart
grlib,gptimer
grlib,irqmp
qemu,register
SUNW,bpp
SUNW,CS4231
SUNW,DBRI
SUNW,DBRI.prom
SUNW,fdtwo
SUNW,sx
SUNW,tcx
xilinx,zynq_slcr
xlnx,zynqmp
xlnx,zynqmp-pmu-soc
xlnx,zynq-xadc
These are all device types. They can't be plugged with -device /
device_add, except for xlnx,zynqmp-pmu-soc, and I doubt that one
actually works.
They *can* be used with -device / device_add to request help.
Usability is poor, though: you have to double the comma, like this:
$ qemu-system-x86_64 -device SUNW,,fdtwo,help
Trap for the unwary. The fact that this was broken in
device-introspect-test for more than six years until commit e27bd49876
fixed it demonstrates that "the unwary" includes seasoned developers.
One QOM type name contains ' ': "ICH9 SMB". Because having to
remember just one way to quote would be too easy.
Rename the "SUNW,FOO types to "sun-FOO". Summarily replace ',' and '
' by '-' in the other type names.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210304140229.575481-2-armbru@redhat.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/arm/xilinx_zynq.c | 2 | ||||
-rw-r--r-- | hw/audio/cs4231.c | 2 | ||||
-rw-r--r-- | hw/block/fdc.c | 4 | ||||
-rw-r--r-- | hw/char/etraxfs_ser.c | 2 | ||||
-rw-r--r-- | hw/cris/axis_dev88.c | 6 | ||||
-rw-r--r-- | hw/display/tcx.c | 2 | ||||
-rw-r--r-- | hw/intc/etraxfs_pic.c | 2 | ||||
-rw-r--r-- | hw/microblaze/xlnx-zynqmp-pmu.c | 2 | ||||
-rw-r--r-- | hw/misc/zynq_slcr.c | 2 | ||||
-rw-r--r-- | hw/sparc/sun4m.c | 12 | ||||
-rw-r--r-- | hw/timer/etraxfs_timer.c | 2 |
11 files changed, 19 insertions, 19 deletions
diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index b72772b..8db6cfd 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -231,7 +231,7 @@ static void zynq_init(MachineState *machine) clock_set_hz(zynq_machine->ps_clk, PS_CLK_FREQUENCY); /* Create slcr, keep a pointer to connect clocks */ - slcr = qdev_new("xilinx,zynq_slcr"); + slcr = qdev_new("xilinx-zynq_slcr"); qdev_connect_clock_in(slcr, "ps_clk", zynq_machine->ps_clk); sysbus_realize_and_unref(SYS_BUS_DEVICE(slcr), &error_fatal); sysbus_mmio_map(SYS_BUS_DEVICE(slcr), 0, 0xF8000000); diff --git a/hw/audio/cs4231.c b/hw/audio/cs4231.c index 209c05a..aefc3ed 100644 --- a/hw/audio/cs4231.c +++ b/hw/audio/cs4231.c @@ -37,7 +37,7 @@ #define CS_DREGS 32 #define CS_MAXDREG (CS_DREGS - 1) -#define TYPE_CS4231 "SUNW,CS4231" +#define TYPE_CS4231 "sun-CS4231" typedef struct CSState CSState; DECLARE_INSTANCE_CHECKER(CSState, CS4231, TYPE_CS4231) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 32701c2..82afda7 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -2537,7 +2537,7 @@ void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, DeviceState *dev; FDCtrlSysBus *sys; - dev = qdev_new("SUNW,fdtwo"); + dev = qdev_new("sun-fdtwo"); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sys = SYSBUS_FDC(dev); sysbus_connect_irq(SYS_BUS_DEVICE(sys), 0, irq); @@ -2933,7 +2933,7 @@ static void sun4m_fdc_class_init(ObjectClass *klass, void *data) } static const TypeInfo sun4m_fdc_info = { - .name = "SUNW,fdtwo", + .name = "sun-fdtwo", .parent = TYPE_SYSBUS_FDC, .instance_init = sun4m_fdc_initfn, .class_init = sun4m_fdc_class_init, diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c index 6bee3ee..e8c3017 100644 --- a/hw/char/etraxfs_ser.c +++ b/hw/char/etraxfs_ser.c @@ -50,7 +50,7 @@ #define STAT_TR_IDLE 22 #define STAT_TR_RDY 24 -#define TYPE_ETRAX_FS_SERIAL "etraxfs,serial" +#define TYPE_ETRAX_FS_SERIAL "etraxfs-serial" typedef struct ETRAXSerial ETRAXSerial; DECLARE_INSTANCE_CHECKER(ETRAXSerial, ETRAX_SERIAL, TYPE_ETRAX_FS_SERIAL) diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c index b0cb6d8..af5a0e3 100644 --- a/hw/cris/axis_dev88.c +++ b/hw/cris/axis_dev88.c @@ -289,7 +289,7 @@ void axisdev88_init(MachineState *machine) &gpio_state.iomem); - dev = qdev_new("etraxfs,pic"); + dev = qdev_new("etraxfs-pic"); s = SYS_BUS_DEVICE(dev); sysbus_realize_and_unref(s, &error_fatal); sysbus_mmio_map(s, 0, 0x3001c000); @@ -323,8 +323,8 @@ void axisdev88_init(MachineState *machine) } /* 2 timers. */ - sysbus_create_varargs("etraxfs,timer", 0x3001e000, irq[0x1b], nmi[1], NULL); - sysbus_create_varargs("etraxfs,timer", 0x3005e000, irq[0x1b], nmi[1], NULL); + sysbus_create_varargs("etraxfs-timer", 0x3001e000, irq[0x1b], nmi[1], NULL); + sysbus_create_varargs("etraxfs-timer", 0x3005e000, irq[0x1b], nmi[1], NULL); for (i = 0; i < 4; i++) { etraxfs_ser_create(0x30026000 + i * 0x2000, irq[0x14 + i], serial_hd(i)); diff --git a/hw/display/tcx.c b/hw/display/tcx.c index d3db304..d4d09d0 100644 --- a/hw/display/tcx.c +++ b/hw/display/tcx.c @@ -56,7 +56,7 @@ #define TCX_THC_CURSMASK 0x900 #define TCX_THC_CURSBITS 0x980 -#define TYPE_TCX "SUNW,tcx" +#define TYPE_TCX "sun-tcx" OBJECT_DECLARE_SIMPLE_TYPE(TCXState, TCX) struct TCXState { diff --git a/hw/intc/etraxfs_pic.c b/hw/intc/etraxfs_pic.c index 54ed4c7..bd37d1c 100644 --- a/hw/intc/etraxfs_pic.c +++ b/hw/intc/etraxfs_pic.c @@ -38,7 +38,7 @@ #define R_R_GURU 4 #define R_MAX 5 -#define TYPE_ETRAX_FS_PIC "etraxfs,pic" +#define TYPE_ETRAX_FS_PIC "etraxfs-pic" DECLARE_INSTANCE_CHECKER(struct etrax_pic, ETRAX_FS_PIC, TYPE_ETRAX_FS_PIC) diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c index 1d1b4b5..5a20166 100644 --- a/hw/microblaze/xlnx-zynqmp-pmu.c +++ b/hw/microblaze/xlnx-zynqmp-pmu.c @@ -28,7 +28,7 @@ /* Define the PMU device */ -#define TYPE_XLNX_ZYNQMP_PMU_SOC "xlnx,zynqmp-pmu-soc" +#define TYPE_XLNX_ZYNQMP_PMU_SOC "xlnx-zynqmp-pmu-soc" OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPPMUSoCState, XLNX_ZYNQMP_PMU_SOC) #define XLNX_ZYNQMP_PMU_ROM_SIZE 0x8000 diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c index c66d7db..5086e6b 100644 --- a/hw/misc/zynq_slcr.c +++ b/hw/misc/zynq_slcr.c @@ -182,7 +182,7 @@ REG32(DDRIOB, 0xb40) #define ZYNQ_SLCR_MMIO_SIZE 0x1000 #define ZYNQ_SLCR_NUM_REGS (ZYNQ_SLCR_MMIO_SIZE / 4) -#define TYPE_ZYNQ_SLCR "xilinx,zynq_slcr" +#define TYPE_ZYNQ_SLCR "xilinx-zynq_slcr" OBJECT_DECLARE_SIMPLE_TYPE(ZynqSLCRState, ZYNQ_SLCR) struct ZynqSLCRState { diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 312e2af..1a00816 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -496,7 +496,7 @@ static void tcx_init(hwaddr addr, qemu_irq irq, int vram_size, int width, DeviceState *dev; SysBusDevice *s; - dev = qdev_new("SUNW,tcx"); + dev = qdev_new("sun-tcx"); qdev_prop_set_uint32(dev, "vram_size", vram_size); qdev_prop_set_uint16(dev, "width", width); qdev_prop_set_uint16(dev, "height", height); @@ -970,7 +970,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, } if (hwdef->sx_base) { - create_unimplemented_device("SUNW,sx", hwdef->sx_base, 0x2000); + create_unimplemented_device("sun-sx", hwdef->sx_base, 0x2000); } dev = qdev_new("sysbus-m48t08"); @@ -1045,23 +1045,23 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, slavio_irq[30], fdc_tc); if (hwdef->cs_base) { - sysbus_create_simple("SUNW,CS4231", hwdef->cs_base, + sysbus_create_simple("sun-CS4231", hwdef->cs_base, slavio_irq[5]); } if (hwdef->dbri_base) { /* ISDN chip with attached CS4215 audio codec */ /* prom space */ - create_unimplemented_device("SUNW,DBRI.prom", + create_unimplemented_device("sun-DBRI.prom", hwdef->dbri_base + 0x1000, 0x30); /* reg space */ - create_unimplemented_device("SUNW,DBRI", + create_unimplemented_device("sun-DBRI", hwdef->dbri_base + 0x10000, 0x100); } if (hwdef->bpp_base) { /* parallel port */ - create_unimplemented_device("SUNW,bpp", hwdef->bpp_base, 0x20); + create_unimplemented_device("sun-bpp", hwdef->bpp_base, 0x20); } initrd_size = 0; diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c index 48f2e3a..5379006 100644 --- a/hw/timer/etraxfs_timer.c +++ b/hw/timer/etraxfs_timer.c @@ -48,7 +48,7 @@ #define R_INTR 0x50 #define R_MASKED_INTR 0x54 -#define TYPE_ETRAX_FS_TIMER "etraxfs,timer" +#define TYPE_ETRAX_FS_TIMER "etraxfs-timer" typedef struct ETRAXTimerState ETRAXTimerState; DECLARE_INSTANCE_CHECKER(ETRAXTimerState, ETRAX_TIMER, TYPE_ETRAX_FS_TIMER) |