From nobody Wed Nov 19 18:38:43 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1702639761; cv=none; d=zohomail.com; s=zohoarc; b=DzSOKyRoypxjNp+ZhB0F96mBWsNm20mJZASw5ty3iC11JHNqAXsPmGa9erTSQgEe2zpccrpT8CRsWggbD2a2IcbaVsIbXZTXsduvnMMj0kLfJP4mXaUmhZqM+AUEsZqDgHjwq+agxMiL4DViET12tpFdrZenG+GjFL9Rxb5gPbM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1702639761; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=0i5r57sAw8QjB30mHV+P8fvG850MAvHAx4phnQ8ja8M=; b=HdN5XAOeilNZoDAv7L38SLP9Kak/8f1iUjXBaUjiShN/48eeLGOuLv0C7XSKQYBlxxGmnOjDJf0W4wnS4yXvWhgr0gICagWRfmjJh5PvzcwSaIKApTu6/zYlNnzMx5cilH13wa9zWrGTmn2U+uxgWT8b3MscKE94lnNWql3ftos= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1702639761598982.698287810782; Fri, 15 Dec 2023 03:29:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rE6NH-0002mS-R6; Fri, 15 Dec 2023 06:28:59 -0500 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 1rE6N2-0002kv-Uk for qemu-devel@nongnu.org; Fri, 15 Dec 2023 06:28:46 -0500 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rE6N1-0007tx-6N for qemu-devel@nongnu.org; Fri, 15 Dec 2023 06:28:44 -0500 Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-5c68b5cf14bso249576a12.0 for ; Fri, 15 Dec 2023 03:28:42 -0800 (PST) Received: from localhost ([157.82.205.15]) by smtp.gmail.com with UTF8SMTPSA id w2-20020a1709029a8200b001cfca7b8ee7sm14044087plp.99.2023.12.15.03.28.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 15 Dec 2023 03:28:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1702639721; x=1703244521; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=0i5r57sAw8QjB30mHV+P8fvG850MAvHAx4phnQ8ja8M=; b=LBFFsdqeOYc+CEQjoOmFJ1A2kfeHBWvafONMlp8Q+bVV1ipxqq28rkBAll9micvEV8 FLIGUi7rqSw82jwzQ3LYFEDdwOHF1O3QbFzyKJSeOQV2ZB/APXtGNTHxQ3//lh3O7BQE 1PEdLWwyjearujAaSSswuZ3/luZY7lveDE1W9clXcmK2iN2N7DZ4JyyPYcmii+rIq8NS ASJxdcM6YxgHyQ+Z6iVwbdMRkOJ1KvfYwR9RtSrBxjLRd/49pRmEhg5OUL6yz19HLjsM 6K2Fqljvl9uICW0cHGQho9LEPEhzKTurBuUSgT/nt8HeuY0gtbwXS6q65Bbex5zy+t79 yM1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702639721; x=1703244521; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0i5r57sAw8QjB30mHV+P8fvG850MAvHAx4phnQ8ja8M=; b=WoQ7dVo2xr9YygIGAPtT0updVux9aMxaGXosCAOEziEbP/jJoU26ajmsMLn0X9Yjqt SSWGYEHH3FvCi8rOeIEscfoPhJ+PT5qLKnmBtCN+OoiEqUna5jm4bvU852yPtQZUWMOg ngN5bdbSSynTS47mzP6rqUMPAjS+uH9HxVLGqaZlClytV2ctx0SkBpInA++edpQk2JNl CPHRoKx9yWPcgTfsDI8syPX3w1jsLzMqN+YyWslse/wYTWfVRXzTgSdgZ8Qgm6edt85Q qhuiBFLXYUMaLgTf4WIPdrPSSuX2zoTWn1QFKR2CoXuQ4ozLS+OQV8g0/0KOImmRf456 ptZA== X-Gm-Message-State: AOJu0YzOTTJ2KNgAY+tGHPDfZWzcGnqm7VoalK+8uYy3mjLmTCFxCQuR wApmdy+Vrszz4IV77wYhwIaU9Q== X-Google-Smtp-Source: AGHT+IGcmuqa37VajnEK0afUzLDz5pNgqpmpP4DYBnf7Ql4ajhLd54CIWxYwJQ/U6ojN4s2VJdic3A== X-Received: by 2002:a05:6a20:e128:b0:18f:97c:9285 with SMTP id kr40-20020a056a20e12800b0018f097c9285mr8038116pzb.106.1702639721197; Fri, 15 Dec 2023 03:28:41 -0800 (PST) From: Akihiko Odaki Date: Fri, 15 Dec 2023 20:28:33 +0900 Subject: [PATCH v2 1/4] Move dbus-display1 out of ui MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231215-dbus-v2-1-1e2e6aa02115@daynix.com> References: <20231215-dbus-v2-0-1e2e6aa02115@daynix.com> In-Reply-To: <20231215-dbus-v2-0-1e2e6aa02115@daynix.com> To: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Gerd Hoffmann , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Cc: qemu-devel@nongnu.org, Akihiko Odaki X-Mailer: b4 0.12.4 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: none client-ip=2607:f8b0:4864:20::52e; envelope-from=akihiko.odaki@daynix.com; helo=mail-pg1-x52e.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-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 @daynix-com.20230601.gappssmtp.com) X-ZM-MESSAGEID: 1702639762527100005 Despite its name, dbus-display1 does not only provide DBus interfaces for the display but also for the audio. Signed-off-by: Akihiko Odaki --- MAINTAINERS | 1 + meson.build | 21 +++++++++++++++++++++ ui/dbus.h | 2 +- audio/dbusaudio.c | 2 +- tests/qtest/dbus-display-test.c | 2 +- ui/dbus-display1.xml =3D> dbus-display1.xml | 0 ui/meson.build | 18 ------------------ 7 files changed, 25 insertions(+), 21 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 695e0bd34fbb..0c2630d0e264 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3389,6 +3389,7 @@ F: docs/sphinx/dbus* F: docs/sphinx/fakedbusdoc.py F: tests/qtest/dbus* F: scripts/xml-preprocess* +F: dbus-display.xml =20 Seccomp M: Daniel P. Berrange diff --git a/meson.build b/meson.build index ec01f8b138aa..5e1b25a47184 100644 --- a/meson.build +++ b/meson.build @@ -2014,6 +2014,27 @@ dbus_display =3D get_option('dbus_display') \ error_message: gdbus_codegen_error.format('-display dbus')) \ .allowed() =20 +if dbus_display + env =3D environment() + env.set('TARGETOS', targetos) + xml =3D custom_target('dbus-display preprocess', + input: 'dbus-display1.xml', + output: 'dbus-display1.xml', + env: env, + command: [xml_pp, '@INPUT@', '@OUTPUT@']) + dbus_display1 =3D custom_target('dbus-display gdbus-codegen', + output: ['dbus-display1.h', 'dbus-display1= .c'], + input: xml, + command: [gdbus_codegen, '@INPUT@', + '--glib-min-required', '2.64', + '--output-directory', meson.curr= ent_build_dir(), + '--interface-prefix', 'org.qemu.= ', + '--c-namespace', 'QemuDBus', + '--generate-c-code', '@BASENAME@= ']) + dbus_display1_lib =3D static_library('dbus-display1', dbus_display1, dep= endencies: gio) + dbus_display1_dep =3D declare_dependency(link_with: dbus_display1_lib, i= nclude_directories: include_directories('.')) +endif + have_virtfs =3D get_option('virtfs') \ .require(targetos =3D=3D 'linux' or targetos =3D=3D 'darwin', error_message: 'virtio-9p (virtfs) requires Linux or macOS') \ diff --git a/ui/dbus.h b/ui/dbus.h index 1e8c24a48e32..ba9bab9f84d9 100644 --- a/ui/dbus.h +++ b/ui/dbus.h @@ -31,7 +31,7 @@ #include "ui/console.h" #include "ui/clipboard.h" =20 -#include "ui/dbus-display1.h" +#include "dbus-display1.h" =20 typedef struct DBusClipboardRequest { GDBusMethodInvocation *invocation; diff --git a/audio/dbusaudio.c b/audio/dbusaudio.c index 60fcf643ecf8..5222b3c68804 100644 --- a/audio/dbusaudio.c +++ b/audio/dbusaudio.c @@ -34,7 +34,7 @@ #endif =20 #include "ui/dbus.h" -#include "ui/dbus-display1.h" +#include "dbus-display1.h" =20 #define AUDIO_CAP "dbus" #include "audio.h" diff --git a/tests/qtest/dbus-display-test.c b/tests/qtest/dbus-display-tes= t.c index 21edaa1e321f..a15e9c377b08 100644 --- a/tests/qtest/dbus-display-test.c +++ b/tests/qtest/dbus-display-test.c @@ -5,7 +5,7 @@ #include #include #include "libqtest.h" -#include "ui/dbus-display1.h" +#include "dbus-display1.h" =20 static GDBusConnection* test_dbus_p2p_from_fd(int fd) diff --git a/ui/dbus-display1.xml b/dbus-display1.xml similarity index 100% rename from ui/dbus-display1.xml rename to dbus-display1.xml diff --git a/ui/meson.build b/ui/meson.build index 0ccb3387ee6a..bbb7c5242d55 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -75,24 +75,6 @@ endif =20 if dbus_display dbus_ss =3D ss.source_set() - env =3D environment() - env.set('TARGETOS', targetos) - xml =3D custom_target('dbus-display preprocess', - input: 'dbus-display1.xml', - output: 'dbus-display1.xml', - env: env, - command: [xml_pp, '@INPUT@', '@OUTPUT@']) - dbus_display1 =3D custom_target('dbus-display gdbus-codegen', - output: ['dbus-display1.h', 'dbus-display1= .c'], - input: xml, - command: [gdbus_codegen, '@INPUT@', - '--glib-min-required', '2.64', - '--output-directory', meson.curr= ent_build_dir(), - '--interface-prefix', 'org.qemu.= ', - '--c-namespace', 'QemuDBus', - '--generate-c-code', '@BASENAME@= ']) - dbus_display1_lib =3D static_library('dbus-display1', dbus_display1, dep= endencies: gio) - dbus_display1_dep =3D declare_dependency(link_with: dbus_display1_lib, i= nclude_directories: include_directories('.')) dbus_ss.add(when: [gio, dbus_display1_dep], if_true: [files( 'dbus-chardev.c', --=20 2.43.0 From nobody Wed Nov 19 18:38:43 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1702639770; cv=none; d=zohomail.com; s=zohoarc; b=gg7CxTFyK9xc0lu699lE+w75aFJ6WyXrTGxgauUoOD2M+um9lj9h86htSCaHF8E3stDO3n5jCHEN6t33tImzYvhsipeJFstGiAU+Z5HDYrquKzOCQjiGl8ZKpsq9XdluDuqevov2ucRTklPyMY8VaduUoc9Yb8gg/l8+r/Q9Vm0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1702639770; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zM+oiGzxg7EKd7lE0tQu0q7ghD+aa2QZNrxY4fYz6OM=; b=RcE3aAmNF4440P2fKTWri+Zu37W5bob/fnIB1DWCdtNydEX3+mgbKfydNyH1xsQ50i+vPKmT5L6K8NMjGWOkjlNnBgXE0PLkrucQnzr4iMhApFIYz5VrJRC7DWWOXb9N51HPjP7DrRkVLPbOCakTcs9YKfcCDLy5CsxRk9FaazQ= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1702639770352274.4275626799166; Fri, 15 Dec 2023 03:29:30 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rE6NI-0002n1-AD; Fri, 15 Dec 2023 06:29:00 -0500 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 1rE6NA-0002m3-CZ for qemu-devel@nongnu.org; Fri, 15 Dec 2023 06:28:58 -0500 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rE6N4-000816-MP for qemu-devel@nongnu.org; Fri, 15 Dec 2023 06:28:48 -0500 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-6d099d316a8so485616b3a.0 for ; Fri, 15 Dec 2023 03:28:46 -0800 (PST) Received: from localhost ([157.82.205.15]) by smtp.gmail.com with UTF8SMTPSA id g16-20020aa78750000000b006c4d47a7668sm13371429pfo.127.2023.12.15.03.28.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 15 Dec 2023 03:28:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1702639725; x=1703244525; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=zM+oiGzxg7EKd7lE0tQu0q7ghD+aa2QZNrxY4fYz6OM=; b=NcrszIdZTVsQkzY4zN3h7BG0KslNFRPhGbtxEArmqsHTku7nt0bYLfaC8TB4kfaDgM XFjW/9Pw2nKcP5sYB1ZGzB2nheU8k8n6xluJOk2wiTJEXmK338HmnDnMT6oWukw851C4 TQCvWRnrK2fTb+yqCfqiJQnzgvWvvYuUKwYiAo4lMwQvxYo2d/1mE+MJaUPWeNPJj8iu D51P8JKBQYg3iUr6YASR5e/w89SYlEceTX2Ph8gCVWadzs1dtqlxbbgn18K/o3tivsb/ IVu79dD34HiC4xL0JYMTGtwE4wWDFVFa98ZeI/YjvXbS+qZxomD8xfIuOCd76gyn2OlS QX9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702639725; x=1703244525; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zM+oiGzxg7EKd7lE0tQu0q7ghD+aa2QZNrxY4fYz6OM=; b=MSvsToUb2qrZ6Wg7hkQJAnAyHrL4LSY1byEIdVPLs/V+tbiIGvcIwx3zgg+v15bgjM Zp81yZxB/I+ZrPwD+TPV6dGxZ/VWrgNXrAneYz3h+8n2AUKjTZDSYSZs4ILlxm6ONs92 barbn6yHru0iHDIRlLangiT7V/wZr3jCUUhZH3v4iaw4XDSZy+AO/8DlA/k6vwUl9Z2b NQH8fT1XL+IgLrMkl41A5y+85vUBHT3jq1vSt/IzG6SfUFhqCDPzejY5nmGK3bYux5D1 3PEC5chFEJ+Uy0RStvN2cuCpM+ZED0IOOhtCv+n64Wa9VwD1kOI5Dt9OJLNTvu6AwkRs fNrw== X-Gm-Message-State: AOJu0YzgR31z7JMNZZ/n6NM7MduAojqMzAO/GVqvDMCAL6JuUEZho3kR mLlrMQ9f+cs+Kd0LLRtlHeEPzi43iXvngajzWHZobA== X-Google-Smtp-Source: AGHT+IGZGWK38ebpT2e4v8XCMZGbrkEtjRcjumP00Fk7kIOA59ejXg/CCo624Y6x0Jv9iNKdI1q/TQ== X-Received: by 2002:a05:6a00:14cb:b0:6d0:d864:219d with SMTP id w11-20020a056a0014cb00b006d0d864219dmr4942670pfu.3.1702639725511; Fri, 15 Dec 2023 03:28:45 -0800 (PST) From: Akihiko Odaki Date: Fri, 15 Dec 2023 20:28:34 +0900 Subject: [PATCH v2 2/4] audio: Depend on dbus_display1_dep MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231215-dbus-v2-2-1e2e6aa02115@daynix.com> References: <20231215-dbus-v2-0-1e2e6aa02115@daynix.com> In-Reply-To: <20231215-dbus-v2-0-1e2e6aa02115@daynix.com> To: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Gerd Hoffmann , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Cc: qemu-devel@nongnu.org, Akihiko Odaki X-Mailer: b4 0.12.4 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: none client-ip=2607:f8b0:4864:20::429; envelope-from=akihiko.odaki@daynix.com; helo=mail-pf1-x429.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-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 @daynix-com.20230601.gappssmtp.com) X-ZM-MESSAGEID: 1702639772498100003 dbusaudio needs dbus_display1_dep. Fixes: 739362d4205c ("audio: add "dbus" audio backend") Signed-off-by: Akihiko Odaki Reviewed-by: Marc-Andr=C3=A9 Lureau --- audio/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/audio/meson.build b/audio/meson.build index c8f658611f42..608f35e6af78 100644 --- a/audio/meson.build +++ b/audio/meson.build @@ -30,7 +30,8 @@ endforeach =20 if dbus_display module_ss =3D ss.source_set() - module_ss.add(when: [gio, pixman], if_true: files('dbusaudio.c')) + module_ss.add(when: [gio, dbus_display1_dep, pixman], + if_true: files('dbusaudio.c')) audio_modules +=3D {'dbus': module_ss} endif =20 --=20 2.43.0 From nobody Wed Nov 19 18:38:43 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1702639773; cv=none; d=zohomail.com; s=zohoarc; b=hRsrXVemBxY/R1pjfoxauIEIUGOKvpvecCdZZ3jS6UUavrlMlcS8bIkKwKucdkKz0eGXrA0Owkg6jy4G1lRA8UDGJ6Oxmz46es8hHMBUtwO4ab6xf05k/RPvtGYNNhYjzKk949+Ej1yIT4/b+gxIe60BQ9rZsBw4LdptF47gW3I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1702639773; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=VZJAznuesX8ySXoW7pIxzli6WPy8swHkLJj7jCZBmjA=; b=DaIJiWMEhjiFxXRATdAaZRBjcbrk400Gy80+cMX3zMMBrUO9jRO5Y1VCvSn+tjCfb0GcXM9lXfU+MeJvBoT4NsWX3sIhbsrOwwL8oLrFMgKmZz9L47JYn+YYN4sn3N+o29wcPJiR+rsoiQQ5UInHXmMBsOL8tHRPFyxjO+xxcH0= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1702639773756712.3024540151255; Fri, 15 Dec 2023 03:29:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rE6NJ-0002nD-4L; Fri, 15 Dec 2023 06:29:01 -0500 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 1rE6NF-0002m7-2r for qemu-devel@nongnu.org; Fri, 15 Dec 2023 06:28:58 -0500 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rE6NA-00087N-5a for qemu-devel@nongnu.org; Fri, 15 Dec 2023 06:28:53 -0500 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-1d0b2752dc6so3907055ad.3 for ; Fri, 15 Dec 2023 03:28:50 -0800 (PST) Received: from localhost ([157.82.205.15]) by smtp.gmail.com with UTF8SMTPSA id iz12-20020a170902ef8c00b001d349240e60sm562423plb.72.2023.12.15.03.28.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 15 Dec 2023 03:28:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1702639729; x=1703244529; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=VZJAznuesX8ySXoW7pIxzli6WPy8swHkLJj7jCZBmjA=; b=G25HGncS9UR8AIFhxopZvGpggzJNUB9q/z+oAtzOlGaofABCXORE0D2yPabThWHoSV uQQVE7XwGJibGxcK6wZhHQJXMlY63KGMOzJ1woBhXaFihvzOxgjplaF+A+gQF3vKZih4 h+PE0qJNN6F5DzOaHXc/pzv0BLQjoGh6Su2w9k4Qx21BcIm/ONwQj6xLySc55+L0vgj5 YCFOgfo4/gvcbtGi2QoiJk0VbF/r9pWosSR+erUp5eo7g8Byk2IEOKshivWhcUfCqUMg 8vOkKsjkIVc9jEl+OIRUXy+Jl16ge2XJYy1CPznFptOgClARPN20lVRscvfit/eSJL4p s6Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702639729; x=1703244529; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VZJAznuesX8ySXoW7pIxzli6WPy8swHkLJj7jCZBmjA=; b=PUTPSfw9U28FXlci+OsTTUR0MuEyV4sCjCQXhXrtgu+tkeelBFsYGqg91QJz3oI+CP 9x7/VrUAiwgcO3ZG8WnaHdJIoc/oy0ioq63Lj4TsCKgUeRGsQbR2HhV0csWFcdyiwJjH qMEV75m/8DqWsdCIpq0qjZgdF1YBI2W0fFUzmr83e1a3Fv2nzKsAysWL3djAIvtPUCcs c16mIObZ+LUi9JQmo8Vk5TmdioMWaxykte5tBzCzLqBoK8DyIIW/NLEs7jHxJwhEixyp xlsTannaM1oW8Saa2dvH0QfZwZM3PIcSbBkkv15JEQ/jI/GHkvEDWTFw7ofL4dCrerKF v0gg== X-Gm-Message-State: AOJu0YwiEKp0JBpXdivFctT2QXW8ghzeglwnjapWMUX35A9Su69g38Yk NShwJyfgE+wkcFnj184+J8G+qg== X-Google-Smtp-Source: AGHT+IGu5YlrwZKTb8f4Fu5k+B6lKlazWMxpyLpt5zRM1EDYHsMBMQ/oZ//UylWlYqgxKR57gXEgPA== X-Received: by 2002:a17:902:784c:b0:1d3:185a:eba4 with SMTP id e12-20020a170902784c00b001d3185aeba4mr7713252pln.4.1702639729155; Fri, 15 Dec 2023 03:28:49 -0800 (PST) From: Akihiko Odaki Date: Fri, 15 Dec 2023 20:28:35 +0900 Subject: [PATCH v2 3/4] meson: Explicitly specify dbus-display1.h dependency MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231215-dbus-v2-3-1e2e6aa02115@daynix.com> References: <20231215-dbus-v2-0-1e2e6aa02115@daynix.com> In-Reply-To: <20231215-dbus-v2-0-1e2e6aa02115@daynix.com> To: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Gerd Hoffmann , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Cc: qemu-devel@nongnu.org, Akihiko Odaki X-Mailer: b4 0.12.4 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: none client-ip=2607:f8b0:4864:20::631; envelope-from=akihiko.odaki@daynix.com; helo=mail-pl1-x631.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-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 @daynix-com.20230601.gappssmtp.com) X-ZM-MESSAGEID: 1702639774534100005 Explicitly specify dbus-display1.h as a dependency so that files depending on it will not get compiled too early. Fixes: 1222070e7728 ("meson: ensure dbus-display generated code is built be= fore other units") Signed-off-by: Akihiko Odaki Reviewed-by: Marc-Andr=C3=A9 Lureau --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 5e1b25a47184..c31168e11cfb 100644 --- a/meson.build +++ b/meson.build @@ -2032,7 +2032,7 @@ if dbus_display '--c-namespace', 'QemuDBus', '--generate-c-code', '@BASENAME@= ']) dbus_display1_lib =3D static_library('dbus-display1', dbus_display1, dep= endencies: gio) - dbus_display1_dep =3D declare_dependency(link_with: dbus_display1_lib, i= nclude_directories: include_directories('.')) + dbus_display1_dep =3D declare_dependency(link_with: dbus_display1_lib, s= ources: dbus_display1[0]) endif =20 have_virtfs =3D get_option('virtfs') \ --=20 2.43.0 From nobody Wed Nov 19 18:38:43 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1702639784; cv=none; d=zohomail.com; s=zohoarc; b=n5318GJf1fiyX/gBrmy8N+p7Cc9bLEzgbUeGGU5E/mlrcVdYNJZ5Lv0NPakMjP5pzK+q1aszuzqTWyUJXVZA4Y31RoF9bLLP6v9PngvYtQmjEkGLKjosOIhOVDa/ZEI/XJAJNTz4PsclZtrUP53CTsiipv3u3BsjOXVqIRnApag= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1702639784; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Pi8rBs3H6d5UCS4ax38pPa/AnRGEOIdS0XPsGWwIxMI=; b=bs8NbyQ72QJHIxOGRzUUfDKeBdZruZvJgPPFfP1UmN4p0uQrfliGhgYd2SCdkj0nCcOyHt7tuGvcgLWJ5l7bYCxFvBBZuCgVG4xGPZIraXr7OQ6vVJ/LcZFNBAh50iox0a+OCSQgnRPDijRyj7HgTeMb50sSfPNJJORZH4cMDPk= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1702639784213819.9390223186394; Fri, 15 Dec 2023 03:29:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rE6NL-0002no-1O; Fri, 15 Dec 2023 06:29:03 -0500 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 1rE6NI-0002mq-Hp for qemu-devel@nongnu.org; Fri, 15 Dec 2023 06:29:00 -0500 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rE6NE-0008DL-Rr for qemu-devel@nongnu.org; Fri, 15 Dec 2023 06:28:59 -0500 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-1d0bcc0c313so1326935ad.3 for ; Fri, 15 Dec 2023 03:28:54 -0800 (PST) Received: from localhost ([157.82.205.15]) by smtp.gmail.com with UTF8SMTPSA id w7-20020a1709027b8700b001d38ca8cbc2sm749163pll.156.2023.12.15.03.28.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 15 Dec 2023 03:28:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1702639733; x=1703244533; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Pi8rBs3H6d5UCS4ax38pPa/AnRGEOIdS0XPsGWwIxMI=; b=Yo5t92tochXO2II2q05EibvW/rY8XmowW8c/logXKPdXH7UiBZo6SxFe1CNe5bzJsx VjDNJH4drpycZrYCtuV9v2Ql/YqXNXr+KWnbu3I2Zhd4mp4Fy3lvAQS7yJjqXi+MVAhh LlmH+ZJiK5ivVr/vZq/8IRAOc9dkOKFUqYZLjGsxMKF+sIAG70iDPDws7UJTvnqVgliS 7tcE5mC6n/jcs2OkJ4z4k0ovbupkN/7v4xcQUiRjGnI97YsO6lyaRF1eywEgDbTEIKfh At7s/ss8CPAQZyQIi9HPsl7kssc3MvvYwZW6HcVCE5JHDckqRDSlyK3if76KBrBuB787 I0bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702639733; x=1703244533; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Pi8rBs3H6d5UCS4ax38pPa/AnRGEOIdS0XPsGWwIxMI=; b=TGlvTTbJN3w2yPetSoUuZoUAKR/pqvfOXf1K8oqdK/6l90iCIgYehDyDhogOfb24Hh 35vElbqQ8w1CRlXAOZffHlgwj/cU8ZDYhnTHKVykl9NR2Yb1nYB0Y8tvm3M3esfC2OXV fbrigOUkwJ7zy4LAG6VdgbunpeKzEiuDpZnqL14l4KbsYlKOFDGTRJRQogxZfn/pOEGd z2mppqWUugOdznFhu9MaC5D3oWemAr9vkiA9ivHXr/4pUma6/Waa++ffd34xUgfI4p+h LzJoOrS4DfsW1ty1cDdiEpPa0YxcurNoVuyM+WY0l6RcXsX4HzPUL8mV3nHB7iA+YOTK n3Cw== X-Gm-Message-State: AOJu0YwTAk9GwW5SLGqeA9haKOJzQqfUw8MpzO1e2Gbtc9pfgDKAwuYg pqvCKkbByps9NbmkmPnMlAjFQA== X-Google-Smtp-Source: AGHT+IGNXd2KSSAOKhnIbHdcjCr8I6UlY/AbU17W1Xs1gWW+WLTJE5D9+oVK86dyqZvFcjGg5pOgPg== X-Received: by 2002:a17:902:fc4f:b0:1d3:4796:c201 with SMTP id me15-20020a170902fc4f00b001d34796c201mr3822481plb.128.1702639733232; Fri, 15 Dec 2023 03:28:53 -0800 (PST) From: Akihiko Odaki Date: Fri, 15 Dec 2023 20:28:36 +0900 Subject: [PATCH v2 4/4] tests/qtest: Depend on dbus_display1_dep MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231215-dbus-v2-4-1e2e6aa02115@daynix.com> References: <20231215-dbus-v2-0-1e2e6aa02115@daynix.com> In-Reply-To: <20231215-dbus-v2-0-1e2e6aa02115@daynix.com> To: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Gerd Hoffmann , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Cc: qemu-devel@nongnu.org, Akihiko Odaki X-Mailer: b4 0.12.4 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: none client-ip=2607:f8b0:4864:20::62a; envelope-from=akihiko.odaki@daynix.com; helo=mail-pl1-x62a.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-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 @daynix-com.20230601.gappssmtp.com) X-ZM-MESSAGEID: 1702639784534100001 It ensures dbus-display1.c will not be recompiled. Signed-off-by: Akihiko Odaki Reviewed-by: Marc-Andr=C3=A9 Lureau --- tests/qtest/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 47dabf91d048..3a1a79d7c72e 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -332,7 +332,7 @@ if vnc.found() endif =20 if dbus_display - qtests +=3D {'dbus-display-test': [dbus_display1, gio]} + qtests +=3D {'dbus-display-test': [dbus_display1_dep, gio]} endif =20 qtest_executables =3D {} --=20 2.43.0