From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50325) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJQR4-0000UR-IR for qemu-devel@nongnu.org; Thu, 05 Feb 2015 12:41:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YJQR2-0004r6-MB for qemu-devel@nongnu.org; Thu, 05 Feb 2015 12:41:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55973) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJQR2-0004qs-Dm for qemu-devel@nongnu.org; Thu, 05 Feb 2015 12:41:48 -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 t15Hfl0X026403 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 5 Feb 2015 12:41:47 -0500 From: John Snow Date: Thu, 5 Feb 2015 12:41:25 -0500 Message-Id: <1423158090-25580-15-git-send-email-jsnow@redhat.com> In-Reply-To: <1423158090-25580-1-git-send-email-jsnow@redhat.com> References: <1423158090-25580-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH v3 14/19] libqos/ahci: add ahci command size setters 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 Adds setters for size, prd_size and both via set_sizes. Reviewed-by: Stefan Hajnoczi Signed-off-by: John Snow --- tests/libqos/ahci.c | 22 ++++++++++++++++++++++ tests/libqos/ahci.h | 4 ++++ 2 files changed, 26 insertions(+) diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c index ce1f0ef..2a5d8c4 100644 --- a/tests/libqos/ahci.c +++ b/tests/libqos/ahci.c @@ -660,6 +660,28 @@ void ahci_command_set_buffer(AHCICommand *cmd, uint64_t buffer) cmd->buffer = buffer; } +void ahci_command_set_sizes(AHCICommand *cmd, uint64_t xbytes, + unsigned prd_size) +{ + /* Each PRD can describe up to 4MiB, and must not be odd. */ + g_assert_cmphex(prd_size, <=, 4096 * 1024); + g_assert_cmphex(prd_size & 0x01, ==, 0x00); + cmd->prd_size = prd_size; + cmd->xbytes = xbytes; + cmd->fis.count = (cmd->xbytes / AHCI_SECTOR_SIZE); + cmd->header.prdtl = size_to_prdtl(cmd->xbytes, cmd->prd_size); +} + +void ahci_command_set_size(AHCICommand *cmd, uint64_t xbytes) +{ + ahci_command_set_sizes(cmd, xbytes, cmd->prd_size); +} + +void ahci_command_set_prd_size(AHCICommand *cmd, unsigned prd_size) +{ + ahci_command_set_sizes(cmd, cmd->xbytes, prd_size); +} + void ahci_command_commit(AHCIQState *ahci, AHCICommand *cmd, uint8_t port) { uint16_t i, prdtl; diff --git a/tests/libqos/ahci.h b/tests/libqos/ahci.h index 26ccdd6..57ff344 100644 --- a/tests/libqos/ahci.h +++ b/tests/libqos/ahci.h @@ -533,6 +533,10 @@ void ahci_command_free(AHCICommand *cmd); /* Command adjustments */ void ahci_command_set_buffer(AHCICommand *cmd, uint64_t buffer); +void ahci_command_set_size(AHCICommand *cmd, uint64_t xbytes); +void ahci_command_set_prd_size(AHCICommand *cmd, unsigned prd_size); +void ahci_command_set_sizes(AHCICommand *cmd, uint64_t xbytes, + unsigned prd_size); /* Command Misc */ uint8_t ahci_command_slot(AHCICommand *cmd); -- 1.9.3