From nobody Tue Feb 10 01:35:49 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=1636988367; cv=none; d=zohomail.com; s=zohoarc; b=hhxsR32N+PDfSNo4X6yKZCTAwwE6gTSxOTAwtC3b3j+Z/T7IITlrGluzIO8/oc3D5YXBd3VLb9xwUGdgfftKNwya9fNgi+qCanxwWxFuVpU/4T6MJGXjCKLIA4Pa7ZImPsGJmOtYHa173UcGfbWYv15y2EMIl553JVpAhSbVIgg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636988367; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=gF1s0KbAL9b83AB6/JlbAHqywgqU7lOR4NhlFP3KFgg=; b=fSzECkyrw6DqduOKyQvAycCa4Frekkl/5p3Cf5UbDlqiHlcWFIcstT0XnudHXW5OLYkymYaqhZiy1tTbEEInCCe4LpwjefBylYYFY7xitfhTsWSExKun7MXyK1BS+wqtnCCxu7pytXp39Ey/Q5ggM036RjiwGarhWWAuxqBgD1M= 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 1636988367772540.7144922830369; Mon, 15 Nov 2021 06:59:27 -0800 (PST) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-210-H5i-IobHPg-dS6_zG3FH4w-1; Mon, 15 Nov 2021 09:59:25 -0500 Received: by mail-wm1-f70.google.com with SMTP id 144-20020a1c0496000000b003305ac0e03aso9740820wme.8 for ; Mon, 15 Nov 2021 06:59:24 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id d15sm20289354wri.50.2021.11.15.06.59.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 06:59:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636988366; 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=gF1s0KbAL9b83AB6/JlbAHqywgqU7lOR4NhlFP3KFgg=; b=cy2OEnuTRuwnbJtQVSpL1cS2O8A8lJEdoXNuCVUaBHP65zobighyd7hhx1BtbVO3azEgyV 2EqfxHMd55gN0IZhuPDZUrEpuPyhNEuL27bX8B8Fvu/yequjb2XocaP9QMnSX3G7S2JKcR U5ZA2Bdjkv666n6Jp2f1RutAvPVsEd4= X-MC-Unique: H5i-IobHPg-dS6_zG3FH4w-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=gF1s0KbAL9b83AB6/JlbAHqywgqU7lOR4NhlFP3KFgg=; b=DgGbyybxazPAOUGWJpQ29qV0w4j2aDXk2HxO0hqa5aXuLTxHngAkOyB698HFUmK+QA lRj6s8Z0fzryA7N4cc+jCHGdKACr6Qw2GCF12FVF3Kc+YILJTiHurGvXRILMXb71K+wz zP3DadWtuTSmDzly9ZOJoH2DiaK/oNx+YGscMWbTc/GJEazftde4KQYfegkRrnMu7wTz CaKhUuWqpO3n6/lLKhqKDmpy9fTnE5gtJBxfdeNx4EmejenlanHf9pBbx5dY9Z5gDNwE 63cDckwj8Kt3pLxFnN3r07Chn0S4y6mNwihYwYWvtK+mzIl8rpPfc3sBremFCMvDRW0d a5Yw== X-Gm-Message-State: AOAM533husrfgV1lzqJPf7xhci9B3vHIoJafn5YM/NT6j5mSmUKENpfm ksfbY8J6R0Nv8qcNxhjIoJfGj1cjHRM05Us4oYTB74pDorfFTS7KMYDOgr7oX7RiHLO/5b8hjkf OxPEPiU94d7YOEg== X-Received: by 2002:a05:600c:3553:: with SMTP id i19mr59753373wmq.97.1636988364003; Mon, 15 Nov 2021 06:59:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJyBiHO29Vm+h+jU24GT/dqqfeksL0Vw9veynBbFRs2Rn1r5bPrUU8uyakzy04flTYbN4S4oew== X-Received: by 2002:a05:600c:3553:: with SMTP id i19mr59753356wmq.97.1636988363875; Mon, 15 Nov 2021 06:59:23 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , Andrew Jones , Eduardo Habkost , Thomas Huth , Marcel Apfelbaum Subject: [PATCH-for-7.0 v4 05/11] tests/unit/test-smp-parse: Split the 'generic' test in valid / invalid Date: Mon, 15 Nov 2021 15:58:54 +0100 Message-Id: <20211115145900.2531865-6-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211115145900.2531865-1-philmd@redhat.com> References: <20211115145900.2531865-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: 1636988368713100001 Split the 'generic' test in two tests: 'valid' and 'invalid'. This will allow us to remove the hack which modifies the MachineClass internal state. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Yanan Wang --- tests/unit/test-smp-parse.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index 37c6b4981db..e27aedad354 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -487,7 +487,7 @@ static void machine_base_class_init(ObjectClass *oc, vo= id *data) mc->name =3D g_strdup(SMP_MACHINE_NAME); } =20 -static void test_generic(const void *opaque) +static void test_generic_valid(const void *opaque) { const char *machine_type =3D opaque; Object *obj =3D object_new(machine_type); @@ -508,6 +508,19 @@ static void test_generic(const void *opaque) smp_parse_test(ms, data, true); } =20 + object_unref(obj); +} + +static void test_generic_invalid(const void *opaque) +{ + const char *machine_type =3D opaque; + Object *obj =3D object_new(machine_type); + MachineState *ms =3D MACHINE(obj); + MachineClass *mc =3D MACHINE_GET_CLASS(obj); + SMPTestData *data =3D &(SMPTestData){}; + int i; + + /* Force invalid min CPUs and max CPUs */ mc->min_cpus =3D 2; mc->max_cpus =3D 511; @@ -601,9 +614,12 @@ int main(int argc, char *argv[]) =20 g_test_init(&argc, &argv, NULL); =20 - g_test_add_data_func("/test-smp-parse/generic", + g_test_add_data_func("/test-smp-parse/generic/valid", TYPE_MACHINE, - test_generic); + test_generic_valid); + g_test_add_data_func("/test-smp-parse/generic/invalid", + TYPE_MACHINE, + test_generic_invalid); g_test_add_data_func("/test-smp-parse/with_dies", TYPE_MACHINE, test_with_dies); --=20 2.31.1