Commit 40c2281c authored by Markus Armbruster's avatar Markus Armbruster
Browse files

Drop more @errp parameters after previous commit 



Several functions can't fail anymore: ich9_pm_add_properties(),
device_add_bootindex_property(), ppc_compat_add_property(),
spapr_caps_add_properties(), PropertyInfo.create().  Drop their @errp
parameter.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-16-armbru@redhat.com>
parent d2623129

bootdevice.c

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ static void property_release_bootindex(Object *obj, const char *name, 


void device_add_bootindex_property(Object *obj, int32_t *bootindex,

                                   const char *name, const char *suffix,

                                   DeviceState *dev, Error **errp)

                                   DeviceState *dev)

{

    BootIndexProperty *prop = g_malloc0(sizeof(*prop));

hw/acpi/ich9.c

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ static void ich9_pm_set_enable_tco(Object *obj, bool value, Error **errp) 
    s->pm.enable_tco = value;

}



void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)

void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm)

{

    static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;

    pm->acpi_memory_hotplug.is_enabled = true;

hw/block/fdc.c

+2 −2
Original line number Diff line number Diff line
@@ -2813,10 +2813,10 @@ static void isabus_fdc_instance_init(Object *obj) 


    device_add_bootindex_property(obj, &isa->bootindexA,

                                  "bootindexA", "/floppy@0",

                                  DEVICE(obj), NULL);

                                  DEVICE(obj));

    device_add_bootindex_property(obj, &isa->bootindexB,

                                  "bootindexB", "/floppy@1",

                                  DEVICE(obj), NULL);

                                  DEVICE(obj));

}



static const TypeInfo isa_fdc_info = {

hw/block/nvme.c

+1 −1
Original line number Diff line number Diff line
@@ -1594,7 +1594,7 @@ static void nvme_instance_init(Object *obj) 


    device_add_bootindex_property(obj, &s->conf.bootindex,

                                  "bootindex", "/namespace@1,0",

                                  DEVICE(obj), &error_abort);

                                  DEVICE(obj));

}



static const TypeInfo nvme_info = {

hw/block/vhost-user-blk.c

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ static void vhost_user_blk_instance_init(Object *obj) 
    VHostUserBlk *s = VHOST_USER_BLK(obj);



    device_add_bootindex_property(obj, &s->bootindex, "bootindex",

                                  "/disk@0,0", DEVICE(obj), NULL);

                                  "/disk@0,0", DEVICE(obj));

}



static const VMStateDescription vmstate_vhost_user_blk = {