From nobody Mon Feb 9 18:18:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1639660841; cv=none; d=zohomail.com; s=zohoarc; b=VQG7UQHbqYEi0yIBunNCbcNcRUdMBWqBJTgYM8lyXJAnD2Q3XN6LQ+EkPz1qPz7buthVU8PRopQYMa+PWVflnZeGi+tf9D5TzlR2Gs/P0OPnuHq0H/1ru+arTiR/1032hWgsil9wCDTC/qCFY+y/yQP1x8vCOjmhUkY8MiuDwmU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639660841; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=1chFsAOK0rTvA7TehLOkyqZafZUrvfp4t7SGxNleGGw=; b=bG/dKPp1ILv0XC9I1abEWoLZsv6LFVdXUpaq363eEH7+6ndz5Chutz2efKhIEokHzDxRCKXCDsxRkcE0ch5qmCFWiceB/+ufh12DbEiLnHGXc6UFqBSPCEk2935GJtv6QuCZF/81L0uaX0mGxWSZurOuVST7k45Qwinc+Cneqp4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1639660841636255.55655389236097; Thu, 16 Dec 2021 05:20:41 -0800 (PST) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-214-e_CLlFcpMlm6fqb0fq114g-1; Thu, 16 Dec 2021 08:20:39 -0500 Received: by mail-wr1-f71.google.com with SMTP id p15-20020adfaa0f000000b001a240b45c1fso610711wrd.4 for ; Thu, 16 Dec 2021 05:20:39 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id t11sm4597752wrz.97.2021.12.16.05.20.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 05:20:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639660840; 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=1chFsAOK0rTvA7TehLOkyqZafZUrvfp4t7SGxNleGGw=; b=UKeLArtn1mF4w2MoUm378xRwmxnSMd/SuSSe66zY/2yCyDizXpks/xeLCZvFQQC8YLAnm7 /Rw3I8iFGoESb/qncik8hxgtxTi9Y1ENAzja0CFd814To3GP0bpv9hEbQD3pRH2GuKalmd 0YJORsljHTNI7tNRkU3nkq20FkOZMQY= X-MC-Unique: e_CLlFcpMlm6fqb0fq114g-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=1chFsAOK0rTvA7TehLOkyqZafZUrvfp4t7SGxNleGGw=; b=2u661LAh5/pRU39T/wb/pT8MbjfniQptigX1E8VI0lP7OCAdjHyO2Ruxg36syM3x4n lMu2Hw6p2qs500i5dYj7IpTZDngHnhVYvTuZArfkcKm2fwHABQrgMzufatNmPUZTrwaY V5o0Yd0hlOPY57H9fPa4v2tc5/3M7zRpUyImty8EqU1HssTtRBOhfRKsDy3XSKyk228V HHsNa0TMJ8CEZtIlOI7Aje9egtcKxEzzIXbnJIrCcuCOy2iFtunnT6wIxvEGcbS/65wC DUrIzzyl3a1GQy4mCvm1NIXsriLHSPH1ekiSlkP5vRDUIFpdP+c767jSrnmMPV0bfpaG 2wjg== X-Gm-Message-State: AOAM531zCIIzrXvX0CbL8OvJ6tggNqsiiU6ecg26kwyZo/U/jF/A5JBZ RmAOu7KkWLnxhNeeBZdGkcBm6USaWF1GYwZJJqFYeD5kXCPkVd8F8sDlTKZaCyoNILRxMPIomyL iapbIzlRJa3bs+Q== X-Received: by 2002:a05:6000:104c:: with SMTP id c12mr8638539wrx.588.1639660838492; Thu, 16 Dec 2021 05:20:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJz9FyDLN2KLSJxbfwjviG1yY8ZaRuGTvyxYv7cYvz73wWlktpKvitGPeP6AifT0+LQF5uwrZQ== X-Received: by 2002:a05:6000:104c:: with SMTP id c12mr8638525wrx.588.1639660838335; Thu, 16 Dec 2021 05:20:38 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Richard Henderson , Yanan Wang Subject: [PATCH v6 3/8] tests/unit/test-smp-parse: Add 'smp-with-dies' machine type Date: Thu, 16 Dec 2021 14:20:10 +0100 Message-Id: <20211216132015.815493-4-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211216132015.815493-1-philmd@redhat.com> References: <20211216132015.815493-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: 1639660843887100001 Avoid modifying the MachineClass internals by adding the 'smp-with-dies' machine, which inherits from TYPE_MACHINE. Reviewed-by: Richard Henderson Reviewed-by: Yanan Wang Tested-by: Yanan Wang Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/unit/test-smp-parse.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index 425ed6b6b92..f66cf7bb598 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -487,6 +487,16 @@ static void machine_base_class_init(ObjectClass *oc, v= oid *data) mc->name =3D g_strdup(SMP_MACHINE_NAME); } =20 +static void machine_with_dies_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + + mc->min_cpus =3D MIN_CPUS; + mc->max_cpus =3D MAX_CPUS; + + mc->smp_props.dies_supported =3D true; +} + static void test_generic_valid(const void *opaque) { const char *machine_type =3D opaque; @@ -548,9 +558,6 @@ static void test_with_dies(const void *opaque) unsigned int num_dies =3D 2; int i; =20 - /* Force the SMP compat properties */ - mc->smp_props.dies_supported =3D true; - for (i =3D 0; i < ARRAY_SIZE(data_generic_valid); i++) { *data =3D data_generic_valid[i]; unsupported_params_init(mc, data); @@ -588,9 +595,6 @@ static void test_with_dies(const void *opaque) smp_parse_test(ms, data, false); } =20 - /* Restore the SMP compat properties */ - mc->smp_props.dies_supported =3D false; - object_unref(obj); } =20 @@ -602,6 +606,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-with-dies"), + .parent =3D TYPE_MACHINE, + .class_init =3D machine_with_dies_class_init, } }; =20 @@ -620,7 +628,7 @@ int main(int argc, char *argv[]) TYPE_MACHINE, test_generic_invalid); g_test_add_data_func("/test-smp-parse/with_dies", - TYPE_MACHINE, + MACHINE_TYPE_NAME("smp-with-dies"), test_with_dies); =20 g_test_run(); --=20 2.33.1