From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YMJCD-0000xa-RF for qemu-devel@nongnu.org; Fri, 13 Feb 2015 11:34:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YMJCC-0002jo-TH for qemu-devel@nongnu.org; Fri, 13 Feb 2015 11:34:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48726) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YMJCC-0002jd-LD for qemu-devel@nongnu.org; Fri, 13 Feb 2015 11:34:24 -0500 From: Stefan Hajnoczi Date: Fri, 13 Feb 2015 16:24:30 +0000 Message-Id: <1423844701-21041-35-git-send-email-stefanha@redhat.com> In-Reply-To: <1423844701-21041-1-git-send-email-stefanha@redhat.com> References: <1423844701-21041-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 34/65] libqos/ahci: Add ahci_guest_io List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , John Snow , Stefan Hajnoczi From: John Snow 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 --- tests/libqos/ahci.c | 15 +++++++++++++++ tests/libqos/ahci.h | 2 ++ 2 files changed, 17 insertions(+) diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c index 2a5d8c4..f7713e1 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); +} + typedef struct AHCICommand { /* Test Management Data */ uint8_t name; diff --git a/tests/libqos/ahci.h b/tests/libqos/ahci.h index 57ff344..1206c7a 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); -- 2.1.0