From e178113ff6465b55893c2b048b0a4be82a7bbd25 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 4 Mar 2021 15:02:28 +0100 Subject: 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 Message-Id: <20210304140229.575481-2-armbru@redhat.com> Reviewed-by: Mark Cave-Ayland Acked-by: Paolo Bonzini --- include/hw/i386/ich9.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/hw/i386') diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h index d1ea000..23ee8e3 100644 --- a/include/hw/i386/ich9.h +++ b/include/hw/i386/ich9.h @@ -216,7 +216,7 @@ struct ICH9LPCState { /* D31:F3 SMBus controller */ -#define TYPE_ICH9_SMB_DEVICE "ICH9 SMB" +#define TYPE_ICH9_SMB_DEVICE "ICH9-SMB" #define ICH9_A2_SMB_REVISION 0x02 #define ICH9_SMB_PI 0x00 -- cgit v1.1