mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
qdev: use device_class_set_parent_realize/unrealize/reset()
changes generated using the following Coccinelle patch: @@ type DeviceParentClass; DeviceParentClass *pc; DeviceClass *dc; identifier parent_fn; identifier child_fn; @@ ( +device_class_set_parent_realize(dc, child_fn, &pc->parent_fn); -pc->parent_fn = dc->realize; ... -dc->realize = child_fn; | +device_class_set_parent_unrealize(dc, child_fn, &pc->parent_fn); -pc->parent_fn = dc->unrealize; ... -dc->unrealize = child_fn; | +device_class_set_parent_reset(dc, child_fn, &pc->parent_fn); -pc->parent_fn = dc->reset; ... -dc->reset = child_fn; ) Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <20180114020412.26160-4-f4bug@amsat.org> Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> Acked-by: Cornelia Huck <cohuck@redhat.com> Reviewed-by: Laurent Vivier <laurent@vivier.eu> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
committed by
Paolo Bonzini
parent
46795cf2e2
commit
bf85388169
+2
-2
@@ -315,8 +315,8 @@ static void kvm_pit_class_init(ObjectClass *klass, void *data)
|
|||||||
PITCommonClass *k = PIT_COMMON_CLASS(klass);
|
PITCommonClass *k = PIT_COMMON_CLASS(klass);
|
||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
|
|
||||||
kpc->parent_realize = dc->realize;
|
device_class_set_parent_realize(dc, kvm_pit_realizefn,
|
||||||
dc->realize = kvm_pit_realizefn;
|
&kpc->parent_realize);
|
||||||
k->set_channel_gate = kvm_pit_set_gate;
|
k->set_channel_gate = kvm_pit_set_gate;
|
||||||
k->get_channel_info = kvm_pit_get_channel_info;
|
k->get_channel_info = kvm_pit_get_channel_info;
|
||||||
dc->reset = kvm_pit_reset;
|
dc->reset = kvm_pit_reset;
|
||||||
|
|||||||
+1
-2
@@ -142,8 +142,7 @@ static void kvm_i8259_class_init(ObjectClass *klass, void *data)
|
|||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
|
|
||||||
dc->reset = kvm_pic_reset;
|
dc->reset = kvm_pic_reset;
|
||||||
kpc->parent_realize = dc->realize;
|
device_class_set_parent_realize(dc, kvm_pic_realize, &kpc->parent_realize);
|
||||||
dc->realize = kvm_pic_realize;
|
|
||||||
k->pre_save = kvm_pic_get;
|
k->pre_save = kvm_pic_get;
|
||||||
k->post_load = kvm_pic_put;
|
k->post_load = kvm_pic_put;
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -374,8 +374,8 @@ static void adb_kbd_class_init(ObjectClass *oc, void *data)
|
|||||||
ADBDeviceClass *adc = ADB_DEVICE_CLASS(oc);
|
ADBDeviceClass *adc = ADB_DEVICE_CLASS(oc);
|
||||||
ADBKeyboardClass *akc = ADB_KEYBOARD_CLASS(oc);
|
ADBKeyboardClass *akc = ADB_KEYBOARD_CLASS(oc);
|
||||||
|
|
||||||
akc->parent_realize = dc->realize;
|
device_class_set_parent_realize(dc, adb_kbd_realizefn,
|
||||||
dc->realize = adb_kbd_realizefn;
|
&akc->parent_realize);
|
||||||
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
|
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
|
||||||
|
|
||||||
adc->devreq = adb_kbd_request;
|
adc->devreq = adb_kbd_request;
|
||||||
|
|||||||
@@ -228,8 +228,8 @@ static void adb_mouse_class_init(ObjectClass *oc, void *data)
|
|||||||
ADBDeviceClass *adc = ADB_DEVICE_CLASS(oc);
|
ADBDeviceClass *adc = ADB_DEVICE_CLASS(oc);
|
||||||
ADBMouseClass *amc = ADB_MOUSE_CLASS(oc);
|
ADBMouseClass *amc = ADB_MOUSE_CLASS(oc);
|
||||||
|
|
||||||
amc->parent_realize = dc->realize;
|
device_class_set_parent_realize(dc, adb_mouse_realizefn,
|
||||||
dc->realize = adb_mouse_realizefn;
|
&amc->parent_realize);
|
||||||
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
|
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
|
||||||
|
|
||||||
adc->devreq = adb_mouse_request;
|
adc->devreq = adb_mouse_request;
|
||||||
|
|||||||
+1
-2
@@ -1461,8 +1461,7 @@ static void arm_gic_class_init(ObjectClass *klass, void *data)
|
|||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
ARMGICClass *agc = ARM_GIC_CLASS(klass);
|
ARMGICClass *agc = ARM_GIC_CLASS(klass);
|
||||||
|
|
||||||
agc->parent_realize = dc->realize;
|
device_class_set_parent_realize(dc, arm_gic_realize, &agc->parent_realize);
|
||||||
dc->realize = arm_gic_realize;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo arm_gic_info = {
|
static const TypeInfo arm_gic_info = {
|
||||||
|
|||||||
@@ -591,10 +591,9 @@ static void kvm_arm_gic_class_init(ObjectClass *klass, void *data)
|
|||||||
|
|
||||||
agcc->pre_save = kvm_arm_gic_get;
|
agcc->pre_save = kvm_arm_gic_get;
|
||||||
agcc->post_load = kvm_arm_gic_put;
|
agcc->post_load = kvm_arm_gic_put;
|
||||||
kgc->parent_realize = dc->realize;
|
device_class_set_parent_realize(dc, kvm_arm_gic_realize,
|
||||||
kgc->parent_reset = dc->reset;
|
&kgc->parent_realize);
|
||||||
dc->realize = kvm_arm_gic_realize;
|
device_class_set_parent_reset(dc, kvm_arm_gic_reset, &kgc->parent_reset);
|
||||||
dc->reset = kvm_arm_gic_reset;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo kvm_arm_gic_info = {
|
static const TypeInfo kvm_arm_gic_info = {
|
||||||
|
|||||||
+1
-2
@@ -385,8 +385,7 @@ static void arm_gicv3_class_init(ObjectClass *klass, void *data)
|
|||||||
ARMGICv3Class *agc = ARM_GICV3_CLASS(klass);
|
ARMGICv3Class *agc = ARM_GICV3_CLASS(klass);
|
||||||
|
|
||||||
agcc->post_load = arm_gicv3_post_load;
|
agcc->post_load = arm_gicv3_post_load;
|
||||||
agc->parent_realize = dc->realize;
|
device_class_set_parent_realize(dc, arm_gic_realize, &agc->parent_realize);
|
||||||
dc->realize = arm_gic_realize;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo arm_gicv3_info = {
|
static const TypeInfo arm_gicv3_info = {
|
||||||
|
|||||||
@@ -245,11 +245,10 @@ static void kvm_arm_its_class_init(ObjectClass *klass, void *data)
|
|||||||
|
|
||||||
dc->realize = kvm_arm_its_realize;
|
dc->realize = kvm_arm_its_realize;
|
||||||
dc->props = kvm_arm_its_props;
|
dc->props = kvm_arm_its_props;
|
||||||
ic->parent_reset = dc->reset;
|
device_class_set_parent_reset(dc, kvm_arm_its_reset, &ic->parent_reset);
|
||||||
icc->send_msi = kvm_its_send_msi;
|
icc->send_msi = kvm_its_send_msi;
|
||||||
icc->pre_save = kvm_arm_its_pre_save;
|
icc->pre_save = kvm_arm_its_pre_save;
|
||||||
icc->post_load = kvm_arm_its_post_load;
|
icc->post_load = kvm_arm_its_post_load;
|
||||||
dc->reset = kvm_arm_its_reset;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo kvm_arm_its_info = {
|
static const TypeInfo kvm_arm_its_info = {
|
||||||
|
|||||||
@@ -795,10 +795,9 @@ static void kvm_arm_gicv3_class_init(ObjectClass *klass, void *data)
|
|||||||
|
|
||||||
agcc->pre_save = kvm_arm_gicv3_get;
|
agcc->pre_save = kvm_arm_gicv3_get;
|
||||||
agcc->post_load = kvm_arm_gicv3_put;
|
agcc->post_load = kvm_arm_gicv3_put;
|
||||||
kgc->parent_realize = dc->realize;
|
device_class_set_parent_realize(dc, kvm_arm_gicv3_realize,
|
||||||
kgc->parent_reset = dc->reset;
|
&kgc->parent_realize);
|
||||||
dc->realize = kvm_arm_gicv3_realize;
|
device_class_set_parent_reset(dc, kvm_arm_gicv3_reset, &kgc->parent_reset);
|
||||||
dc->reset = kvm_arm_gicv3_reset;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo kvm_arm_gicv3_info = {
|
static const TypeInfo kvm_arm_gicv3_info = {
|
||||||
|
|||||||
+1
-2
@@ -443,8 +443,7 @@ static void i8259_class_init(ObjectClass *klass, void *data)
|
|||||||
PICClass *k = PIC_CLASS(klass);
|
PICClass *k = PIC_CLASS(klass);
|
||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
|
|
||||||
k->parent_realize = dc->realize;
|
device_class_set_parent_realize(dc, pic_realize, &k->parent_realize);
|
||||||
dc->realize = pic_realize;
|
|
||||||
dc->reset = pic_reset;
|
dc->reset = pic_reset;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -2664,8 +2664,8 @@ static void vmxnet3_class_init(ObjectClass *class, void *data)
|
|||||||
c->class_id = PCI_CLASS_NETWORK_ETHERNET;
|
c->class_id = PCI_CLASS_NETWORK_ETHERNET;
|
||||||
c->subsystem_vendor_id = PCI_VENDOR_ID_VMWARE;
|
c->subsystem_vendor_id = PCI_VENDOR_ID_VMWARE;
|
||||||
c->subsystem_id = PCI_DEVICE_ID_VMWARE_VMXNET3;
|
c->subsystem_id = PCI_DEVICE_ID_VMWARE_VMXNET3;
|
||||||
vc->parent_dc_realize = dc->realize;
|
device_class_set_parent_realize(dc, vmxnet3_realize,
|
||||||
dc->realize = vmxnet3_realize;
|
&vc->parent_dc_realize);
|
||||||
dc->desc = "VMWare Paravirtualized Ethernet v3";
|
dc->desc = "VMWare Paravirtualized Ethernet v3";
|
||||||
dc->reset = vmxnet3_qdev_reset;
|
dc->reset = vmxnet3_qdev_reset;
|
||||||
dc->vmsd = &vmstate_vmxnet3;
|
dc->vmsd = &vmstate_vmxnet3;
|
||||||
|
|||||||
@@ -137,8 +137,7 @@ static void gen_rp_dev_class_init(ObjectClass *klass, void *data)
|
|||||||
dc->vmsd = &vmstate_rp_dev;
|
dc->vmsd = &vmstate_rp_dev;
|
||||||
dc->props = gen_rp_props;
|
dc->props = gen_rp_props;
|
||||||
|
|
||||||
rpc->parent_realize = dc->realize;
|
device_class_set_parent_realize(dc, gen_rp_realize, &rpc->parent_realize);
|
||||||
dc->realize = gen_rp_realize;
|
|
||||||
|
|
||||||
rpc->aer_vector = gen_rp_aer_vector;
|
rpc->aer_vector = gen_rp_aer_vector;
|
||||||
rpc->interrupts_init = gen_rp_interrupts_init;
|
rpc->interrupts_init = gen_rp_interrupts_init;
|
||||||
|
|||||||
@@ -1284,8 +1284,8 @@ static void pvscsi_class_init(ObjectClass *klass, void *data)
|
|||||||
k->device_id = PCI_DEVICE_ID_VMWARE_PVSCSI;
|
k->device_id = PCI_DEVICE_ID_VMWARE_PVSCSI;
|
||||||
k->class_id = PCI_CLASS_STORAGE_SCSI;
|
k->class_id = PCI_CLASS_STORAGE_SCSI;
|
||||||
k->subsystem_id = 0x1000;
|
k->subsystem_id = 0x1000;
|
||||||
pvs_k->parent_dc_realize = dc->realize;
|
device_class_set_parent_realize(dc, pvscsi_realize,
|
||||||
dc->realize = pvscsi_realize;
|
&pvs_k->parent_dc_realize);
|
||||||
dc->reset = pvscsi_reset;
|
dc->reset = pvscsi_reset;
|
||||||
dc->vmsd = &vmstate_pvscsi;
|
dc->vmsd = &vmstate_pvscsi;
|
||||||
dc->props = pvscsi_properties;
|
dc->props = pvscsi_properties;
|
||||||
|
|||||||
+1
-2
@@ -358,8 +358,7 @@ static void pit_class_initfn(ObjectClass *klass, void *data)
|
|||||||
PITCommonClass *k = PIT_COMMON_CLASS(klass);
|
PITCommonClass *k = PIT_COMMON_CLASS(klass);
|
||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
|
|
||||||
pc->parent_realize = dc->realize;
|
device_class_set_parent_realize(dc, pit_realizefn, &pc->parent_realize);
|
||||||
dc->realize = pit_realizefn;
|
|
||||||
k->set_channel_gate = pit_set_channel_gate;
|
k->set_channel_gate = pit_set_channel_gate;
|
||||||
k->get_channel_info = pit_get_channel_info_common;
|
k->get_channel_info = pit_get_channel_info_common;
|
||||||
k->post_load = pit_post_load;
|
k->post_load = pit_post_load;
|
||||||
|
|||||||
+2
-2
@@ -34,8 +34,8 @@ static void vfio_amd_xgbe_class_init(ObjectClass *klass, void *data)
|
|||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
VFIOAmdXgbeDeviceClass *vcxc =
|
VFIOAmdXgbeDeviceClass *vcxc =
|
||||||
VFIO_AMD_XGBE_DEVICE_CLASS(klass);
|
VFIO_AMD_XGBE_DEVICE_CLASS(klass);
|
||||||
vcxc->parent_realize = dc->realize;
|
device_class_set_parent_realize(dc, amd_xgbe_realize,
|
||||||
dc->realize = amd_xgbe_realize;
|
&vcxc->parent_realize);
|
||||||
dc->desc = "VFIO AMD XGBE";
|
dc->desc = "VFIO AMD XGBE";
|
||||||
dc->vmsd = &vfio_platform_amd_xgbe_vmstate;
|
dc->vmsd = &vfio_platform_amd_xgbe_vmstate;
|
||||||
/* Supported by TYPE_VIRT_MACHINE */
|
/* Supported by TYPE_VIRT_MACHINE */
|
||||||
|
|||||||
@@ -34,8 +34,8 @@ static void vfio_calxeda_xgmac_class_init(ObjectClass *klass, void *data)
|
|||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
VFIOCalxedaXgmacDeviceClass *vcxc =
|
VFIOCalxedaXgmacDeviceClass *vcxc =
|
||||||
VFIO_CALXEDA_XGMAC_DEVICE_CLASS(klass);
|
VFIO_CALXEDA_XGMAC_DEVICE_CLASS(klass);
|
||||||
vcxc->parent_realize = dc->realize;
|
device_class_set_parent_realize(dc, calxeda_xgmac_realize,
|
||||||
dc->realize = calxeda_xgmac_realize;
|
&vcxc->parent_realize);
|
||||||
dc->desc = "VFIO Calxeda XGMAC";
|
dc->desc = "VFIO Calxeda XGMAC";
|
||||||
dc->vmsd = &vfio_platform_calxeda_xgmac_vmstate;
|
dc->vmsd = &vfio_platform_calxeda_xgmac_vmstate;
|
||||||
/* Supported by TYPE_VIRT_MACHINE */
|
/* Supported by TYPE_VIRT_MACHINE */
|
||||||
|
|||||||
@@ -1907,8 +1907,8 @@ static void virtio_pci_class_init(ObjectClass *klass, void *data)
|
|||||||
k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
|
k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
|
||||||
k->revision = VIRTIO_PCI_ABI_VERSION;
|
k->revision = VIRTIO_PCI_ABI_VERSION;
|
||||||
k->class_id = PCI_CLASS_OTHERS;
|
k->class_id = PCI_CLASS_OTHERS;
|
||||||
vpciklass->parent_dc_realize = dc->realize;
|
device_class_set_parent_realize(dc, virtio_pci_dc_realize,
|
||||||
dc->realize = virtio_pci_dc_realize;
|
&vpciklass->parent_dc_realize);
|
||||||
dc->reset = virtio_pci_reset;
|
dc->reset = virtio_pci_reset;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -233,8 +233,8 @@ static void alpha_cpu_class_init(ObjectClass *oc, void *data)
|
|||||||
CPUClass *cc = CPU_CLASS(oc);
|
CPUClass *cc = CPU_CLASS(oc);
|
||||||
AlphaCPUClass *acc = ALPHA_CPU_CLASS(oc);
|
AlphaCPUClass *acc = ALPHA_CPU_CLASS(oc);
|
||||||
|
|
||||||
acc->parent_realize = dc->realize;
|
device_class_set_parent_realize(dc, alpha_cpu_realizefn,
|
||||||
dc->realize = alpha_cpu_realizefn;
|
&acc->parent_realize);
|
||||||
|
|
||||||
cc->class_by_name = alpha_cpu_class_by_name;
|
cc->class_by_name = alpha_cpu_class_by_name;
|
||||||
cc->has_work = alpha_cpu_has_work;
|
cc->has_work = alpha_cpu_has_work;
|
||||||
|
|||||||
+2
-2
@@ -1722,8 +1722,8 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data)
|
|||||||
CPUClass *cc = CPU_CLASS(acc);
|
CPUClass *cc = CPU_CLASS(acc);
|
||||||
DeviceClass *dc = DEVICE_CLASS(oc);
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
||||||
|
|
||||||
acc->parent_realize = dc->realize;
|
device_class_set_parent_realize(dc, arm_cpu_realizefn,
|
||||||
dc->realize = arm_cpu_realizefn;
|
&acc->parent_realize);
|
||||||
dc->props = arm_cpu_properties;
|
dc->props = arm_cpu_properties;
|
||||||
|
|
||||||
acc->parent_reset = cc->reset;
|
acc->parent_reset = cc->reset;
|
||||||
|
|||||||
+2
-2
@@ -260,8 +260,8 @@ static void cris_cpu_class_init(ObjectClass *oc, void *data)
|
|||||||
CPUClass *cc = CPU_CLASS(oc);
|
CPUClass *cc = CPU_CLASS(oc);
|
||||||
CRISCPUClass *ccc = CRIS_CPU_CLASS(oc);
|
CRISCPUClass *ccc = CRIS_CPU_CLASS(oc);
|
||||||
|
|
||||||
ccc->parent_realize = dc->realize;
|
device_class_set_parent_realize(dc, cris_cpu_realizefn,
|
||||||
dc->realize = cris_cpu_realizefn;
|
&ccc->parent_realize);
|
||||||
|
|
||||||
ccc->parent_reset = cc->reset;
|
ccc->parent_reset = cc->reset;
|
||||||
cc->reset = cris_cpu_reset;
|
cc->reset = cris_cpu_reset;
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user