瀏覽代碼

qom: fix objects with improper parent type

Some objects accidentally inherit ObjectClass instead of Object.
They compile silently but may crash after downcasting.

In this patch, we introduce a coccinelle script to find broken
declarations and fix them manually with proper base type.

Signed-off-by: Sergey Nizovtsev <snizovtsev@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Paolo Bonzini 4 年之前
父節點
當前提交
22fb6eb571
共有 5 個文件被更改,包括 30 次插入3 次删除
  1. 1 0
      MAINTAINERS
  2. 1 1
      include/hw/acpi/vmgenid.h
  3. 1 1
      include/hw/misc/vmcoreinfo.h
  4. 1 1
      include/net/can_host.h
  5. 26 0
      scripts/coccinelle/qom-parent-type.cocci

+ 1 - 0
MAINTAINERS

@@ -2462,6 +2462,7 @@ F: include/monitor/qdev.h
 F: include/qom/
 F: include/qom/
 F: qapi/qom.json
 F: qapi/qom.json
 F: qapi/qdev.json
 F: qapi/qdev.json
+F: scripts/coccinelle/qom-parent-type.cocci
 F: softmmu/qdev-monitor.c
 F: softmmu/qdev-monitor.c
 F: qom/
 F: qom/
 F: tests/check-qom-interface.c
 F: tests/check-qom-interface.c

+ 1 - 1
include/hw/acpi/vmgenid.h

@@ -19,7 +19,7 @@
 OBJECT_DECLARE_SIMPLE_TYPE(VmGenIdState, VMGENID)
 OBJECT_DECLARE_SIMPLE_TYPE(VmGenIdState, VMGENID)
 
 
 struct VmGenIdState {
 struct VmGenIdState {
-    DeviceClass parent_obj;
+    DeviceState parent_obj;
     QemuUUID guid;                /* The 128-bit GUID seen by the guest */
     QemuUUID guid;                /* The 128-bit GUID seen by the guest */
     uint8_t vmgenid_addr_le[8];   /* Address of the GUID (little-endian) */
     uint8_t vmgenid_addr_le[8];   /* Address of the GUID (little-endian) */
 };
 };

+ 1 - 1
include/hw/misc/vmcoreinfo.h

@@ -24,7 +24,7 @@ DECLARE_INSTANCE_CHECKER(VMCoreInfoState, VMCOREINFO,
 typedef struct fw_cfg_vmcoreinfo FWCfgVMCoreInfo;
 typedef struct fw_cfg_vmcoreinfo FWCfgVMCoreInfo;
 
 
 struct VMCoreInfoState {
 struct VMCoreInfoState {
-    DeviceClass parent_obj;
+    DeviceState parent_obj;
 
 
     bool has_vmcoreinfo;
     bool has_vmcoreinfo;
     FWCfgVMCoreInfo vmcoreinfo;
     FWCfgVMCoreInfo vmcoreinfo;

+ 1 - 1
include/net/can_host.h

@@ -35,7 +35,7 @@
 OBJECT_DECLARE_TYPE(CanHostState, CanHostClass, CAN_HOST)
 OBJECT_DECLARE_TYPE(CanHostState, CanHostClass, CAN_HOST)
 
 
 struct CanHostState {
 struct CanHostState {
-    ObjectClass oc;
+    Object oc;
 
 
     CanBusState *bus;
     CanBusState *bus;
     CanBusClientState bus_client;
     CanBusClientState bus_client;

+ 26 - 0
scripts/coccinelle/qom-parent-type.cocci

@@ -0,0 +1,26 @@
+// Highlight object declarations that don't look like object class but
+// accidentally inherit from it.
+
+@match@
+identifier obj_t, fld;
+type parent_t =~ ".*Class$";
+@@
+struct obj_t {
+    parent_t fld;
+    ...
+};
+
+@script:python filter depends on match@
+obj_t << match.obj_t;
+@@
+is_class_obj = obj_t.endswith('Class')
+cocci.include_match(not is_class_obj)
+
+@replacement depends on filter@
+identifier match.obj_t, match.fld;
+type match.parent_t;
+@@
+struct obj_t {
+*   parent_t fld;
+    ...
+};