118bfd76c9
Convert
foo(..., &err);
if (err) {
...
}
to
if (!foo(..., &err)) {
...
}
for qdev_realize(), qdev_realize_and_unref(), qbus_realize() and their
wrappers isa_realize_and_unref(), pci_realize_and_unref(),
sysbus_realize(), sysbus_realize_and_unref(), usb_realize_and_unref().
Coccinelle script:
@@
identifier fun = {
isa_realize_and_unref, pci_realize_and_unref, qbus_realize,
qdev_realize, qdev_realize_and_unref, sysbus_realize,
sysbus_realize_and_unref, usb_realize_and_unref
};
expression list args, args2;
typedef Error;
Error *err;
@@
- fun(args, &err, args2);
- if (err)
+ if (!fun(args, &err, args2))
{
...
}
Chokes on hw/arm/musicpal.c's lcd_refresh() with the unhelpful error
message "no position information". Nothing to convert there; skipped.
Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Converted manually.
A few line breaks tidied up manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Message-Id: <20200707160613.848843-5-armbru@redhat.com>
75 lines
2.1 KiB
C
75 lines
2.1 KiB
C
/*
|
|
* virtio ccw random number generator implementation
|
|
*
|
|
* Copyright 2012, 2015 IBM Corp.
|
|
* Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or (at
|
|
* your option) any later version. See the COPYING file in the top-level
|
|
* directory.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "hw/virtio/virtio.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/module.h"
|
|
#include "virtio-ccw.h"
|
|
|
|
static void virtio_ccw_rng_realize(VirtioCcwDevice *ccw_dev, Error **errp)
|
|
{
|
|
VirtIORNGCcw *dev = VIRTIO_RNG_CCW(ccw_dev);
|
|
DeviceState *vdev = DEVICE(&dev->vdev);
|
|
Error *err = NULL;
|
|
|
|
if (!qdev_realize(vdev, BUS(&ccw_dev->bus), &err)) {
|
|
error_propagate(errp, err);
|
|
return;
|
|
}
|
|
|
|
object_property_set_link(OBJECT(dev),
|
|
OBJECT(dev->vdev.conf.rng), "rng",
|
|
NULL);
|
|
}
|
|
|
|
static void virtio_ccw_rng_instance_init(Object *obj)
|
|
{
|
|
VirtIORNGCcw *dev = VIRTIO_RNG_CCW(obj);
|
|
|
|
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
|
|
TYPE_VIRTIO_RNG);
|
|
}
|
|
|
|
static Property virtio_ccw_rng_properties[] = {
|
|
DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,
|
|
VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),
|
|
DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,
|
|
VIRTIO_CCW_MAX_REV),
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
};
|
|
|
|
static void virtio_ccw_rng_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);
|
|
|
|
k->realize = virtio_ccw_rng_realize;
|
|
device_class_set_props(dc, virtio_ccw_rng_properties);
|
|
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
|
|
}
|
|
|
|
static const TypeInfo virtio_ccw_rng = {
|
|
.name = TYPE_VIRTIO_RNG_CCW,
|
|
.parent = TYPE_VIRTIO_CCW_DEVICE,
|
|
.instance_size = sizeof(VirtIORNGCcw),
|
|
.instance_init = virtio_ccw_rng_instance_init,
|
|
.class_init = virtio_ccw_rng_class_init,
|
|
};
|
|
|
|
static void virtio_ccw_rng_register(void)
|
|
{
|
|
type_register_static(&virtio_ccw_rng);
|
|
}
|
|
|
|
type_init(virtio_ccw_rng_register)
|