From patchwork Thu Apr 30 18:07:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 466673 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 1FD07140322 for ; Fri, 1 May 2015 04:14:16 +1000 (AEST) Received: from localhost ([::1]:45238 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnsyU-0001tz-8w for incoming@patchwork.ozlabs.org; Thu, 30 Apr 2015 14:14:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36639) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ynss9-0006ck-K1 for qemu-devel@nongnu.org; Thu, 30 Apr 2015 14:07:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ynss4-00071v-R3 for qemu-devel@nongnu.org; Thu, 30 Apr 2015 14:07:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34226) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ynss1-0006zj-Rf; Thu, 30 Apr 2015 14:07:34 -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 t3UI7TRp001505 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 30 Apr 2015 14:07:30 -0400 Received: from scv.usersys.redhat.com (dhcp-17-29.bos.redhat.com [10.18.17.29]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t3UI7NQt015406; Thu, 30 Apr 2015 14:07:29 -0400 From: John Snow To: qemu-block@nongnu.org Date: Thu, 30 Apr 2015 14:07:19 -0400 Message-Id: <1430417242-11859-7-git-send-email-jsnow@redhat.com> In-Reply-To: <1430417242-11859-1-git-send-email-jsnow@redhat.com> References: <1430417242-11859-1-git-send-email-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: marc.mari.barcelo@gmail.com, pbonzini@redhat.com, John Snow , qemu-devel@nongnu.org, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v3 6/9] qtest/ahci: add migrate dma test 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 Write to one guest, migrate, and then read from the other. adjust ahci_io to clear any buffers it creates, so that we can use ahci_io safely on both guests knowing we are using empty buffers and not accidentally re-using data. Signed-off-by: John Snow --- tests/ahci-test.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ tests/libqos/ahci.c | 1 + 2 files changed, 46 insertions(+) diff --git a/tests/ahci-test.c b/tests/ahci-test.c index 2656b37..90f631c 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -1108,6 +1108,50 @@ static void test_migrate_sanity(void) ahci_shutdown(dst); } +/** + * DMA Migration test: Write a pattern, migrate, then read. + */ +static void test_migrate_dma(void) +{ + AHCIQState *src, *dst; + uint8_t px; + size_t bufsize = 4096; + unsigned char *tx = g_malloc(bufsize); + unsigned char *rx = g_malloc0(bufsize); + unsigned i; + const char *uri = "tcp:127.0.0.1:1234"; + + src = ahci_boot_and_enable("-m 1024 -M q35 " + "-hda %s ", tmp_path); + dst = ahci_boot("-m 1024 -M q35 " + "-hda %s " + "-incoming %s", tmp_path, uri); + + set_context(src->parent); + + /* initialize */ + px = ahci_port_select(src); + ahci_port_clear(src, px); + + /* create pattern */ + for (i = 0; i < bufsize; i++) { + tx[i] = (bufsize - i); + } + + /* Write, migrate, then read. */ + ahci_io(src, px, CMD_WRITE_DMA, tx, bufsize, 0); + ahci_migrate(src, dst, uri); + ahci_io(dst, px, CMD_READ_DMA, rx, bufsize, 0); + + /* Verify pattern */ + g_assert_cmphex(memcmp(tx, rx, bufsize), ==, 0); + + ahci_shutdown(src); + ahci_shutdown(dst); + g_free(rx); + g_free(tx); +} + /******************************************************************************/ /* AHCI I/O Test Matrix Definitions */ @@ -1358,6 +1402,7 @@ int main(int argc, char **argv) qtest_add_func("/ahci/flush/retry", test_flush_retry); qtest_add_func("/ahci/migrate/sanity", test_migrate_sanity); + qtest_add_func("/ahci/migrate/dma", test_migrate_dma); ret = g_test_run(); diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c index 29e12f9..e2ac0d7 100644 --- a/tests/libqos/ahci.c +++ b/tests/libqos/ahci.c @@ -650,6 +650,7 @@ void ahci_io(AHCIQState *ahci, uint8_t port, uint8_t ide_cmd, g_assert(props); ptr = ahci_alloc(ahci, bufsize); g_assert(ptr); + qmemset(ptr, 0x00, bufsize); if (props->write) { memwrite(ptr, buffer, bufsize);