| Message ID | 20250102132624.53443-1-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] hw/misc/vmcoreinfo: Rename VMCOREINFO_DEVICE -> TYPE_VMCOREINFO | expand |
On Thu, Jan 2, 2025 at 5:27 PM Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > > Follow the assumed QOM type definition style, prefixing with > 'TYPE_', and dropping the '_DEVICE' suffix which doesn't add > any value. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > Supersedes: <20241219153857.57450-5-philmd@linaro.org> > Since v1: > - Drop '_DEVICE' suffix (danpb) > --- > include/hw/misc/vmcoreinfo.h | 7 +++---- > hw/misc/vmcoreinfo.c | 6 +++--- > 2 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/include/hw/misc/vmcoreinfo.h b/include/hw/misc/vmcoreinfo.h > index 0b7b55d400a..1aa44771632 100644 > --- a/include/hw/misc/vmcoreinfo.h > +++ b/include/hw/misc/vmcoreinfo.h > @@ -16,10 +16,9 @@ > #include "standard-headers/linux/qemu_fw_cfg.h" > #include "qom/object.h" > > -#define VMCOREINFO_DEVICE "vmcoreinfo" > +#define TYPE_VMCOREINFO "vmcoreinfo" > typedef struct VMCoreInfoState VMCoreInfoState; > -DECLARE_INSTANCE_CHECKER(VMCoreInfoState, VMCOREINFO, > - VMCOREINFO_DEVICE) > +DECLARE_INSTANCE_CHECKER(VMCoreInfoState, VMCOREINFO, TYPE_VMCOREINFO) > > typedef struct fw_cfg_vmcoreinfo FWCfgVMCoreInfo; > > @@ -33,7 +32,7 @@ struct VMCoreInfoState { > /* returns NULL unless there is exactly one device */ > static inline VMCoreInfoState *vmcoreinfo_find(void) > { > - Object *o = object_resolve_path_type("", VMCOREINFO_DEVICE, NULL); > + Object *o = object_resolve_path_type("", TYPE_VMCOREINFO, NULL); > > return o ? VMCOREINFO(o) : NULL; > } > diff --git a/hw/misc/vmcoreinfo.c b/hw/misc/vmcoreinfo.c > index b1fcc22e92b..145f13a65cf 100644 > --- a/hw/misc/vmcoreinfo.c > +++ b/hw/misc/vmcoreinfo.c > @@ -47,13 +47,13 @@ static void vmcoreinfo_realize(DeviceState *dev, Error **errp) > */ > if (!vmcoreinfo_find()) { > error_setg(errp, "at most one %s device is permitted", > - VMCOREINFO_DEVICE); > + TYPE_VMCOREINFO); > return; > } > > if (!fw_cfg || !fw_cfg->dma_enabled) { > error_setg(errp, "%s device requires fw_cfg with DMA", > - VMCOREINFO_DEVICE); > + TYPE_VMCOREINFO); > return; > } > > @@ -95,7 +95,7 @@ static void vmcoreinfo_device_class_init(ObjectClass *klass, void *data) > > static const TypeInfo vmcoreinfo_types[] = { > { > - .name = VMCOREINFO_DEVICE, > + .name = TYPE_VMCOREINFO, > .parent = TYPE_DEVICE, > .instance_size = sizeof(VMCoreInfoState), > .class_init = vmcoreinfo_device_class_init, > -- > 2.47.1 > >
diff --git a/include/hw/misc/vmcoreinfo.h b/include/hw/misc/vmcoreinfo.h index 0b7b55d400a..1aa44771632 100644 --- a/include/hw/misc/vmcoreinfo.h +++ b/include/hw/misc/vmcoreinfo.h @@ -16,10 +16,9 @@ #include "standard-headers/linux/qemu_fw_cfg.h" #include "qom/object.h" -#define VMCOREINFO_DEVICE "vmcoreinfo" +#define TYPE_VMCOREINFO "vmcoreinfo" typedef struct VMCoreInfoState VMCoreInfoState; -DECLARE_INSTANCE_CHECKER(VMCoreInfoState, VMCOREINFO, - VMCOREINFO_DEVICE) +DECLARE_INSTANCE_CHECKER(VMCoreInfoState, VMCOREINFO, TYPE_VMCOREINFO) typedef struct fw_cfg_vmcoreinfo FWCfgVMCoreInfo; @@ -33,7 +32,7 @@ struct VMCoreInfoState { /* returns NULL unless there is exactly one device */ static inline VMCoreInfoState *vmcoreinfo_find(void) { - Object *o = object_resolve_path_type("", VMCOREINFO_DEVICE, NULL); + Object *o = object_resolve_path_type("", TYPE_VMCOREINFO, NULL); return o ? VMCOREINFO(o) : NULL; } diff --git a/hw/misc/vmcoreinfo.c b/hw/misc/vmcoreinfo.c index b1fcc22e92b..145f13a65cf 100644 --- a/hw/misc/vmcoreinfo.c +++ b/hw/misc/vmcoreinfo.c @@ -47,13 +47,13 @@ static void vmcoreinfo_realize(DeviceState *dev, Error **errp) */ if (!vmcoreinfo_find()) { error_setg(errp, "at most one %s device is permitted", - VMCOREINFO_DEVICE); + TYPE_VMCOREINFO); return; } if (!fw_cfg || !fw_cfg->dma_enabled) { error_setg(errp, "%s device requires fw_cfg with DMA", - VMCOREINFO_DEVICE); + TYPE_VMCOREINFO); return; } @@ -95,7 +95,7 @@ static void vmcoreinfo_device_class_init(ObjectClass *klass, void *data) static const TypeInfo vmcoreinfo_types[] = { { - .name = VMCOREINFO_DEVICE, + .name = TYPE_VMCOREINFO, .parent = TYPE_DEVICE, .instance_size = sizeof(VMCoreInfoState), .class_init = vmcoreinfo_device_class_init,
Follow the assumed QOM type definition style, prefixing with 'TYPE_', and dropping the '_DEVICE' suffix which doesn't add any value. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- Supersedes: <20241219153857.57450-5-philmd@linaro.org> Since v1: - Drop '_DEVICE' suffix (danpb) --- include/hw/misc/vmcoreinfo.h | 7 +++---- hw/misc/vmcoreinfo.c | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-)