From nobody Tue Feb 10 01:15:47 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=1639660846; cv=none; d=zohomail.com; s=zohoarc; b=bv8//JBAj2EgusfahH0YGke63QvIAhw+ntibCXVra0jKMx8bDfp9yxEC24mnWh3rLI4qCl0McHrQKzXpXJ61LMG+P5x/tQZNIV9oh5FMxmBnlsOPbBQClNDytvf1Qozox4KZdJ3ORTekaGgkZivI566syDYNZi4a0bg884u7vJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639660846; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Jq9mjYYb0qGdPqgYaDEj1wSgWHxTePfmSvB1yYAydck=; b=ElunEXwo126GEAj0RhMCcUYv892SOy9e5F6uUPe4AEZI1I2tWcRRFyiiX0cjvq2tvCuTTYY4VdT/MCCwd9W/2Pd3FAbvQqBYbLDguV9bmQImYKlETd1Y4twtg9PMS4OfGkHzFDcsU8V2KBszdp9WkJKoMO2AxXSP9EmX4ZuH+I0= 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 1639660846312616.8998698435267; Thu, 16 Dec 2021 05:20:46 -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-544-p5i3vljYO1mhR3jFhcktWQ-1; Thu, 16 Dec 2021 08:20:44 -0500 Received: by mail-wr1-f70.google.com with SMTP id h7-20020adfaa87000000b001885269a937so6956582wrc.17 for ; Thu, 16 Dec 2021 05:20:44 -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 j18sm10293444wmq.44.2021.12.16.05.20.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 05:20:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639660845; 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=Jq9mjYYb0qGdPqgYaDEj1wSgWHxTePfmSvB1yYAydck=; b=SL2EdyvhbwMcdBWrmK1gtkypcMOKOX9pJqV6BTryHD+HhKX9dscs7QcITW4w1suHbS5B4W 9Bbogv0Hbp6FKCumwLM0qv2owiN+e9QNV0aM5jb0pouHPAPBElJChO+ZaCinH4NQuSUKGf WN5EfygwrigmIZFVNJnBMlh3gKEfbOU= X-MC-Unique: p5i3vljYO1mhR3jFhcktWQ-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=Jq9mjYYb0qGdPqgYaDEj1wSgWHxTePfmSvB1yYAydck=; b=YY+/8tjelIwIVJJoscLAB1gnj9j3UiwXg9MmogblTuLh6be5WFqoEE0fr36ZZGNr5S JQceXVtSqS8oElaX+cB5aPrCh0uiNP0Vqi/ZhHNZTzQjUbc+NFkryjpo+kTff0WzJj71 LD2fvbVGSDxgENxpSr/nJN3dInDF7vyBURMRCQPoE8a/uBDQwDlV9Gf/Tg/kjmx99xFH FV8E/cE00ma9b+OZwGm7+3T9rbMTQK/HdqtUQEfLC5PhKvvy7nK1LgG4gLTaGXaB53fR GGel6XWtKQRxe8Kki8JOUNr9z+pYezwhGMSjeR0TWsUPVzM4PmUciumdArlK2DJaPqpl sGqA== X-Gm-Message-State: AOAM531czw8tSyrNZlJgcdzrGGpESM1Dw/5dvJfQvPabvLbxD/8PUoma hYmVtfUFdf4sz8PKUQMaSo5bbdtohWyWxFZobypxaehtHK1ew/MuUtGk2uKXJx59SenN/ztLIfT irSlf7e/T29k1+Q== X-Received: by 2002:a5d:50c7:: with SMTP id f7mr8721523wrt.327.1639660842816; Thu, 16 Dec 2021 05:20:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJxC9x+fuE0iUTpPPeFN3hAmrvHgs+mtnao9AhdPvImgRKlxsxQmddMWnfRev9Gzspys9TuanA== X-Received: by 2002:a5d:50c7:: with SMTP id f7mr8721510wrt.327.1639660842620; Thu, 16 Dec 2021 05:20:42 -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 4/8] tests/unit/test-smp-parse: Add 'smp-generic-invalid' machine type Date: Thu, 16 Dec 2021 14:20:11 +0100 Message-Id: <20211216132015.815493-5-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: 1639660846919100001 Avoid modifying the MachineClass internals by adding the 'smp-generic-invalid' machine, which inherits from TYPE_MACHINE. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Yanan Wang --- tests/unit/test-smp-parse.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index f66cf7bb598..47e11089e22 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -487,6 +487,17 @@ static void machine_base_class_init(ObjectClass *oc, v= oid *data) mc->name =3D g_strdup(SMP_MACHINE_NAME); } =20 +static void machine_generic_invalid_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + + /* Force invalid min CPUs and max CPUs */ + mc->min_cpus =3D 2; + mc->max_cpus =3D 511; + + mc->smp_props.dies_supported =3D false; +} + static void machine_with_dies_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -530,10 +541,6 @@ static void test_generic_invalid(const void *opaque) SMPTestData *data =3D &(SMPTestData){}; int i; =20 - /* Force invalid min CPUs and max CPUs */ - mc->min_cpus =3D 2; - mc->max_cpus =3D 511; - for (i =3D 0; i < ARRAY_SIZE(data_generic_invalid); i++) { *data =3D data_generic_invalid[i]; unsupported_params_init(mc, data); @@ -541,10 +548,6 @@ static void test_generic_invalid(const void *opaque) smp_parse_test(ms, data, false); } =20 - /* Reset the supported min CPUs and max CPUs */ - mc->min_cpus =3D MIN_CPUS; - mc->max_cpus =3D MAX_CPUS; - object_unref(obj); } =20 @@ -606,6 +609,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-generic-invalid"), + .parent =3D TYPE_MACHINE, + .class_init =3D machine_generic_invalid_class_init, }, { .name =3D MACHINE_TYPE_NAME("smp-with-dies"), .parent =3D TYPE_MACHINE, @@ -625,7 +632,7 @@ int main(int argc, char *argv[]) TYPE_MACHINE, test_generic_valid); g_test_add_data_func("/test-smp-parse/generic/invalid", - TYPE_MACHINE, + MACHINE_TYPE_NAME("smp-generic-invalid"), test_generic_invalid); g_test_add_data_func("/test-smp-parse/with_dies", MACHINE_TYPE_NAME("smp-with-dies"), --=20 2.33.1