* [PATCH-for-6.0 1/2] hw/scsi/scsi-disk: Rename type as TYPE_SCSI_DISK
2020-11-06 17:04 [PATCH-for-6.0 0/2] hw/scsi/scsi-disk: QOM style change Philippe Mathieu-Daudé
@ 2020-11-06 17:04 ` Philippe Mathieu-Daudé
2020-11-06 17:04 ` [PATCH-for-6.0 2/2] hw/scsi/scsi-disk: Use SCSI_DISK_GET_CLASS() macro Philippe Mathieu-Daudé
2020-11-23 12:32 ` [PATCH-for-6.0 0/2] hw/scsi/scsi-disk: QOM style change Philippe Mathieu-Daudé
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-11-06 17:04 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Paolo Bonzini, Fam Zheng,
Philippe Mathieu-Daudé, Eduardo Habkost
Rename TYPE_SCSI_DISK without the '_BASE' suffix to match
the other abstract types in the codebase.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/scsi/scsi-disk.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index e859534eaf3..d2b9cb28da1 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -53,9 +53,9 @@
#define DEFAULT_MAX_UNMAP_SIZE (1 * GiB)
#define DEFAULT_MAX_IO_SIZE INT_MAX /* 2 GB - 1 block */
-#define TYPE_SCSI_DISK_BASE "scsi-disk-base"
+#define TYPE_SCSI_DISK "scsi-disk-base"
-OBJECT_DECLARE_TYPE(SCSIDiskState, SCSIDiskClass, SCSI_DISK_BASE)
+OBJECT_DECLARE_TYPE(SCSIDiskState, SCSIDiskClass, SCSI_DISK)
struct SCSIDiskClass {
SCSIDeviceClass parent_class;
@@ -2956,7 +2956,7 @@ BlockAIOCB *scsi_dma_writev(int64_t offset, QEMUIOVector *iov,
static void scsi_disk_base_class_initfn(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SCSIDiskClass *sdc = SCSI_DISK_BASE_CLASS(klass);
+ SCSIDiskClass *sdc = SCSI_DISK_CLASS(klass);
dc->fw_name = "disk";
dc->reset = scsi_disk_reset;
@@ -2966,7 +2966,7 @@ static void scsi_disk_base_class_initfn(ObjectClass *klass, void *data)
}
static const TypeInfo scsi_disk_base_info = {
- .name = TYPE_SCSI_DISK_BASE,
+ .name = TYPE_SCSI_DISK,
.parent = TYPE_SCSI_DEVICE,
.class_init = scsi_disk_base_class_initfn,
.instance_size = sizeof(SCSIDiskState),
@@ -3036,7 +3036,7 @@ static void scsi_hd_class_initfn(ObjectClass *klass, void *data)
static const TypeInfo scsi_hd_info = {
.name = "scsi-hd",
- .parent = TYPE_SCSI_DISK_BASE,
+ .parent = TYPE_SCSI_DISK,
.class_init = scsi_hd_class_initfn,
};
@@ -3067,7 +3067,7 @@ static void scsi_cd_class_initfn(ObjectClass *klass, void *data)
static const TypeInfo scsi_cd_info = {
.name = "scsi-cd",
- .parent = TYPE_SCSI_DISK_BASE,
+ .parent = TYPE_SCSI_DISK,
.class_init = scsi_cd_class_initfn,
};
@@ -3090,7 +3090,7 @@ static void scsi_block_class_initfn(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
SCSIDeviceClass *sc = SCSI_DEVICE_CLASS(klass);
- SCSIDiskClass *sdc = SCSI_DISK_BASE_CLASS(klass);
+ SCSIDiskClass *sdc = SCSI_DISK_CLASS(klass);
sc->realize = scsi_block_realize;
sc->alloc_req = scsi_block_new_request;
@@ -3106,7 +3106,7 @@ static void scsi_block_class_initfn(ObjectClass *klass, void *data)
static const TypeInfo scsi_block_info = {
.name = "scsi-block",
- .parent = TYPE_SCSI_DISK_BASE,
+ .parent = TYPE_SCSI_DISK,
.class_init = scsi_block_class_initfn,
};
#endif
@@ -3146,7 +3146,7 @@ static void scsi_disk_class_initfn(ObjectClass *klass, void *data)
static const TypeInfo scsi_disk_info = {
.name = "scsi-disk",
- .parent = TYPE_SCSI_DISK_BASE,
+ .parent = TYPE_SCSI_DISK,
.class_init = scsi_disk_class_initfn,
};
--
2.26.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH-for-6.0 2/2] hw/scsi/scsi-disk: Use SCSI_DISK_GET_CLASS() macro
2020-11-06 17:04 [PATCH-for-6.0 0/2] hw/scsi/scsi-disk: QOM style change Philippe Mathieu-Daudé
2020-11-06 17:04 ` [PATCH-for-6.0 1/2] hw/scsi/scsi-disk: Rename type as TYPE_SCSI_DISK Philippe Mathieu-Daudé
@ 2020-11-06 17:04 ` Philippe Mathieu-Daudé
2020-11-23 12:32 ` [PATCH-for-6.0 0/2] hw/scsi/scsi-disk: QOM style change Philippe Mathieu-Daudé
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-11-06 17:04 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Paolo Bonzini, Fam Zheng,
Philippe Mathieu-Daudé, Eduardo Habkost
Use the SCSI_DISK_GET_CLASS() macro to match the rest of
the codebase.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/scsi/scsi-disk.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index d2b9cb28da1..deb51ec8e7d 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -338,7 +338,7 @@ static void scsi_read_complete(void *opaque, int ret)
static void scsi_do_read(SCSIDiskReq *r, int ret)
{
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
- SCSIDiskClass *sdc = (SCSIDiskClass *) object_get_class(OBJECT(s));
+ SCSIDiskClass *sdc = SCSI_DISK_GET_CLASS(s);
assert (r->req.aiocb == NULL);
if (scsi_disk_req_check_error(r, ret, false)) {
@@ -438,7 +438,7 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r, int error, bool acct_failed)
{
bool is_read = (r->req.cmd.mode == SCSI_XFER_FROM_DEV);
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
- SCSIDiskClass *sdc = (SCSIDiskClass *) object_get_class(OBJECT(s));
+ SCSIDiskClass *sdc = SCSI_DISK_GET_CLASS(s);
BlockErrorAction action = blk_get_error_action(s->qdev.conf.blk,
is_read, error);
@@ -538,7 +538,7 @@ static void scsi_write_data(SCSIRequest *req)
{
SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req);
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
- SCSIDiskClass *sdc = (SCSIDiskClass *) object_get_class(OBJECT(s));
+ SCSIDiskClass *sdc = SCSI_DISK_GET_CLASS(s);
/* No data transfer may already be in progress */
assert(r->req.aiocb == NULL);
@@ -2149,7 +2149,7 @@ static int32_t scsi_disk_dma_command(SCSIRequest *req, uint8_t *buf)
{
SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req);
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, req->dev);
- SCSIDiskClass *sdc = (SCSIDiskClass *) object_get_class(OBJECT(s));
+ SCSIDiskClass *sdc = SCSI_DISK_GET_CLASS(s);
uint32_t len;
uint8_t command;
--
2.26.2
^ permalink raw reply related [flat|nested] 4+ messages in thread