[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 07/11] libqos: allow zero-size allocations
From: |
John Snow |
Subject: |
[Qemu-devel] [PULL v2 07/11] libqos: allow zero-size allocations |
Date: |
Mon, 11 Jan 2016 14:33:56 -0500 |
As part of streamlining the AHCI tests interface, it'd be nice
if specying a size of zero could be handled without special branches
and the allocator could handle this special case gracefully.
This lets me use the "ahci_io" macros for non-data commands, too,
which moves me forward towards shepherding all AHCI qtests into
a common set of commands in a unified pipeline.
Signed-off-by: John Snow <address@hidden>
Message-id: address@hidden
---
tests/ahci-test.c | 8 +-------
tests/libqos/ahci.c | 6 +++---
tests/libqos/malloc.c | 4 ++++
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index 8ebbd33..8c48587 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -890,18 +890,12 @@ static void ahci_test_io_rw_simple(AHCIQState *ahci,
unsigned bufsize,
static uint8_t ahci_test_nondata(AHCIQState *ahci, uint8_t ide_cmd)
{
uint8_t port;
- AHCICommand *cmd;
/* Sanitize */
port = ahci_port_select(ahci);
ahci_port_clear(ahci, port);
- /* Issue Command */
- cmd = ahci_command_create(ide_cmd);
- ahci_command_commit(ahci, cmd, port);
- ahci_command_issue(ahci, cmd);
- ahci_command_verify(ahci, cmd);
- ahci_command_free(cmd);
+ ahci_io(ahci, port, ide_cmd, NULL, 0, 0);
return port;
}
diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c
index 96a05a8..6536408 100644
--- a/tests/libqos/ahci.c
+++ b/tests/libqos/ahci.c
@@ -668,16 +668,16 @@ void ahci_io(AHCIQState *ahci, uint8_t port, uint8_t
ide_cmd,
props = ahci_command_find(ide_cmd);
g_assert(props);
ptr = ahci_alloc(ahci, bufsize);
- g_assert(ptr);
+ g_assert(!bufsize || ptr);
qmemset(ptr, 0x00, bufsize);
- if (props->write) {
+ if (bufsize && props->write) {
bufwrite(ptr, buffer, bufsize);
}
ahci_guest_io(ahci, port, ide_cmd, ptr, bufsize, sector);
- if (props->read) {
+ if (bufsize && props->read) {
bufread(ptr, buffer, bufsize);
}
diff --git a/tests/libqos/malloc.c b/tests/libqos/malloc.c
index 82b9df5..19d05ca 100644
--- a/tests/libqos/malloc.c
+++ b/tests/libqos/malloc.c
@@ -270,6 +270,10 @@ uint64_t guest_alloc(QGuestAllocator *allocator, size_t
size)
uint64_t rsize = size;
uint64_t naddr;
+ if (!size) {
+ return 0;
+ }
+
rsize += (allocator->page_size - 1);
rsize &= -allocator->page_size;
g_assert_cmpint((allocator->start + rsize), <=, allocator->end);
--
2.4.3
- [Qemu-devel] [PULL v2 00/11] Ide patches, John Snow, 2016/01/11
- [Qemu-devel] [PULL v2 01/11] macio: fix overflow in lba to offset conversion for ATAPI devices, John Snow, 2016/01/11
- [Qemu-devel] [PULL v2 06/11] libqos/ahci: Switch to mutable properties, John Snow, 2016/01/11
- [Qemu-devel] [PULL v2 05/11] libqos/ahci: ATAPI identify, John Snow, 2016/01/11
- [Qemu-devel] [PULL v2 07/11] libqos: allow zero-size allocations,
John Snow <=
- [Qemu-devel] [PULL v2 10/11] qtest/ahci: ATAPI data tests, John Snow, 2016/01/11
- [Qemu-devel] [PULL v2 03/11] ahci-test: fix memory leak, John Snow, 2016/01/11
- [Qemu-devel] [PULL v2 02/11] ide: ahci: reset ncq object to unused on error, John Snow, 2016/01/11
- [Qemu-devel] [PULL v2 04/11] libqos/ahci: ATAPI support, John Snow, 2016/01/11
- [Qemu-devel] [PULL v2 08/11] libqos/ahci: allow nondata commands for ahci_io variants, John Snow, 2016/01/11
- [Qemu-devel] [PULL v2 11/11] libqos/ahci: organize header, John Snow, 2016/01/11
- [Qemu-devel] [PULL v2 09/11] libqos/ahci: add ahci_exec, John Snow, 2016/01/11
- Re: [Qemu-devel] [PULL v2 00/11] Ide patches, Peter Maydell, 2016/01/12