motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-22 09:32:40 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

libqos: drop duplicated virtio_scsi.h definitions

Browse source 
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1462798061-30382-8-git-send-email-stefanha@redhat.com
This commit is contained in:
Stefan Hajnoczi 2016-05-09 13:47:40 +01:00
parent 4565a3e029
commit 74f079a7ee
1 changed files with 15 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

45
tests/virtio-scsi-test.c
View file

@ -18,11 +18,11 @@
#include "libqos/malloc-pc.h" #include "libqos/malloc-pc.h"
#include "libqos/malloc-generic.h" #include "libqos/malloc-generic.h"
#include "standard-headers/linux/virtio_ids.h" #include "standard-headers/linux/virtio_ids.h"
#include "standard-headers/linux/virtio_scsi.h"
#define PCI_SLOT 0x02 #define PCI_SLOT 0x02
#define PCI_FN 0x00 #define PCI_FN 0x00
#define QVIRTIO_SCSI_TIMEOUT_US (1 * 1000 * 1000) #define QVIRTIO_SCSI_TIMEOUT_US (1 * 1000 * 1000)
#define CDB_SIZE 32
#define MAX_NUM_QUEUES 64 #define MAX_NUM_QUEUES 64
@ -34,24 +34,6 @@ typedef struct {
QVirtQueue *vq[MAX_NUM_QUEUES + 2]; QVirtQueue *vq[MAX_NUM_QUEUES + 2];
} QVirtIOSCSI; } QVirtIOSCSI;
typedef struct {
uint8_t lun[8];
int64_t tag;
uint8_t task_attr;
uint8_t prio;
uint8_t crn;
uint8_t cdb[CDB_SIZE];
} QEMU_PACKED QVirtIOSCSICmdReq;
typedef struct {
uint32_t sense_len;
uint32_t resid;
uint16_t status_qualifier;
uint8_t status;
uint8_t response;
uint8_t sense[96];
} QEMU_PACKED QVirtIOSCSICmdResp;
static void qvirtio_scsi_start(const char *extra_opts) static void qvirtio_scsi_start(const char *extra_opts)
{ {
char *cmdline; char *cmdline;
@ -100,11 +82,11 @@ static uint8_t virtio_scsi_do_command(QVirtIOSCSI *vs, const uint8_t *cdb,
const uint8_t *data_in, const uint8_t *data_in,
size_t data_in_len, size_t data_in_len,
uint8_t *data_out, size_t data_out_len, uint8_t *data_out, size_t data_out_len,
QVirtIOSCSICmdResp *resp_out) struct virtio_scsi_cmd_resp *resp_out)
{ {
QVirtQueue *vq; QVirtQueue *vq;
QVirtIOSCSICmdReq req = { { 0 } }; struct virtio_scsi_cmd_req req = { { 0 } };
QVirtIOSCSICmdResp resp = { .response = 0xff, .status = 0xff }; struct virtio_scsi_cmd_resp resp = { .response = 0xff, .status = 0xff };
uint64_t req_addr, resp_addr, data_in_addr = 0, data_out_addr = 0; uint64_t req_addr, resp_addr, data_in_addr = 0, data_out_addr = 0;
uint8_t response; uint8_t response;
uint32_t free_head; uint32_t free_head;
@ -113,7 +95,7 @@ static uint8_t virtio_scsi_do_command(QVirtIOSCSI *vs, const uint8_t *cdb,
req.lun[0] = 1; /* Select LUN */ req.lun[0] = 1; /* Select LUN */
req.lun[1] = 1; /* Select target 1 */ req.lun[1] = 1; /* Select target 1 */
memcpy(req.cdb, cdb, CDB_SIZE); memcpy(req.cdb, cdb, VIRTIO_SCSI_CDB_SIZE);
/* XXX: Fix endian if any multi-byte field in req/resp is used */ /* XXX: Fix endian if any multi-byte field in req/resp is used */
@ -138,7 +120,8 @@ static uint8_t virtio_scsi_do_command(QVirtIOSCSI *vs, const uint8_t *cdb,
qvirtqueue_kick(&qvirtio_pci, vs->dev, vq, free_head); qvirtqueue_kick(&qvirtio_pci, vs->dev, vq, free_head);
qvirtio_wait_queue_isr(&qvirtio_pci, vs->dev, vq, QVIRTIO_SCSI_TIMEOUT_US); qvirtio_wait_queue_isr(&qvirtio_pci, vs->dev, vq, QVIRTIO_SCSI_TIMEOUT_US);
response = readb(resp_addr + offsetof(QVirtIOSCSICmdResp, response)); response = readb(resp_addr +
offsetof(struct virtio_scsi_cmd_resp, response));
if (resp_out) { if (resp_out) {
memread(resp_addr, resp_out, sizeof(*resp_out)); memread(resp_addr, resp_out, sizeof(*resp_out));
@ -153,10 +136,10 @@ static uint8_t virtio_scsi_do_command(QVirtIOSCSI *vs, const uint8_t *cdb,
static QVirtIOSCSI *qvirtio_scsi_pci_init(int slot) static QVirtIOSCSI *qvirtio_scsi_pci_init(int slot)
{ {
const uint8_t test_unit_ready_cdb[CDB_SIZE] = {}; const uint8_t test_unit_ready_cdb[VIRTIO_SCSI_CDB_SIZE] = {};
QVirtIOSCSI *vs; QVirtIOSCSI *vs;
QVirtioPCIDevice *dev; QVirtioPCIDevice *dev;
QVirtIOSCSICmdResp resp; struct virtio_scsi_cmd_resp resp;
void *addr; void *addr;
int i; int i;
@ -239,10 +222,12 @@ static void test_unaligned_write_same(void)
QVirtIOSCSI *vs; QVirtIOSCSI *vs;
uint8_t buf1[512] = { 0 }; uint8_t buf1[512] = { 0 };
uint8_t buf2[512] = { 1 }; uint8_t buf2[512] = { 1 };
const uint8_t write_same_cdb_1[CDB_SIZE] = { 0x41, 0x00, 0x00, 0x00, 0x00, const uint8_t write_same_cdb_1[VIRTIO_SCSI_CDB_SIZE] = {
0x01, 0x00, 0x00, 0x02, 0x00 }; 0x41, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00
const uint8_t write_same_cdb_2[CDB_SIZE] = { 0x41, 0x00, 0x00, 0x00, 0x00, };
0x01, 0x00, 0x33, 0x00, 0x00 }; const uint8_t write_same_cdb_2[VIRTIO_SCSI_CDB_SIZE] = {
0x41, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x33, 0x00, 0x00
};
qvirtio_scsi_start("-drive file=blkdebug::null-co://,if=none,id=dr1" qvirtio_scsi_start("-drive file=blkdebug::null-co://,if=none,id=dr1"
",format=raw,file.align=4k " ",format=raw,file.align=4k "