diff options
| -rw-r--r-- | tests/ahci-test.c | 8 | ||||
| -rw-r--r-- | tests/libqos/ahci.c | 6 | ||||
| -rw-r--r-- | 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 8ebbd33349..8c485870ff 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 96a05a8599..6536408a7d 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 82b9df537a..19d05cafa6 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); |