hw/misc/vmcoreinfo: Rename VMCOREINFO_DEVICE -> TYPE_VMCOREINFO
PATCH v2 1/1 hw/misc/vmcoreinfo: Rename VMCOREINFO_DEVICE -> TYPE_VMCOREINFO
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é <[email protected]>
---
Supersedes: <[email protected]> Since v1:
- Drop '_DEVICE' suffix (danpb)
--- include/hw/misc/vmcoreinfo.h | 7 +++---- hw/misc/vmcoreinfo.c | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-)
include/hw/misc/vmcoreinfo.h +3 -4
@@ -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 ; }
hw/misc/vmcoreinfo.c +3 -3
@@ -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,
Signature · 1 line
2.47.1
Quoted 6 lines · Philippe Mathieu-Daudé
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é <[email protected]>
Reviewed-by Marc-André Lureau <[email protected]>
Quoted 68 lines
---
Supersedes: <[email protected]> Since v1:
- Drop '_DEVICE' suffix (danpb)--- include/hw/misc/vmcoreinfo.h | 7 +++---- hw/misc/vmcoreinfo.c | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-)include/hw/misc/vmcoreinfo.h +3
-4@@ -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 ; }hw/misc/vmcoreinfo.c +3
-4@@ -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
Signature · 1 line
Marc-André Lureau
Quoted 5 lines · Philippe Mathieu-Daudé
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é <[email protected]>
Quoted 8 lines
---
Supersedes: <[email protected]> Since v1:
- Drop '_DEVICE' suffix (danpb)--- include/hw/misc/vmcoreinfo.h | 7 +++---- hw/misc/vmcoreinfo.c | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-)
Patch queued.