2019-01-03 22:10:06 +08:00
|
|
|
/*
|
|
|
|
|
* Vhost scsi PCI bindings
|
|
|
|
|
*
|
|
|
|
|
* Copyright IBM, Corp. 2011
|
|
|
|
|
*
|
|
|
|
|
* Authors:
|
|
|
|
|
* Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
|
|
|
|
|
*
|
|
|
|
|
* Changes for QEMU mainline + tcm_vhost kernel upstream:
|
|
|
|
|
* Nicholas Bellinger <nab@risingtidesystems.com>
|
|
|
|
|
*
|
|
|
|
|
* This work is licensed under the terms of the GNU LGPL, version 2 or later.
|
|
|
|
|
* See the COPYING.LIB file in the top-level directory.
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "qemu/osdep.h"
|
|
|
|
|
|
|
|
|
|
#include "standard-headers/linux/virtio_pci.h"
|
2019-08-12 13:23:51 +08:00
|
|
|
#include "hw/qdev-properties.h"
|
2019-01-03 22:10:06 +08:00
|
|
|
#include "hw/virtio/vhost-scsi.h"
|
|
|
|
|
#include "qapi/error.h"
|
2019-05-23 22:35:07 +08:00
|
|
|
#include "qemu/module.h"
|
2019-01-03 22:10:06 +08:00
|
|
|
#include "virtio-pci.h"
|
|
|
|
|
|
|
|
|
|
typedef struct VHostSCSIPCI VHostSCSIPCI;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* vhost-scsi-pci: This extends VirtioPCIProxy.
|
|
|
|
|
*/
|
|
|
|
|
#define TYPE_VHOST_SCSI_PCI "vhost-scsi-pci-base"
|
|
|
|
|
#define VHOST_SCSI_PCI(obj) \
|
|
|
|
|
OBJECT_CHECK(VHostSCSIPCI, (obj), TYPE_VHOST_SCSI_PCI)
|
|
|
|
|
|
|
|
|
|
struct VHostSCSIPCI {
|
|
|
|
|
VirtIOPCIProxy parent_obj;
|
|
|
|
|
VHostSCSI vdev;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static Property vhost_scsi_pci_properties[] = {
|
|
|
|
|
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,
|
|
|
|
|
DEV_NVECTORS_UNSPECIFIED),
|
|
|
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void vhost_scsi_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
|
|
|
|
|
{
|
|
|
|
|
VHostSCSIPCI *dev = VHOST_SCSI_PCI(vpci_dev);
|
|
|
|
|
DeviceState *vdev = DEVICE(&dev->vdev);
|
|
|
|
|
VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(vdev);
|
|
|
|
|
|
|
|
|
|
if (vpci_dev->nvectors == DEV_NVECTORS_UNSPECIFIED) {
|
2020-08-18 22:33:45 +08:00
|
|
|
vpci_dev->nvectors = vs->conf.num_queues +
|
|
|
|
|
VIRTIO_SCSI_VQ_NUM_FIXED + 1;
|
2019-01-03 22:10:06 +08:00
|
|
|
}
|
|
|
|
|
|
qdev: Convert uses of qdev_set_parent_bus() with Coccinelle
In addition to the qdev_create() patterns converted so far, we have a
qdev_set_parent_bus() pattern. Mostly when we embed a device in a
parent device rather than allocating it on the heap.
This pattern also puts devices in the dangerous "no QOM parent, but
plugged into bus" state I explained in recent commit "qdev: New
qdev_new(), qdev_realize(), etc."
Apply same solution: convert to qdev_realize(). Coccinelle script:
@@
expression dev, bus, errp;
symbol true;
@@
- qdev_set_parent_bus(DEVICE(dev), bus);
...
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize(DEVICE(dev), bus, errp);
@ depends on !(file in "qdev-monitor.c") && !(file in "hw/core/qdev.c")@
expression dev, bus, errp;
symbol true;
@@
- qdev_set_parent_bus(dev, bus);
...
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize(dev, bus, errp);
@@
expression dev, bus;
symbol true;
@@
- qdev_set_parent_bus(DEVICE(dev), bus);
...
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize(DEVICE(dev), bus, &error_fatal);
Unconverted uses of qdev_set_parent_bus() remain. They'll be
converted later in this series.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-12-armbru@redhat.com>
[Also convert new hw/virtio/vhost-user-vsock-pci.c]
2020-06-10 13:32:00 +08:00
|
|
|
qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
|
2019-01-03 22:10:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void vhost_scsi_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 = vhost_scsi_pci_realize;
|
|
|
|
|
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
|
2020-01-10 23:30:32 +08:00
|
|
|
device_class_set_props(dc, vhost_scsi_pci_properties);
|
2019-01-03 22:10:06 +08:00
|
|
|
pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
|
|
|
|
|
pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_SCSI;
|
|
|
|
|
pcidev_k->revision = 0x00;
|
|
|
|
|
pcidev_k->class_id = PCI_CLASS_STORAGE_SCSI;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void vhost_scsi_pci_instance_init(Object *obj)
|
|
|
|
|
{
|
|
|
|
|
VHostSCSIPCI *dev = VHOST_SCSI_PCI(obj);
|
|
|
|
|
|
|
|
|
|
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
|
|
|
|
|
TYPE_VHOST_SCSI);
|
|
|
|
|
object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 23:29:22 +08:00
|
|
|
"bootindex");
|
2019-01-03 22:10:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const VirtioPCIDeviceTypeInfo vhost_scsi_pci_info = {
|
|
|
|
|
.base_name = TYPE_VHOST_SCSI_PCI,
|
|
|
|
|
.generic_name = "vhost-scsi-pci",
|
|
|
|
|
.transitional_name = "vhost-scsi-pci-transitional",
|
|
|
|
|
.non_transitional_name = "vhost-scsi-pci-non-transitional",
|
|
|
|
|
.instance_size = sizeof(VHostSCSIPCI),
|
|
|
|
|
.instance_init = vhost_scsi_pci_instance_init,
|
|
|
|
|
.class_init = vhost_scsi_pci_class_init,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void vhost_scsi_pci_register(void)
|
|
|
|
|
{
|
|
|
|
|
virtio_pci_types_register(&vhost_scsi_pci_info);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
type_init(vhost_scsi_pci_register)
|