Commit dda65c7c authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Michael S. Tsirkin
Browse files

pc: Use error_abort when registering properties 



No errors should happen when registering the properties, but we
shouldn't silently ignore them if they happen.

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent e8963e5c

hw/i386/pc.c

+8 −8
Original line number Diff line number Diff line
@@ -1886,39 +1886,39 @@ static void pc_machine_initfn(Object *obj) 


    object_property_add(obj, PC_MACHINE_MEMHP_REGION_SIZE, "int",

                        pc_machine_get_hotplug_memory_region_size,

                        NULL, NULL, NULL, NULL);

                        NULL, NULL, NULL, &error_abort);



    pcms->max_ram_below_4g = 1ULL << 32; /* 4G */

    object_property_add(obj, PC_MACHINE_MAX_RAM_BELOW_4G, "size",

                        pc_machine_get_max_ram_below_4g,

                        pc_machine_set_max_ram_below_4g,

                        NULL, NULL, NULL);

                        NULL, NULL, &error_abort);

    object_property_set_description(obj, PC_MACHINE_MAX_RAM_BELOW_4G,

                                    "Maximum ram below the 4G boundary (32bit boundary)",

                                    NULL);

                                    &error_abort);



    pcms->smm = ON_OFF_AUTO_AUTO;

    object_property_add(obj, PC_MACHINE_SMM, "OnOffAuto",

                        pc_machine_get_smm,

                        pc_machine_set_smm,

                        NULL, NULL, NULL);

                        NULL, NULL, &error_abort);

    object_property_set_description(obj, PC_MACHINE_SMM,

                                    "Enable SMM (pc & q35)",

                                    NULL);

                                    &error_abort);



    pcms->vmport = ON_OFF_AUTO_AUTO;

    object_property_add(obj, PC_MACHINE_VMPORT, "OnOffAuto",

                        pc_machine_get_vmport,

                        pc_machine_set_vmport,

                        NULL, NULL, NULL);

                        NULL, NULL, &error_abort);

    object_property_set_description(obj, PC_MACHINE_VMPORT,

                                    "Enable vmport (pc & q35)",

                                    NULL);

                                    &error_abort);



    pcms->enforce_aligned_dimm = true;

    object_property_add_bool(obj, PC_MACHINE_ENFORCE_ALIGNED_DIMM,

                             pc_machine_get_aligned_dimm,

                             NULL, NULL);

                             NULL, &error_abort);

}



static unsigned pc_cpu_index_to_socket_id(unsigned cpu_index)