From patchwork Sat Nov 9 00:04:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 289943 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8262D2C00B3 for ; Sat, 9 Nov 2013 11:02:37 +1100 (EST) Received: from localhost ([::1]:52460 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vew0Z-0007ar-Dk for incoming@patchwork.ozlabs.org; Fri, 08 Nov 2013 19:02:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vevzs-0007IL-6H for qemu-devel@nongnu.org; Fri, 08 Nov 2013 19:02:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vevzi-00025j-Vu for qemu-devel@nongnu.org; Fri, 08 Nov 2013 19:01:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51766) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vevzi-00024t-MF for qemu-devel@nongnu.org; Fri, 08 Nov 2013 19:01:42 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rA901aBV021607 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 8 Nov 2013 19:01:36 -0500 Received: from lacos-laptop.usersys.redhat.com (vpn1-4-229.ams2.redhat.com [10.36.4.229]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id rA901P44023277; Fri, 8 Nov 2013 19:01:34 -0500 From: Laszlo Ersek To: afaerber@suse.de, pbonzini@redhat.com, jljusten@gmail.com, marcel.a@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Sat, 9 Nov 2013 01:04:11 +0100 Message-Id: <1383955451-20618-5-git-send-email-lersek@redhat.com> In-Reply-To: <1383955451-20618-1-git-send-email-lersek@redhat.com> References: <1383955451-20618-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/4] i440fx-test: verify firmware under 4G and 1M, both -bios and -pflash 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 Check whether the firmware is not hidden by other memory regions. Qemu is started in paused mode: it shouldn't try to interpret generated garbage. Signed-off-by: Laszlo Ersek --- tests/i440fx-test.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 75 insertions(+), 6 deletions(-) diff --git a/tests/i440fx-test.c b/tests/i440fx-test.c index 1fe98de..43adcb8 100644 --- a/tests/i440fx-test.c +++ b/tests/i440fx-test.c @@ -35,6 +35,11 @@ typedef struct TestData int num_cpus; } TestData; +typedef struct FirmwareTestFixture { + /* decides whether we're testing -bios or -pflash */ + bool is_bios; +} FirmwareTestFixture; + static QPCIBus *test_start_get_bus(const TestData *s) { char *cmdline; @@ -278,6 +283,7 @@ static void test_i440fx_pam(gconstpointer opaque) } #define FW_SIZE ((size_t)65536) +#define ISA_BIOS_MAXSZ ((size_t)(128 * 1024)) /* Create a temporary firmware blob, and return its absolute pathname as a * dynamically allocated string. @@ -328,23 +334,86 @@ static char *create_firmware(void) return ret == -1 ? NULL : pathname; } -int main(int argc, char **argv) +static void test_i440fx_firmware(FirmwareTestFixture *fixture, + gconstpointer user_data) { - char *fw_pathname; - TestData data; - int ret; - - g_test_init(&argc, &argv, NULL); + char *fw_pathname, *cmdline; + char unsigned *buf; + size_t i, isa_bios_size; fw_pathname = create_firmware(); g_assert(fw_pathname != NULL); + + /* Better hope the user didn't put metacharacters in TMPDIR and co. */ + cmdline = g_strdup_printf("-S -display none %s %s", + fixture->is_bios ? "-bios" : "-pflash", + fw_pathname); + g_test_message("qemu cmdline: %s", cmdline); + qtest_start(cmdline); + g_free(cmdline); + + /* Qemu has loaded the firmware (because qtest_start() only returns after + * the QMP handshake completes). We must unlink the firmware blob right + * here, because any assertion firing below would leak it in the + * filesystem. This is also the reason why we recreate the blob every time + * this function is invoked. + */ unlink(fw_pathname); g_free(fw_pathname); + /* check below 4G */ + buf = g_malloc0(FW_SIZE); + memread(0x100000000ULL - FW_SIZE, buf, FW_SIZE); + for (i = 0; i < FW_SIZE; ++i) { + g_assert_cmphex(buf[i], ==, (char unsigned)i); + } + + /* check in ISA space too */ + memset(buf, 0, FW_SIZE); + isa_bios_size = ISA_BIOS_MAXSZ < FW_SIZE ? ISA_BIOS_MAXSZ : FW_SIZE; + memread(0x100000 - isa_bios_size, buf, isa_bios_size); + for (i = 0; i < isa_bios_size; ++i) { + g_assert_cmphex(buf[i], ==, + (char unsigned)((FW_SIZE - isa_bios_size) + i)); + } + + g_free(buf); + qtest_end(); +} + +static void add_firmware_test(const char *testpath, + void (*setup_fixture)(FirmwareTestFixture *f, + gconstpointer test_data)) +{ + g_test_add(testpath, FirmwareTestFixture, NULL, setup_fixture, + test_i440fx_firmware, NULL); +} + +static void request_bios(FirmwareTestFixture *fixture, + gconstpointer user_data) +{ + fixture->is_bios = true; +} + +static void request_pflash(FirmwareTestFixture *fixture, + gconstpointer user_data) +{ + fixture->is_bios = false; +} + +int main(int argc, char **argv) +{ + TestData data; + int ret; + + g_test_init(&argc, &argv, NULL); + data.num_cpus = 1; g_test_add_data_func("/i440fx/defaults", &data, test_i440fx_defaults); g_test_add_data_func("/i440fx/pam", &data, test_i440fx_pam); + add_firmware_test("/i440fx/firmware/bios", request_bios); + add_firmware_test("/i440fx/firmware/pflash", request_pflash); ret = g_test_run(); return ret;