From nobody Mon Feb 9 13:37:36 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=1639660850; cv=none; d=zohomail.com; s=zohoarc; b=ZGtYYWx51jwk7MIkvhaEi/mjB4vpUs+IKDqF3IWmo0a2t7hSXFRG1TZRzdj/k1RMUHHFpGHTXhnSYGsbl4aK7qLCHeG40qfPePkkQo08vCaQ8otBUQLpwCgunOdBvnctSsg+KIXvGCDswH2WRIujZoSS+OuQLQ/xTdR4q1jrbIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639660850; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=HqXPiCt79z3PGUD6iKjmKupwIGk6gXPKMLdUw9UGyco=; b=RIo/CeahyzZaNM8qhj8QEybj4CvehVyCcEVxil/LLeV/YfKBB0UEud5AFAsZPu2DxaIxHWaMeY37elplCRjnax38KxEZOLyRia9Nu3INrOP6ap5ce2gzc53qWYGWHuFO3Zj9sTL+OJBEGru7cDn77j7WpiGOsSiQAVBplZZ1a70= 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 1639660850444516.219430276036; Thu, 16 Dec 2021 05:20:50 -0800 (PST) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-628-9iPv4rpRPEWznthgfZdE0A-1; Thu, 16 Dec 2021 08:20:48 -0500 Received: by mail-wr1-f69.google.com with SMTP id v17-20020adfedd1000000b0017c5e737b02so6894278wro.18 for ; Thu, 16 Dec 2021 05:20:48 -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 f18sm4663357wre.7.2021.12.16.05.20.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 05:20:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639660849; 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=HqXPiCt79z3PGUD6iKjmKupwIGk6gXPKMLdUw9UGyco=; b=OV8BX+MG6muGqbBNUaGIrtii6URCrsNFVfdHRbY8T4IOn4GBfK3ZVs1ROMtNbjXHJtjPnW stvqnpIcCIKYhvxLhFDYffBBktw0uZ9xVwWFi8vvO4H+FLm4hCpIC0akKuoBrgeAlgZA3e e3QSU5QfQwKHBTKBRXIQ/sHL/ZEssr8= X-MC-Unique: 9iPv4rpRPEWznthgfZdE0A-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=HqXPiCt79z3PGUD6iKjmKupwIGk6gXPKMLdUw9UGyco=; b=Nf9aGAbZYOnlUDjlTiRvMJiEuZz39z+oAy2N6FklF6r4GjIEvXCvRCiC0SCoNQXGnK iBgf1UzB0KPcm70/V0jscF/KOnYswjO6EsKdiNkZLBwTZQCvMOgchqGYW6DvuAc94KTO MbEmSWi4ir5UV/6B9dPtluJcN/eH4+A6GJMx91NW/tqWfwVxoeAcb7zLIC0t9T3Oy+P+ uOC6UPl84ZPg99T4b9Zjo3RF9g6GnPcKDk7dBdZjHQgltDOxmzxZaONmzL51bZhI+7a+ vwe93fXOWkjeflTixsq9yrj3swsk0K6Z7LSatxtkZHcUgib8Bgr2oxOAhwUlMVcl6VwM 7Hyg== X-Gm-Message-State: AOAM532NqnvZDdlS8foK0DLLM/M6Kxx52dzqC50JmWn4irjW+zHr84O7 MDC64vlUScIPoAbvwx9aNDDxAyYFUYiaWo3HAiPHrh8zbQJ6T5wbcw7sW350VT7WqPzeb1ki6bL 91GI63QsoiD1Rvg== X-Received: by 2002:a1c:e915:: with SMTP id q21mr5156149wmc.94.1639660847147; Thu, 16 Dec 2021 05:20:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJzTfBEZYFWlOjEVkuNxIRychZ9SzNiZ9yOpxrRedeLrrvVnM2qwi8cxU9rFC8MNaw+Ay9QUcg== X-Received: by 2002:a1c:e915:: with SMTP id q21mr5156131wmc.94.1639660846988; Thu, 16 Dec 2021 05:20:46 -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 Subject: [PATCH v6 5/8] tests/unit/test-smp-parse: Add 'smp-generic-valid' machine type Date: Thu, 16 Dec 2021 14:20:12 +0100 Message-Id: <20211216132015.815493-6-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: 1639660851544100001 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 Reviewed-by: Yanan Wang --- 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 47e11089e22..b20bf2c2359 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_generic_valid_class_init(ObjectClass *oc, void *data) +{ + 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_generic_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_generic_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