Message ID | 1534870966-9287-11-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gcwnOWA9"; dkim-atps=neutral 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 41vxq529S7z9s4v for <incoming@patchwork.ozlabs.org>; Wed, 22 Aug 2018 03:04:17 +1000 (AEST) Received: from localhost ([::1]:54942 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1fsA4l-0001Gc-1o for incoming@patchwork.ozlabs.org; Tue, 21 Aug 2018 13:04:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fsA3x-0001Al-8X for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:03:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fsA3o-0005hC-O3 for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:03:20 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:37167) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fsA3n-0005c0-JN for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:03:16 -0400 Received: by mail-wr1-x42f.google.com with SMTP id u12-v6so16460851wrr.4 for <qemu-devel@nongnu.org>; Tue, 21 Aug 2018 10:03:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=TWZzAulVo+A0Kz/7z6ngW5EJM7sxfjkxlRE2NVAR6vA=; b=gcwnOWA9A9mu+X45/CsL5sdHyGsoDePHH+Hq8lcnE+s7xaNKikeGj+Um686bgscZ8D GoQwFvsWEq93g/s7+9kUWVJY4+tLosP0w9L6g8oZY5GXop02xbcVvp4nWeiHmzJV2Ya4 Pq5KkOYXOANMD9ASw3eMPRIjs8O8ky6Wq3kuqNgZmnJNJhef/TFYJVcjQLD8RN11vg2w ydkrxARXD/zErHwdMsoPStjiZzK+x/fdDw/FIxD7ESZrfOkBOvIWKuweAnk+8kix5thU jhJRCKFKOYvnLlWo4TOFoz+9zpGwm1YNnmtFxZx4fv0lfAnjXw4oCq9B7dwA1skoTMFC 1t2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=TWZzAulVo+A0Kz/7z6ngW5EJM7sxfjkxlRE2NVAR6vA=; b=OiG9S7R5fydt6kG3dc30KU3pscGE18/5JEPlFLashdvNQ+nEX7iDTsHiScOHnL6dxt hLfGjFN+5T8+QQ/B+SpzUdtK4YjvjYpON0BQYt8+nTjPFCtRj72DAu9ZMBf0rOg1g0dt 11wyVEENviUYwpL+d4RmWAGlRpTDLQvambuC/6Va0GvynkHKL8WQYTaK8mT2zVTW0zeA wDLFvM7G5Nz/cKeOjrqJCDObV2YAqcJA52vhq0JcF7cgpw/5eNXWOr8sQ5WyuAeuhwLg dOBOWg/LsX2DEvo/Q0bTcwOr2hA8OTa2AYzo5bs3aW0EzVc/4YQvI73aJ8src4/o81sB 46nw== X-Gm-Message-State: APzg51DQBaDCLRdvFaxt2X/iUy5+5Wzz06MRv4vcgvdAghALLWGwCUc1 d4PWPxWcELV6XKIQ8h33guqUghon X-Google-Smtp-Source: ANB0Vdbk/MwPxCLKGiMrD4W6mZazrbaf059Hge/gy4GsPbzRkXWHXr5GilxGiYY1pc9RY3pp+ZGm6A== X-Received: by 2002:adf:a602:: with SMTP id k2-v6mr12263239wrc.181.1534870994131; Tue, 21 Aug 2018 10:03:14 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-184-244.clienti.tiscali.it. [78.12.184.244]) by smtp.gmail.com with ESMTPSA id v6-v6sm2608955wmc.43.2018.08.21.10.03.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 10:03:13 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2018 19:01:42 +0200 Message-Id: <1534870966-9287-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> References: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42f Subject: [Qemu-devel] [PULL 10/74] tests/migration-test: Silence the kvm_hv message by default X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Thomas Huth <thuth@redhat.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/74] tests: virtio: separate ccw tests from libqos
|
expand
|
diff --git a/tests/migration-test.c b/tests/migration-test.c index eb58d0a..0e687b7 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -438,15 +438,6 @@ static int test_migrate_start(QTestState **from, QTestState **to, " -incoming %s", accel, tmpfs, bootpath, uri); } else if (strcmp(arch, "ppc64") == 0) { - - /* On ppc64, the test only works with kvm-hv, but not with kvm-pr - * and TCG is touchy due to race conditions on dirty bits - * (especially on PPC for some reason) - */ - if (access("/sys/module/kvm_hv", F_OK)) { - g_print("Skipping test: kvm_hv not available "); - return -1; - } cmd_src = g_strdup_printf("-machine accel=%s -m 256M" " -name source,debug-threads=on" " -serial file:%s/src_serial" @@ -750,6 +741,17 @@ int main(int argc, char **argv) return 0; } + /* + * On ppc64, the test only works with kvm-hv, but not with kvm-pr and TCG + * is touchy due to race conditions on dirty bits (especially on PPC for + * some reason) + */ + if (g_str_equal(qtest_get_arch(), "ppc64") && + access("/sys/module/kvm_hv", F_OK)) { + g_test_message("Skipping test: kvm_hv not available"); + return 0; + } + tmpfs = mkdtemp(template); if (!tmpfs) { g_test_message("mkdtemp on path (%s): %s\n", template, strerror(errno));