739e95f574
The function scsi_bus_new() creates a new SCSI bus; callers can either pass in a name argument to specify the name of the new bus, or they can pass in NULL to allow the bus to be given an automatically generated unique name. Almost all callers want to use the autogenerated name; the only exception is the virtio-scsi device. Taking a name argument that should almost always be NULL is an easy-to-misuse API design -- it encourages callers to think perhaps they should pass in some standard name like "scsi" or "scsi-bus". We don't do this anywhere for SCSI, but we do (incorrectly) do it for other bus types such as i2c. The function name also implies that it will return a newly allocated object, when it in fact does in-place allocation. We more commonly name such functions foo_init(), with foo_new() being the allocate-and-return variant. Replace all the scsi_bus_new() callsites with either: * scsi_bus_init() for the usual case where the caller wants an autogenerated bus name * scsi_bus_init_named() for the rare case where the caller needs to specify the bus name and document that for the _named() version it's then the caller's responsibility to think about uniqueness of bus names. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com> Message-id: 20210923121153.23754-2-peter.maydell@linaro.org
64 lines
1.4 KiB
C
64 lines
1.4 KiB
C
/*
|
|
* USB Mass Storage Device emulation
|
|
*
|
|
* Copyright (c) 2006 CodeSourcery.
|
|
* Written by Paul Brook
|
|
*
|
|
* This code is licensed under the LGPL.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qemu/typedefs.h"
|
|
#include "qapi/error.h"
|
|
#include "hw/usb.h"
|
|
#include "hw/usb/desc.h"
|
|
#include "hw/usb/msd.h"
|
|
|
|
static const struct SCSIBusInfo usb_msd_scsi_info_bot = {
|
|
.tcq = false,
|
|
.max_target = 0,
|
|
.max_lun = 15,
|
|
|
|
.transfer_data = usb_msd_transfer_data,
|
|
.complete = usb_msd_command_complete,
|
|
.cancel = usb_msd_request_cancelled,
|
|
.load_request = usb_msd_load_request,
|
|
};
|
|
|
|
static void usb_msd_bot_realize(USBDevice *dev, Error **errp)
|
|
{
|
|
MSDState *s = USB_STORAGE_DEV(dev);
|
|
DeviceState *d = DEVICE(dev);
|
|
|
|
usb_desc_create_serial(dev);
|
|
usb_desc_init(dev);
|
|
dev->flags |= (1 << USB_DEV_FLAG_IS_SCSI_STORAGE);
|
|
if (d->hotplugged) {
|
|
s->dev.auto_attach = 0;
|
|
}
|
|
|
|
scsi_bus_init(&s->bus, sizeof(s->bus), DEVICE(dev), &usb_msd_scsi_info_bot);
|
|
usb_msd_handle_reset(dev);
|
|
}
|
|
|
|
static void usb_msd_class_bot_initfn(ObjectClass *klass, void *data)
|
|
{
|
|
USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
|
|
|
|
uc->realize = usb_msd_bot_realize;
|
|
uc->attached_settable = true;
|
|
}
|
|
|
|
static const TypeInfo bot_info = {
|
|
.name = "usb-bot",
|
|
.parent = TYPE_USB_STORAGE,
|
|
.class_init = usb_msd_class_bot_initfn,
|
|
};
|
|
|
|
static void register_types(void)
|
|
{
|
|
type_register_static(&bot_info);
|
|
}
|
|
|
|
type_init(register_types)
|