From patchwork Sat May 25 13:12:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1939261 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=DgrRTbB0; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Vmj6M690Sz20KL for ; Sat, 25 May 2024 23:14:03 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sArCs-00014b-OA; Sat, 25 May 2024 09:13:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sArCq-00013e-JV; Sat, 25 May 2024 09:13:04 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sArCp-0007FJ-4M; Sat, 25 May 2024 09:13:04 -0400 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-1f333e7a669so29328515ad.3; Sat, 25 May 2024 06:13:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716642780; x=1717247580; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=k55Y6DV4WOIGnZ+GT9e2Ud91C2qHGHQZ7NwmPFN6yig=; b=DgrRTbB0ZrNXS5/Ozl25U9sknjFvjDBMCI8MOJoPUJb2QskF5223xsk8BOXro27Og5 oq3pdC9Viui5w3XQLsMFyGRr8ocd1mvQ1w8OomDhc5/jElRDqZ77HT8Np1ISm0CdB3N3 03xa7aV+rHKKwrVdHp5AbcB25xSEf+Hda5sQbF16kjiAhS3J6LRVyc5phhFdUFeCRzL/ AOmHX1TwTLXMEFfFIdNMv2Y16X+25bbmYjG0kSZF8YwuKjkjKPrm1UmrAc1xr57MCo0T n6k+5eOtyzCs1+7C/0gA6eTubNKkqjlz8ZQBw099rQyO28dwIj4rRBkWLiuS/cuamfJT r8Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716642780; x=1717247580; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=k55Y6DV4WOIGnZ+GT9e2Ud91C2qHGHQZ7NwmPFN6yig=; b=CaWk5+DhpPZZEIvfyeQ+CsGK0iBX1Y9n9V4gI2et/32qDuiYZ1oPuzvdspIuemYNCM DMd8zCETMAqE/JhryHSmvIPEkJPa/gprKGDwvUv2FwfLJvbT4PfFp7uZdKgsa2HBmXqh AkcjG6oF/dLRdhpPOBcPBRjJd9SmPt9/ZsoWXQQoLDflzsIf/eU7czdxh5MLEEN3kNUr NFkkNe89G0Oxa/PgpBhJD0LVIGzGnA6KHpO0yTn8dSt1yqKJEpjLskxalDKplMIELMri YYM7aCzPepQebu4mImA3RbbHC5ysxPNuuJB1AyELqDTs2EmTUUQhZ07+8ecyKPZD/4cQ 0TCg== X-Forwarded-Encrypted: i=1; AJvYcCXYQ4tLgcaMTEVEq3IiBS40VDxJSbvDy64Fj+U5VhJRJqoahilozHal+hE5CyRWayh28loxOe9DyTuBDwE0UxfS4Mtj0vQ= X-Gm-Message-State: AOJu0YwZHn5YQpMIiHtPVAfr0i+tJ8TxA8TkPD+AijvepsPNELEoPi7/ gUfG6L8/Bg9ht0+EOLzlreNrayAK6kiUGdb2sWZB0VWeVpGx+lTcIbbLaw== X-Google-Smtp-Source: AGHT+IH1anC0Js/dMhugsQC8ninNLg3wK5lvuPUsHSgYpXwgIO+kLeaZUXxWFLst40mfg38dF/qTRg== X-Received: by 2002:a17:902:c401:b0:1f2:f954:d6a3 with SMTP id d9443c01a7336-1f4486d1cb5mr51043715ad.5.1716642780067; Sat, 25 May 2024 06:13:00 -0700 (PDT) Received: from wheely.local0.net (110-175-65-7.tpgi.com.au. [110.175.65.7]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f44c9dd1efsm29653525ad.291.2024.05.25.06.12.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 May 2024 06:12:59 -0700 (PDT) From: Nicholas Piggin To: qemu-s390x@nongnu.org Cc: Nicholas Piggin , Halil Pasic , Christian Borntraeger , David Hildenbrand , Thomas Huth , Peter Xu , Fabiano Rosas , Laurent Vivier , Paolo Bonzini , qemu-devel@nongnu.org Subject: [RFC PATCH 1/3] hw/intc/s390_flic: Migrate pending state Date: Sat, 25 May 2024 23:12:38 +1000 Message-ID: <20240525131241.378473-2-npiggin@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240525131241.378473-1-npiggin@gmail.com> References: <20240525131241.378473-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::629; envelope-from=npiggin@gmail.com; helo=mail-pl1-x629.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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 The flic pending state is not migrated, so if the machine is migrated while an interrupt is pending, it can be lost. This shows up in qtest migration test, an extint is pending (due to console writes?) and the CPU waits via s390_cpu_set_psw and expects the interrupt to wake it. However when the flic pending state is lost, s390_cpu_has_int returns false, so s390_cpu_exec_interrupt falls through to halting again. Fix this by migrating pending. This prevents the qtest from hanging. Does service_param need to be migrated? Or the IO lists? Signed-off-by: Nicholas Piggin --- hw/intc/s390_flic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c index 6771645699..b70cf2295a 100644 --- a/hw/intc/s390_flic.c +++ b/hw/intc/s390_flic.c @@ -369,6 +369,7 @@ static const VMStateDescription qemu_s390_flic_vmstate = { .fields = (const VMStateField[]) { VMSTATE_UINT8(simm, QEMUS390FLICState), VMSTATE_UINT8(nimm, QEMUS390FLICState), + VMSTATE_UINT32(pending, QEMUS390FLICState), VMSTATE_END_OF_LIST() } }; From patchwork Sat May 25 13:12:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1939262 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=YepuLwpM; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Vmj6k5Vfdz20KL for ; Sat, 25 May 2024 23:14:22 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sArCx-00015c-3X; Sat, 25 May 2024 09:13:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sArCu-00014l-Q1; Sat, 25 May 2024 09:13:08 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sArCt-0007Fp-Bw; Sat, 25 May 2024 09:13:08 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-1f44b52f86cso33125ad.1; Sat, 25 May 2024 06:13:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716642785; x=1717247585; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=skPSuF1WhcswVBprHeljIeYPo7mMMqZfxAd2KjroudY=; b=YepuLwpMILo5o8H3cSQhaFXa9WOlU5mV8Al5zex3BgkcQBWajWFjG/90RR9rvpo+JW S1NmEWnqPc6tf0GEYedL+mviXYQzYdNG6OjpG3i8fMQbmCJnbg+9txbuF4lguo9Xo6Dt SHG8EEGsWZfOAETGSvG6McS92zexjtwidtYHi+WaOLLuGPKGM0HzoAmx+483Zbp8SLBg ZBomZGe3SMqerDXA7JI0Al3Du/br9YdhFrAqrAmIkqyuu5TRbxGWfpQ5BWz0JS1Peo2p GHeeVAmBwmPbytfbchQLIB3ldsEKU1B4MvKEDhK3jI0UOSSEzc70Yi48GQUV0XLr4eov QoOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716642785; x=1717247585; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=skPSuF1WhcswVBprHeljIeYPo7mMMqZfxAd2KjroudY=; b=g27koEtxb8v7fbBSZRfbeYNrGPCIhB0QRFZXwp4aFGAPV28uy5+uY9nPmRmbnKtmEk T9IvqKgTGFvELjnDz1aSo4Bt4yA3l/e+ta0E2GUP4QgEpSNP4sHJ9js/aIGi0QqD+2Uu 90VZtk5kuiQ4K2dQmxQdl5357Bm7X4XfwSTrFUcmIlI1JrCIZZjxyMl/TZTLTm2riuQq 3zgfIDFOkhDB88ivWNkUdYQBhuPTdiksitXAqWIdT1nfY2Lj6X7yzR7/Dw0hAawAmkOf z6OVH/5Am//WYjkx9fJeJbhOP/07OonyFUq1Ju0ESBBfjjYy4BXePHmW4nR9C9DsYem3 g2eg== X-Forwarded-Encrypted: i=1; AJvYcCU7LGOELqoRuknFj1OtFl+3ThETjqZmfrHjY+RkrexXUImQ0B9aZEsV4/9qbqSnDQtrIutNNJ//BsHnKcJKFUMt9gIWDs0= X-Gm-Message-State: AOJu0YzGVJTCZbC3NeNa+eEr8BAY7cz+OXhnF5W0HWe25N/t0L3JC8+v TMqscIl2Fcj5bgOjrGPcVA0GRbf6ng5/KkQ3Knbr5K2Xib5B9Nceqwqtyg== X-Google-Smtp-Source: AGHT+IFvDpXG+Q1a4Nvy6pYX84kKHAw8q/E/g3deRZX8YvW63HM6gBAS9JK9GRnQvyigG0+qdAVvjw== X-Received: by 2002:a17:902:da91:b0:1f3:7f0:74d with SMTP id d9443c01a7336-1f4486c6241mr69926065ad.11.1716642785264; Sat, 25 May 2024 06:13:05 -0700 (PDT) Received: from wheely.local0.net (110-175-65-7.tpgi.com.au. [110.175.65.7]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f44c9dd1efsm29653525ad.291.2024.05.25.06.13.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 May 2024 06:13:05 -0700 (PDT) From: Nicholas Piggin To: qemu-s390x@nongnu.org Cc: Nicholas Piggin , Halil Pasic , Christian Borntraeger , David Hildenbrand , Thomas Huth , Peter Xu , Fabiano Rosas , Laurent Vivier , Paolo Bonzini , qemu-devel@nongnu.org Subject: [RFC PATCH 2/3] tests/qtest/migration-test: enable on s390x Date: Sat, 25 May 2024 23:12:39 +1000 Message-ID: <20240525131241.378473-3-npiggin@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240525131241.378473-1-npiggin@gmail.com> References: <20240525131241.378473-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=npiggin@gmail.com; helo=mail-pl1-x62a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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 s390x is more stable now. Enable it. Signed-off-by: Nicholas Piggin --- tests/qtest/migration-test.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 94d5057857..7987faaded 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -3428,16 +3428,6 @@ int main(int argc, char **argv) migration_test_add("/migration/analyze-script", test_analyze_script); #endif - /* - * On s390x, the test seems to be touchy with TCG, perhaps due to race - * conditions on dirty bits, so disable it there until the problems are - * resolved. - */ - if (g_str_equal(arch, "s390x") && !has_kvm) { - g_test_message("Skipping tests: s390x host with KVM is required"); - goto test_add_done; - } - if (is_x86) { migration_test_add("/migration/precopy/unix/suspend/live", test_precopy_unix_suspend_live); @@ -3619,8 +3609,6 @@ int main(int argc, char **argv) test_vcpu_dirty_limit); } -test_add_done: - ret = g_test_run(); g_assert_cmpint(ret, ==, 0); From patchwork Sat May 25 13:12:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1939263 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=B+zgyQk2; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Vmj6m3LnNz20KL for ; Sat, 25 May 2024 23:14:24 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sArD1-00016c-Lb; Sat, 25 May 2024 09:13:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sArD0-000162-CZ; Sat, 25 May 2024 09:13:14 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sArCy-0007Gh-PC; Sat, 25 May 2024 09:13:14 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1f3469382f2so19528095ad.0; Sat, 25 May 2024 06:13:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716642791; x=1717247591; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pMBZRk5DaM+sm3AueYuXflAX4KvkNhNyU5gkYTdSzFE=; b=B+zgyQk2pj+hjnUmc0/Yo51syW1DosfLE5Z/bxLTv3Tz+nwkOGtR6bEeWomWOoUe4O ZsosqRmtQIXBMienw0bBPk8JNtiJtre82UXKuKH9qcr0z5eliHL1r8zTfy70X8DLfwqu DQ/hh+V8GYI+PeTHAX3gTNVii5vzETqT7pKoY8EaIiXzQ6tCj4083FZdqdDzjFY2NT67 XBsGShqhBuTx2eDIbAd2vXQi2hjQS0Nj8Gk8cyIkqQT3YRH7Nexbtxyg2SoSA39qeK8B y/imRHKkiFXN7mHGydQKtuInWDYihYmhDKJNh0kj8ldWWmVs2UalvC3//HirDHc5qhdB sqtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716642791; x=1717247591; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pMBZRk5DaM+sm3AueYuXflAX4KvkNhNyU5gkYTdSzFE=; b=IzwSAi91AfbeeVkVPIYNEfBqy7lwgb1dt8iFz5cB4yduCiMhwmiGbHoTZIH0aSe6z3 hq4vAL8E6mnGKn3w+e6S23blk8Abjk/BAwsX+L2Sh7wbpw/MG+xNU+Z4k0etag/Nn3ih 4rwvfHzj39nMIeClxyGifmabX624uFkTX5GXo/NOLfIr0mWC+IQUd37kR/1kkWebGtIr 2U2J/rIBw0Pm4btYgsiXRFB0ef6vc2EXT0p2GIoqQDyiJxlS4x6P3DKux8nxDrUkiS8D ICjk0V03h3/sSDC8z88mLY5Vk7OrQ+N65OhCyeB6xIJIwWsF1VuYxbkst45niILDldg1 k7ew== X-Forwarded-Encrypted: i=1; AJvYcCUgw+DJZiDmRLbkWPTohYzCylYYVhVe8Lzlziafj9w9dFVOwJA8MFSsmg9SWy91ThkJsRg+3H8nm8QRC4Xn34gaBTznIb8= X-Gm-Message-State: AOJu0YxIAGAHM8EvM+JqTi8IyroBBp+x/Hf/sW7DfURaK34sSoCMOi+p 6odcRNOJLZHwSvbeKWIFCK3r71jLtGB7XPlAOuKt3E8UFldQmEYj+hEZ8Q== X-Google-Smtp-Source: AGHT+IF8sfK/n1Q/HRSrp01nsiZucotYi7rUrYOSYG7qnbGhaC0KHHhi2mA3sEcmqO0yZuiCjm+XWw== X-Received: by 2002:a17:903:1c4:b0:1f3:7a3:8fc9 with SMTP id d9443c01a7336-1f4486c56f1mr63599785ad.3.1716642790912; Sat, 25 May 2024 06:13:10 -0700 (PDT) Received: from wheely.local0.net (110-175-65-7.tpgi.com.au. [110.175.65.7]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f44c9dd1efsm29653525ad.291.2024.05.25.06.13.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 May 2024 06:13:10 -0700 (PDT) From: Nicholas Piggin To: qemu-s390x@nongnu.org Cc: Nicholas Piggin , Halil Pasic , Christian Borntraeger , David Hildenbrand , Thomas Huth , Peter Xu , Fabiano Rosas , Laurent Vivier , Paolo Bonzini , qemu-devel@nongnu.org, Yury Kotov , "Dr . David Alan Gilbert" Subject: [RFC PATCH 3/3] tests/qtest/migration-test: Enable test_ignore_shared Date: Sat, 25 May 2024 23:12:40 +1000 Message-ID: <20240525131241.378473-4-npiggin@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240525131241.378473-1-npiggin@gmail.com> References: <20240525131241.378473-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=npiggin@gmail.com; helo=mail-pl1-x62d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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 This was said to be broken on aarch64, but if it works on others, let's try enable it. It's already starting to bitrot... Cc: Yury Kotov Cc: Dr. David Alan Gilbert Signed-off-by: Nicholas Piggin --- tests/qtest/migration-test.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 7987faaded..2bcdc33b7c 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -1862,14 +1862,15 @@ static void test_precopy_unix_tls_x509_override_host(void) #endif /* CONFIG_TASN1 */ #endif /* CONFIG_GNUTLS */ -#if 0 -/* Currently upset on aarch64 TCG */ static void test_ignore_shared(void) { g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs); QTestState *from, *to; + MigrateStart args = { + .use_shmem = true, + }; - if (test_migrate_start(&from, &to, uri, false, true, NULL, NULL)) { + if (test_migrate_start(&from, &to, uri, &args)) { return; } @@ -1898,7 +1899,6 @@ static void test_ignore_shared(void) test_migrate_end(from, to, true); } -#endif static void * test_migrate_xbzrle_start(QTestState *from, @@ -3537,7 +3537,10 @@ int main(int argc, char **argv) #endif /* CONFIG_TASN1 */ #endif /* CONFIG_GNUTLS */ - /* migration_test_add("/migration/ignore_shared", test_ignore_shared); */ + if (strcmp(arch, "aarch64") == 0) { /* Currently upset on aarch64 TCG */ + migration_test_add("/migration/ignore_shared", test_ignore_shared); + } + #ifndef _WIN32 migration_test_add("/migration/precopy/fd/tcp", test_migrate_precopy_fd_socket);