From nobody Wed Nov 19 18:38:38 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=1702713272; cv=none; d=zohomail.com; s=zohoarc; b=FpndRVxkVH/GxEGBXuat6WIC9ZKbKIcduuCe5n3a4n/8y/yeOrbEYBumPvtJScLJ43+zbSLxXM34mpUKXZtROd8USrdD7oT6IUKkFi5jSyGXESKzDB9wt5vEYa1ak424LzoE9b/2Zs61SmlyBO8xNrVmHkA1TBKYYwb49rbk9eQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1702713272; 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=mba+KNYPgLE1PBtZG/WyHQolldbLh2VAI2fUQ8kqkG/bnXcXyJoGl/lvxLK9HTqLxZwBZv2ucU5YBABYalYyocbYL2H9FWASszyLQyQ5/TqL1lhcLLp1RS9T2HKIY6pdEEQadTKRZat0dbLzZiIkUGP2O20HdiHp/mLGqyb/ROA= 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 1702713272467159.99331222089575; Fri, 15 Dec 2023 23:54:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rEPUZ-0003Bq-H1; Sat, 16 Dec 2023 02:53:47 -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 1rEPUX-0003BS-7D for qemu-devel@nongnu.org; Sat, 16 Dec 2023 02:53:45 -0500 Received: from mail-io1-xd30.google.com ([2607:f8b0:4864:20::d30]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rEPUV-0000kK-L7 for qemu-devel@nongnu.org; Sat, 16 Dec 2023 02:53:44 -0500 Received: by mail-io1-xd30.google.com with SMTP id ca18e2360f4ac-7b7ab52afcdso49278739f.3 for ; Fri, 15 Dec 2023 23:53:43 -0800 (PST) Received: from localhost ([157.82.205.15]) by smtp.gmail.com with UTF8SMTPSA id x4-20020a170902ec8400b001d05456394csm15315443plg.28.2023.12.15.23.53.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 15 Dec 2023 23:53:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1702713222; x=1703318022; 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=Kpu43phfH+Nv6ekIiAIVhITYgzVjaR27Z/64gsTJ36wlRAUvGClbZM0az8dQ51+gxu G9g0lR4milsOXNoMFr+uTDVhCsUzXy9VHIGLFuuOng24/7gyNLvKR+f46KOqPKCTH38I FBPhygCCUoam7/KJOnaBC8NX9ZWxb3ndAwRKGnH2pza0gH/4nwihP/YmgPNJntXticbz MXQspIVpQkr6pgUEJHg8Uh9sjOwQfS5tVe6eVEkNC6CuMn2QUqRi1hBT48Py6hjxLNxh RBdkW+IgaCNgWOuHSf30JPKnjtLCNb+RCxNpDLs7yLZB/0aidYvWOEq403zoLNrhM6Ms QLzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702713222; x=1703318022; 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=G9CpCzMWjbtfa7faHcG7I5KsQjZQeEZVwtDYGthz249oi1T/ITMfzAYqOso7wStaKb 0fKLpwioWOquveGznuPWNbHKn6Yc4s2WiWp2kzjmJa3f34dwtqnitBL6ZzvNM3uQSjCx HXDGiIA4GR/6PE32i+XJfmHjVdGBd+ScapM8ZYaPwqmaKfAamzaaxQXIBU0a7n4n8npC Ok8eyxvenim+PEQ4CkQacB9ZJAucEKuwordoomnh9jqhyN1qP2F9/yubtkJ0SfXevuKO YudkEvc7ERbNADaxSkCwxq2waBQjEnbjlbPdfcBe62AQvY6IOAsLbBt7tbY+Q8A9FlPO 74xg== X-Gm-Message-State: AOJu0YznXEMtAEeyrmvu/Cj7bllg6mUOskHH7v4Z/aZ2Vo0PQ11meFSu OGobuuguMixZoeDGeU/wZ1+jcg== X-Google-Smtp-Source: AGHT+IEFkaphxKsZoCUIujHttE2wD2hSe+a7DUe9kOo1QGIK8s55WyyuBFHNqWYxwDFtgxNM9lL9Qg== X-Received: by 2002:a05:6e02:214b:b0:35d:59a2:127f with SMTP id d11-20020a056e02214b00b0035d59a2127fmr18462113ilv.43.1702713222304; Fri, 15 Dec 2023 23:53:42 -0800 (PST) From: Akihiko Odaki Date: Sat, 16 Dec 2023 16:53:30 +0900 Subject: [PATCH v3 1/3] Move dbus-display1 out of ui MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231216-dbus-v3-1-b4bcbed7374a@daynix.com> References: <20231216-dbus-v3-0-b4bcbed7374a@daynix.com> In-Reply-To: <20231216-dbus-v3-0-b4bcbed7374a@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::d30; envelope-from=akihiko.odaki@daynix.com; helo=mail-io1-xd30.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: 1702713274242100007 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:38 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=1702713281; cv=none; d=zohomail.com; s=zohoarc; b=kfQj4O3Z5Ikx8QtBCdNtmdt+b8v5KLK3+OzJ95QpdW04YcgdEN6iUsoEdfcXukllPIS++7xcW3vW2ZOL9Lrwbz3Z2BjN3bIjnpGLTQdgKhMybWBuDvaTJi8dkURZnwgy26dle1kqaLgopcznM0I6P91Fib+IFQeayTiAenAJQWk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1702713281; 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=LHOwd/6K8GyW2k1yyxbyqMFbMO+BDnG3SZBA/pnIlsE=; b=JWG4aFl44rBeWchm/6kJCjUqHTG1YCf9oR8hG2ayR39Jp/+sjXx7jvi8b/BAGD5UsrnDeIHy1e0W2SZRW1weWuYvSAeH8KQqctNLsQHFOP0RxXaWKftcnN/R28eq1dVmJEtPsIpWUq8WLRXKC/YMXTEyGF0q2x0R5oPYyoxAxvE= 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 1702713281170968.9019495982536; Fri, 15 Dec 2023 23:54:41 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rEPUd-0003CA-2U; Sat, 16 Dec 2023 02:53:51 -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 1rEPUa-0003Bt-UR for qemu-devel@nongnu.org; Sat, 16 Dec 2023 02:53:48 -0500 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rEPUZ-0000kY-9s for qemu-devel@nongnu.org; Sat, 16 Dec 2023 02:53:48 -0500 Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-28659348677so1025065a91.0 for ; Fri, 15 Dec 2023 23:53:46 -0800 (PST) Received: from localhost ([157.82.205.15]) by smtp.gmail.com with UTF8SMTPSA id pq3-20020a17090b3d8300b0028b3539cd97sm2240366pjb.20.2023.12.15.23.53.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 15 Dec 2023 23:53:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1702713226; x=1703318026; 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=LHOwd/6K8GyW2k1yyxbyqMFbMO+BDnG3SZBA/pnIlsE=; b=PYvu4WLWg1Sn/d8OZmcFSbl486SaUxo3oeEoZ5Hj1obL5HBouibfkZL9jOXGo0/J7S XsDFq7YaLy9diJPhWx2DqMGKpgtVTjIws5wHUkG7wmKWl0KIjToAByviUeJp720bQfnp yXWOkCxQwmIWWs4ZC99vtADFI4Bnk66f34r0VgpbeGOJqx2iRaPWOs182ltYoMVzoNC1 borh8tkLKcfOiUMUhqYN19E2Y38RgaR1roSb0z18KJe9T132XNV//WlQ8g1MA3xwlosV pz+XmRrHEcRdd4tUAaGgndCs6/BuCLKFwB1FZ/mNZnHa2XROyg2e2U1Q0JYW1NH5SFCq FNVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702713226; x=1703318026; 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=LHOwd/6K8GyW2k1yyxbyqMFbMO+BDnG3SZBA/pnIlsE=; b=tQURRicWSjbXcrRx2bamPB2TsqIjXe2RKkG/ZFIkLARyWvrgbvz7EynE/RP+7BIsIx AdD7sw989uVZANX6DlOoO08yrYJlpu01UUetEKh23rwrSZWqBpTxkn0tOWVVxwPuFJkX mTMafq+RsQd+XduxuTThRfVBm4Z2nv+a7xIgeKTmvEkOAW3ikZS6aDV3f7zxaFzitcNR 3Q61Ez8JHNuVzQeJRVgaZ4ZwGQXxj6HGvNXj7zrAUqzu/fQFR9+oYY2HsqkaSwCGXUBT jvXIoLTpLJ1DY0kDM3/Oq4ZoQnzjFu3Dvm5HWmcyhYqsw1UeP38xYGxAz0DxVhpG9aUa PeUg== X-Gm-Message-State: AOJu0Yx/4/9y6FXJNF5BzSZ/XBMDONieHYomKEyQ3jX8tMFcPThO7G4t ykJCvcNUfY0luaGXcOHISOq/+g== X-Google-Smtp-Source: AGHT+IH6CZpowqBlUh9Tyrcml4jInrshkqdG3fip/MkhJtZcufKM/QK6pGrUcG072qI2PymLL5MFiw== X-Received: by 2002:a17:90b:892:b0:28b:3c7e:2819 with SMTP id bj18-20020a17090b089200b0028b3c7e2819mr2005290pjb.7.1702713226006; Fri, 15 Dec 2023 23:53:46 -0800 (PST) From: Akihiko Odaki Date: Sat, 16 Dec 2023 16:53:31 +0900 Subject: [PATCH v3 2/3] meson: Add dbus_display1 to util_ss and genh MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231216-dbus-v3-2-b4bcbed7374a@daynix.com> References: <20231216-dbus-v3-0-b4bcbed7374a@daynix.com> In-Reply-To: <20231216-dbus-v3-0-b4bcbed7374a@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::1033; envelope-from=akihiko.odaki@daynix.com; helo=mail-pj1-x1033.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: 1702713282387100001 Adding dbus_display1 to util_ss ensures that the source will be linked with audio/dbus. It also avoids recompilation when linking with dbus-display-test. Adding dbus_display1 to genh ensures that dbus-display1.h is generated before compiling ui/dbus, audio/dbus, and dbus-display-test. Both changes combined, it is no longer necessary for ui/dbus, audio/dbus, and dbus-display-test to explicitly state the dependency on dbus_display1. Fixes: 142ca628a733 ("ui: add a D-Bus display backend") Fixes: 739362d4205c ("audio: add "dbus" audio backend") Signed-off-by: Akihiko Odaki --- meson.build | 6 ++++-- tests/qtest/meson.build | 2 +- ui/meson.build | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 5e1b25a47184..c5808d410361 100644 --- a/meson.build +++ b/meson.build @@ -2014,6 +2014,7 @@ dbus_display =3D get_option('dbus_display') \ error_message: gdbus_codegen_error.format('-display dbus')) \ .allowed() =20 +dbus_display1_ss =3D ss.source_set() if dbus_display env =3D environment() env.set('TARGETOS', targetos) @@ -2031,8 +2032,8 @@ if dbus_display '--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_display1_ss.add(dbus_display1) + genh +=3D dbus_display1[0] endif =20 have_virtfs =3D get_option('virtfs') \ @@ -3433,6 +3434,7 @@ event_loop_base =3D declare_dependency(link_whole: ev= ent_loop_base, =20 stub_ss =3D stub_ss.apply(config_all, strict: false) =20 +util_ss.add_all(dbus_display1_ss) util_ss.add_all(trace_ss) util_ss =3D util_ss.apply(config_all, strict: false) libqemuutil =3D static_library('qemuutil', diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 47dabf91d048..225cd35e4664 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': [gio]} endif =20 qtest_executables =3D {} diff --git a/ui/meson.build b/ui/meson.build index bbb7c5242d55..21d1d3b27f29 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -75,7 +75,7 @@ endif =20 if dbus_display dbus_ss =3D ss.source_set() - dbus_ss.add(when: [gio, dbus_display1_dep], + dbus_ss.add(when: [gio], if_true: [files( 'dbus-chardev.c', 'dbus-clipboard.c', --=20 2.43.0 From nobody Wed Nov 19 18:38:38 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=1702713272; cv=none; d=zohomail.com; s=zohoarc; b=Fw9ga74y5q0DVzfZ/BOZra0vYQFec0UInKoU2fv4jzEglq1knOM/HjCBYuCT5OHLkH8fAeX/yKzSbs//9wL3EFtks4bHwBz+eaKQF8e6rEQqS4PNvknNczxuXkAjy7i0Tubi370CedGjlo9gConh6UG4YMluItKvQBCDoewmAWI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1702713272; 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=Gq7IuwiCbAL4UxAqcWW6ByhjVTZVkTwXzK3NqvNRRfI=; b=P8OwgEvLkvDvYyPbabiPLCA7ZDJpwRsmM1xNVHd6AdRe57cFUfkbs0l0GXW1Pk2JJfKMcWbPrWALu583nt1a37xt1qrzKgoLSQB5vBCTnC/OCzBu58/zdITU18JdasohdupDF4DyRQF0lw66KAClkv3Fm1xNyeKNVkZF4N/ttsA= 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 1702713272467321.16925538446253; Fri, 15 Dec 2023 23:54:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rEPUs-0003H3-SY; Sat, 16 Dec 2023 02:54:06 -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 1rEPUr-0003GU-0V for qemu-devel@nongnu.org; Sat, 16 Dec 2023 02:54:05 -0500 Received: from mail-il1-x12e.google.com ([2607:f8b0:4864:20::12e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rEPUd-0000kx-SN for qemu-devel@nongnu.org; Sat, 16 Dec 2023 02:54:04 -0500 Received: by mail-il1-x12e.google.com with SMTP id e9e14a558f8ab-35d699ec3caso5856415ab.3 for ; Fri, 15 Dec 2023 23:53:51 -0800 (PST) Received: from localhost ([157.82.205.15]) by smtp.gmail.com with UTF8SMTPSA id jj18-20020a170903049200b001d3650256fdsm2323314plb.294.2023.12.15.23.53.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 15 Dec 2023 23:53:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1702713230; x=1703318030; 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=Gq7IuwiCbAL4UxAqcWW6ByhjVTZVkTwXzK3NqvNRRfI=; b=FKLpakcJMoqECM2+/flpa3oE5JRqyrDtfI/eJLG6uI634Md/ayuEGJE51NLmeCVinw torI3TeYltdVLnAlUTilREvq5zoGlQAF5UI1c/F0xRij1qCd9pAEjgxxIosVwsXR/rC0 0W/nZ3K9sg/du0A0GCK7Xg3Wk9t/bZvSTYa3osUzePBGeln9bh0iUnpN6XeZLJ1DCyi7 R96KnfBtuL29wN9HGI8Hse3eUhCZuIsJ1efFB6uZyaJYVIzXf1tzXmFzkF0RoviuY6g2 i31WF+k6ZsHN8pOlDGp+eP0r5MKBcxYu8xudAs0svWkZZ6aeNRGB2bhRkfref8YOSMdq elYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702713230; x=1703318030; 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=Gq7IuwiCbAL4UxAqcWW6ByhjVTZVkTwXzK3NqvNRRfI=; b=BhslVWaXwC7GAJradOWprIZeSp/JfaOd98Lvk6gxidpdpYyh4UQOYcPa6aJc0jOsCR yN75XpYWI2VAqQFMCIYkoLSjAjWQDkrOhLFQ9vU4AW8q9qYBwj4fvVxdN5LaD79MZ9CM qRSARF95BBCDssV36xt2zK3hLDdHAeYGtO3EEaLnkKHHOQHZlvQypGock8Sy+z7pzQxl hGLCWIuvgHGBxBfcjfL/J4rJbUzYLp81ORqyJRUvpWJPB/F82QEjjThYnk6fa4F8bpKO DKFsX3iWiVQ6fjen/BGGvJ+Xq6xMVNbpovEshovpg5U3u+BGRAbu/DyRucKKkzFJE3qS leQQ== X-Gm-Message-State: AOJu0YxuUALyzOrDpr5TWz8GoX4cz2IskgZ5v+XZaH/SMr7kAczR3NsE m1rp9bVxYFklZ+X0deK/QlW++S2ZuLb95GUOsbCmbw== X-Google-Smtp-Source: AGHT+IGfAyeC2tYtM8d8sIUamsSPiad01fdOxBRI1cLfGVqLc+JzJRwyqaRpDKvAPeO8tfJr9UHD0Q== X-Received: by 2002:a05:6e02:2194:b0:35d:7f2d:adbe with SMTP id j20-20020a056e02219400b0035d7f2dadbemr16305022ila.15.1702713229818; Fri, 15 Dec 2023 23:53:49 -0800 (PST) From: Akihiko Odaki Date: Sat, 16 Dec 2023 16:53:32 +0900 Subject: [PATCH v3 3/3] audio: Do not include ui/dbus.h MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231216-dbus-v3-3-b4bcbed7374a@daynix.com> References: <20231216-dbus-v3-0-b4bcbed7374a@daynix.com> In-Reply-To: <20231216-dbus-v3-0-b4bcbed7374a@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::12e; envelope-from=akihiko.odaki@daynix.com; helo=mail-il1-x12e.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: 1702713274262100008 ui/dbusaudio.c does not depend on ui/dbus.h Signed-off-by: Akihiko Odaki --- audio/dbusaudio.c | 1 - audio/meson.build | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/audio/dbusaudio.c b/audio/dbusaudio.c index 5222b3c68804..f6cdcec80aaa 100644 --- a/audio/dbusaudio.c +++ b/audio/dbusaudio.c @@ -33,7 +33,6 @@ #include #endif =20 -#include "ui/dbus.h" #include "dbus-display1.h" =20 #define AUDIO_CAP "dbus" diff --git a/audio/meson.build b/audio/meson.build index c8f658611f42..8931c1697b4d 100644 --- a/audio/meson.build +++ b/audio/meson.build @@ -30,7 +30,7 @@ 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], if_true: files('dbusaudio.c')) audio_modules +=3D {'dbus': module_ss} endif =20 --=20 2.43.0