diff options
| author | John Snow <jsnow@redhat.com> | 2015-01-19 15:15:53 -0500 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2015-02-16 14:36:03 +0000 |
| commit | fa02e6084f727191e15fc6b2d1328c4fae874741 (patch) | |
| tree | 5830cd68f8334fa06e9afa55b9a8e373b26e4f20 /tests | |
| parent | f1518d1192a1a9387f881919897fbb0101ad3426 (diff) | |
libqos: add alloc_init_flags
Allow a generic interface to alloc_init_flags,
not just through pc_alloc_init_flags.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1421698563-6977-6-git-send-email-jsnow@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/libqos/malloc-pc.c | 4 | ||||
| -rw-r--r-- | tests/libqos/malloc.c | 8 | ||||
| -rw-r--r-- | tests/libqos/malloc.h | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/tests/libqos/malloc-pc.c b/tests/libqos/malloc-pc.c index 36a0740f94..6a5fdf360a 100644 --- a/tests/libqos/malloc-pc.c +++ b/tests/libqos/malloc-pc.c @@ -37,9 +37,7 @@ QGuestAllocator *pc_alloc_init_flags(QAllocOpts flags) QFWCFG *fw_cfg = pc_fw_cfg_init(); ram_size = qfw_cfg_get_u64(fw_cfg, FW_CFG_RAM_SIZE); - s = alloc_init(1 << 20, MIN(ram_size, 0xE0000000)); - - s->opts = flags; + s = alloc_init_flags(flags, 1 << 20, MIN(ram_size, 0xE0000000)); s->page_size = PAGE_SIZE; /* clean-up */ diff --git a/tests/libqos/malloc.c b/tests/libqos/malloc.c index 0d34ecd4b6..4ff260f085 100644 --- a/tests/libqos/malloc.c +++ b/tests/libqos/malloc.c @@ -285,3 +285,11 @@ QGuestAllocator *alloc_init(uint64_t start, uint64_t end) return s; } + +QGuestAllocator *alloc_init_flags(QAllocOpts opts, + uint64_t start, uint64_t end) +{ + QGuestAllocator *s = alloc_init(start, end); + s->opts = opts; + return s; +} diff --git a/tests/libqos/malloc.h b/tests/libqos/malloc.h index 677db7764b..7b2954784f 100644 --- a/tests/libqos/malloc.h +++ b/tests/libqos/malloc.h @@ -51,4 +51,6 @@ uint64_t guest_alloc(QGuestAllocator *allocator, size_t size); void guest_free(QGuestAllocator *allocator, uint64_t addr); QGuestAllocator *alloc_init(uint64_t start, uint64_t end); +QGuestAllocator *alloc_init_flags(QAllocOpts flags, + uint64_t start, uint64_t end); #endif |