From nobody Mon Feb 9 13:38:34 2026 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=1639586967; cv=none; d=zohomail.com; s=zohoarc; b=SXy5lgCgWOw3ytAUAZqH/nJLTUQwFn/2kUEfI/8iVXYp2qJbq1olPrBKwE8sT0gzYZQ2FKtHwr0sDvRSIM6Wzm1CSL3sTDgVRSl4kXS9Wmky/s5qSWGurLpV72mkx5yIJaFxcRVMydCLdR1lF26M0FO/tdf+D0ecvXYyVm47y90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639586967; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=gzBQu4QmY83ZJxn/RGUigkeYNejwi9D3HBZlC+kt004=; b=fjVXxMCf+79zWPWtU0m9qGWtpdcdK/CHgnul5X4NRW4+cmq9me0tTF6ZrYSnqmI1QzxyWKo2uWQwuZB71I2NCClOZsS0yZW1PVvt6TcpWWFDk8n/51UrpMTX1jjjp8ZLI8tfCDXfdJ4R/Im6aBOqzktwUSCSalX730R3GX7tO0c= 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 16395869672051009.7260792211604; Wed, 15 Dec 2021 08:49:27 -0800 (PST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-351-dEOdfG7dNDmzXhgCsIfSFg-1; Wed, 15 Dec 2021 11:49:25 -0500 Received: by mail-wm1-f72.google.com with SMTP id k25-20020a05600c1c9900b00332f798ba1dso14893143wms.4 for ; Wed, 15 Dec 2021 08:49:24 -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 g18sm2470449wrv.42.2021.12.15.08.49.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Dec 2021 08:49:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639586966; 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=gzBQu4QmY83ZJxn/RGUigkeYNejwi9D3HBZlC+kt004=; b=SrsmXejsc7wI3y917n/+Cep/siU5L/b+DcMmAdP6W5fp8yGUYFMwIpR2gkadaczbjWSMGd OW1iGG/T2hwd1IBxvtxzB3hw2AB7H4/RnT9G8Wqb9pttT80NCv6rQ9RaSdfsLODfaMD7a6 585nSnfF5fciLmya+2ioufUZSgJSqZ4= X-MC-Unique: dEOdfG7dNDmzXhgCsIfSFg-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=gzBQu4QmY83ZJxn/RGUigkeYNejwi9D3HBZlC+kt004=; b=uG+U/BTUytVw4pPczWbfC/595vwz3r3s51IvpDpCxo1ubGtqx7yjDXpj93JJwdDbI0 ENZdPHYepXPEmL4oDRAjLh3aartgOZ+fibBgG9P053jMhn3s8VsD4pZIHGtnPDRyhhtH 560C3R1grFWUCZgcJhlbd7jXNC8l665cIUV+1APdTCPTUMolXzUJXGI0XfpV6aXO+pWk EejhEeHHEL4vUrayV2W+uTfaW2PBoiwLkcf8/FV/JFJJcL4k42NTED7DWnKVhaMelS5j +OL6BLnL52yIUtFUpc/opR1+wZ/5pBi4WT5YT6DdNCH+sy3Lzo7PJhGXn8zyjBIEIohx ZMxg== X-Gm-Message-State: AOAM530fWZX0va/f4U8zQqktAxBhzcL239nNSpfqk+8xHgQ0x6pqeK+Z jTKgQdIm0HSMJIeIOFD6iDr4sOIsPmM6bl7TKoQMhX0qpxJr9lrCKO+aAGCu1krXy5T5dDVv7d4 vAao7mAn9/FSi4w== X-Received: by 2002:adf:9cc4:: with SMTP id h4mr5178900wre.644.1639586963834; Wed, 15 Dec 2021 08:49:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJwXuiAJUWKwJjDdKhC6tiSLXZKZVSJVpPsjSjHdVdioz1ncOuETMqAfL+zESKB3gKAuPP+www== X-Received: by 2002:adf:9cc4:: with SMTP id h4mr5178890wre.644.1639586963692; Wed, 15 Dec 2021 08:49:23 -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 4/8] tests/unit/test-smp-parse: Add 'smp-generic-invalid' machine type Date: Wed, 15 Dec 2021 17:48:52 +0100 Message-Id: <20211215164856.381990-5-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: 1639587003814100003 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 --- 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..72e7236afd9 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_without_dies_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_without_dies_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