diff options
| author | John Snow <jsnow@redhat.com> | 2015-05-22 14:13:44 -0400 |
|---|---|---|
| committer | John Snow <jsnow@redhat.com> | 2015-05-22 15:58:22 -0400 |
| commit | 91d0374a7ffbd6a9cd0ba159c9160d9f26220cf5 (patch) | |
| tree | 62af69ba1ac03fa870eaa6f669482c72647811c6 | |
| parent | 4d00796364ec4edab86b08abc38fd644d5e3c0ad (diff) | |
| download | qemu-91d0374a7ffbd6a9cd0ba159c9160d9f26220cf5.tar.gz | |
libqos/ahci: Swap memread/write with bufread/write
Where it makes sense, use the new faster primitives.
For generally small reads/writes such as for the PRDT
and FIS packets, stick with the more wasteful but
easier to debug memread/memwrite.
For ahci-test (before migration tests):
With this patch:
real 0m3.675s
user 0m2.582s
sys 0m1.718s
Without any qtest protocol improvements:
real 0m14.171s
user 0m12.072s
sys 0m12.527s
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1430864578-22072-6-git-send-email-jsnow@redhat.com
| -rw-r--r-- | tests/ahci-test.c | 8 | ||||
| -rw-r--r-- | tests/libqos/ahci.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/ahci-test.c b/tests/ahci-test.c index 1a967c3724..6e3fa819e0 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -874,7 +874,7 @@ static void ahci_test_io_rw_simple(AHCIQState *ahci, unsigned bufsize, /* Write some indicative pattern to our buffer. */ generate_pattern(tx, bufsize, AHCI_SECTOR_SIZE); - memwrite(ptr, tx, bufsize); + bufwrite(ptr, tx, bufsize); /* Write this buffer to disk, then read it back to the DMA buffer. */ ahci_guest_io(ahci, port, write_cmd, ptr, bufsize, sector); @@ -882,7 +882,7 @@ static void ahci_test_io_rw_simple(AHCIQState *ahci, unsigned bufsize, ahci_guest_io(ahci, port, read_cmd, ptr, bufsize, sector); /*** Read back the Data ***/ - memread(ptr, rx, bufsize); + bufread(ptr, rx, bufsize); g_assert_cmphex(memcmp(tx, rx, bufsize), ==, 0); ahci_free(ahci, ptr); @@ -1018,7 +1018,7 @@ static void test_dma_fragmented(void) /* Create a DMA buffer in guest memory, and write our pattern to it. */ ptr = guest_alloc(ahci->parent->alloc, bufsize); g_assert(ptr); - memwrite(ptr, tx, bufsize); + bufwrite(ptr, tx, bufsize); cmd = ahci_command_create(CMD_WRITE_DMA); ahci_command_adjust(cmd, 0, ptr, bufsize, 32); @@ -1035,7 +1035,7 @@ static void test_dma_fragmented(void) g_free(cmd); /* Read back the guest's receive buffer into local memory */ - memread(ptr, rx, bufsize); + bufread(ptr, rx, bufsize); guest_free(ahci->parent->alloc, ptr); g_assert_cmphex(memcmp(tx, rx, bufsize), ==, 0); diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c index 95bfb3dac8..7e17bb691e 100644 --- a/tests/libqos/ahci.c +++ b/tests/libqos/ahci.c @@ -653,13 +653,13 @@ void ahci_io(AHCIQState *ahci, uint8_t port, uint8_t ide_cmd, qmemset(ptr, 0x00, bufsize); if (props->write) { - memwrite(ptr, buffer, bufsize); + bufwrite(ptr, buffer, bufsize); } ahci_guest_io(ahci, port, ide_cmd, ptr, bufsize, sector); if (props->read) { - memread(ptr, buffer, bufsize); + bufread(ptr, buffer, bufsize); } ahci_free(ahci, ptr); |