mirror of https://gitee.com/openkylin/qemu.git
tests: virtio-scsi: clear unit attention after reset
The unit attention after reset (power on) prevents normal commands from running. The unaligned WRITE SAME test never executed its command! Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Message-Id: <1438262173-11546-4-git-send-email-stefanha@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
c85a7a0057
commit
4bb7b0daf8
|
@ -13,6 +13,7 @@
|
|||
#include "libqtest.h"
|
||||
#include "qemu/osdep.h"
|
||||
#include <stdio.h>
|
||||
#include "block/scsi.h"
|
||||
#include "libqos/virtio.h"
|
||||
#include "libqos/virtio-pci.h"
|
||||
#include "libqos/pci-pc.h"
|
||||
|
@ -71,40 +72,6 @@ static void qvirtio_scsi_stop(void)
|
|||
qtest_end();
|
||||
}
|
||||
|
||||
static QVirtIOSCSI *qvirtio_scsi_pci_init(int slot)
|
||||
{
|
||||
QVirtIOSCSI *vs;
|
||||
QVirtioPCIDevice *dev;
|
||||
void *addr;
|
||||
int i;
|
||||
|
||||
vs = g_new0(QVirtIOSCSI, 1);
|
||||
vs->alloc = pc_alloc_init();
|
||||
vs->bus = qpci_init_pc();
|
||||
|
||||
dev = qvirtio_pci_device_find(vs->bus, QVIRTIO_SCSI_DEVICE_ID);
|
||||
vs->dev = (QVirtioDevice *)dev;
|
||||
g_assert(dev != NULL);
|
||||
g_assert_cmphex(vs->dev->device_type, ==, QVIRTIO_SCSI_DEVICE_ID);
|
||||
|
||||
qvirtio_pci_device_enable(dev);
|
||||
qvirtio_reset(&qvirtio_pci, vs->dev);
|
||||
qvirtio_set_acknowledge(&qvirtio_pci, vs->dev);
|
||||
qvirtio_set_driver(&qvirtio_pci, vs->dev);
|
||||
|
||||
addr = dev->addr + QVIRTIO_PCI_DEVICE_SPECIFIC_NO_MSIX;
|
||||
vs->num_queues = qvirtio_config_readl(&qvirtio_pci, vs->dev,
|
||||
(uint64_t)(uintptr_t)addr);
|
||||
|
||||
g_assert_cmpint(vs->num_queues, <, MAX_NUM_QUEUES);
|
||||
|
||||
for (i = 0; i < vs->num_queues + 2; i++) {
|
||||
vs->vq[i] = qvirtqueue_setup(&qvirtio_pci, vs->dev, vs->alloc, i);
|
||||
}
|
||||
|
||||
return vs;
|
||||
}
|
||||
|
||||
static void qvirtio_scsi_pci_free(QVirtIOSCSI *vs)
|
||||
{
|
||||
int i;
|
||||
|
@ -134,7 +101,8 @@ static uint64_t qvirtio_scsi_alloc(QVirtIOSCSI *vs, size_t alloc_size,
|
|||
static uint8_t virtio_scsi_do_command(QVirtIOSCSI *vs, const uint8_t *cdb,
|
||||
const uint8_t *data_in,
|
||||
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)
|
||||
{
|
||||
QVirtQueue *vq;
|
||||
QVirtIOSCSICmdReq req = { { 0 } };
|
||||
|
@ -174,6 +142,10 @@ static uint8_t virtio_scsi_do_command(QVirtIOSCSI *vs, const uint8_t *cdb,
|
|||
|
||||
response = readb(resp_addr + offsetof(QVirtIOSCSICmdResp, response));
|
||||
|
||||
if (resp_out) {
|
||||
memread(resp_addr, resp_out, sizeof(*resp_out));
|
||||
}
|
||||
|
||||
guest_free(vs->alloc, req_addr);
|
||||
guest_free(vs->alloc, resp_addr);
|
||||
guest_free(vs->alloc, data_in_addr);
|
||||
|
@ -181,6 +153,52 @@ static uint8_t virtio_scsi_do_command(QVirtIOSCSI *vs, const uint8_t *cdb,
|
|||
return response;
|
||||
}
|
||||
|
||||
static QVirtIOSCSI *qvirtio_scsi_pci_init(int slot)
|
||||
{
|
||||
const uint8_t test_unit_ready_cdb[CDB_SIZE] = {};
|
||||
QVirtIOSCSI *vs;
|
||||
QVirtioPCIDevice *dev;
|
||||
QVirtIOSCSICmdResp resp;
|
||||
void *addr;
|
||||
int i;
|
||||
|
||||
vs = g_new0(QVirtIOSCSI, 1);
|
||||
vs->alloc = pc_alloc_init();
|
||||
vs->bus = qpci_init_pc();
|
||||
|
||||
dev = qvirtio_pci_device_find(vs->bus, QVIRTIO_SCSI_DEVICE_ID);
|
||||
vs->dev = (QVirtioDevice *)dev;
|
||||
g_assert(dev != NULL);
|
||||
g_assert_cmphex(vs->dev->device_type, ==, QVIRTIO_SCSI_DEVICE_ID);
|
||||
|
||||
qvirtio_pci_device_enable(dev);
|
||||
qvirtio_reset(&qvirtio_pci, vs->dev);
|
||||
qvirtio_set_acknowledge(&qvirtio_pci, vs->dev);
|
||||
qvirtio_set_driver(&qvirtio_pci, vs->dev);
|
||||
|
||||
addr = dev->addr + QVIRTIO_PCI_DEVICE_SPECIFIC_NO_MSIX;
|
||||
vs->num_queues = qvirtio_config_readl(&qvirtio_pci, vs->dev,
|
||||
(uint64_t)(uintptr_t)addr);
|
||||
|
||||
g_assert_cmpint(vs->num_queues, <, MAX_NUM_QUEUES);
|
||||
|
||||
for (i = 0; i < vs->num_queues + 2; i++) {
|
||||
vs->vq[i] = qvirtqueue_setup(&qvirtio_pci, vs->dev, vs->alloc, i);
|
||||
}
|
||||
|
||||
/* Clear the POWER ON OCCURRED unit attention */
|
||||
g_assert_cmpint(virtio_scsi_do_command(vs, test_unit_ready_cdb,
|
||||
NULL, 0, NULL, 0, &resp),
|
||||
==, 0);
|
||||
g_assert_cmpint(resp.status, ==, CHECK_CONDITION);
|
||||
g_assert_cmpint(resp.sense[0], ==, 0x70); /* Fixed format sense buffer */
|
||||
g_assert_cmpint(resp.sense[2], ==, UNIT_ATTENTION);
|
||||
g_assert_cmpint(resp.sense[12], ==, 0x29); /* POWER ON */
|
||||
g_assert_cmpint(resp.sense[13], ==, 0x00);
|
||||
|
||||
return vs;
|
||||
}
|
||||
|
||||
/* Tests only initialization so far. TODO: Replace with functional tests */
|
||||
static void pci_nop(void)
|
||||
{
|
||||
|
@ -231,7 +249,7 @@ static void test_unaligned_write_same(void)
|
|||
vs = qvirtio_scsi_pci_init(PCI_SLOT);
|
||||
|
||||
g_assert_cmphex(0, ==,
|
||||
virtio_scsi_do_command(vs, write_same_cdb, NULL, 0, buf, 512));
|
||||
virtio_scsi_do_command(vs, write_same_cdb, NULL, 0, buf, 512, NULL));
|
||||
|
||||
qvirtio_scsi_pci_free(vs);
|
||||
qvirtio_scsi_stop();
|
||||
|
|
Loading…
Reference in New Issue