mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-31 22:11:53 -06:00
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>
87 lines
2.4 KiB
C
87 lines
2.4 KiB
C
/*
|
|
* Virtio rng PCI Bindings
|
|
*
|
|
* Copyright 2012 Red Hat, Inc.
|
|
* Copyright 2012 Amit Shah <amit.shah@redhat.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 "virtio-pci.h"
|
|
#include "hw/virtio/virtio-rng.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/module.h"
|
|
|
|
typedef struct VirtIORngPCI VirtIORngPCI;
|
|
|
|
/*
|
|
* virtio-rng-pci: This extends VirtioPCIProxy.
|
|
*/
|
|
#define TYPE_VIRTIO_RNG_PCI "virtio-rng-pci-base"
|
|
#define VIRTIO_RNG_PCI(obj) \
|
|
OBJECT_CHECK(VirtIORngPCI, (obj), TYPE_VIRTIO_RNG_PCI)
|
|
|
|
struct VirtIORngPCI {
|
|
VirtIOPCIProxy parent_obj;
|
|
VirtIORNG vdev;
|
|
};
|
|
|
|
static void virtio_rng_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
|
|
{
|
|
VirtIORngPCI *vrng = VIRTIO_RNG_PCI(vpci_dev);
|
|
DeviceState *vdev = DEVICE(&vrng->vdev);
|
|
Error *err = NULL;
|
|
|
|
if (!qdev_realize(vdev, BUS(&vpci_dev->bus), &err)) {
|
|
error_propagate(errp, err);
|
|
return;
|
|
}
|
|
|
|
object_property_set_link(OBJECT(vrng),
|
|
OBJECT(vrng->vdev.conf.rng), "rng",
|
|
NULL);
|
|
}
|
|
|
|
static void virtio_rng_pci_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass);
|
|
PCIDeviceClass *pcidev_k = PCI_DEVICE_CLASS(klass);
|
|
|
|
k->realize = virtio_rng_pci_realize;
|
|
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
|
|
|
|
pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
|
|
pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_RNG;
|
|
pcidev_k->revision = VIRTIO_PCI_ABI_VERSION;
|
|
pcidev_k->class_id = PCI_CLASS_OTHERS;
|
|
}
|
|
|
|
static void virtio_rng_initfn(Object *obj)
|
|
{
|
|
VirtIORngPCI *dev = VIRTIO_RNG_PCI(obj);
|
|
|
|
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
|
|
TYPE_VIRTIO_RNG);
|
|
}
|
|
|
|
static const VirtioPCIDeviceTypeInfo virtio_rng_pci_info = {
|
|
.base_name = TYPE_VIRTIO_RNG_PCI,
|
|
.generic_name = "virtio-rng-pci",
|
|
.transitional_name = "virtio-rng-pci-transitional",
|
|
.non_transitional_name = "virtio-rng-pci-non-transitional",
|
|
.instance_size = sizeof(VirtIORngPCI),
|
|
.instance_init = virtio_rng_initfn,
|
|
.class_init = virtio_rng_pci_class_init,
|
|
};
|
|
|
|
static void virtio_rng_pci_register(void)
|
|
{
|
|
virtio_pci_types_register(&virtio_rng_pci_info);
|
|
}
|
|
|
|
type_init(virtio_rng_pci_register)
|