From patchwork Tue Jan 13 03:34:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 428232 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2565A140192 for ; Tue, 13 Jan 2015 14:36:11 +1100 (AEDT) Received: from localhost ([::1]:37211 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YAsH3-0000Wc-BM for incoming@patchwork.ozlabs.org; Mon, 12 Jan 2015 22:36:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41883) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YAsGJ-0007mQ-Pf for qemu-devel@nongnu.org; Mon, 12 Jan 2015 22:35:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YAsGI-0004vm-RX for qemu-devel@nongnu.org; Mon, 12 Jan 2015 22:35:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55809) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YAsGI-0004vQ-Ip for qemu-devel@nongnu.org; Mon, 12 Jan 2015 22:35:22 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0D3ZKPr009664 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 12 Jan 2015 22:35:20 -0500 Received: from scv.usersys.redhat.com (vpn-56-104.rdu2.redhat.com [10.10.56.104]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t0D3YxBi003382; Mon, 12 Jan 2015 22:35:18 -0500 From: John Snow To: qemu-devel@nongnu.org Date: Mon, 12 Jan 2015 22:34:35 -0500 Message-Id: <1421120079-987-11-git-send-email-jsnow@redhat.com> In-Reply-To: <1421120079-987-1-git-send-email-jsnow@redhat.com> References: <1421120079-987-1-git-send-email-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, marc.mari.barcelo@gmail.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, John Snow Subject: [Qemu-devel] [PATCH 10/14] qtest/ahci: remove guest_malloc global X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Make helper routines rely on the earmarked guest allocator object with AHCIQState/QOSSTate instead. Signed-off-by: John Snow Reviewed-by: Paolo Bonzini --- 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 */