From nobody Tue Sep 9 06:59:11 2025 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=1640954909; cv=none; d=zohomail.com; s=zohoarc; b=c66gm/2f3MzCXIVc2SnMaiwDdDG60B4dXHTKjgS+RcRUoSt6nAt2gnk3Y/F3ENlazpcYb9Fracx6JuePsW1HpZ9aAvx9+fCn/m6o797fzw709RdQg68MIspJZ4fSLsAQAwG1LjzEfb/KpLrWHJNLYM6FiNsYFClK7kL2pRLXdYE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640954909; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=LZnXNA41P8rnHQZzG3aZIcc3lAwNKADYkmB/wiXRFOM=; b=KgbRN1VvfFnCUqUvMw+xN3t0RJ88CL3zVh4aX0TW/6xx/vrlFnoSUokttbREg0nMWkut16AvsZfA2Q4oDycCMqh3Wgcbm8ih/Ph8fXHEdTgRspl97Q0m5kd4VfFeQtfG+G2X1S+E3uj1jGtTyDi5qTAeixRRAfdBvUaZ1UOuNW0= 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 1640954909354717.1646987245413; Fri, 31 Dec 2021 04:48:29 -0800 (PST) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-553-Sl6t0Gm3MXaOMEfQ1W3XAw-1; Fri, 31 Dec 2021 07:48:27 -0500 Received: by mail-wr1-f70.google.com with SMTP id d13-20020adf9b8d000000b001a2aa837f8dso7537615wrc.3 for ; Fri, 31 Dec 2021 04:48:27 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id o12sm26897129wrv.76.2021.12.31.04.48.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Dec 2021 04:48:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640954908; 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=LZnXNA41P8rnHQZzG3aZIcc3lAwNKADYkmB/wiXRFOM=; b=AGPsh1Vxqy2YJsgeEP7nbDnr/qPp5iRFKcOoG+PHu51uJ8syrw+7i1iAA06BE9UsE0BFGj 2TOPZ96uPfU3ORBgsQlugI9YWNYvXeUhRq0QBdZiddlsPsvFuJmvUmfybK1m/L6GlYoEvN EcG8DXjWSAzU3fkzYy8hMVdIDJWpvNQ= X-MC-Unique: Sl6t0Gm3MXaOMEfQ1W3XAw-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=LZnXNA41P8rnHQZzG3aZIcc3lAwNKADYkmB/wiXRFOM=; b=byugPFCT3l05Y7elk0fYXSryHIGjSabY25mVrGCgRaBE0dB+E0TCJCP+WBaNfCAs3R SUpbg7XWYDXX8Tzo2HlkRzHoffM/kMHZRWfgGPaDGEJHpBMsQb4tBcGGVtrunHm55ex/ qrCyDGSm5PdwtAbEOiIUHtL/NnDqlAGjwxHf4c0Djzo4dJLqfaLHKVDqjPXIlD8pmp7Y YWKSsAJVtmLAXABc95qta55SHpal/rIqctOI1IjmNIa2iMer4UkVDID84VgBcxr/OXoH OPFViQdSznKCRGuNZy4avdwVLtThlx78XazeZsHkczJ67hRKkmMJ2dTlBVyhwG85HFqg uJlA== X-Gm-Message-State: AOAM532fahtZVRdVnBY0kFI01Fa68Zn1Nu5TMjHp0NQpFrFkTglDTs5l 0Wse20hloAXQ3qcR7pLnEmXX2x7M8cZFa5pyPwc0qSyvY77RHMHHqI1jJrNwQbDj47b0EN35TwJ N8t2TXJ9l+iuKMQ== X-Received: by 2002:a05:600c:1c26:: with SMTP id j38mr29484086wms.101.1640954906387; Fri, 31 Dec 2021 04:48:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJwyKs2Fn/4Ysvytqby1xZZsHJbDEmw2T9jWMcZMHMLmEooeT9Tc58gFht5kTWivmv8ogzCxsw== X-Received: by 2002:a05:600c:1c26:: with SMTP id j38mr29484075wms.101.1640954906190; Fri, 31 Dec 2021 04:48:26 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 07/20] tests/unit/test-smp-parse: Add 'smp-with-dies' machine type Date: Fri, 31 Dec 2021 13:47:41 +0100 Message-Id: <20211231124754.1005747-8-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211231124754.1005747-1-philmd@redhat.com> References: <20211231124754.1005747-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: 1640954911450000001 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 Message-Id: <20211216132015.815493-4-philmd@redhat.com> --- 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