| Message ID | 20231117114457.177308-3-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Limit type names to alphanumerical and some few special characters | expand |
On Fri, Nov 17, 2023 at 9:47 PM Thomas Huth <thuth@redhat.com> wrote: > > From: Markus Armbruster <armbru@redhat.com> > > QOM type names containing ',' result in awful UI. We got rid of them > in v6.0.0 (commit e178113ff64 hw: Replace anti-social QOM type names). > A few have crept back since: > > xlnx,cframe-reg > xlnx,efuse > xlnx,pmc-efuse-cache > xlnx,versal-cfu-apb > xlnx,versal-cfu-fdro > xlnx,versal-cfu-sfr > xlnx,versal-crl > xlnx,versal-efuse > xlnx,zynqmp-efuse > > These are all device types. They can't be plugged with -device / > device_add, except for "xlnx,efuse" (I'm not sure that one is > intentional). > > 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-aarch64 -device xlnx,,pmc-efuse-cache,help > > They can also be used with -global, where you must *not* double the > comma: > > $ qemu-system-aarch64 -global xlnx,efuse.drive-index=2 > > Trap for the unwary. > > "xlnx,efuse", "xlnx,versal-efuse", "xlnx,pmc-efuse-cache", > "xlnx-zynqmp-efuse" are from v6.2.0, "xlnx,versal-crl" is from v7.1.0, > and the remainder are new. > > Rename them all to "xlnx-FOO", like commit e178113ff64 did. > > Reported-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Markus Armbruster <armbru@redhat.com> > Reviewed-by: Thomas Huth <thuth@redhat.com> > Reviewed-by: Francisco Iglesias <francisco.iglesias@amd.com> > Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > docs/system/arm/xlnx-versal-virt.rst | 2 +- > include/hw/misc/xlnx-versal-cframe-reg.h | 2 +- > include/hw/misc/xlnx-versal-cfu.h | 6 +++--- > include/hw/misc/xlnx-versal-crl.h | 2 +- > include/hw/nvram/xlnx-efuse.h | 2 +- > include/hw/nvram/xlnx-versal-efuse.h | 4 ++-- > include/hw/nvram/xlnx-zynqmp-efuse.h | 2 +- > 7 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/docs/system/arm/xlnx-versal-virt.rst b/docs/system/arm/xlnx-versal-virt.rst > index 9a4b2ff55f..0bafc76469 100644 > --- a/docs/system/arm/xlnx-versal-virt.rst > +++ b/docs/system/arm/xlnx-versal-virt.rst > @@ -212,7 +212,7 @@ To use a different index value, N, from default of 1, add: > > .. code-block:: bash > > - -global xlnx,efuse.drive-index=N > + -global xlnx-efuse.drive-index=N > > .. warning:: > In actual physical Versal, BBRAM and eFUSE contain sensitive data. > diff --git a/include/hw/misc/xlnx-versal-cframe-reg.h b/include/hw/misc/xlnx-versal-cframe-reg.h > index a14fbd7fe4..f403b00e31 100644 > --- a/include/hw/misc/xlnx-versal-cframe-reg.h > +++ b/include/hw/misc/xlnx-versal-cframe-reg.h > @@ -23,7 +23,7 @@ > #include "hw/misc/xlnx-versal-cfu.h" > #include "qemu/fifo32.h" > > -#define TYPE_XLNX_VERSAL_CFRAME_REG "xlnx,cframe-reg" > +#define TYPE_XLNX_VERSAL_CFRAME_REG "xlnx-cframe-reg" > OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalCFrameReg, XLNX_VERSAL_CFRAME_REG) > > #define TYPE_XLNX_VERSAL_CFRAME_BCAST_REG "xlnx.cframe-bcast-reg" > diff --git a/include/hw/misc/xlnx-versal-cfu.h b/include/hw/misc/xlnx-versal-cfu.h > index 86fb841053..8c581c0797 100644 > --- a/include/hw/misc/xlnx-versal-cfu.h > +++ b/include/hw/misc/xlnx-versal-cfu.h > @@ -22,13 +22,13 @@ > #include "hw/misc/xlnx-cfi-if.h" > #include "qemu/fifo32.h" > > -#define TYPE_XLNX_VERSAL_CFU_APB "xlnx,versal-cfu-apb" > +#define TYPE_XLNX_VERSAL_CFU_APB "xlnx-versal-cfu-apb" > OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalCFUAPB, XLNX_VERSAL_CFU_APB) > > -#define TYPE_XLNX_VERSAL_CFU_FDRO "xlnx,versal-cfu-fdro" > +#define TYPE_XLNX_VERSAL_CFU_FDRO "xlnx-versal-cfu-fdro" > OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalCFUFDRO, XLNX_VERSAL_CFU_FDRO) > > -#define TYPE_XLNX_VERSAL_CFU_SFR "xlnx,versal-cfu-sfr" > +#define TYPE_XLNX_VERSAL_CFU_SFR "xlnx-versal-cfu-sfr" > OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalCFUSFR, XLNX_VERSAL_CFU_SFR) > > REG32(CFU_ISR, 0x0) > diff --git a/include/hw/misc/xlnx-versal-crl.h b/include/hw/misc/xlnx-versal-crl.h > index 2857f4169a..dfb8dff197 100644 > --- a/include/hw/misc/xlnx-versal-crl.h > +++ b/include/hw/misc/xlnx-versal-crl.h > @@ -13,7 +13,7 @@ > #include "hw/register.h" > #include "target/arm/cpu.h" > > -#define TYPE_XLNX_VERSAL_CRL "xlnx,versal-crl" > +#define TYPE_XLNX_VERSAL_CRL "xlnx-versal-crl" > OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalCRL, XLNX_VERSAL_CRL) > > REG32(ERR_CTRL, 0x0) > diff --git a/include/hw/nvram/xlnx-efuse.h b/include/hw/nvram/xlnx-efuse.h > index 58414e468b..cff7924106 100644 > --- a/include/hw/nvram/xlnx-efuse.h > +++ b/include/hw/nvram/xlnx-efuse.h > @@ -30,7 +30,7 @@ > #include "sysemu/block-backend.h" > #include "hw/qdev-core.h" > > -#define TYPE_XLNX_EFUSE "xlnx,efuse" > +#define TYPE_XLNX_EFUSE "xlnx-efuse" > OBJECT_DECLARE_SIMPLE_TYPE(XlnxEFuse, XLNX_EFUSE); > > struct XlnxEFuse { > diff --git a/include/hw/nvram/xlnx-versal-efuse.h b/include/hw/nvram/xlnx-versal-efuse.h > index a873dc5cb0..86e2261b9a 100644 > --- a/include/hw/nvram/xlnx-versal-efuse.h > +++ b/include/hw/nvram/xlnx-versal-efuse.h > @@ -29,8 +29,8 @@ > > #define XLNX_VERSAL_EFUSE_CTRL_R_MAX ((0x100 / 4) + 1) > > -#define TYPE_XLNX_VERSAL_EFUSE_CTRL "xlnx,versal-efuse" > -#define TYPE_XLNX_VERSAL_EFUSE_CACHE "xlnx,pmc-efuse-cache" > +#define TYPE_XLNX_VERSAL_EFUSE_CTRL "xlnx-versal-efuse" > +#define TYPE_XLNX_VERSAL_EFUSE_CACHE "xlnx-pmc-efuse-cache" > > OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalEFuseCtrl, XLNX_VERSAL_EFUSE_CTRL); > OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalEFuseCache, XLNX_VERSAL_EFUSE_CACHE); > diff --git a/include/hw/nvram/xlnx-zynqmp-efuse.h b/include/hw/nvram/xlnx-zynqmp-efuse.h > index 6b051ec4f1..f5beacc2e6 100644 > --- a/include/hw/nvram/xlnx-zynqmp-efuse.h > +++ b/include/hw/nvram/xlnx-zynqmp-efuse.h > @@ -29,7 +29,7 @@ > > #define XLNX_ZYNQMP_EFUSE_R_MAX ((0x10fc / 4) + 1) > > -#define TYPE_XLNX_ZYNQMP_EFUSE "xlnx,zynqmp-efuse" > +#define TYPE_XLNX_ZYNQMP_EFUSE "xlnx-zynqmp-efuse" > OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPEFuse, XLNX_ZYNQMP_EFUSE); > > struct XlnxZynqMPEFuse { > -- > 2.42.0 > >
diff --git a/docs/system/arm/xlnx-versal-virt.rst b/docs/system/arm/xlnx-versal-virt.rst index 9a4b2ff55f..0bafc76469 100644 --- a/docs/system/arm/xlnx-versal-virt.rst +++ b/docs/system/arm/xlnx-versal-virt.rst @@ -212,7 +212,7 @@ To use a different index value, N, from default of 1, add: .. code-block:: bash - -global xlnx,efuse.drive-index=N + -global xlnx-efuse.drive-index=N .. warning:: In actual physical Versal, BBRAM and eFUSE contain sensitive data. diff --git a/include/hw/misc/xlnx-versal-cframe-reg.h b/include/hw/misc/xlnx-versal-cframe-reg.h index a14fbd7fe4..f403b00e31 100644 --- a/include/hw/misc/xlnx-versal-cframe-reg.h +++ b/include/hw/misc/xlnx-versal-cframe-reg.h @@ -23,7 +23,7 @@ #include "hw/misc/xlnx-versal-cfu.h" #include "qemu/fifo32.h" -#define TYPE_XLNX_VERSAL_CFRAME_REG "xlnx,cframe-reg" +#define TYPE_XLNX_VERSAL_CFRAME_REG "xlnx-cframe-reg" OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalCFrameReg, XLNX_VERSAL_CFRAME_REG) #define TYPE_XLNX_VERSAL_CFRAME_BCAST_REG "xlnx.cframe-bcast-reg" diff --git a/include/hw/misc/xlnx-versal-cfu.h b/include/hw/misc/xlnx-versal-cfu.h index 86fb841053..8c581c0797 100644 --- a/include/hw/misc/xlnx-versal-cfu.h +++ b/include/hw/misc/xlnx-versal-cfu.h @@ -22,13 +22,13 @@ #include "hw/misc/xlnx-cfi-if.h" #include "qemu/fifo32.h" -#define TYPE_XLNX_VERSAL_CFU_APB "xlnx,versal-cfu-apb" +#define TYPE_XLNX_VERSAL_CFU_APB "xlnx-versal-cfu-apb" OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalCFUAPB, XLNX_VERSAL_CFU_APB) -#define TYPE_XLNX_VERSAL_CFU_FDRO "xlnx,versal-cfu-fdro" +#define TYPE_XLNX_VERSAL_CFU_FDRO "xlnx-versal-cfu-fdro" OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalCFUFDRO, XLNX_VERSAL_CFU_FDRO) -#define TYPE_XLNX_VERSAL_CFU_SFR "xlnx,versal-cfu-sfr" +#define TYPE_XLNX_VERSAL_CFU_SFR "xlnx-versal-cfu-sfr" OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalCFUSFR, XLNX_VERSAL_CFU_SFR) REG32(CFU_ISR, 0x0) diff --git a/include/hw/misc/xlnx-versal-crl.h b/include/hw/misc/xlnx-versal-crl.h index 2857f4169a..dfb8dff197 100644 --- a/include/hw/misc/xlnx-versal-crl.h +++ b/include/hw/misc/xlnx-versal-crl.h @@ -13,7 +13,7 @@ #include "hw/register.h" #include "target/arm/cpu.h" -#define TYPE_XLNX_VERSAL_CRL "xlnx,versal-crl" +#define TYPE_XLNX_VERSAL_CRL "xlnx-versal-crl" OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalCRL, XLNX_VERSAL_CRL) REG32(ERR_CTRL, 0x0) diff --git a/include/hw/nvram/xlnx-efuse.h b/include/hw/nvram/xlnx-efuse.h index 58414e468b..cff7924106 100644 --- a/include/hw/nvram/xlnx-efuse.h +++ b/include/hw/nvram/xlnx-efuse.h @@ -30,7 +30,7 @@ #include "sysemu/block-backend.h" #include "hw/qdev-core.h" -#define TYPE_XLNX_EFUSE "xlnx,efuse" +#define TYPE_XLNX_EFUSE "xlnx-efuse" OBJECT_DECLARE_SIMPLE_TYPE(XlnxEFuse, XLNX_EFUSE); struct XlnxEFuse { diff --git a/include/hw/nvram/xlnx-versal-efuse.h b/include/hw/nvram/xlnx-versal-efuse.h index a873dc5cb0..86e2261b9a 100644 --- a/include/hw/nvram/xlnx-versal-efuse.h +++ b/include/hw/nvram/xlnx-versal-efuse.h @@ -29,8 +29,8 @@ #define XLNX_VERSAL_EFUSE_CTRL_R_MAX ((0x100 / 4) + 1) -#define TYPE_XLNX_VERSAL_EFUSE_CTRL "xlnx,versal-efuse" -#define TYPE_XLNX_VERSAL_EFUSE_CACHE "xlnx,pmc-efuse-cache" +#define TYPE_XLNX_VERSAL_EFUSE_CTRL "xlnx-versal-efuse" +#define TYPE_XLNX_VERSAL_EFUSE_CACHE "xlnx-pmc-efuse-cache" OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalEFuseCtrl, XLNX_VERSAL_EFUSE_CTRL); OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalEFuseCache, XLNX_VERSAL_EFUSE_CACHE); diff --git a/include/hw/nvram/xlnx-zynqmp-efuse.h b/include/hw/nvram/xlnx-zynqmp-efuse.h index 6b051ec4f1..f5beacc2e6 100644 --- a/include/hw/nvram/xlnx-zynqmp-efuse.h +++ b/include/hw/nvram/xlnx-zynqmp-efuse.h @@ -29,7 +29,7 @@ #define XLNX_ZYNQMP_EFUSE_R_MAX ((0x10fc / 4) + 1) -#define TYPE_XLNX_ZYNQMP_EFUSE "xlnx,zynqmp-efuse" +#define TYPE_XLNX_ZYNQMP_EFUSE "xlnx-zynqmp-efuse" OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPEFuse, XLNX_ZYNQMP_EFUSE); struct XlnxZynqMPEFuse {