From nobody Mon Feb 9 00:29:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693228390; cv=none; d=zohomail.com; s=zohoarc; b=ltV+Wvb1s7o52VaSlU/8IKMzJMht5/TqW2M1sCVbSKjwBz5nV0IV5TlmorVzPigfKbcqKbTAhBfx6hA8qEL8Xb+ODlg1A7ggbrRDMNPPCChAXuQMTaa6RnyqrGv1WpgnRq8+CFx0fdCQ5lzYJns7+2Hv8G57kysSPxp56OT8/bM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693228390; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Dnn7zcX+XruTT8qtF7bGt5HSsxg08fy+vUhRkZV41uo=; b=j+I0qkrsxNlUd2/1VtkPh/7uk3R300nL6MBOE6uPcbv3UU3yAH4r4SqSzZKu1xbNqXmVdzqj9h8Hle58r6k/4n79Glxm1drGXUM3KHuQEGI2xBt9Y4sF80pKFdJ0964kIK0ocmBCtsMNSge6YH8blnPvADchwpP4uzFL6ZGUBOs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1693228390827160.5633706274574; Mon, 28 Aug 2023 06:13:10 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-6-UKotr6g7MUmuJke6sYDdrQ-1; Mon, 28 Aug 2023 09:11:44 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A261B1C29AE2; Mon, 28 Aug 2023 13:11:40 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E8422026D4B; Mon, 28 Aug 2023 13:11:40 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5DF191946588; Mon, 28 Aug 2023 13:11:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1F39F1946587 for ; Mon, 28 Aug 2023 13:11:34 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1A38D2166B29; Mon, 28 Aug 2023 13:11:34 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 910142166B27 for ; Mon, 28 Aug 2023 13:11:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693228389; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Dnn7zcX+XruTT8qtF7bGt5HSsxg08fy+vUhRkZV41uo=; b=YiAtpgdleWMCdvYnK8IdbRKZXQYN1EzJiLcM7ZahYLlXDb3jMs4zVoOb870W5NuonuFZvs Kf5xucvjuqvHIniSsW82DLQymYtruWpjKXzoQl4kghNLl2hNC/VJij5NTrixyybpiwTi6F lxH20gTAjS2klVhjEs+XHn0Hi00894s= X-MC-Unique: UKotr6g7MUmuJke6sYDdrQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 6/9] qemuhotplugtest: Remove 'modern' field for cpu hotplug tests Date: Mon, 28 Aug 2023 15:11:24 +0200 Message-ID: <178193e71a8a5123790e142536aa5e4985663598.1693227408.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693228391341100001 Content-Type: text/plain; charset="utf-8" Nowadays all tests were considered 'modern' so it makes no longer sense to have that field. Signed-off-by: Peter Krempa --- tests/qemuhotplugtest.c | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 5666e87f75..98f68ce3f4 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -276,7 +276,6 @@ struct testQemuHotplugCpuData { virDomainObj *vm; qemuMonitorTest *mon; - bool modern; }; @@ -317,7 +316,6 @@ struct testQemuHotplugCpuParams { int newcpus; const char *cpumap; bool state; - bool modern; bool fail; const char *arch; GHashTable *capsLatestFiles; @@ -338,8 +336,6 @@ testQemuHotplugCpuPrepare(const struct testQemuHotplugC= puParams *params) data =3D g_new0(struct testQemuHotplugCpuData, 1); - data->modern =3D params->modern; - data->file_xml_dom =3D g_strdup_printf("%s-domain.xml", prefix); data->file_xml_res_live =3D g_strdup_printf("%s-result-live.xml", pref= ix); data->file_xml_res_conf =3D g_strdup_printf("%s-result-conf.xml", pref= ix); @@ -360,9 +356,6 @@ testQemuHotplugCpuPrepare(const struct testQemuHotplugC= puParams *params) priv =3D data->vm->privateData; - if (data->modern) - virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS); - if (!(data->mon =3D qemuMonitorTestNewFromFileFull(data->file_json_mon= itor, &driver, data->vm, sc= hema))) goto error; @@ -370,9 +363,6 @@ testQemuHotplugCpuPrepare(const struct testQemuHotplugC= puParams *params) if (params->fail) qemuMonitorTestAllowUnusedCommands(data->mon); - if (!data->modern) - qemuMonitorTestSkipDeprecatedValidation(data->mon, true); - priv->mon =3D qemuMonitorTestGetMonitor(data->mon); virObjectUnlock(priv->mon); @@ -429,7 +419,7 @@ testQemuHotplugCpuGroup(const void *opaque) rc =3D qemuDomainSetVcpusInternal(&driver, data->vm, data->vm->def, data->vm->newDef, params->newcpus, - params->modern); + true); if (params->fail) { if (rc =3D=3D 0) @@ -799,44 +789,42 @@ mymain(void) "blockdev-del", QMP_OK, "blockdev-del", QMP_OK); -#define DO_TEST_CPU_GROUP(archname, prefix, vcpus, modernhp, expectfail) \ +#define DO_TEST_CPU_GROUP(archname, prefix, vcpus, expectfail) \ do { \ cpudata.test =3D prefix; \ cpudata.arch =3D archname; \ cpudata.newcpus =3D vcpus; \ - cpudata.modern =3D modernhp; \ cpudata.fail =3D expectfail; \ if (virTestRun("hotplug vcpus group " prefix, \ testQemuHotplugCpuGroup, &cpudata) < 0) \ ret =3D -1; \ } while (0) - DO_TEST_CPU_GROUP("x86_64", "x86-modern-bulk", 7, true, false); - DO_TEST_CPU_GROUP("ppc64", "ppc64-modern-bulk", 24, true, false); - DO_TEST_CPU_GROUP("ppc64", "ppc64-modern-bulk", 15, true, true); - DO_TEST_CPU_GROUP("ppc64", "ppc64-modern-bulk", 23, true, true); - DO_TEST_CPU_GROUP("ppc64", "ppc64-modern-bulk", 25, true, true); + DO_TEST_CPU_GROUP("x86_64", "x86-modern-bulk", 7, false); + DO_TEST_CPU_GROUP("ppc64", "ppc64-modern-bulk", 24, false); + DO_TEST_CPU_GROUP("ppc64", "ppc64-modern-bulk", 15, true); + DO_TEST_CPU_GROUP("ppc64", "ppc64-modern-bulk", 23, true); + DO_TEST_CPU_GROUP("ppc64", "ppc64-modern-bulk", 25, true); -#define DO_TEST_CPU_INDIVIDUAL(archname, prefix, mapstr, statefl, modernhp= , expectfail) \ +#define DO_TEST_CPU_INDIVIDUAL(archname, prefix, mapstr, statefl, expectfa= il) \ do { \ cpudata.test =3D prefix; \ cpudata.arch =3D archname; \ cpudata.cpumap =3D mapstr; \ cpudata.state =3D statefl; \ - cpudata.modern =3D modernhp; \ cpudata.fail =3D expectfail; \ if (virTestRun("hotplug vcpus group " prefix, \ testQemuHotplugCpuIndividual, &cpudata) < 0) \ ret =3D -1; \ } while (0) - DO_TEST_CPU_INDIVIDUAL("x86_64", "x86-modern-individual-add", "7", tru= e, true, false); - DO_TEST_CPU_INDIVIDUAL("x86_64", "x86-modern-individual-add", "6,7", t= rue, true, true); - DO_TEST_CPU_INDIVIDUAL("x86_64", "x86-modern-individual-add", "7", fal= se, true, true); + DO_TEST_CPU_INDIVIDUAL("x86_64", "x86-modern-individual-add", "7", tru= e, false); + DO_TEST_CPU_INDIVIDUAL("x86_64", "x86-modern-individual-add", "6,7", t= rue, true); + DO_TEST_CPU_INDIVIDUAL("x86_64", "x86-modern-individual-add", "7", fal= se, true); - DO_TEST_CPU_INDIVIDUAL("ppc64", "ppc64-modern-individual", "16-23", tr= ue, true, false); - DO_TEST_CPU_INDIVIDUAL("ppc64", "ppc64-modern-individual", "16-22", tr= ue, true, true); - DO_TEST_CPU_INDIVIDUAL("ppc64", "ppc64-modern-individual", "17", true,= true, true); + DO_TEST_CPU_INDIVIDUAL("ppc64", "ppc64-modern-individual", "16-23", tr= ue, false); + DO_TEST_CPU_INDIVIDUAL("ppc64", "ppc64-modern-individual", "16-22", tr= ue, true); + DO_TEST_CPU_INDIVIDUAL("ppc64", "ppc64-modern-individual", "17", true,= true); qemuTestDriverFree(&driver); virObjectUnref(data.vm); --=20 2.41.0