From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44849) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUlNi-0006TP-Vc for qemu-devel@nongnu.org; Thu, 18 Sep 2014 19:45:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XUlNc-0003mS-Rn for qemu-devel@nongnu.org; Thu, 18 Sep 2014 19:44:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50003) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUlNc-0003kg-KF for qemu-devel@nongnu.org; Thu, 18 Sep 2014 19:44:52 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s8INilaC020534 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 18 Sep 2014 19:44:47 -0400 From: John Snow Date: Thu, 18 Sep 2014 19:43:39 -0400 Message-Id: <1411083819-9284-16-git-send-email-jsnow@redhat.com> In-Reply-To: <1411083819-9284-1-git-send-email-jsnow@redhat.com> References: <1411083819-9284-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH 15/15] qtest/ahci: Don't use a magic constant for buffer size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, mst@redhat.com, armbru@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, John Snow Fix to correct the use of "512" as a magic constant and define it as the buffer size for the operation instead. Signed-off-by: John Snow --- tests/ahci-test.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/ahci-test.c b/tests/ahci-test.c index e3091b9..9d16d0c 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -1651,6 +1651,7 @@ static void ahci_test_identify(AHCIState *ahci) int rc; uint8_t cx; uint64_t table_ptr; + const size_t buffsize = 512; g_assert(ahci != NULL); @@ -1677,11 +1678,11 @@ static void ahci_test_identify(AHCIState *ahci) port_clear(ahci, i); /* Create a data buffer where we will dump the IDENTIFY data to. */ - data_ptr = guest_alloc(guest_malloc, 512); + data_ptr = guest_alloc(guest_malloc, buffsize); g_assert(data_ptr); /* Construct the Command Table (FIS and PRDT) */ - table_ptr = build_cmd_table(ahci, i, 512, CMD_IDENTIFY, data_ptr); + table_ptr = build_cmd_table(ahci, i, buffsize, CMD_IDENTIFY, data_ptr); /* Pick a command slot and link it to the command table we've built */ cx = link_cmd_slot(ahci, i, table_ptr, CMDH_READ); @@ -1698,13 +1699,13 @@ static void ahci_test_identify(AHCIState *ahci) port_check_interrupts(ahci, i, AHCI_PX_IS_DHRS | AHCI_PX_IS_PSS); port_check_nonbusy(ahci, i, cx); /* Investigate the CMD, assert that we read 512 bytes */ - port_check_cmd_sanity(ahci, i, cx, 512); + port_check_cmd_sanity(ahci, i, cx, buffsize); /* Investigate FIS responses */ port_check_d2h_sanity(ahci, i, cx); - port_check_pio_sanity(ahci, i, cx, 512); + port_check_pio_sanity(ahci, i, cx, buffsize); /* Last, but not least: Investigate the IDENTIFY response data. */ - memread(data_ptr, &buff, 512); + memread(data_ptr, &buff, buffsize); /* Check serial number/version in the buffer */ /* NB: IDENTIFY strings are packed in 16bit little endian chunks. -- 1.9.3