From nobody Mon Feb 9 23:38:46 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=1639586958; cv=none; d=zohomail.com; s=zohoarc; b=bu4xKzCJTzg0YPkQxPLQx+kNM4fiDVomkVCK/nbpuzZATmN3Cf0o7zASV6zCjvYXjEMQKB+7k4du2TGiZ9kZhx9pmsmlZSqyB+7a6mNgCRTCYA6I7orjnu2+K9NoFPOMkKth2jhHNSGX3ggivp0bkjgdkAPTcFtLGy66XCRm6Zg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639586958; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=GXx7W8UBpOZBRJ+rhAKMv79kybQ7cCiq3Z9AZnQ5faU=; b=F2vISz9gy/dd08U7oxWl5g3OKL3EWWndt9Eutit4ovXVm4w0MMiI6qjtqlt1V4HjNTtexyAXWJgtlpG9LLdOZtQq1LSWLRpj+EpJgR5u6zw4hldbF0JHz+Ji3gdY0ydI0+4H99wd4W7WjQ6N6x+wulPAKX7moGIeTeTrJKrdy0o= 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 1639586958570317.0245984660447; Wed, 15 Dec 2021 08:49:18 -0800 (PST) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-45--1lnvANMNGK-D7FX8rC67g-1; Wed, 15 Dec 2021 11:49:16 -0500 Received: by mail-wm1-f71.google.com with SMTP id i15-20020a05600c354f00b0034566ac865bso1033076wmq.6 for ; Wed, 15 Dec 2021 08:49:16 -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 w15sm2428449wrk.77.2021.12.15.08.49.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Dec 2021 08:49:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639586957; 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=GXx7W8UBpOZBRJ+rhAKMv79kybQ7cCiq3Z9AZnQ5faU=; b=VMHFT7AB4LY5hijKf6MQXsHezajteBCFui7IpTIzsHEM3G6kx2qu7p9tP6PYMG/KVuELkM 2GkZlayL5xmjNwbx4Unzy4woGL9WUYdSxpWVrvpmRvwgTJU+zYYSIPGDBxB8Vfy24waQKz i9iqu36GOnfQACgZT9oDlXrV8g/9xHY= X-MC-Unique: -1lnvANMNGK-D7FX8rC67g-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=GXx7W8UBpOZBRJ+rhAKMv79kybQ7cCiq3Z9AZnQ5faU=; b=TlzK+/6xd4V9Yh1Z3a2GdvIbELKUp9s/hjzMtGfdL+3CKJ0hcZhvewwy2NY8j8YSVE fSyTPd8ix9nNtS//lzJDPg6RUVKawy7XPIoFjqz2N9MreuQ1UmeRl87cJ4htKcQHuCsu yd1ssQhwrGyhctGML51SKE97Jagr6HIsrXbFy/KqUGaVh8JNcmBPnx3v4zoXH2HNQIVh fXpBs1t/BJGlkYfS4mHZaIAziCONhydg8bUK4CXQkbhMWstlcJVTPS1ju9p0sWCfgOmU GbZB86MlOmvZvQFkOzUF/lop5HoajIhTPSvMMM3IqqXgBddAt1ofHpMxX2iwXDNMvaUZ c4mA== X-Gm-Message-State: AOAM531v/XdTkDjKAYNWdK9N+aLiIwU4MEmwSobs3vX6AFH5k5nTOLbp M01Amw7bA+JF/83didihCOF4wK08MlUgI0fCW7pYYTfRAMr1O7f8oHDMN4yR0gEyoAFxnYWhiKc /LpVUUWvl02OFXg== X-Received: by 2002:a05:6000:cd:: with SMTP id q13mr5327577wrx.488.1639586955180; Wed, 15 Dec 2021 08:49:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJySnjyTdiPcc1h3etCGx8TgmtMe9GuGO1/2cJhrkebD7KlCmVh0OejZtO4Wolw7jo0abvs02g== X-Received: by 2002:a05:6000:cd:: with SMTP id q13mr5327551wrx.488.1639586954864; Wed, 15 Dec 2021 08:49:14 -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 , Yanan Wang Subject: [PATCH v5 2/8] tests/unit/test-smp-parse: Split the 'generic' test in valid / invalid Date: Wed, 15 Dec 2021 17:48:50 +0100 Message-Id: <20211215164856.381990-3-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: 1639586998546100001 Split the 'generic' test in two tests: 'valid' and 'invalid'. This will allow us to remove the hack which modifies the MachineClass internal state. Reviewed-by: Richard Henderson Reviewed-by: Yanan Wang Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/unit/test-smp-parse.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index 37c6b4981db..425ed6b6b92 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,18 @@ 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 +613,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.33.1