HE> Sadly the current input parameter list of make_ref_t() in struct HE> std_assoc does not include a broker pointer, which prevents me HE> from reworking it in your suggested way. Ah, right :( HE> Maybe you have an idea how to solve this ? Perhaps we could have a macro that dispatches the make_reference() function with the appropriate broker? Maybe something like the following: #define LIBVIRT_CIM_DEFAULT_MAKEREF \ static CMPIInstance make_ref(const CMPIObjectPath *ref, \ const CMPIInstance *inst, \ struct std_assoc_info *info, \ struct std_assoc *assoc) \ { \ return default_make_ref(_BROKER, ref, inst, info, assoc);\ } What do you think? -- Dan Smith IBM Linux Technology Center Open Hypervisor Team email: danms@us.ibm.com