From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56393) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsHeD-0004qn-FV for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:42:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsHeC-0005pd-7G for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:42:09 -0500 Received: from greensocs.com ([87.106.252.221]:52814 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsHeB-0005pS-Sn for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:42:08 -0500 From: fred.konrad@greensocs.com Date: Mon, 7 Jan 2013 19:40:36 +0100 Message-Id: <1357584074-10852-24-git-send-email-fred.konrad@greensocs.com> In-Reply-To: <1357584074-10852-1-git-send-email-fred.konrad@greensocs.com> References: <1357584074-10852-1-git-send-email-fred.konrad@greensocs.com> Subject: [Qemu-devel] [PATCH 23/61] virtio-scsi : don't use pointer for configuration. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, aliguori@us.ibm.com Cc: kwolf@redhat.com, peter.maydell@linaro.org, e.voevodin@samsung.com, mst@redhat.com, mark.burton@greensocs.com, agraf@suse.de, amit.shah@redhat.com, aneesh.kumar@linux.vnet.ibm.com, stefanha@redhat.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com, afaerber@suse.de, fred.konrad@greensocs.com From: KONRAD Frederic 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 --- 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 4e2d884..1bd689c 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); @@ -693,7 +693,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; @@ -705,7 +705,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 38b9c0f..6e027be 100644 --- a/hw/virtio-scsi.h +++ b/hw/virtio-scsi.h @@ -35,7 +35,7 @@ struct VirtIOSCSIConf { typedef struct { VirtIODevice vdev; DeviceState *qdev; - VirtIOSCSIConf *conf; + VirtIOSCSIConf conf; SCSIBus bus; uint32_t sense_size; -- 1.7.11.7