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

libqos/ahci: add ahci_exec 

add ahci_exec, which is a standard purpose flexible command dispatcher
and tester for the AHCI device. The intent is to eventually cut down on
the absurd amount of boilerplate inside of the AHCI qtest.

Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1452282920-21550-8-git-send-email-jsnow@redhat.com
This commit is contained in:
John Snow 2016-01-11 14:10:43 -05:00
parent b682d3a7cf
commit 9350df7cea
2 changed files with 93 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
tests/libqos/ahci.c
View File

@ -601,6 +601,82 @@ inline unsigned size_to_prdtl(unsigned bytes, unsigned bytes_per_prd)
return (bytes + bytes_per_prd - 1) / bytes_per_prd;
}
const AHCIOpts default_opts = { .size = 0 };
/**
* ahci_exec: execute a given command on a specific
* AHCI port.
*
* @ahci: The device to send the command to
* @port: The port number of the SATA device we wish
* to have execute this command
* @op: The S/ATA command to execute, or if opts.atapi
* is true, the SCSI command code.
* @opts: Optional arguments to modify execution behavior.
*/
void ahci_exec(AHCIQState *ahci, uint8_t port,
uint8_t op, const AHCIOpts *opts_in)
{
AHCICommand *cmd;
int rc;
AHCIOpts *opts;
opts = g_memdup((opts_in == NULL ? &default_opts : opts_in),
sizeof(AHCIOpts));
/* No guest buffer provided, create one. */
if (opts->size && !opts->buffer) {
opts->buffer = ahci_alloc(ahci, opts->size);
g_assert(opts->buffer);
qmemset(opts->buffer, 0x00, opts->size);
}
/* Command creation */
if (opts->atapi) {
cmd = ahci_atapi_command_create(op);
if (opts->atapi_dma) {
ahci_command_enable_atapi_dma(cmd);
}
} else {
cmd = ahci_command_create(op);
}
ahci_command_adjust(cmd, opts->lba, opts->buffer,
opts->size, opts->prd_size);
if (opts->pre_cb) {
rc = opts->pre_cb(ahci, cmd, opts);
g_assert_cmpint(rc, ==, 0);
}
/* Write command to memory and issue it */
ahci_command_commit(ahci, cmd, port);
ahci_command_issue_async(ahci, cmd);
if (opts->error) {
qmp_eventwait("STOP");
}
if (opts->mid_cb) {
rc = opts->mid_cb(ahci, cmd, opts);
g_assert_cmpint(rc, ==, 0);
}
if (opts->error) {
qmp_async("{'execute':'cont' }");
qmp_eventwait("RESUME");
}
/* Wait for command to complete and verify sanity */
ahci_command_wait(ahci, cmd);
ahci_command_verify(ahci, cmd);
if (opts->post_cb) {
rc = opts->post_cb(ahci, cmd, opts);
g_assert_cmpint(rc, ==, 0);
}
ahci_command_free(cmd);
if (opts->buffer != opts_in->buffer) {
ahci_free(ahci, opts->buffer);
}
g_free(opts);
}
/* Issue a command, expecting it to fail and STOP the VM */
AHCICommand *ahci_guest_io_halt(AHCIQState *ahci, uint8_t port,
uint8_t ide_cmd, uint64_t buffer,

17
tests/libqos/ahci.h
View File

@ -462,6 +462,21 @@ typedef struct PRD {
/* Opaque, defined within ahci.c */
typedef struct AHCICommand AHCICommand;
/* Options to ahci_exec */
typedef struct AHCIOpts {
size_t size;
unsigned prd_size;
uint64_t lba;
uint64_t buffer;
bool atapi;
bool atapi_dma;
bool error;
int (*pre_cb)(AHCIQState*, AHCICommand*, const struct AHCIOpts *);
int (*mid_cb)(AHCIQState*, AHCICommand*, const struct AHCIOpts *);
int (*post_cb)(AHCIQState*, AHCICommand*, const struct AHCIOpts *);
void *opaque;
} AHCIOpts;
/*** Macro Utilities ***/
#define BITANY(data, mask) (((data) & (mask)) != 0)
#define BITSET(data, mask) (((data) & (mask)) == (mask))
@ -569,6 +584,8 @@ AHCICommand *ahci_guest_io_halt(AHCIQState *ahci, uint8_t port, uint8_t ide_cmd,
void ahci_guest_io_resume(AHCIQState *ahci, AHCICommand *cmd);
void ahci_io(AHCIQState *ahci, uint8_t port, uint8_t ide_cmd,
void *buffer, size_t bufsize, uint64_t sector);
void ahci_exec(AHCIQState *ahci, uint8_t port,
uint8_t op, const AHCIOpts *opts);
/* Command Lifecycle */
AHCICommand *ahci_command_create(uint8_t command_name);