From nobody Tue Feb 10 02:42:58 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=philmd@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=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1636988376; cv=none; d=zohomail.com; s=zohoarc; b=bxvVXPP72AWUzA2FVx4Vs5iwFm0b8b9R6/pPAjXt09avYmyOMWMxG7xSkxSTDjnOlzC+6fRwvfbZd1VUO4uYkfAvzPCc6pFW2N2R04aUEJ1q5lo2SRJ/8yXbFjS4qpnd7pEI0ItbNlaWnoJz8ettUeoNYysMRvlzz6c4n5l8BbY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636988376; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=2CcO+Z0iBapQD7/VeLORTYFY1zV22osrIJAVn0P+5js=; b=J8Zw1AKXWDKv3SfYyz02mjWnL4WbFKAzm97IPtcYOkkzGXiSrEny80H06hM+gO7yyQdcgQ/ojgCL9nPXTxj9Zggh4tU3Y84ykujdmJcF/zaSesEuSUCJk1YQ2UYF8yj9j8p64mVvnNK7nF9VraGA3orKPYohz6UxuWPt4cyQNWk= 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=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1636988376467922.0701145162911; Mon, 15 Nov 2021 06:59:36 -0800 (PST) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-285-m5v-iIuOMKmm0Wx52g4dQA-1; Mon, 15 Nov 2021 09:59:34 -0500 Received: by mail-wm1-f71.google.com with SMTP id g81-20020a1c9d54000000b003330e488323so25479wme.0 for ; Mon, 15 Nov 2021 06:59:33 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id o8sm14256154wrm.67.2021.11.15.06.59.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 06:59:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636988375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2CcO+Z0iBapQD7/VeLORTYFY1zV22osrIJAVn0P+5js=; b=IWdQiMCQzRW2LM+ZoZlVGM9GqhybUJOKCU8Jr8hzvGBd9c54yaJdH/q9HNRCx5cGTYc3/2 KCOQbHwNkOml/W/OHDGasdDGvejCr7cUdpgTmjtuHnOfGfrJY+ixdyPXMy/xpquDGlbZyZ nhsnS/wenYg2vCvDaFFHYHx36wIHWIA= X-MC-Unique: m5v-iIuOMKmm0Wx52g4dQA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2CcO+Z0iBapQD7/VeLORTYFY1zV22osrIJAVn0P+5js=; b=talbX5zksqpL1ckaN03VeO0vbEAUWtMj0GbE9VBOSN7Im6fnPKNRc55spHUgVDb+5X apsjfdBSPjB1Wv7Y2oeDfsHq8RmEVjRuph3c4WSUbE1z0qGB2YHwsiFe1EpBFXI5bfOw 0laO4PHK7i5y6sw8W69nOLWQygUuXSXQHyIczH+aKYfvmaGGwW49+8RBJgvEqImg0R0t mvSiJScf1JfGW14FNrm7M4mJQ4CA6S61Suoq6eyN4BJOy0T9NnrYqWzP55KXbC8bWFVi AJ45al8XeaxeLjvctGv6axs4L+G2OEe/2kptVGB9cuO5I6WgJdWy79AtEPHwP5FZ7js5 KsFQ== X-Gm-Message-State: AOAM532hcyH+sMnI+aPNOA0dHFImpRIHCnjiE2j2l8/Q+mNFKFbUFQEW OMiuHlCc+cobrKQV9qJbRaAwtVQHunvTqvRf92JaDv8tu6ylTTqE5oJjIK9Vd9efTpuo0Xcm1qN gXExI8DwMVF4YEg== X-Received: by 2002:adf:d1e2:: with SMTP id g2mr49312393wrd.346.1636988372998; Mon, 15 Nov 2021 06:59:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJx6CciOegvif+34GnCt0hD/64UuEDugB7rW9G76m3FCy6yAO30mqJbwBDxaNwN/j5jZNdoVtw== X-Received: by 2002:adf:d1e2:: with SMTP id g2mr49312366wrd.346.1636988372860; Mon, 15 Nov 2021 06:59:32 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , Andrew Jones , Eduardo Habkost , Thomas Huth , Marcel Apfelbaum Subject: [PATCH-for-7.0 v4 07/11] tests/unit/test-smp-parse: Add 'smp-without-dies-invalid' machine type Date: Mon, 15 Nov 2021 15:58:56 +0100 Message-Id: <20211115145900.2531865-8-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211115145900.2531865-1-philmd@redhat.com> References: <20211115145900.2531865-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1636988377114100001 Avoid modifying the MachineClass internals by adding the 'smp-without-dies-invalid' machine, which inherits from TYPE_MACHINE. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- tests/unit/test-smp-parse.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index ff61da06e3d..dfe7f1313b0 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -487,6 +487,17 @@ static void machine_base_class_init(ObjectClass *oc, v= oid *data) mc->name =3D g_strdup(SMP_MACHINE_NAME); } =20 +static void machine_without_dies_invalid_class_init(ObjectClass *oc, void = *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + + /* Force invalid min CPUs and max CPUs */ + mc->min_cpus =3D 2; + mc->max_cpus =3D 511; + + mc->smp_props.dies_supported =3D false; +} + static void machine_with_dies_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -530,11 +541,6 @@ static void test_generic_invalid(const void *opaque) SMPTestData *data =3D &(SMPTestData){}; int i; =20 - - /* Force invalid min CPUs and max CPUs */ - mc->min_cpus =3D 2; - mc->max_cpus =3D 511; - for (i =3D 0; i < ARRAY_SIZE(data_generic_invalid); i++) { *data =3D data_generic_invalid[i]; unsupported_params_init(mc, data); @@ -542,10 +548,6 @@ static void test_generic_invalid(const void *opaque) smp_parse_test(ms, data, false); } =20 - /* Reset the supported min CPUs and max CPUs */ - mc->min_cpus =3D MIN_CPUS; - mc->max_cpus =3D MAX_CPUS; - object_unref(obj); } =20 @@ -607,6 +609,10 @@ static const TypeInfo smp_machine_types[] =3D { .class_init =3D machine_base_class_init, .class_size =3D sizeof(MachineClass), .instance_size =3D sizeof(MachineState), + }, { + .name =3D MACHINE_TYPE_NAME("smp-without-dies-invalid"), + .parent =3D TYPE_MACHINE, + .class_init =3D machine_without_dies_invalid_class_init, }, { .name =3D MACHINE_TYPE_NAME("smp-with-dies"), .parent =3D TYPE_MACHINE, @@ -626,7 +632,7 @@ int main(int argc, char *argv[]) TYPE_MACHINE, test_generic_valid); g_test_add_data_func("/test-smp-parse/generic/invalid", - TYPE_MACHINE, + MACHINE_TYPE_NAME("smp-without-dies-invalid"), test_generic_invalid); g_test_add_data_func("/test-smp-parse/with_dies", MACHINE_TYPE_NAME("smp-with-dies"), --=20 2.31.1