From nobody Mon Feb 9 14:37:52 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=1639587017; cv=none; d=zohomail.com; s=zohoarc; b=NsxXzuz8KbJJokH7OMsxo+l7WHnoIMp8AWkzwR9/q5IeTJU7SMB4yHGrVEY6FEyOBy2hlM9K+ql3gZjfKUTUe6+tRUp/ckcoDjCBGtGX8NryCTC1yGzwCanfFJqzhAODN+MAK2g9taZpa2L+m3nWciHa6lUv6T0FfzzcsV2ydpc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639587017; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=TZ3gZVz3PQYnFV6233ldFCcy6QtI3ljXwdYY5S65e7Q=; b=WQY64B1Mbu+uT9egY+Q4zL/YjS9EopNtxX6C2qafOJ0omtKCL1TQPXY+z+XoYp3JWEHsi6oLVaesdaEJT82dRJOoEoYr4YhcmUoDclUN2WHIIRl8XfAjrC04MDl9WdQs4URe8K2zmZ+dLfy/rYVOwb187WvVyGQsu+8RC6EGvIo= 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 1639587017853551.0828305038672; Wed, 15 Dec 2021 08:50:17 -0800 (PST) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-502-RCMw3HeiP86E3_SQvTf-xg-1; Wed, 15 Dec 2021 11:49:29 -0500 Received: by mail-wm1-f69.google.com with SMTP id l6-20020a05600c4f0600b0033321934a39so9255432wmq.9 for ; Wed, 15 Dec 2021 08:49:29 -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 g7sm2096280wrx.104.2021.12.15.08.49.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Dec 2021 08:49:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639587016; 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=TZ3gZVz3PQYnFV6233ldFCcy6QtI3ljXwdYY5S65e7Q=; b=V1Io5UtfFG2elKTVNHXcNL3ux+R00CEgWVpJwWxJC6sfj4SS1HvxQaYtiTsdxX/rq50lXr Z++FmJvNVAcZhv31VwrYMCCJR7L5NEXNW1yJzjh0J1GOD4J8vsESvGAPXC3zKY56RctimI Vz5qGY0bB8zUPUhtB3utjhslYkIJUYk= X-MC-Unique: RCMw3HeiP86E3_SQvTf-xg-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=TZ3gZVz3PQYnFV6233ldFCcy6QtI3ljXwdYY5S65e7Q=; b=M+0I7noAaAxW6qXYGxNCqyfmjYWCZeOlGnX6tW9VZRuLWlGmUi+8iSQNdMYH1UuxQC 9roIzMvKkzOAlKmY3GORKJ4kKzJTgL01YhAOV0LH9/69yOqsQTTi492qS1B0F0snXlNz WrwKTMBlH9c3gKhfD6L/DHkYaco0Bu0mmhE9NfKqZD0GmM3P7dlKaoT+Fka1pDqBOT0j ir08R3RAPnD3CjAQalfz9RkmfL8/2QvaLgbLWqRAzERhGln9zdzZzHUIG+zuQPPh60QX bEtH/b07qZAsWwFJEMXmy5YNWdHXPv+pEDSi5B8M/FCA4mGNu1qa7BseARlK/IJdjBao f2zg== X-Gm-Message-State: AOAM531pOTPdnxZdGvVRFifyEZjXkMLlPscQsiumBpriQCCrrxdL5UuN j6587KukeFHQwXTaZuR4WGYE2hjUCXJYRDq8BQI1WL8hvaNyzDh88MPAIekgetO5RlyY4NkFoO4 Ljlnz361wSqRfOg== X-Received: by 2002:adf:8b0e:: with SMTP id n14mr5006020wra.281.1639586968208; Wed, 15 Dec 2021 08:49:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJyLZRNl/QXAWmtQyPA9iurspmt/Cty8dTXKkBrflwruYnS/bfbzLrk4O0fEL1keu3xvvP4sWQ== X-Received: by 2002:adf:8b0e:: with SMTP id n14mr5006013wra.281.1639586968057; Wed, 15 Dec 2021 08:49:28 -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 Subject: [PATCH v5 5/8] tests/unit/test-smp-parse: Add 'smp-generic-valid' machine type Date: Wed, 15 Dec 2021 17:48:53 +0100 Message-Id: <20211215164856.381990-6-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: 1639587029444100003 Keep the common TYPE_MACHINE class initialization in machine_base_class_init(), make it abstract, and move the non-common code to a new class: "smp-generic-valid". Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/unit/test-smp-parse.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index 72e7236afd9..5349ae14824 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -478,13 +478,19 @@ static void machine_base_class_init(ObjectClass *oc, = void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); =20 + mc->smp_props.prefer_sockets =3D true; + + mc->name =3D g_strdup(SMP_MACHINE_NAME); +} + +static void machine_without_dies_valid_class_init(ObjectClass *oc, void *d= ata) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + mc->min_cpus =3D MIN_CPUS; mc->max_cpus =3D MAX_CPUS; =20 - mc->smp_props.prefer_sockets =3D true; mc->smp_props.dies_supported =3D false; - - mc->name =3D g_strdup(SMP_MACHINE_NAME); } =20 static void machine_without_dies_invalid_class_init(ObjectClass *oc, void = *data) @@ -606,9 +612,14 @@ static const TypeInfo smp_machine_types[] =3D { { .name =3D TYPE_MACHINE, .parent =3D TYPE_OBJECT, + .abstract =3D true, .class_init =3D machine_base_class_init, .class_size =3D sizeof(MachineClass), .instance_size =3D sizeof(MachineState), + }, { + .name =3D MACHINE_TYPE_NAME("smp-generic-valid"), + .parent =3D TYPE_MACHINE, + .class_init =3D machine_without_dies_valid_class_init, }, { .name =3D MACHINE_TYPE_NAME("smp-generic-invalid"), .parent =3D TYPE_MACHINE, @@ -629,7 +640,7 @@ int main(int argc, char *argv[]) g_test_init(&argc, &argv, NULL); =20 g_test_add_data_func("/test-smp-parse/generic/valid", - TYPE_MACHINE, + MACHINE_TYPE_NAME("smp-generic-valid"), test_generic_valid); g_test_add_data_func("/test-smp-parse/generic/invalid", MACHINE_TYPE_NAME("smp-generic-invalid"), --=20 2.33.1