From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47904) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDFnZ-0007fY-M6 for qemu-devel@nongnu.org; Mon, 19 Jan 2015 12:07:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YDFnW-0005wz-BW for qemu-devel@nongnu.org; Mon, 19 Jan 2015 12:07:33 -0500 Received: from mail-wg0-x230.google.com ([2a00:1450:400c:c00::230]:32981) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDFnW-0005wi-4R for qemu-devel@nongnu.org; Mon, 19 Jan 2015 12:07:30 -0500 Received: by mail-wg0-f48.google.com with SMTP id x12so4444331wgg.7 for ; Mon, 19 Jan 2015 09:07:28 -0800 (PST) Sender: Paolo Bonzini Message-ID: <54BD39CD.7050605@redhat.com> Date: Mon, 19 Jan 2015 18:07:25 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1421120079-987-1-git-send-email-jsnow@redhat.com> <1421120079-987-11-git-send-email-jsnow@redhat.com> In-Reply-To: <1421120079-987-11-git-send-email-jsnow@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 10/14] qtest/ahci: remove guest_malloc global List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: John Snow , qemu-devel@nongnu.org Cc: kwolf@redhat.com, marc.mari.barcelo@gmail.com, armbru@redhat.com, stefanha@redhat.com, mreitz@redhat.com On 13/01/2015 04:34, John Snow wrote: > Make helper routines rely on the earmarked > guest allocator object with AHCIQState/QOSSTate instead. > > Signed-off-by: John Snow > --- > tests/ahci-test.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/tests/ahci-test.c b/tests/ahci-test.c > index 1981b6a..b84f942 100644 > --- a/tests/ahci-test.c > +++ b/tests/ahci-test.c > @@ -32,7 +32,6 @@ > #include "libqos/libqos-pc.h" > #include "libqos/ahci.h" > #include "libqos/pci-pc.h" > -#include "libqos/malloc-pc.h" > > #include "qemu-common.h" > #include "qemu/host-utils.h" > @@ -44,7 +43,6 @@ > #define TEST_IMAGE_SIZE (64 * 1024 * 1024) > > /*** Globals ***/ > -static QGuestAllocator *guest_malloc; > static char tmp_path[] = "/tmp/qtest.XXXXXX"; > static bool ahci_pedantic; > > @@ -92,6 +90,11 @@ static void string_bswap16(uint16_t *s, size_t bytes) > } > } > > +static uint64_t ahci_alloc(AHCIQState *ahci, size_t bytes) > +{ > + return qmalloc(ahci->parent, bytes); > +} > + > /** > * Locate, verify, and return a handle to the AHCI device. > */ > @@ -154,9 +157,6 @@ static AHCIQState *ahci_boot(void) > /* Verify that we have an AHCI device present. */ > s->dev = get_ahci_device(&s->fingerprint); > > - /* Stopgap: Copy the allocator reference */ > - guest_malloc = s->parent->alloc; > - > return s; > } > > @@ -272,13 +272,13 @@ static void ahci_hba_enable(AHCIQState *ahci) > > /* Allocate Memory for the Command List Buffer & FIS Buffer */ > /* PxCLB space ... 0x20 per command, as in 4.2.2 p 36 */ > - clb = guest_alloc(guest_malloc, num_cmd_slots * 0x20); > + clb = ahci_alloc(ahci, num_cmd_slots * 0x20); > g_test_message("CLB: 0x%08x", clb); > PX_WREG(i, AHCI_PX_CLB, clb); > g_assert_cmphex(clb, ==, PX_RREG(i, AHCI_PX_CLB)); > > /* PxFB space ... 0x100, as in 4.2.1 p 35 */ > - fb = guest_alloc(guest_malloc, 0x100); > + fb = ahci_alloc(ahci, 0x100); > g_test_message("FB: 0x%08x", fb); > PX_WREG(i, AHCI_PX_FB, fb); > g_assert_cmphex(fb, ==, PX_RREG(i, AHCI_PX_FB)); > @@ -951,12 +951,12 @@ static void ahci_test_identify(AHCIQState *ahci) > > /* Create a Command Table buffer. 0x80 is the smallest with a PRDTL of 0. */ > /* We need at least one PRD, so round up to the nearest 0x80 multiple. */ > - table = guest_alloc(guest_malloc, CMD_TBL_SIZ(1)); > + table = ahci_alloc(ahci, CMD_TBL_SIZ(1)); > g_assert(table); > ASSERT_BIT_CLEAR(table, 0x7F); > > /* Create a data buffer ... where we will dump the IDENTIFY data to. */ > - data_ptr = guest_alloc(guest_malloc, 512); > + data_ptr = ahci_alloc(ahci, 512); > g_assert(data_ptr); > > /* Grab the Command List Buffer pointer */ > Reviewed-by: Paolo Bonzini