From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIlJB-0001v7-D1 for qemu-devel@nongnu.org; Tue, 03 Feb 2015 16:46:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIlJA-0002hE-DO for qemu-devel@nongnu.org; Tue, 03 Feb 2015 16:46:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34450) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIlJA-0002fv-5a for qemu-devel@nongnu.org; Tue, 03 Feb 2015 16:46:56 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t13Lktg1001883 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 3 Feb 2015 16:46:55 -0500 From: John Snow Date: Tue, 3 Feb 2015 16:46:35 -0500 Message-Id: <1422999999-25868-16-git-send-email-jsnow@redhat.com> In-Reply-To: <1422999999-25868-1-git-send-email-jsnow@redhat.com> References: <1422999999-25868-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH v2 15/19] libqos/ahci: Add ahci_guest_io List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: famz@redhat.com, mst@redhat.com, armbru@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, 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 --- 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 60849ea..99a7218 100644 --- a/tests/libqos/ahci.c +++ b/tests/libqos/ahci.c @@ -544,6 +544,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 px, 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, px); + 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 1f09ef1..dcb6c84 100644 --- a/tests/libqos/ahci.h +++ b/tests/libqos/ahci.h @@ -521,6 +521,8 @@ void ahci_destroy_command(AHCIQState *ahci, uint8_t px, uint8_t cx); void ahci_write_fis(AHCIQState *ahci, RegH2DFIS *fis, uint64_t addr); unsigned ahci_pick_cmd(AHCIQState *ahci, uint8_t px); unsigned size_to_prdtl(unsigned bytes, unsigned bytes_per_prd); +void ahci_guest_io(AHCIQState *ahci, uint8_t px, uint8_t ide_cmd, + uint64_t gbuffer, size_t size); /* Command Lifecycle */ AHCICommand *ahci_command_create(uint8_t command_name); -- 1.9.3