Commit 0db949f1 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-qom-2020-05-15' into staging 



QOM patches for 2020-05-15

# gpg: Signature made Fri 15 May 2020 06:58:29 BST
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qom-2020-05-15: (21 commits)
  hw: Remove unnecessary DEVICE() cast
  various: Remove unnecessary OBJECT() cast
  target: Remove unnecessary CPU() cast
  qom: Drop @errp parameter of object_property_del()
  spapr_pci: Drop some dead error handling
  qdev: Unrealize must not fail
  Drop more @errp parameters after previous commit
  qom: Drop parameter @errp of object_property_add() & friends
  qdev: Clean up qdev_connect_gpio_out_named()
  hw/arm/bcm2835: Drop futile attempts at QOM-adopting memory
  e1000: Don't run e1000_instance_init() twice
  hw/isa/superio: Make the components QOM children
  s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes,eaes}-256
  tests/check-qom-proplist: Improve iterator coverage
  qom: Drop object_property_set_description() parameter @errp
  qom: Make all the object_property_add_FOO() return the property
  qom: Drop convenience method object_property_get_uint16List()
  qom: Simplify object_property_get_enum()
  qom: Drop object_property_del_child()'s unused parameter @errp
  qom: Clean up inconsistent use of gchar * vs. char *
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 013a18ed 8e5c952b

accel/kvm/kvm-all.c

+4 −4
Original line number Diff line number Diff line
@@ -3111,15 +3111,15 @@ static void kvm_accel_class_init(ObjectClass *oc, void *data) 


    object_class_property_add(oc, "kernel-irqchip", "on|off|split",

        NULL, kvm_set_kernel_irqchip,

        NULL, NULL, &error_abort);

        NULL, NULL);

    object_class_property_set_description(oc, "kernel-irqchip",

        "Configure KVM in-kernel irqchip", &error_abort);

        "Configure KVM in-kernel irqchip");



    object_class_property_add(oc, "kvm-shadow-mem", "int",

        kvm_get_kvm_shadow_mem, kvm_set_kvm_shadow_mem,

        NULL, NULL, &error_abort);

        NULL, NULL);

    object_class_property_set_description(oc, "kvm-shadow-mem",

        "KVM shadow MMU size", &error_abort);

        "KVM shadow MMU size");

}



static const TypeInfo kvm_accel_type = {

accel/tcg/tcg-all.c

+3 −4
Original line number Diff line number Diff line
@@ -203,14 +203,13 @@ static void tcg_accel_class_init(ObjectClass *oc, void *data) 


    object_class_property_add_str(oc, "thread",

                                  tcg_get_thread,

                                  tcg_set_thread,

                                  NULL);

                                  tcg_set_thread);



    object_class_property_add(oc, "tb-size", "int",

        tcg_get_tb_size, tcg_set_tb_size,

        NULL, NULL, &error_abort);

        NULL, NULL);

    object_class_property_set_description(oc, "tb-size",

        "TCG translation block cache size", &error_abort);

        "TCG translation block cache size");



}

authz/list.c

+2 −3
Original line number Diff line number Diff line
@@ -124,13 +124,12 @@ qauthz_list_class_init(ObjectClass *oc, void *data) 
                                   "QAuthZListPolicy",

                                   &QAuthZListPolicy_lookup,

                                   qauthz_list_prop_get_policy,

                                   qauthz_list_prop_set_policy,

                                   NULL);

                                   qauthz_list_prop_set_policy);



    object_class_property_add(oc, "rules", "QAuthZListRule",

                              qauthz_list_prop_get_rules,

                              qauthz_list_prop_set_rules,

                              NULL, NULL, NULL);

                              NULL, NULL);



    authz->is_allowed = qauthz_list_is_allowed;

}

authz/listfile.c

+2 −4
Original line number Diff line number Diff line
@@ -221,12 +221,10 @@ qauthz_list_file_class_init(ObjectClass *oc, void *data) 


    object_class_property_add_str(oc, "filename",

                                  qauthz_list_file_prop_get_filename,

                                  qauthz_list_file_prop_set_filename,

                                  NULL);

                                  qauthz_list_file_prop_set_filename);

    object_class_property_add_bool(oc, "refresh",

                                   qauthz_list_file_prop_get_refresh,

                                   qauthz_list_file_prop_set_refresh,

                                   NULL);

                                   qauthz_list_file_prop_set_refresh);



    authz->is_allowed = qauthz_list_file_is_allowed;

}

authz/pamacct.c

+1 −2
Original line number Diff line number Diff line
@@ -107,8 +107,7 @@ qauthz_pam_class_init(ObjectClass *oc, void *data) 


    object_class_property_add_str(oc, "service",

                                  qauthz_pam_prop_get_service,

                                  qauthz_pam_prop_set_service,

                                  NULL);

                                  qauthz_pam_prop_set_service);

}