From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
John Snow <jsnow@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PULL v2 33/65] libqos/ahci: add ahci command size setters
Date: Mon, 16 Feb 2015 15:45:58 +0000 [thread overview]
Message-ID: <1424101590-7627-34-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1424101590-7627-1-git-send-email-stefanha@redhat.com>
From: John Snow <jsnow@redhat.com>
Adds setters for size, prd_size and both via set_sizes.
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1423158090-25580-15-git-send-email-jsnow@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
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 09e7159..cd1f3ff 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);
--
2.1.0
next prev parent reply other threads:[~2015-02-16 15:47 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-16 15:45 [Qemu-devel] [PULL v2 00/65] Block patches Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 01/65] nbd: Drop BDS backpointer Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 02/65] iotests: Add "wait" functionality to _cleanup_qemu Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 03/65] iotests: Add test for drive-mirror with NBD target Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 04/65] libqos: Split apart pc_alloc_init Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 05/65] qtest/ahci: Create ahci.h Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 06/65] libqos: create libqos.c Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 07/65] libqos: add qtest_vboot Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 08/65] libqos: add alloc_init_flags Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 09/65] libqos: Update QGuestAllocator to be opaque Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 10/65] libqos: add pc specific interface Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 11/65] qtest/ahci: Store hba_base in AHCIQState Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 12/65] qtest/ahci: finalize AHCIQState consolidation Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 13/65] qtest/ahci: remove pcibus global Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 14/65] qtest/ahci: remove guest_malloc global Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 15/65] libqos/ahci: Functional register helpers Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 16/65] qtest/ahci: remove getter/setter macros Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 17/65] qtest/ahci: Bookmark FB and CLB pointers Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 18/65] libqos/ahci: create libqos/ahci.c Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 19/65] dataplane: endianness-aware accesses Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 20/65] libqos/ahci: Add ahci_port_select helper Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 21/65] libqos/ahci: Add ahci_port_clear helper Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 22/65] qtest/ahci: rename 'Command' to 'CommandHeader' Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 23/65] libqos/ahci: Add command header helpers Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 24/65] libqos/ahci: Add ahci_port_check_error helper Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 25/65] libqos/ahci: Add ahci_port_check_interrupts helper Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 26/65] libqos/ahci: Add port_check_nonbusy helper Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 27/65] libqos/ahci: Add cmd response sanity check helpers Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 28/65] qtest/ahci: Demagic ahci tests Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 29/65] qtest/ahci: add ahci_write_fis Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 30/65] libqos/ahci: Add ide cmd properties Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 31/65] libqos/ahci: add ahci command functions Stefan Hajnoczi
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 32/65] libqos/ahci: add ahci command verify Stefan Hajnoczi
2015-02-16 15:45 ` Stefan Hajnoczi [this message]
2015-02-16 15:45 ` [Qemu-devel] [PULL v2 34/65] libqos/ahci: Add ahci_guest_io Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 35/65] libqos/ahci: add ahci_io Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 36/65] libqos/ahci: Add ahci_clean_mem Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 37/65] qtest/ahci: Assert sector size in identify test Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 38/65] qtest/ahci: Adding simple dma read-write test Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 39/65] nbd: fix the co_queue multi-adding bug Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 40/65] savevm: Improve error message for blocked migration Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 41/65] block: vmdk - fixed sizeof() error Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 42/65] qtest: Fix deadloop by running main loop AIO context's timers Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 43/65] qemu-io: Account IO by aio_read and aio_write Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 44/65] qtest: Add scripts/qtest.py Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 45/65] qemu-iotests: Add VM method qtest() to iotests.py Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 46/65] qemu-iotests: Allow caller to disable underscore convertion for qmp Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 47/65] qemu-iotests: Add 093 for IO throttling Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 48/65] qemu-img: Fix qemu-img convert -n Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 49/65] iotests: Add test for qemu-img convert to NBD Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 50/65] block: Lift some BDS functions to the BlockBackend Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 51/65] block: Add blk_new_open() Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 52/65] block: Add Error parameter to bdrv_find_protocol() Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 53/65] iotests: Add test for driver=qcow2, format=qcow2 Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 54/65] blockdev: Use blk_new_open() in blockdev_init() Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 55/65] block/xen: Use blk_new_open() in blk_connect() Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 56/65] qemu-img: Use blk_new_open() in img_open() Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 57/65] qemu-img: Use blk_new_open() in img_rebase() Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 58/65] qemu-img: Use BlockBackend as far as possible Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 59/65] qemu-nbd: Use blk_new_open() in main() Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 60/65] qemu-io: Use blk_new_open() in openfile() Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 61/65] qemu-io: Remove "growable" option Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 62/65] qemu-io: Use BlockBackend Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 63/65] block: Clamp BlockBackend requests Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 64/65] block: Remove "growable" from BDS Stefan Hajnoczi
2015-02-16 15:46 ` [Qemu-devel] [PULL v2 65/65] block: Keep bdrv_check*_request()'s return value Stefan Hajnoczi
2015-02-24 13:57 ` [Qemu-devel] [PULL v2 00/65] Block patches Peter Maydell
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=1424101590-7627-34-git-send-email-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=jsnow@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).