Commit bf853881 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Paolo Bonzini
Browse files

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: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180114020412.26160-4-f4bug@amsat.org>
Reviewed-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
Acked-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Acked-by: default avatarCornelia Huck <cohuck@redhat.com>
Reviewed-by: default avatarLaurent Vivier <laurent@vivier.eu>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 46795cf2

hw/i386/kvm/i8254.c

+2 −2
Original line number Diff line number Diff line
@@ -315,8 +315,8 @@ static void kvm_pit_class_init(ObjectClass *klass, void *data) 
    PITCommonClass *k = PIT_COMMON_CLASS(klass);

    DeviceClass *dc = DEVICE_CLASS(klass);



    kpc->parent_realize = dc->realize;

    dc->realize = kvm_pit_realizefn;

    device_class_set_parent_realize(dc, kvm_pit_realizefn,

                                    &kpc->parent_realize);

    k->set_channel_gate = kvm_pit_set_gate;

    k->get_channel_info = kvm_pit_get_channel_info;

    dc->reset = kvm_pit_reset;

hw/i386/kvm/i8259.c

+1 −2
Original line number Diff line number Diff line
@@ -142,8 +142,7 @@ static void kvm_i8259_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);



    dc->reset     = kvm_pic_reset;

    kpc->parent_realize = dc->realize;

    dc->realize   = kvm_pic_realize;

    device_class_set_parent_realize(dc, kvm_pic_realize, &kpc->parent_realize);

    k->pre_save   = kvm_pic_get;

    k->post_load  = kvm_pic_put;

}

hw/input/adb-kbd.c

+2 −2
Original line number Diff line number Diff line
@@ -374,8 +374,8 @@ static void adb_kbd_class_init(ObjectClass *oc, void *data) 
    ADBDeviceClass *adc = ADB_DEVICE_CLASS(oc);

    ADBKeyboardClass *akc = ADB_KEYBOARD_CLASS(oc);



    akc->parent_realize = dc->realize;

    dc->realize = adb_kbd_realizefn;

    device_class_set_parent_realize(dc, adb_kbd_realizefn,

                                    &akc->parent_realize);

    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);



    adc->devreq = adb_kbd_request;

hw/input/adb-mouse.c

+2 −2
Original line number Diff line number Diff line
@@ -228,8 +228,8 @@ static void adb_mouse_class_init(ObjectClass *oc, void *data) 
    ADBDeviceClass *adc = ADB_DEVICE_CLASS(oc);

    ADBMouseClass *amc = ADB_MOUSE_CLASS(oc);



    amc->parent_realize = dc->realize;

    dc->realize = adb_mouse_realizefn;

    device_class_set_parent_realize(dc, adb_mouse_realizefn,

                                    &amc->parent_realize);

    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);



    adc->devreq = adb_mouse_request;

hw/intc/arm_gic.c

+1 −2
Original line number Diff line number Diff line
@@ -1461,8 +1461,7 @@ static void arm_gic_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);

    ARMGICClass *agc = ARM_GIC_CLASS(klass);



    agc->parent_realize = dc->realize;

    dc->realize = arm_gic_realize;

    device_class_set_parent_realize(dc, arm_gic_realize, &agc->parent_realize);

}



static const TypeInfo arm_gic_info = {