qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: famz@redhat.com, mst@redhat.com, armbru@redhat.com,
	stefanha@redhat.com, pbonzini@redhat.com,
	John Snow <jsnow@redhat.com>
Subject: [Qemu-devel] [PATCH 13/19] libqos/ahci: add ahci command size setters
Date: Fri, 30 Jan 2015 13:42:07 -0500	[thread overview]
Message-ID: <1422643333-27926-14-git-send-email-jsnow@redhat.com> (raw)
In-Reply-To: <1422643333-27926-1-git-send-email-jsnow@redhat.com>

Adds setters for size, prd_size and both via set_sizes.

Signed-off-by: John Snow <jsnow@redhat.com>
---
 tests/libqos/ahci.c | 22 ++++++++++++++++++++++
 tests/libqos/ahci.h |  5 +++++
 2 files changed, 27 insertions(+)

diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c
index 594c821..3375d54 100644
--- a/tests/libqos/ahci.c
+++ b/tests/libqos/ahci.c
@@ -648,6 +648,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 = cpu_to_le16(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 px)
 {
     uint16_t i, prdtl;
diff --git a/tests/libqos/ahci.h b/tests/libqos/ahci.h
index 46b7bf3..1300967 100644
--- a/tests/libqos/ahci.h
+++ b/tests/libqos/ahci.h
@@ -531,6 +531,11 @@ void ahci_command_verify(AHCIQState *ahci, AHCICommand *cmd);
 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);
 
 uint8_t ahci_command_slot(AHCICommand *cmd);
+
 #endif
-- 
1.9.3

  parent reply	other threads:[~2015-01-30 18:42 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-30 18:41 [Qemu-devel] [PATCH 00/19] qtest/ahci: add dma test John Snow
2015-01-30 18:41 ` [Qemu-devel] [PATCH 01/19] libqos/ahci: Add ahci_port_select helper John Snow
2015-01-30 18:41 ` [Qemu-devel] [PATCH 02/19] libqos/ahci: Add ahci_port_clear helper John Snow
2015-01-30 18:41 ` [Qemu-devel] [PATCH 03/19] qtest/ahci: rename 'Command' to 'CommandHeader' John Snow
2015-02-02 10:25   ` Paolo Bonzini
2015-01-30 18:41 ` [Qemu-devel] [PATCH 04/19] libqos/ahci: Add command header helpers John Snow
2015-02-02 10:25   ` Paolo Bonzini
2015-02-02 20:33     ` John Snow
2015-02-02 10:27   ` Paolo Bonzini
2015-02-02 20:38     ` John Snow
2015-01-30 18:41 ` [Qemu-devel] [PATCH 05/19] libqos/ahci: Add ahci_port_check_error helper John Snow
2015-01-30 18:42 ` [Qemu-devel] [PATCH 06/19] libqos/ahci: Add ahci_port_check_interrupts helper John Snow
2015-01-30 18:42 ` [Qemu-devel] [PATCH 07/19] libqos/ahci: Add port_check_nonbusy helper John Snow
2015-01-30 18:42 ` [Qemu-devel] [PATCH 08/19] libqos/ahci: Add cmd response sanity check helpers John Snow
2015-01-30 18:42 ` [Qemu-devel] [PATCH 09/19] qtest/ahci: Demagic ahci tests John Snow
2015-02-02 10:33   ` Paolo Bonzini
2015-01-30 18:42 ` [Qemu-devel] [PATCH 10/19] libqos/ahci: Add ide cmd properties John Snow
2015-02-02 10:34   ` Paolo Bonzini
2015-01-30 18:42 ` [Qemu-devel] [PATCH 11/19] libqos/ahci: add ahci command functions John Snow
2015-01-30 18:42 ` [Qemu-devel] [PATCH 12/19] libqos/ahci: add ahci command verify John Snow
2015-01-30 18:42 ` John Snow [this message]
2015-02-02 10:35   ` [Qemu-devel] [PATCH 13/19] libqos/ahci: add ahci command size setters Paolo Bonzini
2015-02-02 21:09     ` John Snow
2015-02-03  8:52       ` Paolo Bonzini
2015-01-30 18:42 ` [Qemu-devel] [PATCH 14/19] libqos/ahci: Add ahci_guest_io John Snow
2015-01-30 18:42 ` [Qemu-devel] [PATCH 15/19] libqos/ahci: add ahci_io John Snow
2015-01-30 18:42 ` [Qemu-devel] [PATCH 16/19] libqos/ahci: Add ahci_clean_mem John Snow
2015-01-30 18:42 ` [Qemu-devel] [PATCH 17/19] qtest/ahci: Add a macro bootup routine John Snow
2015-02-02 10:37   ` Paolo Bonzini
2015-02-02 21:12     ` John Snow
2015-02-03  8:53       ` Paolo Bonzini
2015-01-30 18:42 ` [Qemu-devel] [PATCH 18/19] qtest/ahci: Assert sector size in identify test John Snow
2015-01-30 18:42 ` [Qemu-devel] [PATCH 19/19] qtest/ahci: Adding simple dma read-write test John Snow
2015-02-02 10:38   ` Paolo Bonzini
2015-02-02 10:38 ` [Qemu-devel] [PATCH 00/19] qtest/ahci: add dma test Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1422643333-27926-14-git-send-email-jsnow@redhat.com \
    --to=jsnow@redhat.com \
    --cc=armbru@redhat.com \
    --cc=famz@redhat.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).