From patchwork Thu Sep 29 16:30:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1684585 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=QmU5DQe0; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MdgKF37vFz1yql for ; Fri, 30 Sep 2022 03:27:12 +1000 (AEST) Received: from localhost ([::1]:43184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odxJV-0004qg-Ad for incoming@patchwork.ozlabs.org; Thu, 29 Sep 2022 13:27:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwQv-0003hZ-Q1 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:42845) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwQt-00036u-If for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664469042; 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=GJzCllnxG/DxrGKRWWoxC+uavu4ndvSXFH/Fdt26IG8=; b=QmU5DQe0BZAbYVEWG2hl2Ia76VxDMs1esKhdVNdBpsTC0yatTKSKoBR2MRe74XztPji6i5 YmrNwOv6ewGd0SsMoWdEBQDI2Xicppxt5theKE2oae0H775KN0JZbfRl6JSbNNgqfB3Fyd KlMHmhAag9umpWU7EUeqMZJKHRIPkx8= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-207-KI0dBMccOM2PWzreFnB1iQ-1; Thu, 29 Sep 2022 12:30:41 -0400 X-MC-Unique: KI0dBMccOM2PWzreFnB1iQ-1 Received: by mail-ed1-f72.google.com with SMTP id h13-20020a056402280d00b004581108ba90so1663880ede.2 for ; Thu, 29 Sep 2022 09:30:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=GJzCllnxG/DxrGKRWWoxC+uavu4ndvSXFH/Fdt26IG8=; b=Xkmz/6thaqWkIO4JsA4PH9BStQFuVx5JFfyUjdOkx9/Efh/5Nyjg6uVht8fiA07C9e pbUVAypT8TUIjECOP0ekNy7VDU/zXGNKy4g5Emy5yEdpzT9mliDzdDBjdlWtSDT5ioq5 cNBMMVbJteJ7LwMDHaOyej4HPu62AtGSh8lOD2yKqJE4+C0zcpjdMWgccIiGjvmIb6+k ThBW/cCfHY5yWogIwMFro/VR8jMiPPPlHzDNAIEgbkQr4QkSBdxLqL7nQHAFAzSLD1cU e0vUMeCTCl4GzQJl8Ai9O0XHLcldHVs5EyI695hCnx/DK4dt4kd+STx+ThXeEIfGzW0i eG3g== X-Gm-Message-State: ACrzQf2u0oXIiMfu2Au6zuWWx3ONCimLfsiIA/eknPr5Vx45NoDHXyAT prcdfLyf1morvPAZpMquJYHW9Uh4isKL1xTX8IX1qLmuzZ6f8vhBm85PDk3CKrBFETlH6N39hnp qFvjsCYPLUpjuPAJtu36rWK8z/so/xejHF6gr56cJa2LscfGjDffj6W0prOD960AG9Pc= X-Received: by 2002:a17:907:75d4:b0:77a:fcb7:a2cc with SMTP id jl20-20020a17090775d400b0077afcb7a2ccmr3431687ejc.480.1664469039511; Thu, 29 Sep 2022 09:30:39 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7Svg/QW8z/8vub/0u8LdJBGGDI3G+Bhr4BxFFcn6HmWISJWhJZsY7Lw8Y1hrQASbMd1Wvruw== X-Received: by 2002:a17:907:75d4:b0:77a:fcb7:a2cc with SMTP id jl20-20020a17090775d400b0077afcb7a2ccmr3431668ejc.480.1664469039239; Thu, 29 Sep 2022 09:30:39 -0700 (PDT) Received: from avogadro.local ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id kx6-20020a170907774600b007708635be05sm4270475ejc.4.2022.09.29.09.30.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 09:30:38 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Subject: [PULL 08/14] ui: fix path to dbus-display1.h Date: Thu, 29 Sep 2022 18:30:08 +0200 Message-Id: <20220929163014.16950-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220929163014.16950-1-pbonzini@redhat.com> References: <20220929163014.16950-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.08, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.001, RCVD_IN_DNSWL_LOW=-0.7, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" While the source directory is always included in the include path, the corresponding directory in the build tree is not. Therefore, custom_targets (e.g. ui/dbus-display1.h) must be referred to using the full path. This avoids a build failure when ui/dbus-chardev.c is not built as a module: In file included from ../ui/dbus-chardev.c:32: ../ui/dbus.h:34:10: fatal error: dbus-display1.h: No such file or directory 34 | #include "dbus-display1.h" | ^~~~~~~~~~~~~~~~~ Reviewed-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- tests/qtest/dbus-display-test.c | 2 +- ui/dbus.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qtest/dbus-display-test.c b/tests/qtest/dbus-display-test.c index 8be5974763..cb1b62d1d1 100644 --- a/tests/qtest/dbus-display-test.c +++ b/tests/qtest/dbus-display-test.c @@ -3,7 +3,7 @@ #include #include #include "libqtest.h" -#include "dbus-display1.h" +#include "ui/dbus-display1.h" static GDBusConnection* test_dbus_p2p_from_fd(int fd) diff --git a/ui/dbus.h b/ui/dbus.h index c001c11f70..9c149e7b41 100644 --- a/ui/dbus.h +++ b/ui/dbus.h @@ -31,7 +31,7 @@ #include "ui/console.h" #include "ui/clipboard.h" -#include "dbus-display1.h" +#include "ui/dbus-display1.h" typedef struct DBusClipboardRequest { GDBusMethodInvocation *invocation;