[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 01/10] virtio-scsi: don't use pointer for configu
From: |
fred . konrad |
Subject: |
[Qemu-devel] [PATCH v5 01/10] virtio-scsi: don't use pointer for configuration. |
Date: |
Thu, 21 Mar 2013 15:15:11 +0100 |
From: KONRAD Frederic <address@hidden>
The configuration field must not be a pointer as it will be used for virtio-scsi
properties. So *conf is replaced by conf.
Signed-off-by: KONRAD Frederic <address@hidden>
---
hw/virtio-scsi.c | 14 +++++++-------
hw/virtio-scsi.h | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c
index 8620712..55191c5 100644
--- a/hw/virtio-scsi.c
+++ b/hw/virtio-scsi.c
@@ -237,7 +237,7 @@ static void virtio_scsi_save_request(QEMUFile *f,
SCSIRequest *sreq)
VirtIOSCSIReq *req = sreq->hba_private;
uint32_t n = virtio_queue_get_id(req->vq) - 2;
- assert(n < req->dev->conf->num_queues);
+ assert(n < req->dev->conf.num_queues);
qemu_put_be32s(f, &n);
qemu_put_buffer(f, (unsigned char *)&req->elem, sizeof(req->elem));
}
@@ -251,7 +251,7 @@ static void *virtio_scsi_load_request(QEMUFile *f,
SCSIRequest *sreq)
req = g_malloc(sizeof(*req));
qemu_get_be32s(f, &n);
- assert(n < s->conf->num_queues);
+ assert(n < s->conf.num_queues);
qemu_get_buffer(f, (unsigned char *)&req->elem, sizeof(req->elem));
virtio_scsi_parse_req(s, s->cmd_vqs[n], req);
@@ -513,10 +513,10 @@ static void virtio_scsi_get_config(VirtIODevice *vdev,
VirtIOSCSIConfig *scsiconf = (VirtIOSCSIConfig *)config;
VirtIOSCSI *s = (VirtIOSCSI *)vdev;
- stl_raw(&scsiconf->num_queues, s->conf->num_queues);
+ stl_raw(&scsiconf->num_queues, s->conf.num_queues);
stl_raw(&scsiconf->seg_max, 128 - 2);
- stl_raw(&scsiconf->max_sectors, s->conf->max_sectors);
- stl_raw(&scsiconf->cmd_per_lun, s->conf->cmd_per_lun);
+ stl_raw(&scsiconf->max_sectors, s->conf.max_sectors);
+ stl_raw(&scsiconf->cmd_per_lun, s->conf.cmd_per_lun);
stl_raw(&scsiconf->event_info_size, sizeof(VirtIOSCSIEvent));
stl_raw(&scsiconf->sense_size, s->sense_size);
stl_raw(&scsiconf->cdb_size, s->cdb_size);
@@ -698,7 +698,7 @@ VirtIODevice *virtio_scsi_init(DeviceState *dev,
VirtIOSCSIConf *proxyconf)
sizeof(VirtIOSCSIConfig), sz);
s->qdev = dev;
- s->conf = proxyconf;
+ s->conf = *proxyconf;
/* TODO set up vdev function pointers */
s->vdev.get_config = virtio_scsi_get_config;
@@ -710,7 +710,7 @@ VirtIODevice *virtio_scsi_init(DeviceState *dev,
VirtIOSCSIConf *proxyconf)
virtio_scsi_handle_ctrl);
s->event_vq = virtio_add_queue(&s->vdev, VIRTIO_SCSI_VQ_SIZE,
virtio_scsi_handle_event);
- for (i = 0; i < s->conf->num_queues; i++) {
+ for (i = 0; i < s->conf.num_queues; i++) {
s->cmd_vqs[i] = virtio_add_queue(&s->vdev, VIRTIO_SCSI_VQ_SIZE,
virtio_scsi_handle_cmd);
}
diff --git a/hw/virtio-scsi.h b/hw/virtio-scsi.h
index ccf1e42..6a0a95e 100644
--- a/hw/virtio-scsi.h
+++ b/hw/virtio-scsi.h
@@ -35,7 +35,7 @@ struct VirtIOSCSIConf {
typedef struct VirtIOSCSI {
VirtIODevice vdev;
DeviceState *qdev;
- VirtIOSCSIConf *conf;
+ VirtIOSCSIConf conf;
SCSIBus bus;
uint32_t sense_size;
--
1.7.11.7
- [Qemu-devel] [PATCH v5 00/10] virtio-scsi refactoring., fred . konrad, 2013/03/21
- [Qemu-devel] [PATCH v5 02/10] virtio-scsi: allocate cmd_vqs array separately., fred . konrad, 2013/03/21
- [Qemu-devel] [PATCH v5 04/10] virtio-scsi: add the virtio-scsi device., fred . konrad, 2013/03/21
- [Qemu-devel] [PATCH v5 06/10] virtio-scsi-s390: switch to the new API., fred . konrad, 2013/03/21
- [Qemu-devel] [PATCH v5 03/10] virtio-scsi: moving host_features from properties to transport properties., fred . konrad, 2013/03/21
- [Qemu-devel] [PATCH v5 09/10] virtio-scsi: cleanup: init and exit functions., fred . konrad, 2013/03/21
- [Qemu-devel] [PATCH v5 05/10] virtio-scsi-pci: switch to new API., fred . konrad, 2013/03/21
- [Qemu-devel] [PATCH v5 10/10] virtio-scsi: cleanup: remove qdev field., fred . konrad, 2013/03/21
- [Qemu-devel] [PATCH v5 01/10] virtio-scsi: don't use pointer for configuration.,
fred . konrad <=
- [Qemu-devel] [PATCH v5 07/10] virtio-scsi-ccw: switch to new API, fred . konrad, 2013/03/21
- [Qemu-devel] [PATCH v5 08/10] virtio-scsi: cleanup: use QOM casts., fred . konrad, 2013/03/21
- Re: [Qemu-devel] [PATCH v5 00/10] virtio-scsi refactoring., Cornelia Huck, 2013/03/22
- Re: [Qemu-devel] [PATCH v5 00/10] virtio-scsi refactoring., Peter Maydell, 2013/03/26
- Re: [Qemu-devel] [PATCH v5 00/10] virtio-scsi refactoring., Anthony Liguori, 2013/03/26