From nobody Fri May 17 21:53:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695397389; cv=none; d=zohomail.com; s=zohoarc; b=g6YOG32lLv+Htxz3YONmx6CZoN93uxw4zWAyEXD4CXp2CKuToB5R2bmUQeZToz4HIwxeQOX5hnKD31yhVPmX8N416Jlu/GfrrYxdHLezkGIP2UGyeQJKQARaVIZj8b0EnFkz3WCzcIenT6yC+f/f4zt+SQNIIZaTO9dhC+gxHwI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695397389; 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=lyyUffVCCI6wnmLrjN9LYL/D6+d/aBzAyTI/qFrludo=; b=G6xrE5NMIHSSKKH0PlBLOWGkGubGpzuMp7ApYRstIueIR7VcFHp9pOOzzCWxDLLwHJT7Wlg6feETs+DDaj0wgdWNpsG2s6JU1K5xVebHgboyHlqOnlcYCQdEyFAyy2dLVbqzV+wTTDx2ySekb65m3Ax0nw2a+wjKfdPov8Qg9SA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695397389594571.0629773712868; Fri, 22 Sep 2023 08:43:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjiIj-0008Kb-4q; Fri, 22 Sep 2023 11:42:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjiIf-0008Jc-W5 for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:42:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjiIe-0002nU-I5 for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:42:37 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-440-cnzg_nrdPCystIn41OuDCw-1; Fri, 22 Sep 2023 11:42:34 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4054743df06so2207365e9.3 for ; Fri, 22 Sep 2023 08:42:34 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id q12-20020a05600c040c00b003fef60005b5sm5065585wmb.9.2023.09.22.08.42.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 08:42:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695397355; 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=lyyUffVCCI6wnmLrjN9LYL/D6+d/aBzAyTI/qFrludo=; b=f96xwobR2/pGhjhxYcoc80T8GV19wy7cLb3NyYmCV8uQ6Tbzn5NBYUyI5OwfwG87v2ZS0w iAsOOe9jKj2ss19EGmaX3PIX29A7Vjlo1grr8D9O7+tOCa/OyaeHsySakPsuG3mnUQAuaf G8JF6nC+OPGmL/cdge5O1xgKjxHm2LQ= X-MC-Unique: cnzg_nrdPCystIn41OuDCw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695397352; x=1696002152; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lyyUffVCCI6wnmLrjN9LYL/D6+d/aBzAyTI/qFrludo=; b=UgJgCGLOtq85iUXk2PV4aZ3CT1gB3FbxUbFmcgOTzcSXDmlgefmtpgfIH6KCEsWgWx pMlGTLfZ0GkY/7Dr+cN2d29bbUpLe5/cnAGhbroN8lmIFjzJV2UHMxqY8xm5xgtLUnJT o/sfoWn2cHEJ/qr9lcvts7OLyhm/OBWGEM6wXG5u8Ni5XxK454YEnoETE0L1V8vccSeI hhmu57YKiix9ABUPRsbBmtsoe+h892cxz3DY1WyoymclCXx5KoWB8Qo9CQEe7pc0zPEi +oMrnt+bhAy9RwTgFcsXEeHmblNu8hm3RVDaKf7OhYEdooIxioBkOaZeuXELiQBURM3q q8OQ== X-Gm-Message-State: AOJu0YyTpvgUmK/QERKp7vUOins6crFWj3BOEcH6NNIAdURDkQA4fdlK XZeqNtrCasENPKaZCrdV7UVZRFeXGCksLDPwVUvbmje+WQyIECOA/jIwnA+8sAPrUUwkAV/ql4c w7stK/mqPSZabZLhbGr2CTZYYblelvsYL+VF2ey6Zbiybg483O8xTp4BVDuJAIL0s05CED32Od5 A= X-Received: by 2002:a1c:7c1a:0:b0:401:d947:c8a9 with SMTP id x26-20020a1c7c1a000000b00401d947c8a9mr9427481wmc.19.1695397352650; Fri, 22 Sep 2023 08:42:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHo6KSvjxl/p7ksMXoWeOXb9ZIK0hB+5tyZQi2ikqQG6t2qr46NsXufsJwFJubvKL2oP23ZeA== X-Received: by 2002:a1c:7c1a:0:b0:401:d947:c8a9 with SMTP id x26-20020a1c7c1a000000b00401d947c8a9mr9427460wmc.19.1695397352265; Fri, 22 Sep 2023 08:42:32 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: balaton@eik.bme.hu Subject: [PULL 1/9] target/i386: enumerate bit 56 of MSR_IA32_VMX_BASIC Date: Fri, 22 Sep 2023 17:42:20 +0200 Message-ID: <20230922154228.304933-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230922154228.304933-1-pbonzini@redhat.com> References: <20230922154228.304933-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695397391661100005 Content-Type: text/plain; charset="utf-8" On parts that enumerate IA32_VMX_BASIC MSR bit as 1, any exception vector can be delivered with or without an error code if the other consistency checks are satisfied. Signed-off-by: Paolo Bonzini --- scripts/kvm/vmxcap | 1 + target/i386/cpu.c | 1 + target/i386/cpu.h | 1 + 3 files changed, 3 insertions(+) diff --git a/scripts/kvm/vmxcap b/scripts/kvm/vmxcap index ce27f5e635a..3fb4d5b3425 100755 --- a/scripts/kvm/vmxcap +++ b/scripts/kvm/vmxcap @@ -115,6 +115,7 @@ controls =3D [ (50, 53): 'VMCS memory type', 54: 'INS/OUTS instruction information', 55: 'IA32_VMX_TRUE_*_CTLS support', + 56: 'Skip checks on event error code', }, msr =3D MSR_IA32_VMX_BASIC, ), diff --git a/target/i386/cpu.c b/target/i386/cpu.c index b2a20365e10..d48607b4e1e 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1340,6 +1340,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] =3D { .feat_names =3D { [54] =3D "vmx-ins-outs", [55] =3D "vmx-true-ctls", + [56] =3D "vmx-any-errcode", }, .msr =3D { .index =3D MSR_IA32_VMX_BASIC, diff --git a/target/i386/cpu.h b/target/i386/cpu.h index fbb05eace57..d1ffadd78be 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1039,6 +1039,7 @@ uint64_t x86_cpu_get_supported_feature_word(FeatureWo= rd w, #define MSR_VMX_BASIC_DUAL_MONITOR (1ULL << 49) #define MSR_VMX_BASIC_INS_OUTS (1ULL << 54) #define MSR_VMX_BASIC_TRUE_CTLS (1ULL << 55) +#define MSR_VMX_BASIC_ANY_ERRCODE (1ULL << 56) =20 #define MSR_VMX_MISC_PREEMPTION_TIMER_SHIFT_MASK 0x1Full #define MSR_VMX_MISC_STORE_LMA (1ULL << 5) --=20 2.41.0 From nobody Fri May 17 21:53:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695397396; cv=none; d=zohomail.com; s=zohoarc; b=O0U3pbuFpRdmbBftGjrIjDw8RZFjhznHjAIA6jivhZ05RnpeHxmOfxsiepDdD4RIg7u/SrqlCBL+0yFKx8dtxMEwqRk0UUdksJlNXy4x3YyLLUG9gDOvWEtxnKfQ8C/EpcLVrKcUg8dNLqDuD1CAyi+sJjxPYwH5rFvMS6jEadk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695397396; 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=MXr0dDzaioo9uY5bLIe7ScF/gjUT2yjP9YjbogdmloQ=; b=U8XHqpU9mq6H1ELgfBm8Pk6pvEUyPL2PwDHyb14hloGCfJI6pj1zuT2Uy2cGdg6xySp9G9Sj7u3xxiZvZv9vlL1g06PJ8tUVco2tx9HrrY5ytUKCB9Xv73cHm+DOEb7yqLkHtoPdHqOp6MPT9mdVF0+StwRQpguI6e9H4MzZkMc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695397396520363.78022966739513; Fri, 22 Sep 2023 08:43:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjiIj-0008LT-Ht; Fri, 22 Sep 2023 11:42:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjiIi-0008KN-0c for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:42:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjiIg-0002nn-F0 for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:42:39 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-256-ndXJE3MMNv-JM6aJe62ryw-1; Fri, 22 Sep 2023 11:42:36 -0400 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-32153a4533eso1540614f8f.1 for ; Fri, 22 Sep 2023 08:42:36 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id o11-20020a056000010b00b0031c52e81490sm4763698wrx.72.2023.09.22.08.42.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 08:42:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695397357; 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=MXr0dDzaioo9uY5bLIe7ScF/gjUT2yjP9YjbogdmloQ=; b=gE4EMh9MWA/LGdam27TNhwgheAKaoivdrGpgH6k20yR9DFICIwDWqJLKgOyqCDmRGl3WRu l9uvEXPugk0nqOybi53GaGvH8ga4k6mElGwjHnA3pP5Q+DotN9eWkNbEChQkemx0NQ7oAe hvOraAL5woknS0NMVhhpSbtj/d+DeNw= X-MC-Unique: ndXJE3MMNv-JM6aJe62ryw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695397354; x=1696002154; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MXr0dDzaioo9uY5bLIe7ScF/gjUT2yjP9YjbogdmloQ=; b=Jyd0n05LmJN6DZtaCdzfN1N9y0PK/uojWcSvZPluxx/RQ46wgoT/twtr/Z8BlpBkoA I3RKdBWLYx2ryHMArjmc61B9m3SFBUpPt7AzXKovE3X7oJQrnwKHkW2phcr7qsKXJkCg iET2CHzD+G2tZs+nmBdl2RbduhHSrEew9aU+UTItg+AyKTVcK/v9T1qhrtJ4+ZQ6f+Nh xT7ln5QnsTuRe1ubKjlJIQAlYmDjzIZrsKict1AwM1Z+yD9rI0U9yzCyPGYiYb1LoJCd pOOtmbJtxA1UeQDAj2cG+yux2YEIUMhCVZD/2+CCHpbGaye3ecdjwfMBrb4ReJzNM7cZ W2FQ== X-Gm-Message-State: AOJu0YzDXdnJzspiDrZbYR80kjKr+2VpLO2OeHFecCUt+Jiy++U4j0Xi a0UdzvqJgV2/V0r9PtDDhV/9iLLnbN7mlVdiXwpBBPTvc4i8/A+tTMv8+PN3uH27bZtdduZkQTs aAcStBr6Ac5xBhj8W6v87hfoG+fgzfCPC0YsPi3z44EThjSRytkYZEbEGMfoNx89LiDR8yhQ15X Q= X-Received: by 2002:adf:e78a:0:b0:319:7bec:4f31 with SMTP id n10-20020adfe78a000000b003197bec4f31mr63270wrm.10.1695397354720; Fri, 22 Sep 2023 08:42:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IElUq3wsuglnbZZwXXz0TjE7gjDmHqopvrpvIVthbnJ0D663NnFECJl00yKI96ph/EUnXTeyw== X-Received: by 2002:adf:e78a:0:b0:319:7bec:4f31 with SMTP id n10-20020adfe78a000000b003197bec4f31mr63244wrm.10.1695397354238; Fri, 22 Sep 2023 08:42:34 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: balaton@eik.bme.hu, Pawan Gupta , Jack Wang , Daniel Sneddon Subject: [PULL 2/9] target/i386: Export GDS_NO bit to guests Date: Fri, 22 Sep 2023 17:42:21 +0200 Message-ID: <20230922154228.304933-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230922154228.304933-1-pbonzini@redhat.com> References: <20230922154228.304933-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695397398641100003 Content-Type: text/plain; charset="utf-8" From: Pawan Gupta Gather Data Sampling (GDS) is a side-channel attack using Gather instructions. Some Intel processors will set ARCH_CAP_GDS_NO bit in MSR IA32_ARCH_CAPABILITIES to report that they are not vulnerable to GDS. Make this bit available to guests. Closes: https://lore.kernel.org/qemu-devel/CAMGffEmG6TNq0n3+4OJAgXc8J0OevY6= 0KHZekXCBs3LoK9vehA@mail.gmail.com/ Reported-by: Jack Wang Signed-off-by: Pawan Gupta Tested-by: Jack Wang Tested-by: Daniel Sneddon Message-ID: Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index d48607b4e1e..f9e51a9d87e 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1155,7 +1155,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] =3D { NULL, "sbdr-ssdp-no", "fbsdp-no", "psdp-no", NULL, "fb-clear", NULL, NULL, NULL, NULL, NULL, NULL, - "pbrsb-no", NULL, NULL, NULL, + "pbrsb-no", NULL, "gds-no", NULL, NULL, NULL, NULL, NULL, }, .msr =3D { --=20 2.41.0 From nobody Fri May 17 21:53:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695397399; cv=none; d=zohomail.com; s=zohoarc; b=SpD0RKZujSoqIA5C070M4rhMH9URknR0JuFuE5HWxRyDUgL7d3lP/JBv+7JOpu3nqOfoqLii8ynfZTlPxNrLZZl60VHZtTaUFZZwOyUrHqE1gjW56Ma+KKad5j2x1WwpiXmY1EnRb988wH/Jk897qN89Cul4FjlLAoTJ+BkR/wU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695397399; 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=SrSO+Hs9yQZxcMhy+G9BaGpwPutEpMTpch02fxbPNas=; b=daWtFLxsDmf7xHN+g8OuN2lbBvCh9BDFezzpn1SJ4TksghFQOfBEp/cSyHBCqOXSDZeoIzCKmC8cdgjrch0x4ZnboDwsvKq+yAIL8HmH6/psjtXwTBwGzRq2OKYl70TFJFOuPxNeg+ilm7q4NziU/sKmzH51KJ5eI9RYDejUxdQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 169539739937250.293447586959246; Fri, 22 Sep 2023 08:43:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjiIl-0008Mq-7d; Fri, 22 Sep 2023 11:42:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjiIk-0008Lb-1m for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:42:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjiIi-0002oA-L8 for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:42:41 -0400 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.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-484-MTFSTXTcPhqRl5YlULKnLQ-1; Fri, 22 Sep 2023 11:42:38 -0400 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-402cba95486so17804475e9.0 for ; Fri, 22 Sep 2023 08:42:38 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id l18-20020a1c7912000000b003fef3180e7asm7869578wme.44.2023.09.22.08.42.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 08:42:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695397360; 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=SrSO+Hs9yQZxcMhy+G9BaGpwPutEpMTpch02fxbPNas=; b=IrW8f6m5n+OobKRX/qKwI0Fv5zUqwyLVpf5s0bNpy6hYCc7fjSbyhjB4RzLltxuMK49Z3k w7ymh2Zf9mTW89A2h70Z/9YJAwMvOt3Hx3vW+e80CdARvvjpPNWdq3l2K5Lzh/o8Vk4hPs NfKJrcryQl3qrHtjC/0ohKCwmiu6m18= X-MC-Unique: MTFSTXTcPhqRl5YlULKnLQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695397356; x=1696002156; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SrSO+Hs9yQZxcMhy+G9BaGpwPutEpMTpch02fxbPNas=; b=s1xu4LLMCoBRtlJlIBtbKxfo9K6KmHc6lAhMu92A3g7nVl6hudN360gOt5Svf3bgtj WJRNb/U9cz8EBbixugNl78YkARb5kUA8Ju/VgQbukRmm02TfQJTFYmmGpVQK1FIgbAWU usaCpnPlGOc4RyoDpT9Cs+FHYV+U11Ket4s+GAQ6d938/pGbh9KBRGFXmXFnX+1MrO70 90Wu0PRaEbN5jKY4cLhKQplNnZWWjlNPnXkM5j+7QQO3Iav+xC0OLY5kIGClv/xn+Oqd aYM7yxpGpM3ZEESXC+ZKDmhzqytYfUteYXbZ5dm5Zl8dEb7jztsXlIR5Gvf7dWKezneZ EHdA== X-Gm-Message-State: AOJu0YxhuPy/WT0pQ2s2Io2oCBw3Piw7qw+D8aocV0Nv3gjP/gfwJBfE DG89M44vZLyrOgBIoZEjEV5cmnPqwXKHQR50LBb3MyEUjP+TPZv6qHQDHbEe+koh4JpPjT6bHqo AH/8fSQlQxTVi2Qu4zgGAD5cKyA874f87ILNPg0aid5eqhtb36CY4lnR2sT+oAHqG/3XDzLVBG0 8= X-Received: by 2002:a05:600c:1da9:b0:405:3a65:1b4c with SMTP id p41-20020a05600c1da900b004053a651b4cmr3314794wms.6.1695397356701; Fri, 22 Sep 2023 08:42:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFU9KGbGLxWyMfZnyUoJ3MdMOiQ/jtXaGyHNFBHjyGd4Jl1CCBdFFgBS8Jgol4vxmB8EJS6YA== X-Received: by 2002:a05:600c:1da9:b0:405:3a65:1b4c with SMTP id p41-20020a05600c1da900b004053a651b4cmr3314778wms.6.1695397356349; Fri, 22 Sep 2023 08:42:36 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: balaton@eik.bme.hu, LIU Zhiwei Subject: [PULL 3/9] qemu/timer: Add host ticks function for RISC-V Date: Fri, 22 Sep 2023 17:42:22 +0200 Message-ID: <20230922154228.304933-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230922154228.304933-1-pbonzini@redhat.com> References: <20230922154228.304933-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695397400717100007 Content-Type: text/plain; charset="utf-8" From: LIU Zhiwei Signed-off-by: LIU Zhiwei Message-ID: <20230911063223.742-1-zhiwei_liu@linux.alibaba.com> Signed-off-by: Paolo Bonzini --- include/qemu/timer.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 9a91cb1248a..9a366e551fb 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -979,6 +979,28 @@ static inline int64_t cpu_get_host_ticks(void) return cur - ofs; } =20 +#elif defined(__riscv) && __riscv_xlen =3D=3D 32 +static inline int64_t cpu_get_host_ticks(void) +{ + uint32_t lo, hi, tmph; + do { + asm volatile("RDTIMEH %0\n\t" + "RDTIME %1\n\t" + "RDTIMEH %2" + : "=3Dr"(hi), "=3Dr"(lo), "=3Dr"(tmph)); + } while (unlikely(tmph !=3D hi)); + return lo | (uint64_t)hi << 32; +} + +#elif defined(__riscv) && __riscv_xlen > 32 +static inline int64_t cpu_get_host_ticks(void) +{ + int64_t val; + + asm volatile("RDTIME %0" : "=3Dr"(val)); + return val; +} + #else /* The host CPU doesn't have an easily accessible cycle counter. Just return a monotonically increasing value. This will be --=20 2.41.0 From nobody Fri May 17 21:53:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695397409; cv=none; d=zohomail.com; s=zohoarc; b=dsjVUxfMT5TVBj7TWdZCLHoW0HXCzqVMuJ29Vn9Buv5gWA+b3vkm4dGMhgm1GCimD14o7jX1AndNDrseRxhSULgm1WWhlcDTktVSVzdzFuf0tnQmVf9BwtmbntF9oIvwnEwXs4BZnggGum5xyrd61rRoSPtWIi+pAuzUxZBgxTk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695397409; 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=rS1CupBJrFupvgmVw9AdBeqh97yjhKlttsdxSozUwO8=; b=aVmVGeJc1DylX5TXJAYNmxlIlcPuvRlIo6PB2eNBTfdac07ZsXSBoZqtEcfxcCjRuQ4jpEaMfJAMdGbYg68Kr6uLA4/wPZfn+UM0w0HMCiJ0BQKWMQ8AYRpKf62QZe0tYpUv/Xf2RvBWH137ey3zxQu+8akDVmI2EQ6TxU25zh8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695397409946814.1799594037263; Fri, 22 Sep 2023 08:43:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjiIo-00006Y-LU; Fri, 22 Sep 2023 11:42:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjiIn-000053-Bc for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:42:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjiIl-0002oa-NZ for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:42:45 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-220-BNfSfsp8Mda3TB4wb_u6cA-1; Fri, 22 Sep 2023 11:42:41 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4011f56165eso19426815e9.0 for ; Fri, 22 Sep 2023 08:42:41 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id x10-20020a05600c21ca00b004051b994014sm7791320wmj.19.2023.09.22.08.42.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 08:42:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695397363; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rS1CupBJrFupvgmVw9AdBeqh97yjhKlttsdxSozUwO8=; b=Z4YpXsLpS+4txxwDgklNzwIDrgbsSy1ilxAgQIZXOUu++G8jXxvF0F1UgGZJE6/M2TVIWr xcAxuzN97QoicdtzQ0rqr7bWJNQ4XQ/1aW+jYPX0VC+HBaPE4miR2uMpv9fGMxms9oCWmb XRnMgtXr42iyC57eFHGazJShxrGC48w= X-MC-Unique: BNfSfsp8Mda3TB4wb_u6cA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695397359; x=1696002159; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rS1CupBJrFupvgmVw9AdBeqh97yjhKlttsdxSozUwO8=; b=dV7CwXLTELT7y7v7IjAuMuHKXa7xy97uI3Cj1cF3k66YGbMY+dOsKM1ug3kvqjpLJC AG1/JIDSLQeoMbS/n6NrZehOHwLwO2+a6BIqQTzQhoF4F/7j24gNEjvWE/pvHlI8E47m xnnjVKVrrKnyOJBfsD2Zv5UAwSSaGjQeHl7CR21Gsh73K/xTaN1ANvi8lzPbP9EnBJaU Sryf0kiG4Y/O07bjDJ7TsYKnJAZBqA9dNqsivdZ3GkG6hXJYfS2udPjLvY1wKGG/OI40 GKwpsQbZzUneeuGX3WysyPtU+uE0c/uJq+T6ew2c/DfSJJUe1oqLrpH+qEgB2lwZxMvv LIUg== X-Gm-Message-State: AOJu0YwjRhP5fIcY+vsdY3RCWEsn1KI6ryKQqnLTYj5xQ6+xEpIpsy5I G/0lPQtJVm02xMNmMR4lq72ueQEuudmEjtwSMLSntiOEwmG9tO1mKV91tJSVFegYIAgTYoWCaY0 tbZttV4sCttcpQGvOu8tyTX2POt3b6KBDR/bDUXleUrLv9fvwSoSNo1+yi42fg5Z5RWe5Xplnd9 E= X-Received: by 2002:a05:600c:35c9:b0:401:b425:2414 with SMTP id r9-20020a05600c35c900b00401b4252414mr2430484wmq.18.1695397359324; Fri, 22 Sep 2023 08:42:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEeui1D0t5fQQwtvlsyZ1xzI7pb05nAJSGwOwA3OoRknWN0Au/rqloXSDdH18i/pvlfSbkZPA== X-Received: by 2002:a05:600c:35c9:b0:401:b425:2414 with SMTP id r9-20020a05600c35c900b00401b4252414mr2430466wmq.18.1695397358868; Fri, 22 Sep 2023 08:42:38 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: balaton@eik.bme.hu, Martin Kletzander , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 4/9] hw/input/tsc210x: Extract common init code into new function Date: Fri, 22 Sep 2023 17:42:23 +0200 Message-ID: <20230922154228.304933-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230922154228.304933-1-pbonzini@redhat.com> References: <20230922154228.304933-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695397412049100003 From: Martin Kletzander This deduplicates several lines and will make future changes more concise. Signed-off-by: Martin Kletzander Reviewed-by: Daniel P. Berrang=C3=A9 Message-ID: <1d75877cf4cc2a38f87633ff16f9fea3e1bb0c03.1650874791.git.mkletz= an@redhat.com> Signed-off-by: Paolo Bonzini --- hw/input/tsc210x.c | 68 ++++++++++++++++------------------------------ 1 file changed, 24 insertions(+), 44 deletions(-) diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c index 7eae5989f76..f568759e05a 100644 --- a/hw/input/tsc210x.c +++ b/hw/input/tsc210x.c @@ -30,6 +30,7 @@ #include "hw/input/tsc2xxx.h" #include "hw/irq.h" #include "migration/vmstate.h" +#include "qapi/error.h" =20 #define TSC_DATA_REGISTERS_PAGE 0x0 #define TSC_CONTROL_REGISTERS_PAGE 0x1 @@ -1069,20 +1070,10 @@ static const VMStateDescription vmstate_tsc2301 =3D= { .fields =3D vmstatefields_tsc210x, }; =20 -uWireSlave *tsc2102_init(qemu_irq pint) +static void tsc210x_init(TSC210xState *s, + const char *name, + const VMStateDescription *vmsd) { - TSC210xState *s; - - s =3D g_new0(TSC210xState, 1); - s->x =3D 160; - s->y =3D 160; - s->pressure =3D 0; - s->precision =3D s->nextprecision =3D 0; - s->timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, tsc210x_timer_tick, s); - s->pint =3D pint; - s->model =3D 0x2102; - s->name =3D "tsc2102"; - s->tr[0] =3D 0; s->tr[1] =3D 1; s->tr[2] =3D 1; @@ -1104,13 +1095,29 @@ uWireSlave *tsc2102_init(qemu_irq pint) =20 tsc210x_reset(s); =20 - qemu_add_mouse_event_handler(tsc210x_touchscreen_event, s, 1, - "QEMU TSC2102-driven Touchscreen"); + qemu_add_mouse_event_handler(tsc210x_touchscreen_event, s, 1, name); =20 AUD_register_card(s->name, &s->card); =20 qemu_register_reset((void *) tsc210x_reset, s); - vmstate_register(NULL, 0, &vmstate_tsc2102, s); + vmstate_register(NULL, 0, vmsd, s); +} + +uWireSlave *tsc2102_init(qemu_irq pint) +{ + TSC210xState *s; + + s =3D g_new0(TSC210xState, 1); + s->x =3D 160; + s->y =3D 160; + s->pressure =3D 0; + s->precision =3D s->nextprecision =3D 0; + s->timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, tsc210x_timer_tick, s); + s->pint =3D pint; + s->model =3D 0x2102; + s->name =3D "tsc2102"; + + tsc210x_init(s, "QEMU TSC2102-driven Touchscreen", &vmstate_tsc2102); =20 return &s->chip; } @@ -1131,34 +1138,7 @@ uWireSlave *tsc2301_init(qemu_irq penirq, qemu_irq k= birq, qemu_irq dav) s->model =3D 0x2301; s->name =3D "tsc2301"; =20 - s->tr[0] =3D 0; - s->tr[1] =3D 1; - s->tr[2] =3D 1; - s->tr[3] =3D 0; - s->tr[4] =3D 1; - s->tr[5] =3D 0; - s->tr[6] =3D 1; - s->tr[7] =3D 0; - - s->chip.opaque =3D s; - s->chip.send =3D (void *) tsc210x_write; - s->chip.receive =3D (void *) tsc210x_read; - - s->codec.opaque =3D s; - s->codec.tx_swallow =3D (void *) tsc210x_i2s_swallow; - s->codec.set_rate =3D (void *) tsc210x_i2s_set_rate; - s->codec.in.fifo =3D s->in_fifo; - s->codec.out.fifo =3D s->out_fifo; - - tsc210x_reset(s); - - qemu_add_mouse_event_handler(tsc210x_touchscreen_event, s, 1, - "QEMU TSC2301-driven Touchscreen"); - - AUD_register_card(s->name, &s->card); - - qemu_register_reset((void *) tsc210x_reset, s); - vmstate_register(NULL, 0, &vmstate_tsc2301, s); + tsc210x_init(s, "QEMU TSC2301-driven Touchscreen", &vmstate_tsc2301); =20 return &s->chip; } --=20 2.41.0 From nobody Fri May 17 21:53:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695397419; cv=none; d=zohomail.com; s=zohoarc; b=YbdNxjiqh9C0HUVZQWTxAOjd/wuknZPn5a41+P0wWqPsuJ+svTmtCvaIGKHYkWYsIttIjvQhdHpk/Tl0CJrsS2mOyS+375z+cP1C7bjTE3xXWmxnExFVYk7CekVbiTNEHfW3fKiierX/1YmOC5IvLj3QjiyTtOPcRopEKtpMNts= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695397419; 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=oCqi2uuZUZBw1/6wR9LkzHBSEz7KGdquiO19QA3ceY4=; b=nLfD9/oGabEOccVhRp8dZQTEAJJFdDL7+W7BY/5bGRl5X55dHefqN7SVpwv6E+lfYVop8s9hh+tOeG+5pMdh4+7TUoKpRM3vwTLWR42n4HcWYKfgfDt9+eDgw30QLV6l2UfuSk3cWy3F12Rr91df+qcFpAxOskpaduYJ5xuuTNA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 169539741914419.95855490803274; Fri, 22 Sep 2023 08:43:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjiIp-00007D-9e; Fri, 22 Sep 2023 11:42:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjiIo-00006g-ME for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:42:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjiIn-0002om-2B for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:42:46 -0400 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.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-448-Ukr09GLQOvG77zjQpbhQKA-1; Fri, 22 Sep 2023 11:42:43 -0400 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4005f0a53c5so17870595e9.3 for ; Fri, 22 Sep 2023 08:42:43 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id o7-20020a1c7507000000b004051f8d6207sm5019498wmc.6.2023.09.22.08.42.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 08:42:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695397364; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oCqi2uuZUZBw1/6wR9LkzHBSEz7KGdquiO19QA3ceY4=; b=Vtn1cuc6ReX4A1I7HcsH0wIUYUkV8Lz45rLQAvNRNQ5Pc+Gg6ZTTPSeV3yR2b9Riqon4fe jz15buINRVUIXXkGRw248g0QHn+qfjjFRRKg3G2NLISHmtIa1sTdVlA0Hc9oTRDRVlGKji eHsK0EvU09GjMI+rAgdqt52r33fcFuk= X-MC-Unique: Ukr09GLQOvG77zjQpbhQKA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695397361; x=1696002161; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oCqi2uuZUZBw1/6wR9LkzHBSEz7KGdquiO19QA3ceY4=; b=aX4wp6+vJS6CF5FwP89qcKPsM4IkM2pPqyAjwPzH4ksUsLKSvzZhhGtfYwBzhF038k KNtDCJj5wmHlb/YBm+SYL9Z8b9dzr/BWVCdfqm9wk4O5YstAiv6YllGjVfuGaLFPzQGm Bw0jRJ0zNWG2blpAFLcw8aPZ0+N89eAf94tS/wYb0KMZRT0uXkJERssFqDoS67HAj7gt mSn8gUgr31qxypMh+bZQCflvwlUEBss33+3zyAefbZvrRY3lxHCIXsITTNNus0CxleYg V4xLvzS4dZlREYO0esb/1vUNPXVBwuCvPAnc30WbBtkYYOPf2S+6k8WB3IGiq5gPGGWd bnHg== X-Gm-Message-State: AOJu0YzO2v0ZEaR6MDh7pHwvxGdua7yrwbMubrLADk6TmlRHCuc61PdC 0z68DQD6CtZHRtyzlNpRRzC8oER19oUph4cEaoJWR0wYv0GZnhN3bFZep/49dcFBRUKfDnCNMSG dPoEn2Vr2+bsZOuDuQwca74HUUs525HKU+gqSUuEZUpxXhutc9JOJYDMFjXxOcm4I30iUzCM107 s= X-Received: by 2002:a05:600c:5123:b0:401:dc7e:b688 with SMTP id o35-20020a05600c512300b00401dc7eb688mr8221423wms.6.1695397361574; Fri, 22 Sep 2023 08:42:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGE4FAGHRg2J+2eGHP9zGzuwwyUijfkw5G0T3ErAjJhv21Na8fQliEXR45jsE681BHodQx3Zg== X-Received: by 2002:a05:600c:5123:b0:401:dc7e:b688 with SMTP id o35-20020a05600c512300b00401dc7eb688mr8221411wms.6.1695397361283; Fri, 22 Sep 2023 08:42:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: balaton@eik.bme.hu, Martin Kletzander , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 5/9] hw/audio: Simplify hda audio init Date: Fri, 22 Sep 2023 17:42:24 +0200 Message-ID: <20230922154228.304933-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230922154228.304933-1-pbonzini@redhat.com> References: <20230922154228.304933-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695397421026100005 From: Martin Kletzander No return values are used anywhere, so switch the functions to be void and add support for error reporting using errp for use in next patches. Signed-off-by: Martin Kletzander Reviewed-by: Daniel P. Berrang=C3=A9 Message-ID: Signed-off-by: Paolo Bonzini --- hw/audio/hda-codec.c | 32 ++++++++++++++++++-------------- hw/audio/intel-hda.c | 4 +--- hw/audio/intel-hda.h | 2 +- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index c51d8ba6177..a26048cf15e 100644 --- a/hw/audio/hda-codec.c +++ b/hw/audio/hda-codec.c @@ -675,7 +675,9 @@ static void hda_audio_stream(HDACodecDevice *hda, uint3= 2_t stnr, bool running, b } } =20 -static int hda_audio_init(HDACodecDevice *hda, const struct desc_codec *de= sc) +static void hda_audio_init(HDACodecDevice *hda, + const struct desc_codec *desc, + Error **errp) { HDAAudioState *a =3D HDA_AUDIO(hda); HDAAudioStream *st; @@ -718,7 +720,6 @@ static int hda_audio_init(HDACodecDevice *hda, const st= ruct desc_codec *desc) break; } } - return 0; } =20 static void hda_audio_exit(HDACodecDevice *hda) @@ -848,37 +849,40 @@ static Property hda_audio_properties[] =3D { DEFINE_PROP_END_OF_LIST(), }; =20 -static int hda_audio_init_output(HDACodecDevice *hda) +static void hda_audio_init_output(HDACodecDevice *hda, Error **errp) { HDAAudioState *a =3D HDA_AUDIO(hda); + const struct desc_codec *desc =3D &output_nomixemu; =20 if (!a->mixer) { - return hda_audio_init(hda, &output_nomixemu); - } else { - return hda_audio_init(hda, &output_mixemu); + desc =3D &output_mixemu; } + + hda_audio_init(hda, desc, errp); } =20 -static int hda_audio_init_duplex(HDACodecDevice *hda) +static void hda_audio_init_duplex(HDACodecDevice *hda, Error **errp) { HDAAudioState *a =3D HDA_AUDIO(hda); + const struct desc_codec *desc =3D &duplex_nomixemu; =20 if (!a->mixer) { - return hda_audio_init(hda, &duplex_nomixemu); - } else { - return hda_audio_init(hda, &duplex_mixemu); + desc =3D &duplex_mixemu; } + + hda_audio_init(hda, desc, errp); } =20 -static int hda_audio_init_micro(HDACodecDevice *hda) +static void hda_audio_init_micro(HDACodecDevice *hda, Error **errp) { HDAAudioState *a =3D HDA_AUDIO(hda); + const struct desc_codec *desc =3D µ_nomixemu; =20 if (!a->mixer) { - return hda_audio_init(hda, µ_nomixemu); - } else { - return hda_audio_init(hda, µ_mixemu); + desc =3D µ_mixemu; } + + hda_audio_init(hda, desc, errp); } =20 static void hda_audio_base_class_init(ObjectClass *klass, void *data) diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index b9ed231fe84..78ff9f9a680 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -71,9 +71,7 @@ static void hda_codec_dev_realize(DeviceState *qdev, Erro= r **errp) return; } bus->next_cad =3D dev->cad + 1; - if (cdc->init(dev) !=3D 0) { - error_setg(errp, "HDA audio init failed"); - } + cdc->init(dev, errp); } =20 static void hda_codec_dev_unrealize(DeviceState *qdev) diff --git a/hw/audio/intel-hda.h b/hw/audio/intel-hda.h index f78c1833e34..8d710eee5d6 100644 --- a/hw/audio/intel-hda.h +++ b/hw/audio/intel-hda.h @@ -31,7 +31,7 @@ struct HDACodecBus { struct HDACodecDeviceClass { DeviceClass parent_class; =20 - int (*init)(HDACodecDevice *dev); + void (*init)(HDACodecDevice *dev, Error **errp); void (*exit)(HDACodecDevice *dev); void (*command)(HDACodecDevice *dev, uint32_t nid, uint32_t data); void (*stream)(HDACodecDevice *dev, uint32_t stnr, bool running, bool = output); --=20 2.41.0 From nobody Fri May 17 21:53:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695397381; cv=none; d=zohomail.com; s=zohoarc; b=Fl8OUHMyvxqjSZcxGEGsAwP6qTZ4oe0sQp8UuEbaaKB5NAk34TADuHA/wVkvfV2dFrxb0NWw1En9jgXb7QlLeMsgDVy0G/9dE38HBgd7UPpgSLpEddaYAIJEtfVW65bZcpDSEyWdMdr+obTiKFGAhh31O+1Q7gKqvt6SLTVmC3I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695397381; 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=IqGt2fPfgTyHEp6DMIYvMCh4gKwvp12ld6099wBQ+mY=; b=VrHnvmR6HKzxALkuaRSWpB3LFs0z9TssOYozKsJBG6UJCIyBryKJMjZ/txvJT4RZhkSyiFahafbiOXgOW7cp8pHJZaGQagnlEHH/NnL1uCGXDv/Ts3vM3AA/VVapmW55DpUZ5CMV8mluIMy/CZO0Co6hmyOEdLpkoNUWQ1EOrG4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695397381393752.8274345410894; Fri, 22 Sep 2023 08:43:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjiIx-0000nV-Uu; Fri, 22 Sep 2023 11:42:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjiIu-0000b3-68 for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:42:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjiIp-0002pJ-FP for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:42:51 -0400 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.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-645-aI1KLTL3O6CKv0yFW4_rVg-1; Fri, 22 Sep 2023 11:42:45 -0400 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-403ca0e2112so17386785e9.0 for ; Fri, 22 Sep 2023 08:42:45 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id d18-20020a05600c251200b003fed7fa6c00sm7848768wma.7.2023.09.22.08.42.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 08:42:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695397366; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IqGt2fPfgTyHEp6DMIYvMCh4gKwvp12ld6099wBQ+mY=; b=JIT6wKwtw6J1ngNIfS02iNcEnOHGQNrRbHwzmKr5VBttaGcHyoQvcP0BLWDGGuidLgr+Rh qWKEVxT+8r2H+GpTyqKfXy51somch9UCeCmXwIuPObddIqvOwIJrVv3wh6Ytvk3QOmIPp6 gILhd81VesF5Hyw8/9Bgf6ykJqPbWDM= X-MC-Unique: aI1KLTL3O6CKv0yFW4_rVg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695397363; x=1696002163; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IqGt2fPfgTyHEp6DMIYvMCh4gKwvp12ld6099wBQ+mY=; b=tD0mtHo1LmXHBtcBYS2Nu8KJVVWeqBFR1Aw71coAT4A7dI43qEPjY1HS2ApDQwnaeR Ey5FcB32s42GAKUumb8uK0HLSf4tGDz7pH8OO70bHWAaV77vo4DKUwWZiLcRIX3k2ZQA +ifPtQzbmZL+60z1uA66mEowsKeHRj6Z27WnCMxLIEZP13aLaSm2kz62n5n1heg+tICz RgsaBoIbGl/JR62/qqCZFuf8smbqyxVUswTNp1XucziBTjsNT4NKiMaiY+B+bYb/Tzm4 SLzkztFeHkDADLlkXwrfJ2idPSgKDw/aZ6L0FQuuedtTA3dNKmM9iDv3MM8LiId950h8 eY9g== X-Gm-Message-State: AOJu0Yy/bBzEtM6L8tESCuOIjRuIUCrbZtaF4H9B7YN/ttY8PenhYj5e K5e7IIhVVVAASXJsSSX84xAI4IJw72qCnNNqp1AgLuvAOtzPzuNmMPXA/aTp/IomjMq3APO+IaM v8zmiMlFWsyTEze4A1th4sKqHZTpyqywXTb8XWqyHi8rZVPBQZUuZHqj2YnfYVlPFpA5guPs9wC M= X-Received: by 2002:a7b:cbd3:0:b0:3fd:2e89:31bd with SMTP id n19-20020a7bcbd3000000b003fd2e8931bdmr8158284wmi.14.1695397363537; Fri, 22 Sep 2023 08:42:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFfgCLEhw53eJfZE0rF7xkomyzHjiE+JKoAaPuh22PAd6ysKUNko2FGBinK04arsoC8KEiFYw== X-Received: by 2002:a7b:cbd3:0:b0:3fd:2e89:31bd with SMTP id n19-20020a7bcbd3000000b003fd2e8931bdmr8158266wmi.14.1695397363241; Fri, 22 Sep 2023 08:42:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: balaton@eik.bme.hu, Martin Kletzander , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 6/9] hw/audio/lm4549: Add errp error reporting to init function Date: Fri, 22 Sep 2023 17:42:25 +0200 Message-ID: <20230922154228.304933-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230922154228.304933-1-pbonzini@redhat.com> References: <20230922154228.304933-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695397383546100003 From: Martin Kletzander This will be used in future commit. Signed-off-by: Martin Kletzander Reviewed-by: Daniel P. Berrang=C3=A9 Message-ID: Signed-off-by: Paolo Bonzini --- hw/audio/lm4549.c | 3 ++- hw/audio/lm4549.h | 3 ++- hw/audio/pl041.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/audio/lm4549.c b/hw/audio/lm4549.c index 32b1481b561..418041bc9c6 100644 --- a/hw/audio/lm4549.c +++ b/hw/audio/lm4549.c @@ -276,7 +276,8 @@ static int lm4549_post_load(void *opaque, int version_i= d) return 0; } =20 -void lm4549_init(lm4549_state *s, lm4549_callback data_req_cb, void* opaqu= e) +void lm4549_init(lm4549_state *s, lm4549_callback data_req_cb, void* opaqu= e, + Error **errp) { struct audsettings as; =20 diff --git a/hw/audio/lm4549.h b/hw/audio/lm4549.h index aba9bb5b077..61c3ab12dd3 100644 --- a/hw/audio/lm4549.h +++ b/hw/audio/lm4549.h @@ -36,7 +36,8 @@ typedef struct { extern const VMStateDescription vmstate_lm4549_state; =20 =20 -void lm4549_init(lm4549_state *s, lm4549_callback data_req, void *opaque); +void lm4549_init(lm4549_state *s, lm4549_callback data_req, void *opaque, + Error **errp); uint32_t lm4549_read(lm4549_state *s, hwaddr offset); void lm4549_write(lm4549_state *s, hwaddr offset, uint32_t value); uint32_t lm4549_write_samples(lm4549_state *s, uint32_t left, uint32_t rig= ht); diff --git a/hw/audio/pl041.c b/hw/audio/pl041.c index 03acd4fe344..868dffbfd32 100644 --- a/hw/audio/pl041.c +++ b/hw/audio/pl041.c @@ -564,7 +564,7 @@ static void pl041_realize(DeviceState *dev, Error **err= p) } =20 /* Init the codec */ - lm4549_init(&s->codec, &pl041_request_data, (void *)s); + lm4549_init(&s->codec, &pl041_request_data, (void *)s, errp); } =20 static const VMStateDescription vmstate_pl041_regfile =3D { --=20 2.41.0 From nobody Fri May 17 21:53:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695397419; cv=none; d=zohomail.com; s=zohoarc; b=mzKlY+J5Kcy1uRAGHJF9ZzQLbU6l6dBKfHHHxh+Kh4uZBOEjXxfLrGLyxsFop+zvVBVxjvA05HKu5VSKu/6mvQyTnW3xKRi8oPVdFuXmDUt9cfvZksG3RJSzZ7aOFE78+69xI3dVDPk3+PX2U4GCp9fe0u4abU5gcT8auMRbvt8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695397419; 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=g4aZIa2PSQ4iemAt8feI7jH/a2bDufHqmAyu5oMZZBw=; b=PPCgtn1DUh8GEQ7ES9X1EKGQ3FZLqlC4ugkDdVwTiKZeb3qqiBzdNMoO+Ff42zV1/yjU6GYGIX2y735ykPDGI+9DGqqm3zuJcFA7LsjJFNQwlJu3e1MrC+m4lqgSbTZC+ph1MUPdKTY/+R7ibqCP5hFKYEonaVlZLNTBUoT/NeI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695397419275894.5596423735191; Fri, 22 Sep 2023 08:43:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjiIy-00017b-LM; Fri, 22 Sep 2023 11:42:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjiIv-0000ko-HE for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:42:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjiIr-0002pS-W1 for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:42:53 -0400 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.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-447-DE5-JkQ2NH-QPHPMamTE_Q-1; Fri, 22 Sep 2023 11:42:48 -0400 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-40524bc3c5cso16646955e9.0 for ; Fri, 22 Sep 2023 08:42:47 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id k1-20020adfe3c1000000b0031ff1ef7dc0sm4734204wrm.66.2023.09.22.08.42.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 08:42:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695397369; 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=g4aZIa2PSQ4iemAt8feI7jH/a2bDufHqmAyu5oMZZBw=; b=OLM7u+J4onUHD5nu/lRVIhoZBsEpbAAR8DtIM/NL2hRkcUFTXbauUd0SRV1+H1VcC+bAcx 3PEx5B0XcSb/W9dP97LS8oHUg5yGRVtusktx7bAblIeeDAdf1dw47WbpuLemylEGnQzpoe QWo3AmOeTw5yLtZXup2HLFSSGFFXWBA= X-MC-Unique: DE5-JkQ2NH-QPHPMamTE_Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695397365; x=1696002165; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=g4aZIa2PSQ4iemAt8feI7jH/a2bDufHqmAyu5oMZZBw=; b=KqDNJFayLbu3ATRa5yhKc9NtrczO1gnfZTl2WnudSxhLeraiGXCYsAOT3iAjRkqVeQ L4K2nnDptpcl9Sugtkqh214NBfDKgoJu41zf1a9AQcelRS1DsFNzmMikmbwe05Pn2wTQ zWw2pRfIhEA65F5Gl2yAd7lkHC9H6vLeDq4ITl8ZZoZe/xv80rC3Q1tpJZA1M9R+69o3 V/ZXgXpPKAuaomOIwtFkozGJY1Kr+xTpL2B2ZieMl6HP8lM2xxoV7WeLPh5a8oDiU0zK ZQY4j17eF6pmhzZo0RYeBZ5Bs5Ayk3F8t4OX4NTRpVV7PRR7PQ1O6AdGX1MupRW19EXe fxqw== X-Gm-Message-State: AOJu0Yyvp+LBClo+LxYQid/bfPQqtt6PupdP1zcfX9kgJ6aU1lj/cTKD FyI24kwcQdKZfhcw1ZF1nBDhig3y+hIjW0jWDYDsxIwlfnIJucKG+0a+8qo3kW1HbR7C8RIOVNx wcwU6g48lX00hfdv18ONAm1yLVq7tjOlreCO7dzzaqQnLvMbUWpDEaU66/SWj+nhT0XWeDYkM95 Q= X-Received: by 2002:a05:600c:ad6:b0:401:b1c6:97d8 with SMTP id c22-20020a05600c0ad600b00401b1c697d8mr7819796wmr.35.1695397365656; Fri, 22 Sep 2023 08:42:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEkSjfwUAeeNNYIut9i92JKnqBawbZMW5wo3kzWimKFxIMvn6Bom8/k80QaUuzxj8l4ciTGfQ== X-Received: by 2002:a05:600c:ad6:b0:401:b1c6:97d8 with SMTP id c22-20020a05600c0ad600b00401b1c697d8mr7819780wmr.35.1695397365278; Fri, 22 Sep 2023 08:42:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: balaton@eik.bme.hu, Martin Kletzander Subject: [PULL 7/9] hw/display/xlnx_dp.c: Add audiodev property Date: Fri, 22 Sep 2023 17:42:26 +0200 Message-ID: <20230922154228.304933-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230922154228.304933-1-pbonzini@redhat.com> References: <20230922154228.304933-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695397421112100006 Content-Type: text/plain; charset="utf-8" From: Martin Kletzander There was no way to set this and we need that for it to be able to properly initialise. Signed-off-by: Martin Kletzander Message-ID: <16963256573fcbfa7720aa2fd000ba74a4055222.1650874791.git.mkletz= an@redhat.com> Signed-off-by: Paolo Bonzini --- hw/display/xlnx_dp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c index 43c7dd8e9cd..341e91e886f 100644 --- a/hw/display/xlnx_dp.c +++ b/hw/display/xlnx_dp.c @@ -1385,6 +1385,11 @@ static void xlnx_dp_reset(DeviceState *dev) xlnx_dp_update_irq(s); } =20 +static Property xlnx_dp_device_properties[] =3D { + DEFINE_AUDIO_PROPERTIES(XlnxDPState, aud_card), + DEFINE_PROP_END_OF_LIST(), +}; + static void xlnx_dp_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); @@ -1392,6 +1397,7 @@ static void xlnx_dp_class_init(ObjectClass *oc, void = *data) dc->realize =3D xlnx_dp_realize; dc->vmsd =3D &vmstate_dp; dc->reset =3D xlnx_dp_reset; + device_class_set_props(dc, xlnx_dp_device_properties); } =20 static const TypeInfo xlnx_dp_info =3D { --=20 2.41.0 From nobody Fri May 17 21:53:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695397388; cv=none; d=zohomail.com; s=zohoarc; b=g1lE2Y2wRHCewtRH8nzoscToqCSyKMvIkfkVoKfmrsGhNUJDRc07rD8TlLnCSxGeZoMh6YoBFBLn+49iA72gnWh09ukRmOlt91gWfakURGbBV5X/xWN3HUDXsoQyoUqJKKEzxIyQd4DoYTwO/34Jm30uaEu/YUnvqFfCBOGyvU4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695397388; 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=eEsKc+d0fnRtLJHbjHGMBYA2mr0CMr95bGIl3yAmm50=; b=hs8hdq7WAactb0a76e3rANEX2f2yyuyheNCft+HwsJn8z2BLJiS9CTBGGeg6lWmYZqyBINQuyQCirbQQX4Iqzn2GOTUzA3guysE/I1XtzB6yxZ0h/dCZ8scM3L8tvvrSaMdXM4kX93NVVSvVXW33HoKEQB5b+xYMmOAzOW8O0Bg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695397388807439.30700843243176; Fri, 22 Sep 2023 08:43:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjiIz-0001DG-VB; Fri, 22 Sep 2023 11:42:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjiIy-00013a-0n for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:42:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjiIv-0002pp-3n for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:42:55 -0400 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.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-479-M9K7lICJNCS1SYHr5omQCw-1; Fri, 22 Sep 2023 11:42:49 -0400 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-40526a782f7so17935045e9.2 for ; Fri, 22 Sep 2023 08:42:49 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id y2-20020a7bcd82000000b00403bbe69629sm4988462wmj.31.2023.09.22.08.42.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 08:42:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695397372; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eEsKc+d0fnRtLJHbjHGMBYA2mr0CMr95bGIl3yAmm50=; b=N5ut2L1By/OSu5Y3WRAAGnmD5/a/zV7lyndkDMONr21YCPL7mRZGCbjnMjB3ETa0M38AmF Wb9o6fD30J0teljJw3H6UpEyAZTzO3ER2aAYl5jzV4hKMWN2kaus5gKvnL4PqZ9hp04cCf FH0rEZwsmdxaNkMcGmBdpS28ORW5+OI= X-MC-Unique: M9K7lICJNCS1SYHr5omQCw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695397368; x=1696002168; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eEsKc+d0fnRtLJHbjHGMBYA2mr0CMr95bGIl3yAmm50=; b=gCdXRsZ276zXXuSb5mVRtvPEwowGrD1JmipF8s4NYEOu45Dx3SZgopSA9xLK50cY1o LkX2ywOwOZSo1UOjB+KZvI3feAfEK73ucwxT2aWUf1b8MM8s6u4fp7FD09Xp0oZBcaj8 y2YAvyoO1UBoi3Ll4eo+kbuH1Tr6AhbSZTHv/HS4sVUQQ9r+uX7OolaCZMWS5qC0RsCd FMhfKmoHeyYXlbt9FqV+UWV5VWpjKcjXTMWGbaxwcvoQwVlr2YmG3vMeyQM0G3/Aqnem VYxrQTtZ8YBeCUSqHRjxWzOQC8VnD2hFM1cMV0e0CPBF7vpKcDNWbb5+SJioY+s6vMJX f7Nw== X-Gm-Message-State: AOJu0YxIH1QybE1EuUA0L3ogSfFJk9urkiscUb99P+TLwnDuk3Hw3kud VMqA+Lo1uinrmkxHr+kF0KTlqOs16GYJ5qFA/iWQOe6pI5r2TegrDX7H7EXuAkVE/G3xQ7Oj82h 2Raq4fZiYTfomd1Ft2AIO+yKKWjIBxg1EAF60PKjcPJfDFwpIal0VW7wt20QnrM0CFLhF0gw39s Y= X-Received: by 2002:a1c:7419:0:b0:3fb:b248:67c with SMTP id p25-20020a1c7419000000b003fbb248067cmr8384565wmc.22.1695397368033; Fri, 22 Sep 2023 08:42:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFC5gMzJmlbuqlco8FqYLbougVmrD4mm3m4tztnpspMLM4Npp1qjWEdvzlAym2H6ickiATutQ== X-Received: by 2002:a1c:7419:0:b0:3fb:b248:67c with SMTP id p25-20020a1c7419000000b003fbb248067cmr8384546wmc.22.1695397367657; Fri, 22 Sep 2023 08:42:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: balaton@eik.bme.hu, Martin Kletzander , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 8/9] tests/qtest: Specify audiodev= and -audiodev Date: Fri, 22 Sep 2023 17:42:27 +0200 Message-ID: <20230922154228.304933-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230922154228.304933-1-pbonzini@redhat.com> References: <20230922154228.304933-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695397390746100003 From: Martin Kletzander 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 Message-ID: <6e7f2808dd40679a415812767b88f2a411fc137f.1650874791.git.mkletz= an@redhat.com> Signed-off-by: Paolo Bonzini --- tests/qtest/es1370-test.c | 3 ++- tests/qtest/fuzz/generic_fuzz_configs.h | 6 ++++-- tests/qtest/intel-hda-test.c | 15 ++++++++++----- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/tests/qtest/es1370-test.c b/tests/qtest/es1370-test.c index 97ab65c4357..8387e74193b 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 50689da6539..4d7c8ca4ece 100644 --- a/tests/qtest/fuzz/generic_fuzz_configs.h +++ b/tests/qtest/fuzz/generic_fuzz_configs.h @@ -106,8 +106,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 d4a8db6fd60..663bb6c4854 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("-machine pc -device intel-hda,id=3D" HDA_ID CODEC_DEVICES= ); + qtest_start(AUDIODEV "-machine pc -device intel-hda,id=3D" HDA_ID CODE= C_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.41.0 From nobody Fri May 17 21:53:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695397401; cv=none; d=zohomail.com; s=zohoarc; b=WvwDpsT30OYAqGrPiCHlUP5R5hxEbIF+KqkZzVksfvQX6uBbwIrrOg3UA1YNEuTStwi40NQPcj4BZudXauEpOGb6Z/dgTEF27zVeh+zX1yAMw4DcUjfLdLOOFYRANPJZn+dPC3CzjgDFym0W2guT11brWZErxSku+bku5/ko37U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695397401; 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=VMZ+AskVKkkayA7hWqukYo5LCBh6zTOaAKLH+iWgTGE=; b=CxdFjUfN9wfQU7l7+54jX7Ssafjzb2Af19eJa1Wq+jvgV/cHvSdZaqFJyKbeXwKuchjwjOrxlP2ikOCW5aziwhEdsYVnhfv+ga2vxxcW5RnBnb8rDPFRru7Lh5ETGDTABJVR3JqI7aczeye/0slqWgDY1Hja8vlgUK5A/qiWueQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695397401352425.6650398073308; Fri, 22 Sep 2023 08:43:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjiJ0-0001Hf-Lj; Fri, 22 Sep 2023 11:42:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjiIz-0001C8-Im for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:42:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjiIy-0002q4-2j for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:42:57 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-331-EhIQt_dKOdO7lQ6VvrBhFw-1; Fri, 22 Sep 2023 11:42:51 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-40540179bcdso4655275e9.2 for ; Fri, 22 Sep 2023 08:42:51 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id o5-20020a056000010500b0031ddf6cc89csm4693058wrx.98.2023.09.22.08.42.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 08:42:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695397374; 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=VMZ+AskVKkkayA7hWqukYo5LCBh6zTOaAKLH+iWgTGE=; b=EQg5p31dfaAZ+iJQ0XAh30F5NIs0mEDs3/YhPn6baUEChjwaC6+BM7df6Eq4iRRUuuFhix wFr7534kMbBwnBgMflrV9A8HbgJilTG8Uc9pSmgMzEHLsQyaids6NbDgRKmXBPwibws02s NTnd9HHSKmXUYiv3VK/p7I0V0gRbqRg= X-MC-Unique: EhIQt_dKOdO7lQ6VvrBhFw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695397370; x=1696002170; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VMZ+AskVKkkayA7hWqukYo5LCBh6zTOaAKLH+iWgTGE=; b=CPsD+tMaJqJ4YrqWJ0veQt4DYuMQVN0boyJOHp9LTMDBHzmPbwKJH0ba2Fe/lP+oa7 65MQWDkaiJmeZDawHMKNv+GFNvdYmXY26lo3BiJ9ySfIFhKJ5mkO4enRzROZArpnuDiv HEA5ez48/S57SAi/QEW526LJG2BI7pGu1qzLrZ4bKMEpjagEbrlX1rQ45UvLsl3vSfi9 ssf7ui3d6iIJ4taVtFkRQ9KBCYCSWC9AAb6cAq9vIrOOQy7+fNMQliiKIOzwcS1HGlbB jt3krc8utoNLxELoZCzuoAh7YgXxOVkvbIGmHbPE/ZtoW8PC70nKq2NAEWbRk3aJBnB5 ifww== X-Gm-Message-State: AOJu0YystvHtsRO5lfKbpfY56s/A9Oahog2AEwGMDKOdufvX80hZUmYw AJOoKXD96s5iM9S0Gac9dd4e1VL4YAiZ/Yp/VaFgawyDsUNL/iH05ghLm9Ih5uMKP6hT8brpYvu PgNPdi8faRNoi9cucEcCWWuhKE0mT9mRB3U/QEpbHw09hhlcHTYdycEHryIe2F8HrN/uWPqW70g A= X-Received: by 2002:a5d:4d4c:0:b0:31f:97e2:a924 with SMTP id a12-20020a5d4d4c000000b0031f97e2a924mr48367wru.14.1695397369886; Fri, 22 Sep 2023 08:42:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGYSX1xydJU9QEVerkJ8R48/IVdwdXsNGgdpis3W6z0iXO6w24s4WhSDqXJQ7XTo63WRMNtAw== X-Received: by 2002:a5d:4d4c:0:b0:31f:97e2:a924 with SMTP id a12-20020a5d4d4c000000b0031f97e2a924mr48352wru.14.1695397369613; Fri, 22 Sep 2023 08:42:49 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: balaton@eik.bme.hu Subject: [PULL 9/9] vl: recognize audiodev groups in configuration files Date: Fri, 22 Sep 2023 17:42:28 +0200 Message-ID: <20230922154228.304933-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230922154228.304933-1-pbonzini@redhat.com> References: <20230922154228.304933-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695397402962100011 Content-Type: text/plain; charset="utf-8" This is necessary for the q35 configuration tests to pass, once audiodev becomes mandatory. Signed-off-by: Paolo Bonzini --- docs/config/q35-emulated.cfg | 4 ++++ docs/config/q35-virtio-graphical.cfg | 4 ++++ softmmu/vl.c | 10 ++++++++++ 3 files changed, 18 insertions(+) diff --git a/docs/config/q35-emulated.cfg b/docs/config/q35-emulated.cfg index c8806e6d362..b4bd7e858a9 100644 --- a/docs/config/q35-emulated.cfg +++ b/docs/config/q35-emulated.cfg @@ -288,3 +288,7 @@ driver =3D "hda-duplex" bus =3D "ich9-hda-audio.0" cad =3D "0" + audiodev =3D "audiodev0" + +[audiodev "audiodev0"] + driver =3D "none" # CHANGE ME diff --git a/docs/config/q35-virtio-graphical.cfg b/docs/config/q35-virtio-= graphical.cfg index 148b5d2c5e4..820860aefe0 100644 --- a/docs/config/q35-virtio-graphical.cfg +++ b/docs/config/q35-virtio-graphical.cfg @@ -248,3 +248,7 @@ driver =3D "hda-duplex" bus =3D "sound.0" cad =3D "0" + audiodev =3D "audiodev0" + +[audiodev "audiodev0"] + driver =3D "none" # CHANGE ME diff --git a/softmmu/vl.c b/softmmu/vl.c index 3db4fd26808..db04f98c36f 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2125,6 +2125,7 @@ static int global_init_func(void *opaque, QemuOpts *o= pts, Error **errp) static bool is_qemuopts_group(const char *group) { if (g_str_equal(group, "object") || + g_str_equal(group, "audiodev") || g_str_equal(group, "machine") || g_str_equal(group, "smp-opts") || g_str_equal(group, "boot-opts")) { @@ -2140,6 +2141,15 @@ static void qemu_record_config_group(const char *gro= up, QDict *dict, Visitor *v =3D qobject_input_visitor_new_keyval(QOBJECT(dict)); object_option_add_visitor(v); visit_free(v); + + } else if (g_str_equal(group, "audiodev")) { + Audiodev *dev =3D NULL; + Visitor *v =3D qobject_input_visitor_new_keyval(QOBJECT(dict)); + if (visit_type_Audiodev(v, NULL, &dev, errp)) { + audio_define(dev); + } + visit_free(v); + } else if (g_str_equal(group, "machine")) { /* * Cannot merge string-valued and type-safe dictionaries, so JSON --=20 2.41.0