Eric Blake <ebl...@redhat.com> writes:
> On 7/2/20 10:49 AM, Markus Armbruster wrote:
>> When all we do with an Error we receive into a local variable is
>> propagating to somewhere else, we can just as well receive it there
>> right away. The previous two commits did that for sufficiently simple
>> cases with Coccinelle. Do it for several more manually.
>>
>> Signed-off-by: Markus Armbruster <arm...@redhat.com>
>> ---
>
>> +++ b/qdev-monitor.c
>> @@ -597,7 +597,6 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error
>> **errp)
>> const char *driver, *path;
>> DeviceState *dev = NULL;
>> BusState *bus = NULL;
>> - Error *err = NULL;
>> bool hide;
>> driver = qemu_opt_get(opts, "driver");
>> @@ -652,15 +651,14 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error
>> **errp)
>> dev = qdev_new(driver);
>> /* Check whether the hotplug is allowed by the machine */
>> - if (qdev_hotplug && !qdev_hotplug_allowed(dev, &err)) {
>> + if (qdev_hotplug && !qdev_hotplug_allowed(dev, errp)) {
>> /* Error must be set in the machine hook */
>> - assert(err);
>
> That comment could be deleted now.
Yes.
> Either way,
> Reviewed-by: Eric Blake <ebl...@redhat.com>
Thanks!
