From nobody Mon Feb 9 23:01:33 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=1636988405; cv=none; d=zohomail.com; s=zohoarc; b=K13cShDPcWZ0EwSgnI5Hiqi0QWqMin2bSUGU2RBEXV6FYY2z0o+Hkfb7Sd0Rur45FxROoVlbfaJHrUPiixeoNaCl5lZ8jMszzrTaEe8JVRRVWZf/KmOHBSERQcegbQ8tMuBwiJO+znaaUjQsiGV954qb+9nM0hJxAwzbnK60Ujo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636988405; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=BZpI0ahGf4kduGjb9YumMUGF6LmoFzxgBcNi4uwMZn8=; b=MEhONr/HJtMg/RpHIryDJ174ySyBsqfU312RbgKkvSW2GU/k9L7cqkw6l3uBY4noIU3uJlWgthtfAbwlKYzIK6Ro9zwRItQhXnJvLxOKf7TFx3oyUo4Ag0CoswaMSutc2rG+6kuIifSBb6L/6PHMIFqoSBCqHWMKXbmnBTkDAes= 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 1636988405456416.1273355116057; Mon, 15 Nov 2021 07:00:05 -0800 (PST) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-411-6DR8SbBSO9CyCp4dSnU5bQ-1; Mon, 15 Nov 2021 09:59:20 -0500 Received: by mail-wm1-f71.google.com with SMTP id l4-20020a05600c1d0400b00332f47a0fa3so2119wms.8 for ; Mon, 15 Nov 2021 06:59:20 -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 h15sm14551985wml.9.2021.11.15.06.59.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 06:59:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636988404; 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=BZpI0ahGf4kduGjb9YumMUGF6LmoFzxgBcNi4uwMZn8=; b=JCerl6pt8iYl6uMla7DlOYoZ1NJJAMGK4jFLeHE6ZW6c0j+jNQ02ncI/G2TelQUmXxxeU0 NCLA0R2rrI5cIE3ogOv6nI6K9D0ffSSlV9S5MXc2MkITeNJ4Brxl+8jhS+4fCM8xF+on1i NcIJHd/3OIpHyaG702rsUFDa0NBcrZI= X-MC-Unique: 6DR8SbBSO9CyCp4dSnU5bQ-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=BZpI0ahGf4kduGjb9YumMUGF6LmoFzxgBcNi4uwMZn8=; b=iXd3sWdIfC5eo2ccm/q36A1RZilSTG4rwllqSrGEDGJB78+DxS6QQwLCgEonO2DSbS DS4H5NzWq9NUClUjGTKsFMhcbdH61hALx9QHHSC+XYwRFxJR/paXCsPFl01yiVD5vVfI d8QSJQloXmKlUOz8PodE7vYX7lLQUK1k6rwcaYMUVtO69YdOH0HxqlOE0/ZAUmlZeZow T2o3eO+Ivr7J18MkodxylVZpFB+PQGscwBE2nzRMZVmxTl60AZzto1GLpHbBc/vWar3O 78GwHRNDUfOB9bPaT+Eq4w+r1L+Lx/C6tgvMgMUbFPVsKgsY63iONk+EmDjOSNvxGwM3 /waA== X-Gm-Message-State: AOAM530vadE3fTFaSHsOm/oK43T1OXN8Ntsp184JRETLWjA0ZRAnOZx5 KJtdY9wp5L1kp1ck+mjdsU0dj+OeJjdFPJA78/D3P399ez/l9PgAs6DmsylBCxsU1IaX7kxV7c8 JPwN29ZcUbsKDWw== X-Received: by 2002:a7b:ce16:: with SMTP id m22mr42101232wmc.39.1636988359516; Mon, 15 Nov 2021 06:59:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJwmV7M5DT5RuonHLIfQoQVMZNVgK795Dk22eQTXVP5DyttGto4TohsnhEW3oETy41PCeUw0HA== X-Received: by 2002:a7b:ce16:: with SMTP id m22mr42101213wmc.39.1636988359392; Mon, 15 Nov 2021 06:59:19 -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 04/11] tests/unit/test-smp-parse: Pass machine type as argument to tests Date: Mon, 15 Nov 2021 15:58:53 +0100 Message-Id: <20211115145900.2531865-5-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: 1636988410734100001 Use g_test_add_data_func() instead of g_test_add_func() so we can pass the machine type to the tests (we will soon have different machine types). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Yanan Wang --- tests/unit/test-smp-parse.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index b02450e25a3..37c6b4981db 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -487,9 +487,10 @@ static void machine_base_class_init(ObjectClass *oc, v= oid *data) mc->name =3D g_strdup(SMP_MACHINE_NAME); } =20 -static void test_generic(void) +static void test_generic(const void *opaque) { - Object *obj =3D object_new(TYPE_MACHINE); + 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){{ }}; @@ -525,9 +526,10 @@ static void test_generic(void) object_unref(obj); } =20 -static void test_with_dies(void) +static void test_with_dies(const void *opaque) { - Object *obj =3D object_new(TYPE_MACHINE); + 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){{ }}; @@ -599,8 +601,12 @@ int main(int argc, char *argv[]) =20 g_test_init(&argc, &argv, NULL); =20 - g_test_add_func("/test-smp-parse/generic", test_generic); - g_test_add_func("/test-smp-parse/with_dies", test_with_dies); + g_test_add_data_func("/test-smp-parse/generic", + TYPE_MACHINE, + test_generic); + g_test_add_data_func("/test-smp-parse/with_dies", + TYPE_MACHINE, + test_with_dies); =20 g_test_run(); =20 --=20 2.31.1