From nobody Tue Dec 16 07:41:27 2025 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=libvir-list-bounces@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=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1650874982; cv=none; d=zohomail.com; s=zohoarc; b=h+fiETRvzhwkMEDYM95z8PKpTdZ7dELoiPDWoT/Q8PY8mAz5DUBk6Ojs+RkeJU2gdhZr1Aoh6HY2r+i9j835+NGjtE2xiLzrppY6joXD6xkp/DuDEuEXD1AVRPmj4uysnW9sGzwT25o/7r1uVOtU16NmEaYXLY7J4+MqdIhk89w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1650874982; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CxH74JGUW7ryvtn4xS8i28T7ZhqNwBVbzuWMzVW6NKE=; b=ECx6806V9vm7JBnRk0M1xFU8pK5S5wP5eoGZGGqQ96gTECZqRHeh7F98RsllyT8eLOVrBny7Tdc5DUTaicbRG1uIFS5fgC7H+Hwgk6dIxpuJ7xiXvLbiSMjI28KL7tAzmF4HmnKs1DDCYm9WpVYEuYx/qynQYQcigYeLGDGZ8Lk= 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=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: 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 1650874982944235.4728268920959; Mon, 25 Apr 2022 01:23:02 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-153-SdQpLcxOPo6U6P8t2tXsJg-1; Mon, 25 Apr 2022 04:22:23 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AB0942811820; Mon, 25 Apr 2022 08:22:16 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 764571468956; Mon, 25 Apr 2022 08:22:16 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 037A11940365; Mon, 25 Apr 2022 08:22:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 40628194036F for ; Mon, 25 Apr 2022 08:22:12 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 24BCA7AF9; Mon, 25 Apr 2022 08:22:12 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast08.extmail.prod.ext.rdu2.redhat.com [10.11.55.24]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DCBF59E82 for ; Mon, 25 Apr 2022 08:22:07 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 20AC1383A5E5 for ; Mon, 25 Apr 2022 08:22:07 +0000 (UTC) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-223-FQkgikLeOuW9ud-oL_5Nnw-1; Mon, 25 Apr 2022 04:22:05 -0400 Received: by mail-wm1-f69.google.com with SMTP id b12-20020a05600c4e0c00b003914432b970so6859656wmq.8 for ; Mon, 25 Apr 2022 01:22:05 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id h9-20020a05600c350900b00393f01c8f00sm77266wmq.47.2022.04.25.01.22.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 01:22:04 -0700 (PDT) Received: from wheatley.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 2FFDE67B1B5A; Mon, 25 Apr 2022 10:22:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650874982; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=CxH74JGUW7ryvtn4xS8i28T7ZhqNwBVbzuWMzVW6NKE=; b=eVxhL01hzEI66pIZLxU4uG9Bf+hwBUSYMSShcl7YdPv7w5OlLiX1ViNzRXnzM/OWtpdf/l bkHj2Z0gLiZfxMDYhAoV0FH9BBxtLb1y6iJ6rfFueXkrfchjQHWPEdX1+/2m7+rK9KSJdt SlO/Hf6Bk2LXZXcPxn5e6B/iDMcbksE= X-MC-Unique: SdQpLcxOPo6U6P8t2tXsJg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: FQkgikLeOuW9ud-oL_5Nnw-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=CxH74JGUW7ryvtn4xS8i28T7ZhqNwBVbzuWMzVW6NKE=; b=ToIJ47krckpJvEZcfoMpV5UXaneKyuo1xEZ/S56xt/QK4IqEKr1tRQiuqZlwvABVYR IokgQd7O7TuwwctesVqBILWsFiysfs256F06cz3AOXbYQ7phgMkJrsz4oNVYmwHDJ31R s9TJaYbVp2PlOGxORIEcJGveTqBicYqHihLOdtdpLsM5ZSt+vTayAWOR2Wo4oGFiBEAu 4bY/6lotjPXN+sA4IzrlziEF1XWhblk1wSyQmviL0f+2WG8SaKU4/t2yfIeHVrg+xFYi fcEcDj95MydY9QvuLbSLedFHi8ximK6Yp9gQsREDrLDwg99A3CD/wKJYL7VEBY//blEC g73g== X-Gm-Message-State: AOAM530VpwiL//kCcdQLBe71XK1dSNwlCzDGbPHLgbrB9dY14A10rLw8 J2nPip0yp+qXnZqhsw4vGqL4aFwXsBEgNq9cjaSJsSeKYHd9ldmzIzEOny6lOm0s6WYfweX1/P/ 7KMiafXukgDH+cFvxtP4= X-Received: by 2002:a5d:598c:0:b0:20a:9194:22d4 with SMTP id n12-20020a5d598c000000b0020a919422d4mr13194365wri.124.1650874924648; Mon, 25 Apr 2022 01:22:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXaqOa3YGloOuHdu9I/QDfXPNlBvXS0NM2gTP8aPnZlIrHdCUbxL8fl4ZTH69w0ylU0Ngz2g== X-Received: by 2002:a5d:598c:0:b0:20a:9194:22d4 with SMTP id n12-20020a5d598c000000b0020a919422d4mr13194350wri.124.1650874924450; Mon, 25 Apr 2022 01:22:04 -0700 (PDT) From: Martin Kletzander To: qemu-devel@nongnu.org Subject: [PATCH 05/18] tests/qtest: Specify audiodev= and -audiodev Date: Mon, 25 Apr 2022 10:21:48 +0200 Message-Id: <6e7f2808dd40679a415812767b88f2a411fc137f.1650874791.git.mkletzan@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Stefan Hajnoczi , libvir-list@redhat.com, Christian Schoenebeck , Yanan Wang , Gerd Hoffmann , "Edgar E. Iglesias" , Qiuhao Li , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Marcel Apfelbaum , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , Thomas Huth , Alistair Francis , Alexander Bulekov , Bandan Das , qemu-arm@nongnu.org, Jan Kiszka , Pavel Dovgalyuk , Eduardo Habkost , Darren Kenny , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-ppc@nongnu.org, Paolo Bonzini Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1650874984765100002 Content-Type: text/plain; charset="utf-8"; x-default="true" This will enable removing deprecated default audiodev support. I did not figure out how to make the audiodev represented as an interface node, so this is a workaround. I am not sure what would be the proper way. Signed-off-by: Martin Kletzander Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/qtest/ac97-test.c | 3 ++- tests/qtest/es1370-test.c | 3 ++- tests/qtest/fuzz/generic_fuzz_configs.h | 6 ++++-- tests/qtest/intel-hda-test.c | 15 ++++++++++----- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/tests/qtest/ac97-test.c b/tests/qtest/ac97-test.c index e09f2495d24d..9711f1f6d966 100644 --- a/tests/qtest/ac97-test.c +++ b/tests/qtest/ac97-test.c @@ -45,7 +45,8 @@ static void *ac97_create(void *pci_bus, QGuestAllocator *= alloc, void *addr) static void ac97_register_nodes(void) { QOSGraphEdgeOptions opts =3D { - .extra_device_opts =3D "addr=3D04.0", + .extra_device_opts =3D "addr=3D04.0,audiodev=3Daudio0", + .before_cmd_line =3D "-audiodev driver=3Dnone,id=3Daudio0", }; add_qpci_address(&opts, &(QPCIAddress) { .devfn =3D QPCI_DEVFN(4, 0) }= ); =20 diff --git a/tests/qtest/es1370-test.c b/tests/qtest/es1370-test.c index 2fd7fd2d3d30..5facda8d0d8d 100644 --- a/tests/qtest/es1370-test.c +++ b/tests/qtest/es1370-test.c @@ -46,7 +46,8 @@ static void *es1370_create(void *pci_bus, QGuestAllocator= *alloc, void *addr) static void es1370_register_nodes(void) { QOSGraphEdgeOptions opts =3D { - .extra_device_opts =3D "addr=3D04.0", + .extra_device_opts =3D "addr=3D04.0,audiodev=3Daudio0", + .before_cmd_line =3D "-audiodev driver=3Dnone,id=3Daudio0", }; add_qpci_address(&opts, &(QPCIAddress) { .devfn =3D QPCI_DEVFN(4, 0) }= ); =20 diff --git a/tests/qtest/fuzz/generic_fuzz_configs.h b/tests/qtest/fuzz/gen= eric_fuzz_configs.h index 004c701915e1..84a93b3c350b 100644 --- a/tests/qtest/fuzz/generic_fuzz_configs.h +++ b/tests/qtest/fuzz/generic_fuzz_configs.h @@ -101,8 +101,10 @@ const generic_fuzz_config predefined_configs[] =3D { },{ .name =3D "intel-hda", .args =3D "-machine q35 -nodefaults -device intel-hda,id=3Dhda0 " - "-device hda-output,bus=3Dhda0.0 -device hda-micro,bus=3Dhda0.0 " - "-device hda-duplex,bus=3Dhda0.0", + "-audiodev driver=3Dnone,id=3Daudio0", + "-device hda-output,bus=3Dhda0.0,audiodev=3Daudio0 " + "-device hda-micro,bus=3Dhda0.0,audiodev=3Daudio0 " + "-device hda-duplex,bus=3Dhda0.0,audiodev=3Daudio0", .objects =3D "intel-hda", },{ .name =3D "ide-hd", diff --git a/tests/qtest/intel-hda-test.c b/tests/qtest/intel-hda-test.c index a58c98e4d11b..39ced2bc6ac6 100644 --- a/tests/qtest/intel-hda-test.c +++ b/tests/qtest/intel-hda-test.c @@ -11,20 +11,24 @@ #include "libqtest-single.h" =20 #define HDA_ID "hda0" -#define CODEC_DEVICES " -device hda-output,bus=3D" HDA_ID ".0" \ - " -device hda-micro,bus=3D" HDA_ID ".0" \ - " -device hda-duplex,bus=3D" HDA_ID ".0" +#define AUDIODEV " -audiodev driver=3Dnone,id=3Daudio0 " +#define AUDIODEV_REF "audiodev=3Daudio0" +#define CODEC_DEVICES " -device hda-output,bus=3D" HDA_ID ".0," AUDIODEV_R= EF \ + " -device hda-micro,bus=3D" HDA_ID ".0," AUDIODEV_RE= F \ + " -device hda-duplex,bus=3D" HDA_ID ".0," AUDIODEV_R= EF =20 /* Tests only initialization so far. TODO: Replace with functional tests */ static void ich6_test(void) { - qtest_start("-device intel-hda,id=3D" HDA_ID CODEC_DEVICES); + qtest_start(AUDIODEV "-device intel-hda,id=3D" HDA_ID CODEC_DEVICES); qtest_end(); } =20 static void ich9_test(void) { - qtest_start("-machine q35 -device ich9-intel-hda,bus=3Dpcie.0,addr=3D1= b.0,id=3D" + qtest_start("-machine q35" + AUDIODEV + "-device ich9-intel-hda,bus=3Dpcie.0,addr=3D1b.0,id=3D" HDA_ID CODEC_DEVICES); qtest_end(); } @@ -39,6 +43,7 @@ static void test_issue542_ich6(void) QTestState *s; =20 s =3D qtest_init("-nographic -nodefaults -M pc-q35-6.2 " + AUDIODEV "-device intel-hda,id=3D" HDA_ID CODEC_DEVICES); =20 qtest_outl(s, 0xcf8, 0x80000804); --=20 2.35.1