From nobody Mon Feb 9 16:12:55 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=1639586962; cv=none; d=zohomail.com; s=zohoarc; b=Y7cigERVUGX+ZKVAT9uzTMH31TOxtFTD7XSehUinFRKUnALJIKM+sYV4gq5+5OLRc/ppvYOEh3AbcJMJ9xIUYTtwgBATtKqu290F/991VyxQqtyVQqw1/2+tV9NkaEy4YEJ8f5LSYkxuQvOEIUa0jTzUKjeoo+vicKWw6Y1loVM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639586962; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=1chFsAOK0rTvA7TehLOkyqZafZUrvfp4t7SGxNleGGw=; b=aBIrwFmp4CA8cnbbrXpGlTgV45IZc/eCkuTIQP6TjHK1w97x378KQBg3Bz7e3axg7l/n1qAB/kXsBMWk0yDjCjvRp7zlvODFiaj8MHBO9HLLCWwo816NaP5Mn9B2Lj4SMo511XFEQnw/TuI+eznMhz9TAoDxU4OTp11n9hnk2B0= 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 1639586962866102.4116387382818; Wed, 15 Dec 2021 08:49:22 -0800 (PST) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-350-cBHV7Y9SO2SyPqk2RI4HvQ-1; Wed, 15 Dec 2021 11:49:20 -0500 Received: by mail-wm1-f71.google.com with SMTP id l4-20020a05600c1d0400b00332f47a0fa3so9237625wms.8 for ; Wed, 15 Dec 2021 08:49:20 -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 g198sm2770354wme.23.2021.12.15.08.49.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Dec 2021 08:49:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639586961; 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=CGdHdzBN8pWu93Mub35Bdupg4hi7zTxbKH4B1gN1+VKeRoCOpg/EO0txZGjYvbDQkE+0ly cWQ359xpYcjT7ktu7xviYOTruipSlCs1i0EAjbCCUI3HHfYt5jUiXbXQo2cKUDR6fT27En TTgYYKREOJLSaKPMMr0Mhj4pclTY4Ao= X-MC-Unique: cBHV7Y9SO2SyPqk2RI4HvQ-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=WACSlSy4ZlPjr2emcEtZbDE7ioSBXQikgZBBDFuH/CkCl6shlAW+fTLZiZABk0QJQ/ nzHbbhYYcIeQ58DbTsAk0je3AWFWFD1pC6dkyRLWAicUWjDXSeVlHmd0ArSYOlkh1qFO P+bi/u3JW7UbzIL+psMkxKgmsHtJ7CzkvMv5VuMltCej8gQnKjRPccJ/FBISFPd1GDcb oMYCGn4oHsD/dP8z9ihNTsB4wy990OM1pd+SaRW2RztBzA8D1T4qLtjD7FQN1hDBK//Z 0KsA2evdVh02uM8JmS9NFvjbzLIr9tmYaXFc20s2NPW+dCG+179zuyDGM8hCHnEttqWH TatQ== X-Gm-Message-State: AOAM532lxx0Jzg1FtKsA3YyCeSEHuOPKCYNFc9Z6K1IqLN7EDDc1781E 4J+dGxrDgsbGJ3D5b4tW1QGEmTEPK/3H59R8FEvmcyz+fR8X/CpZ1BtMCDPuJc8PE70MpH1noIF rxJTxtINDTC33Sg== X-Received: by 2002:adf:f252:: with SMTP id b18mr2219703wrp.341.1639586959504; Wed, 15 Dec 2021 08:49:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJzvMe099VeiUOsjwqp5vjLQgdbQE2t1ELl+aWSPW++zwyoBgykdmWf3GfuR9CnXjG1nkowesw== X-Received: by 2002:adf:f252:: with SMTP id b18mr2219686wrp.341.1639586959359; Wed, 15 Dec 2021 08:49:19 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Yanan Wang Subject: [PATCH v5 3/8] tests/unit/test-smp-parse: Add 'smp-with-dies' machine type Date: Wed, 15 Dec 2021 17:48:51 +0100 Message-Id: <20211215164856.381990-4-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211215164856.381990-1-philmd@redhat.com> References: <20211215164856.381990-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: 1639587001658100001 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