mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-28 06:13:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging

Browse Source 
* remotes/bonzini/scsi-next:
  megasas: remove buildtime strings
  block: iscsi build fix if LIBISCSI_FEATURE_IOVECTOR is not defined
  virtio-scsi: Plug memory leak on virtio_scsi_push_event() error path
  scsi: Document intentional fall through in scsi_req_length()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2014-05-22 15:27:46 +01:00
commit 65903a8b08
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/iscsi.c
View File

@ -381,6 +381,7 @@ retry:
} }
#if defined(LIBISCSI_FEATURE_IOVECTOR)
static bool iscsi_allocationmap_is_allocated(IscsiLun *iscsilun, static bool iscsi_allocationmap_is_allocated(IscsiLun *iscsilun,
int64_t sector_num, int nb_sectors) int64_t sector_num, int nb_sectors)
{ {
@ -393,9 +394,6 @@ static bool iscsi_allocationmap_is_allocated(IscsiLun *iscsilun,
sector_num / iscsilun->cluster_sectors) == size); sector_num / iscsilun->cluster_sectors) == size);
} }
#if defined(LIBISCSI_FEATURE_IOVECTOR)
static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs, static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs,
int64_t sector_num, int64_t sector_num,
int nb_sectors, int *pnum) int nb_sectors, int *pnum)

4
hw/scsi/megasas.c
View File

@ -728,8 +728,8 @@ static int megasas_ctrl_get_info(MegasasState *s, MegasasCmd *cmd)
snprintf(info.package_version, 0x60, "%s-QEMU", QEMU_VERSION); snprintf(info.package_version, 0x60, "%s-QEMU", QEMU_VERSION);
memcpy(info.image_component[0].name, "APP", 3); memcpy(info.image_component[0].name, "APP", 3);
memcpy(info.image_component[0].version, MEGASAS_VERSION "-QEMU", 9); memcpy(info.image_component[0].version, MEGASAS_VERSION "-QEMU", 9);
memcpy(info.image_component[0].build_date, __DATE__, 11); memcpy(info.image_component[0].build_date, "Apr 1 2014", 11);
memcpy(info.image_component[0].build_time, __TIME__, 8); memcpy(info.image_component[0].build_time, "12:34:56", 8);
info.image_component_count = 1; info.image_component_count = 1;
if (pci_dev->has_rom) { if (pci_dev->has_rom) {
uint8_t biosver[32]; uint8_t biosver[32];

2
hw/scsi/scsi-bus.c
View File

@ -938,6 +938,7 @@ static int scsi_req_length(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf)
if (cmd->xfer == 0) { if (cmd->xfer == 0) {
cmd->xfer = 256; cmd->xfer = 256;
} }
/* fall through */
case WRITE_10: case WRITE_10:
case WRITE_VERIFY_10: case WRITE_VERIFY_10:
case WRITE_12: case WRITE_12:
@ -952,6 +953,7 @@ static int scsi_req_length(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf)
if (cmd->xfer == 0) { if (cmd->xfer == 0) {
cmd->xfer = 256; cmd->xfer = 256;
} }
/* fall through */
case READ_10: case READ_10:
case RECOVER_BUFFERED_DATA: case RECOVER_BUFFERED_DATA:
case READ_12: case READ_12:

3
hw/scsi/virtio-scsi.c
View File

@ -498,7 +498,7 @@ static void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev,
uint32_t event, uint32_t reason) uint32_t event, uint32_t reason)
{ {
VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(s); VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(s);
VirtIOSCSIReq *req = virtio_scsi_pop_req(s, vs->event_vq); VirtIOSCSIReq *req;
VirtIOSCSIEvent *evt; VirtIOSCSIEvent *evt;
VirtIODevice *vdev = VIRTIO_DEVICE(s); VirtIODevice *vdev = VIRTIO_DEVICE(s);
int in_size; int in_size;
@ -507,6 +507,7 @@ static void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev,
return; return;
} }
req = virtio_scsi_pop_req(s, vs->event_vq);
if (!req) { if (!req) {
s->events_dropped = true; s->events_dropped = true;
return; return;