From: John Snow Date: Thu, 5 Feb 2015 17:41:26 +0000 (-0500) Subject: libqos/ahci: Add ahci_guest_io X-Git-Tag: v2.3.0-rc0~58^2~31 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=113221956cb819837dda5350e3f9d52819183805;p=thirdparty%2Fqemu.git libqos/ahci: Add ahci_guest_io ahci_guest_io is a shorthand function that will, in one shot, execute a data command on the guest to the specified guest buffer location, in the requested amount. Signed-off-by: John Snow Reviewed-by: Paolo Bonzini Message-id: 1423158090-25580-16-git-send-email-jsnow@redhat.com Signed-off-by: Stefan Hajnoczi --- diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c index cd1f3ffcdaa..345d1f190b6 100644 --- a/tests/libqos/ahci.c +++ b/tests/libqos/ahci.c @@ -548,6 +548,21 @@ inline unsigned size_to_prdtl(unsigned bytes, unsigned bytes_per_prd) return (bytes + bytes_per_prd - 1) / bytes_per_prd; } +/* Given a guest buffer address, perform an IO operation */ +void ahci_guest_io(AHCIQState *ahci, uint8_t port, uint8_t ide_cmd, + uint64_t buffer, size_t bufsize) +{ + AHCICommand *cmd; + + cmd = ahci_command_create(ide_cmd); + ahci_command_set_buffer(cmd, buffer); + ahci_command_set_size(cmd, bufsize); + ahci_command_commit(ahci, cmd, port); + ahci_command_issue(ahci, cmd); + ahci_command_verify(ahci, cmd); + ahci_command_free(cmd); +} + struct AHCICommand { /* Test Management Data */ uint8_t name; diff --git a/tests/libqos/ahci.h b/tests/libqos/ahci.h index 57ff3445c41..1206c7abab3 100644 --- a/tests/libqos/ahci.h +++ b/tests/libqos/ahci.h @@ -521,6 +521,8 @@ void ahci_destroy_command(AHCIQState *ahci, uint8_t port, uint8_t slot); void ahci_write_fis(AHCIQState *ahci, RegH2DFIS *fis, uint64_t addr); unsigned ahci_pick_cmd(AHCIQState *ahci, uint8_t port); unsigned size_to_prdtl(unsigned bytes, unsigned bytes_per_prd); +void ahci_guest_io(AHCIQState *ahci, uint8_t port, uint8_t ide_cmd, + uint64_t gbuffer, size_t size); /* Command Lifecycle */ AHCICommand *ahci_command_create(uint8_t command_name);