[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V3 14/44] virtio-scsi: don't use pointer for configu
From: |
fred . konrad |
Subject: |
[Qemu-devel] [PATCH V3 14/44] virtio-scsi: don't use pointer for configuration. |
Date: |
Tue, 15 Jan 2013 15:09:28 +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 3645423..29eb395 100644
--- a/hw/virtio-scsi.c
+++ b/hw/virtio-scsi.c
@@ -236,7 +236,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));
}
@@ -250,7 +250,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);
@@ -512,10 +512,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);
@@ -697,7 +697,7 @@ VirtIODevice *virtio_scsi_init(DeviceState *dev,
VirtIOSCSIConf *proxyconf)
sizeof(VirtIOSCSIConfig), sz);
s->qdev = dev;
- s->conf = proxyconf;
+ memcpy(&(s->conf), proxyconf, sizeof(struct VirtIOSCSIConf));
/* TODO set up vdev function pointers */
s->vdev.get_config = virtio_scsi_get_config;
@@ -709,7 +709,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 613deb5..7878638 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 V3 04/44] virtio-blk-pci: switch to new API., (continued)
- [Qemu-devel] [PATCH V3 04/44] virtio-blk-pci: switch to new API., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 07/44] virtio-blk: cleanup: remove qdev field., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 12/44] virtio-net: cleanup: init and exit function., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 11/44] virtio-net: cleanup: use QOM cast., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 09/44] virtio-net-pci: switch to the new API., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 08/44] virtio-net: add the virtio-net device., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 15/44] virtio-scsi: allocate cmd_vqs array separately., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 10/44] virtio-net-s390: switch to the new API., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 44/44] virtio-9p: cleanup: QOM casts., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 14/44] virtio-scsi: don't use pointer for configuration.,
fred . konrad <=
- [Qemu-devel] [PATCH V3 39/44] virtio-serial: cleanup: use QOM casts., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 33/44] virtio-rng.c: cleanup: remove qdev field., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 32/44] virtio-rng.c: cleanup: init and exit functions., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 41/44] virtio-9p: add the virtio-9p device., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 18/44] virtio-scsi-pci: switch to new API., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 13/44] virtio-net: cleanup: remove qdev field., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 06/44] virtio-blk: cleanup: use QOM cast., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 36/44] virtio-serial-pci: switch to the new API., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 19/44] virtio-scsi-s390: switch to the new API., fred . konrad, 2013/01/15