ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ISCSI: get device type at connection time 

This is needed to avoid READ CAPACITY(16) for MMC devices.

Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Ronnie Sahlberg 2012-05-25 21:59:01 +10:00 committed by Paolo Bonzini
parent c7b4a95202
commit dbfff6d776
1 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
block/iscsi.c
View File

@ -29,6 +29,7 @@
#include "qemu-error.h" #include "qemu-error.h"
#include "block_int.h" #include "block_int.h"
#include "trace.h" #include "trace.h"
#include "hw/scsi-defs.h"
#include <iscsi/iscsi.h> #include <iscsi/iscsi.h>
#include <iscsi/scsi-lowlevel.h> #include <iscsi/scsi-lowlevel.h>
@ -37,6 +38,7 @@
typedef struct IscsiLun { typedef struct IscsiLun {
struct iscsi_context *iscsi; struct iscsi_context *iscsi;
int lun; int lun;
enum scsi_inquiry_peripheral_device_type type;
int block_size; int block_size;
uint64_t num_blocks; uint64_t num_blocks;
int events; int events;
@ -507,6 +509,44 @@ iscsi_readcapacity16_cb(struct iscsi_context *iscsi, int status,
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
} }
static void
iscsi_inquiry_cb(struct iscsi_context *iscsi, int status, void *command_data,
void *opaque)
{
struct IscsiTask *itask = opaque;
struct scsi_task *task = command_data;
struct scsi_inquiry_standard *inq;
if (status != 0) {
itask->status = 1;
itask->complete = 1;
scsi_free_scsi_task(task);
return;
}
inq = scsi_datain_unmarshall(task);
if (inq == NULL) {
error_report("iSCSI: Failed to unmarshall inquiry data.");
itask->status = 1;
itask->complete = 1;
scsi_free_scsi_task(task);
return;
}
itask->iscsilun->type = inq->periperal_device_type;
scsi_free_scsi_task(task);
task = iscsi_readcapacity16_task(iscsi, itask->iscsilun->lun,
iscsi_readcapacity16_cb, opaque);
if (task == NULL) {
error_report("iSCSI: failed to send readcapacity16 command.");
itask->status = 1;
itask->complete = 1;
return;
}
}
static void static void
iscsi_connect_cb(struct iscsi_context *iscsi, int status, void *command_data, iscsi_connect_cb(struct iscsi_context *iscsi, int status, void *command_data,
void *opaque) void *opaque)
@ -520,10 +560,11 @@ iscsi_connect_cb(struct iscsi_context *iscsi, int status, void *command_data,
return; return;
} }
task = iscsi_readcapacity16_task(iscsi, itask->iscsilun->lun, task = iscsi_inquiry_task(iscsi, itask->iscsilun->lun,
iscsi_readcapacity16_cb, opaque); 0, 0, 36,
iscsi_inquiry_cb, opaque);
if (task == NULL) { if (task == NULL) {
error_report("iSCSI: failed to send readcapacity16 command."); error_report("iSCSI: failed to send inquiry command.");
itask->status = 1; itask->status = 1;
itask->complete = 1; itask->complete = 1;
return; return;