Commit b1b66c3b authored by John Snow's avatar John Snow
Browse files

libqos: allow zero-size allocations 



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: default avatarJohn Snow <jsnow@redhat.com>
Message-id: 1452282920-21550-6-git-send-email-jsnow@redhat.com
parent b88641e2

tests/ahci-test.c

+1 −7
Original line number Diff line number Diff line
@@ -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;

}

tests/libqos/ahci.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

    }

tests/libqos/malloc.c

+4 −0
Original line number Diff line number Diff line
@@ -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);