From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41332) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHhlK-0007DZ-6z for qemu-devel@nongnu.org; Fri, 08 Jan 2016 19:52:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aHhlJ-0005lO-7u for qemu-devel@nongnu.org; Fri, 08 Jan 2016 19:52:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44500) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHhlJ-0005lJ-2n for qemu-devel@nongnu.org; Fri, 08 Jan 2016 19:52:09 -0500 From: John Snow Date: Fri, 8 Jan 2016 19:51:54 -0500 Message-Id: <1452300718-10660-8-git-send-email-jsnow@redhat.com> In-Reply-To: <1452300718-10660-1-git-send-email-jsnow@redhat.com> References: <1452300718-10660-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PULL 07/11] libqos: allow zero-size allocations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jsnow@redhat.com 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 Message-id: 1452282920-21550-6-git-send-email-jsnow@redhat.com --- 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 a219f67..df29560 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