Skip to content

Commit

Permalink
qdev: Make functions taking Error ** return bool, not void
Browse files Browse the repository at this point in the history
See recent commit "error: Document Error API usage rules" for
rationale.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-32-armbru@redhat.com>
  • Loading branch information
Markus Armbruster committed Jul 10, 2020
1 parent b783f54 commit 73ac1aa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions hw/core/qdev-properties-system.c
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ const PropertyInfo qdev_prop_audiodev = {
.set = set_audiodev,
};

void qdev_prop_set_drive_err(DeviceState *dev, const char *name,
bool qdev_prop_set_drive_err(DeviceState *dev, const char *name,
BlockBackend *value, Error **errp)
{
const char *ref = "";
Expand All @@ -436,7 +436,7 @@ void qdev_prop_set_drive_err(DeviceState *dev, const char *name,
}
}

object_property_set_str(OBJECT(dev), name, ref, errp);
return object_property_set_str(OBJECT(dev), name, ref, errp);
}

void qdev_prop_set_drive(DeviceState *dev, const char *name,
Expand Down
4 changes: 2 additions & 2 deletions include/hw/qdev-properties.h
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,8 @@ extern const PropertyInfo qdev_prop_pcie_link_width;
/*
* Set properties between creation and realization.
*/
void qdev_prop_set_drive_err(DeviceState *dev, const char *name,
BlockBackend *value, Error **errp);
bool qdev_prop_set_drive_err(DeviceState *dev, const char *name,
BlockBackend *value, Error **errp);

/*
* Set properties between creation and realization.
Expand Down

0 comments on commit 73ac1aa

Please sign in to comment.