[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/10] scsi: make reqops const
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 07/10] scsi: make reqops const |
Date: |
Wed, 12 Oct 2011 16:24:08 +0200 |
Also delete a stale occurrence of SCSIReqOps inside SCSIDeviceInfo.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi-bus.c | 10 +++++-----
hw/scsi-disk.c | 2 +-
hw/scsi-generic.c | 2 +-
hw/scsi.h | 7 +++----
4 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index bdd6e94..252e903 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -160,7 +160,7 @@ static int32_t scsi_invalid_command(SCSIRequest *req,
uint8_t *buf)
return 0;
}
-struct SCSIReqOps reqops_invalid_opcode = {
+const struct SCSIReqOps reqops_invalid_opcode = {
.size = sizeof(SCSIRequest),
.send_command = scsi_invalid_command
};
@@ -178,7 +178,7 @@ static int32_t scsi_unit_attention(SCSIRequest *req,
uint8_t *buf)
return 0;
}
-struct SCSIReqOps reqops_unit_attention = {
+const struct SCSIReqOps reqops_unit_attention = {
.size = sizeof(SCSIRequest),
.send_command = scsi_unit_attention
};
@@ -386,7 +386,7 @@ static uint8_t *scsi_target_get_buf(SCSIRequest *req)
return r->buf;
}
-struct SCSIReqOps reqops_target_command = {
+const struct SCSIReqOps reqops_target_command = {
.size = sizeof(SCSITargetReq),
.send_command = scsi_target_send_command,
.read_data = scsi_target_read_data,
@@ -394,8 +394,8 @@ struct SCSIReqOps reqops_target_command = {
};
-SCSIRequest *scsi_req_alloc(SCSIReqOps *reqops, SCSIDevice *d, uint32_t tag,
- uint32_t lun, void *hba_private)
+SCSIRequest *scsi_req_alloc(const SCSIReqOps *reqops, SCSIDevice *d,
+ uint32_t tag, uint32_t lun, void *hba_private)
{
SCSIRequest *req;
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index a4daa29..6c1d5a2 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -1583,7 +1583,7 @@ static int scsi_disk_initfn(SCSIDevice *dev)
}
}
-static SCSIReqOps scsi_disk_reqops = {
+static const SCSIReqOps scsi_disk_reqops = {
.size = sizeof(SCSIDiskReq),
.free_req = scsi_free_request,
.send_command = scsi_send_command,
diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c
index 7b291ec..9c9f64a 100644
--- a/hw/scsi-generic.c
+++ b/hw/scsi-generic.c
@@ -432,7 +432,7 @@ static int scsi_generic_initfn(SCSIDevice *s)
return 0;
}
-static SCSIReqOps scsi_generic_req_ops = {
+static const SCSIReqOps scsi_generic_req_ops = {
.size = sizeof(SCSIGenericReq),
.free_req = scsi_free_request,
.send_command = scsi_send_command,
diff --git a/hw/scsi.h b/hw/scsi.h
index c8649cf..832682e 100644
--- a/hw/scsi.h
+++ b/hw/scsi.h
@@ -41,7 +41,7 @@ struct SCSICommand {
struct SCSIRequest {
SCSIBus *bus;
SCSIDevice *dev;
- SCSIReqOps *ops;
+ const SCSIReqOps *ops;
uint32_t refcount;
uint32_t tag;
uint32_t lun;
@@ -95,7 +95,6 @@ struct SCSIDeviceInfo {
SCSIRequest *(*alloc_req)(SCSIDevice *s, uint32_t tag, uint32_t lun,
void *hba_private);
void (*unit_attention_reported)(SCSIDevice *s);
- SCSIReqOps reqops;
};
struct SCSIBusInfo {
@@ -175,8 +174,8 @@ extern const struct SCSISense
sense_code_DEVICE_INTERNAL_RESET;
int scsi_sense_valid(SCSISense sense);
-SCSIRequest *scsi_req_alloc(SCSIReqOps *reqops, SCSIDevice *d, uint32_t tag,
- uint32_t lun, void *hba_private);
+SCSIRequest *scsi_req_alloc(const SCSIReqOps *reqops, SCSIDevice *d,
+ uint32_t tag, uint32_t lun, void *hba_private);
SCSIRequest *scsi_req_new(SCSIDevice *d, uint32_t tag, uint32_t lun,
uint8_t *buf, void *hba_private);
int32_t scsi_req_enqueue(SCSIRequest *req);
--
1.7.6
- [Qemu-devel] [PATCH 00/10] scsi: add specialized block device passthrough, Paolo Bonzini, 2011/10/12
- [Qemu-devel] [PATCH 03/10] scsi-generic: check ioctl statuses when SG_IO succeeds, Paolo Bonzini, 2011/10/12
- [Qemu-devel] [PATCH 02/10] scsi-generic: remove scsi_req_fixup, Paolo Bonzini, 2011/10/12
- [Qemu-devel] [PATCH 05/10] scsi-disk: do not duplicate BlockDriverState member, Paolo Bonzini, 2011/10/12
- [Qemu-devel] [PATCH 07/10] scsi: make reqops const,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 01/10] scsi-generic: drop SCSIGenericState, Paolo Bonzini, 2011/10/12
- [Qemu-devel] [PATCH 06/10] scsi-disk: small clean up to INQUIRY, Paolo Bonzini, 2011/10/12
- [Qemu-devel] [PATCH 08/10] scsi: export scsi_generic_reqops, Paolo Bonzini, 2011/10/12
- [Qemu-devel] [PATCH 09/10] scsi: pass cdb to alloc_req, Paolo Bonzini, 2011/10/12
- [Qemu-devel] [PATCH 04/10] scsi-generic: look at host status, Paolo Bonzini, 2011/10/12
- [Qemu-devel] [PATCH 10/10] scsi-disk: add scsi-block for device passthrough, Paolo Bonzini, 2011/10/12