From nobody Wed May 15 20:19:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600175507; cv=none; d=zohomail.com; s=zohoarc; b=dwi7Zohy8oK56pO3bv9PWSHTtO9Ej0KWq/nFtVfmdn+GWozXDHSUkeHQ7dlgIik3jOOTr3uuHVpqRxf04AdSq++2x27qZLf88RXlMpMpOyB7KURAOCth1i6dEZoAd6xnw1rs1XFhsuosNvjXIRU7hn+1+9++frL/umVV0Q2UHP8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600175507; 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=B3ZPtHfdJ4Gje3DB/qetfFNCeVgnpdH/NklhR+qZLNc=; b=OHzlniR+hT66KSPT01ScW6FTwJpRQPSjlY3OpIByl6rNdkldTVE0WCcdTr1DvOGZsdvTjftVr+iOfr7rDJ6GIlr2oUhLX0yr29SIggX2O6PvRGorHVO9MoIsvje0aqfcPgZUSv92v86/Bx+wEK1cM7F8T/GZOKuLuRlD+Zgg/Ns= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600175507279921.4505045876195; Tue, 15 Sep 2020 06:11:47 -0700 (PDT) Received: from localhost ([::1]:42042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIAkI-00063r-PV for importer@patchew.org; Tue, 15 Sep 2020 09:11:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIAi5-00037X-FL for qemu-devel@nongnu.org; Tue, 15 Sep 2020 09:09:25 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:29590 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kIAi3-0007Ov-Fr for qemu-devel@nongnu.org; Tue, 15 Sep 2020 09:09:25 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-562--Djaunf9NdmpCmUQLxwnzQ-1; Tue, 15 Sep 2020 09:09:20 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 056DEAF21C for ; Tue, 15 Sep 2020 13:09:20 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-85.ams2.redhat.com [10.36.112.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D86C19D7C; Tue, 15 Sep 2020 13:09:09 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 7646F40830; Tue, 15 Sep 2020 15:09:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600175362; 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=B3ZPtHfdJ4Gje3DB/qetfFNCeVgnpdH/NklhR+qZLNc=; b=JHS3aIo1ROJIgJrH2iENEiMmn0RmOWIhnGMCbJ0Em9eVORWA7P6cec3/L+4w7v1l3uMs44 +O3hZSpHWAai6IIY2rxsN3WjAae69k8uXG3au0ND8l/lLaQjVaAbCog47FNu4VbyhEzPR+ CU6Sd3CC7yFt7WxPHnoo358f7t5arvM= X-MC-Unique: -Djaunf9NdmpCmUQLxwnzQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 1/6] meson: fix qxl dependencies Date: Tue, 15 Sep 2020 15:09:03 +0200 Message-Id: <20200915130908.12808-2-kraxel@redhat.com> In-Reply-To: <20200915130908.12808-1-kraxel@redhat.com> References: <20200915130908.12808-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com 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=205.139.110.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/15 02:11:06 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, 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_H2=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Gerd Hoffmann , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Add pixman and spice deps to qxl module. Signed-off-by: Gerd Hoffmann Message-id: 20200914134224.29769-2-kraxel@redhat.com --- hw/display/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/display/meson.build b/hw/display/meson.build index 78adaf9db463..2cc73fc2b927 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -41,7 +41,8 @@ specific_ss.add(when: 'CONFIG_VGA', if_true: files('vga.c= ')) =20 if config_all_devices.has_key('CONFIG_QXL') qxl_ss =3D ss.source_set() - qxl_ss.add(when: 'CONFIG_QXL', if_true: files('qxl.c', 'qxl-logger.c', '= qxl-render.c')) + qxl_ss.add(when: 'CONFIG_QXL', if_true: [files('qxl.c', 'qxl-logger.c', = 'qxl-render.c'), + pixman, spice]) hw_display_modules +=3D {'qxl': qxl_ss} endif =20 --=20 2.27.0 From nobody Wed May 15 20:19:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600175611; cv=none; d=zohomail.com; s=zohoarc; b=SbhNVeVFb57aSsqq4AeABinJ5LiLoRKJiulBW1R9QjnpCyZcRJCchwlQlTEUJ0LP3VgoV2ufRvN/AvkXfu8aoPqt25Twc0HsWfYG0pY8RdbY2RcYJWuWX0eCirjmK5VAglhyMjraJNq+yHIiNc+3pf6XBmpJUXXEv7cAasYcnZE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600175611; 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=GftzsHIGRA08qEsKPoS3fkRLZ9gSmoUwvHhmxi13WCU=; b=FOQDQcjDus9bZv/10LoaJoe9WRh6G58Pi3GGr+XXATSlYrrgLxfMjYxJTE0iYCQiwWAzEVlQYh8lbILWwUvA2u+lAB/U1QW0t1ftA0jCNX2ahwt9UODN8gPzGiNxYeBngkE+hfAst7Xm+J9QeSb+RaAdvi4lgH45NPAHUqMT/u4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600175611313445.1658169791996; Tue, 15 Sep 2020 06:13:31 -0700 (PDT) Received: from localhost ([::1]:47284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIAm0-0008D9-PF for importer@patchew.org; Tue, 15 Sep 2020 09:13:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIAi4-00035Y-Kq for qemu-devel@nongnu.org; Tue, 15 Sep 2020 09:09:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:40310) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kIAi2-0007OD-Da for qemu-devel@nongnu.org; Tue, 15 Sep 2020 09:09:24 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-158-MTHC3wMbOK62cxV1B7lShg-1; Tue, 15 Sep 2020 09:09:19 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A3B5580F040 for ; Tue, 15 Sep 2020 13:09:18 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-85.ams2.redhat.com [10.36.112.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A43675138; Tue, 15 Sep 2020 13:09:09 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 7F32A40839; Tue, 15 Sep 2020 15:09:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600175361; 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=GftzsHIGRA08qEsKPoS3fkRLZ9gSmoUwvHhmxi13WCU=; b=IujzSek7i+dIqv7FeVwiKS6QH5ldIX0/Qq9UxKPVt+SYZNQiXTZFJD6A71ikh0cKI3vA9p PEXk/ACfu/3d8u5fHPMUGrVJ39z3eUeY8N7xJSQTsOrJNx9U7dhzeZpgG/SX240cqcpuwn Pfu81CfQSelZPLd7P2D40oSZCiJlHPE= X-MC-Unique: MTHC3wMbOK62cxV1B7lShg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 2/6] meson: fix module config Date: Tue, 15 Sep 2020 15:09:04 +0200 Message-Id: <20200915130908.12808-3-kraxel@redhat.com> In-Reply-To: <20200915130908.12808-1-kraxel@redhat.com> References: <20200915130908.12808-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/15 02:23:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, 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_H5=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Gerd Hoffmann , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Use all config symbols not only the host ones. Needed to make sure device configs like CONFIG_QXL are used for modules too. Suggested-by: Paolo Bonzini Signed-off-by: Gerd Hoffmann Message-id: 20200914134224.29769-3-kraxel@redhat.com --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 690723b47089..bba766b4bc66 100644 --- a/meson.build +++ b/meson.build @@ -913,7 +913,7 @@ softmmu_mods =3D [] foreach d, list : modules foreach m, module_ss : list if enable_modules and targetos !=3D 'windows' - module_ss =3D module_ss.apply(config_host, strict: false) + module_ss =3D module_ss.apply(config_all, strict: false) sl =3D static_library(d + '-' + m, [genh, module_ss.sources()], dependencies: [modulecommon, module_ss.dependenc= ies()], pic: true) if d =3D=3D 'block' --=20 2.27.0 From nobody Wed May 15 20:19:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600175957; cv=none; d=zohomail.com; s=zohoarc; b=NayndXz+08aNF2BE7dfXQkS4LNHOUHdPKJWHKB3y4Hwr4g2K9edfRE1q/AQIiRvX5bSF3m+5SY4X26qqxYvCFeA7DK6KDVW238n95aQ3z0qjXtbqHGbU/eCbe8C4h/rEfYGqFKslzw1zG1/RKCpCA2MsA7uLlp2pmY/mCDDFEdE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600175957; 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=MJ6cj5QA5ODIi0rC7i5lW5HXOOKNLCLKG52C4W7aUqo=; b=J2xm6w2zT8+1sa81RGkCYiv8qFtzIq10ZzBCftlknNz7vDKkOVunQBeikL1BVSLQ5uclstXZbv2KWginNRbH+LK0Hk1sPh9LdGkSWIUphh9CbBtkmujN+RpoxMwlpJzd9isHihRnlOyNnKFtW8EDlz7RxfHB1RPKPopHqXS0JuY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600175957086261.7426131098582; Tue, 15 Sep 2020 06:19:17 -0700 (PDT) Received: from localhost ([::1]:37808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIArb-0007eR-Tb for importer@patchew.org; Tue, 15 Sep 2020 09:19:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIAi0-0002wG-Ad for qemu-devel@nongnu.org; Tue, 15 Sep 2020 09:09:20 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:57207 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kIAhy-0007Mo-Ms for qemu-devel@nongnu.org; Tue, 15 Sep 2020 09:09:19 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-250-0VXTbLGFM9GDAmwVC9Iqkg-1; Tue, 15 Sep 2020 09:09:16 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 51EB1190A3E4 for ; Tue, 15 Sep 2020 13:09:15 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-85.ams2.redhat.com [10.36.112.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5358F60BE2; Tue, 15 Sep 2020 13:09:09 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 87FCF4083F; Tue, 15 Sep 2020 15:09:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600175357; 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=MJ6cj5QA5ODIi0rC7i5lW5HXOOKNLCLKG52C4W7aUqo=; b=BhUOOkfBt+44R3r7zbX3qsRmfCutHZR7CHAJ2nNgu+R5FwdipVXhj2/gYM0ID7olgOUszG DLToZ38iK49fAkWmaVucqnvsCBkvRVMbg+KUmAt1QDms2oilTrXCL+jW15vyyMw8/o7g9R Pdi12LD58WgtBxL+Xv5FwjzKcicIGhE= X-MC-Unique: 0VXTbLGFM9GDAmwVC9Iqkg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 3/6] meson: remove duplicate qxl sources Date: Tue, 15 Sep 2020 15:09:05 +0200 Message-Id: <20200915130908.12808-4-kraxel@redhat.com> In-Reply-To: <20200915130908.12808-1-kraxel@redhat.com> References: <20200915130908.12808-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com 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=205.139.110.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/15 02:11:06 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, 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_H2=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Gerd Hoffmann , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" We should add sources to the softmmu_ss or module_ss but not both. Signed-off-by: Gerd Hoffmann Message-id: 20200914134224.29769-4-kraxel@redhat.com --- hw/display/meson.build | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/display/meson.build b/hw/display/meson.build index 2cc73fc2b927..2f07d427ddc8 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -46,8 +46,6 @@ if config_all_devices.has_key('CONFIG_QXL') hw_display_modules +=3D {'qxl': qxl_ss} endif =20 -softmmu_ss.add(when: 'CONFIG_QXL', if_true: files('qxl.c', 'qxl-logger.c',= 'qxl-render.c')) - softmmu_ss.add(when: 'CONFIG_DPCD', if_true: files('dpcd.c')) softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dp.c')) =20 --=20 2.27.0 From nobody Wed May 15 20:19:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600175464; cv=none; d=zohomail.com; s=zohoarc; b=YEVayzaPFttB1mTHKNNGMngu5aHI3on8cDg6YOSaKWuTd9h5ZLGRjvRuoFIkro3mrSIXmItp9t/cEp+gudayMvqSVrdwaHNjRbKyTp4363+Qgf2BH0M3RLOKQeWn1/G5xfnQeF62vUIl1LuiaCVtzyOjftlsePojuuR/fj7QSrw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600175464; 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=QNCV1DGX90U1EaGw/EzD/AYmgFleZOV911DDu+biJYA=; b=RhlOK8+27vlVAUEB1WCHoIXiVLOo9aM/bLX+25yg2Mt3p60jjhHmpntESUefN2BGyG+Y00EzAOOaMR5Tq/R7dX5RChytHAyTj5gs2uhcplwGOFyDNqyHSa+mFuD04fxUHn1Y5z6fLBe7VMaurhIrsuqtvhmvFnlOJ55pOJ+5ffs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600175464412762.5835536383382; Tue, 15 Sep 2020 06:11:04 -0700 (PDT) Received: from localhost ([::1]:38880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIAje-0004fW-KN for importer@patchew.org; Tue, 15 Sep 2020 09:11:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIAi1-0002yF-4v for qemu-devel@nongnu.org; Tue, 15 Sep 2020 09:09:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:47738) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kIAhz-0007Mv-Gk for qemu-devel@nongnu.org; Tue, 15 Sep 2020 09:09:20 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-354-cezoBf5QO2eRqhmzKyTP7g-1; Tue, 15 Sep 2020 09:09:16 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4BC86190A3E2 for ; Tue, 15 Sep 2020 13:09:15 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-85.ams2.redhat.com [10.36.112.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61C226111F; Tue, 15 Sep 2020 13:09:09 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 9103F40840; Tue, 15 Sep 2020 15:09:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600175358; 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=QNCV1DGX90U1EaGw/EzD/AYmgFleZOV911DDu+biJYA=; b=Jl6EQsKzMG9J9c60bKwVrC02bbHdoBr647uqpbU/3t1biohzyoC5GQE6mmDeFxbFg3iGbH P14atdKCszw/h/3Z8826ykNZfbHIAWSGZ8+qcG1wncNH97El8EkI2n7Z4+IU6nopriweLp GJVJDFAA6mRIk+vC1grMliHYHpntU7g= X-MC-Unique: cezoBf5QO2eRqhmzKyTP7g-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 4/6] object_initialize: try module load Date: Tue, 15 Sep 2020 15:09:06 +0200 Message-Id: <20200915130908.12808-5-kraxel@redhat.com> In-Reply-To: <20200915130908.12808-1-kraxel@redhat.com> References: <20200915130908.12808-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/15 02:23:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, 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_H5=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Gerd Hoffmann , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Needed to allow virtio-gpu-pci initialize the virtio-gpu-device child device. Signed-off-by: Gerd Hoffmann Message-id: 20200914134224.29769-5-kraxel@redhat.com --- qom/object.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/qom/object.c b/qom/object.c index b1822a2ef4be..387efb25ebe9 100644 --- a/qom/object.c +++ b/qom/object.c @@ -518,6 +518,12 @@ void object_initialize(void *data, size_t size, const = char *typename) { TypeImpl *type =3D type_get_by_name(typename); =20 +#ifdef CONFIG_MODULES + if (!type) { + module_load_qom_one(typename); + type =3D type_get_by_name(typename); + } +#endif if (!type) { error_report("missing object type '%s'", typename); abort(); --=20 2.27.0 From nobody Wed May 15 20:19:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600176283; cv=none; d=zohomail.com; s=zohoarc; b=mt9zhtZXdHztJ9PdsM61dMWS7rrLIkzGEI2giYLHU4C7Y792z5QJ+yTyVL8BAjVnBypgy6FkTHFdCcbMKR32dvqkp3lqhlHNXmoJwt+iWT3gwRsbTheVFMdN8+iIFhNlufGagYk6mUvarWZeMCCPq4FiFNaBbo5TG45NLCkziMM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600176283; 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=GMTNKz2rky10bwI9X5cZ3qQoqUJ4O5bCjWqvNYvf1XU=; b=Qt8+z9Hn5M3dIvN/aJzK3vxKKAvm3Slg0JhIUG/poWhy2m7T4gJ6m5nIyEi/z02wQ8XSjRQ0YQ6cjNnkyIzIOOXR9cpvj7Ax5DsEuzi4qYHQVqKrpVUINgAfgnINMmuOL0DCCdqdkZWChePy0KugnyKWyv1dP8ovZQXoxa++nWs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600176283796546.1100911868853; Tue, 15 Sep 2020 06:24:43 -0700 (PDT) Received: from localhost ([::1]:56014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIAws-0006k6-Gk for importer@patchew.org; Tue, 15 Sep 2020 09:24:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIAiA-0003MJ-S8 for qemu-devel@nongnu.org; Tue, 15 Sep 2020 09:09:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:50955) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kIAi8-0007Si-U9 for qemu-devel@nongnu.org; Tue, 15 Sep 2020 09:09:30 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-382-KhKEe2WtNxe8G1R4GZO7PA-1; Tue, 15 Sep 2020 09:09:26 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 855B18014D9 for ; Tue, 15 Sep 2020 13:09:25 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-85.ams2.redhat.com [10.36.112.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 393AA5FC3B; Tue, 15 Sep 2020 13:09:16 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 9DB6D40844; Tue, 15 Sep 2020 15:09:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600175368; 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=GMTNKz2rky10bwI9X5cZ3qQoqUJ4O5bCjWqvNYvf1XU=; b=b5eo4WMmfHpkujeSqLeZwUvijPbO3FFqNwytn23R7K0gR10Q5V5c4HKmFjeHctYc4wKqLb cIRPq6h1akZqkDGKf3760vJ1SMacPcHGDsEMF+vE0tGy2lx7XrXknSQ41afJR/xKlJ10py UyR+Cwd6GMe3QnSnokSKHeI6sKzWxto= X-MC-Unique: KhKEe2WtNxe8G1R4GZO7PA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 5/6] virtio-gpu: make virtio_gpu_ops static Date: Tue, 15 Sep 2020 15:09:07 +0200 Message-Id: <20200915130908.12808-6-kraxel@redhat.com> In-Reply-To: <20200915130908.12808-1-kraxel@redhat.com> References: <20200915130908.12808-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/15 02:23:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, 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_H5=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Gerd Hoffmann , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Reference it via ops pointer instead, simliar to the vga one. Removes hard symbol reference, needed to build virtio-gpu modular. Signed-off-by: Gerd Hoffmann Message-id: 20200914134224.29769-6-kraxel@redhat.com --- include/hw/virtio/virtio-gpu.h | 3 +-- hw/display/virtio-gpu-base.c | 3 ++- hw/display/virtio-vga.c | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index f334b780858c..6b45b4799a3e 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -106,6 +106,7 @@ struct VirtIOGPUBase { =20 struct virtio_gpu_base_conf conf; struct virtio_gpu_config virtio_config; + const GraphicHwOps *hw_ops; =20 bool use_virgl_renderer; int renderer_blocked; @@ -171,8 +172,6 @@ struct VhostUserGPU { bool backend_blocked; }; =20 -extern const GraphicHwOps virtio_gpu_ops; - #define VIRTIO_GPU_FILL_CMD(out) do { \ size_t s; \ s =3D iov_to_buf(cmd->elem.out_sg, cmd->elem.out_num, 0, \ diff --git a/hw/display/virtio-gpu-base.c b/hw/display/virtio-gpu-base.c index 796130860657..aeb87235420a 100644 --- a/hw/display/virtio-gpu-base.c +++ b/hw/display/virtio-gpu-base.c @@ -112,7 +112,7 @@ virtio_gpu_gl_block(void *opaque, bool block) } } =20 -const GraphicHwOps virtio_gpu_ops =3D { +static const GraphicHwOps virtio_gpu_ops =3D { .invalidate =3D virtio_gpu_invalidate_display, .gfx_update =3D virtio_gpu_update_display, .text_update =3D virtio_gpu_text_update, @@ -162,6 +162,7 @@ virtio_gpu_base_device_realize(DeviceState *qdev, g->req_state[0].width =3D g->conf.xres; g->req_state[0].height =3D g->conf.yres; =20 + g->hw_ops =3D &virtio_gpu_ops; for (i =3D 0; i < g->conf.max_outputs; i++) { g->scanout[i].con =3D graphic_console_init(DEVICE(g), i, &virtio_gpu_ops, g); diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index 573e7d59282a..f9410a0c2e61 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -13,7 +13,7 @@ static void virtio_vga_base_invalidate_display(void *opaq= ue) VirtIOGPUBase *g =3D vvga->vgpu; =20 if (g->enable) { - virtio_gpu_ops.invalidate(g); + g->hw_ops->invalidate(g); } else { vvga->vga.hw_ops->invalidate(&vvga->vga); } @@ -25,7 +25,7 @@ static void virtio_vga_base_update_display(void *opaque) VirtIOGPUBase *g =3D vvga->vgpu; =20 if (g->enable) { - virtio_gpu_ops.gfx_update(g); + g->hw_ops->gfx_update(g); } else { vvga->vga.hw_ops->gfx_update(&vvga->vga); } @@ -37,8 +37,8 @@ static void virtio_vga_base_text_update(void *opaque, con= sole_ch_t *chardata) VirtIOGPUBase *g =3D vvga->vgpu; =20 if (g->enable) { - if (virtio_gpu_ops.text_update) { - virtio_gpu_ops.text_update(g, chardata); + if (g->hw_ops->text_update) { + g->hw_ops->text_update(g, chardata); } } else { if (vvga->vga.hw_ops->text_update) { @@ -52,8 +52,8 @@ static int virtio_vga_base_ui_info(void *opaque, uint32_t= idx, QemuUIInfo *info) VirtIOVGABase *vvga =3D opaque; VirtIOGPUBase *g =3D vvga->vgpu; =20 - if (virtio_gpu_ops.ui_info) { - return virtio_gpu_ops.ui_info(g, idx, info); + if (g->hw_ops->ui_info) { + return g->hw_ops->ui_info(g, idx, info); } return -1; } @@ -63,8 +63,8 @@ static void virtio_vga_base_gl_block(void *opaque, bool b= lock) VirtIOVGABase *vvga =3D opaque; VirtIOGPUBase *g =3D vvga->vgpu; =20 - if (virtio_gpu_ops.gl_block) { - virtio_gpu_ops.gl_block(g, block); + if (g->hw_ops->gl_block) { + g->hw_ops->gl_block(g, block); } } =20 --=20 2.27.0 From nobody Wed May 15 20:19:11 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600176177; cv=none; d=zohomail.com; s=zohoarc; b=bN9DcHKSbZyRiqUCGJiQtIJSEfEIFGZVeLuseXnAw26cj7SD7EKdIV2kxTGCGi9x7LgIG2QS43AIYSxOBuV5UJZ0NcXLsNqpVPzzu4T98RJ6eRJ5qV6vxTDtBCx/7P7ceh3+jKvFonfFgbBXf1pOvGBRC0pgeqYmUY82QYoBLF0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600176177; 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=RQC7Rjuf+DS9UuCL89S4yaLmsGabJSQvHSTXfzj37/s=; b=I2PAhfR8m/MSs4bm10Fvcaf1253rylQyox0avRTa+u/MeGMHbkWnMuTgOmWLedwkqs9RAlQU9XAogihwOIcgpzdYI8tdTDM9HBhaKuboFDyrhRzoNV3k5YNsFIKLkfUPv7v4VsAftt+vYUatZ7Prgq5nJIG1DQ0lR3Wax1NL5Ew= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600176177934401.57488289606545; Tue, 15 Sep 2020 06:22:57 -0700 (PDT) Received: from localhost ([::1]:51588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIAvA-0004sU-R1 for importer@patchew.org; Tue, 15 Sep 2020 09:22:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34818) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIAi2-00031g-W8 for qemu-devel@nongnu.org; Tue, 15 Sep 2020 09:09:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45205) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kIAi1-0007Nj-7O for qemu-devel@nongnu.org; Tue, 15 Sep 2020 09:09:22 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-293-ATwEmA72MwW0lKHFttOSnw-1; Tue, 15 Sep 2020 09:09:17 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BD81E190A3E3 for ; Tue, 15 Sep 2020 13:09:16 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-85.ams2.redhat.com [10.36.112.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3328A5DC17; Tue, 15 Sep 2020 13:09:16 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id ABD3340845; Tue, 15 Sep 2020 15:09:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600175360; 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=RQC7Rjuf+DS9UuCL89S4yaLmsGabJSQvHSTXfzj37/s=; b=XmaW1Co5Uptun1EG89u1aGfQi7GwJYTzx8YruDI7TlqusGRfxJp1UdFGmAxGMdxlglPe2J DPm7J1zN17ScL5ONoohZsT3gZ5fX8ogNlNCx5YP6wPFxKw0+ELFHgQGtiyCDb0BkwQmOAy 4jYIbfq4BHH2tBmBCCrkpVEgB9yyTfg= X-MC-Unique: ATwEmA72MwW0lKHFttOSnw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 6/6] virtio-gpu: build modular Date: Tue, 15 Sep 2020 15:09:08 +0200 Message-Id: <20200915130908.12808-7-kraxel@redhat.com> In-Reply-To: <20200915130908.12808-1-kraxel@redhat.com> References: <20200915130908.12808-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/15 02:10:32 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, 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_H5=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Gerd Hoffmann , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Only build virtio-gpu-device modular (the code which actually depends on the external virglrenderer library). virtio-gpu-pci and virtio-vga are compiled into core qemu still. Signed-off-by: Gerd Hoffmann Message-id: 20200914134224.29769-7-kraxel@redhat.com --- util/module.c | 2 ++ hw/display/meson.build | 22 ++++++---------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/util/module.c b/util/module.c index 6e63006a8fb2..34772e7d87eb 100644 --- a/util/module.c +++ b/util/module.c @@ -265,6 +265,8 @@ static struct { { "usb-redir", "hw-", "usb-redirect" }, { "qxl-vga", "hw-", "display-qxl" }, { "qxl", "hw-", "display-qxl" }, + { "virtio-gpu-device", "hw-", "display-virtio-gpu" }, + { "vhost-user-gpu", "hw-", "display-virtio-gpu" }, { "chardev-braille", "chardev-", "baum" }, }; =20 diff --git a/hw/display/meson.build b/hw/display/meson.build index 2f07d427ddc8..0d5ddecd6503 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -59,24 +59,14 @@ if config_all_devices.has_key('CONFIG_VIRTIO_GPU') virtio_gpu_ss.add(when: 'CONFIG_VIRTIO_GPU', if_true: [files('virtio-gpu-base.c', 'virtio-gpu.c', '= virtio-gpu-3d.c'), pixman, virgl]) virtio_gpu_ss.add(when: 'CONFIG_VHOST_USER_GPU', if_true: files('vhost-u= ser-gpu.c')) - virtio_gpu_ss.add(when: ['CONFIG_VIRTIO_GPU', 'CONFIG_VIRTIO_PCI'], if_t= rue: files('virtio-gpu-pci.c')) - virtio_gpu_ss.add(when: ['CONFIG_VHOST_USER_GPU', 'CONFIG_VIRTIO_PCI'], = if_true: files('vhost-user-gpu-pci.c')) - virtio_gpu_ss.add(when: 'CONFIG_VIRTIO_VGA', if_true: files('virtio-vga.= c')) - virtio_gpu_ss.add(when: 'CONFIG_VHOST_USER_VGA', if_true: files('vhost-u= ser-vga.c')) - - # FIXME: this was attempted in the Makefile build system; it was then re= verted - # as it would try to load all devices when the module is loaded, even if - # config_devices for this target only has some of them. Since virtio-gp= u-pci - # and virtio-vga both instantiate a virtio-gpu-device, fixing it probabl= y does - # not even require a dependency system, just splitting the module in thr= ee - # for CONFIG_VIRTIO_GPU/CONFIG_VHOST_USER_GPU, CONFIG_VIRTIO_PCI and - # CONFIG_VIRTIO_VGA/CONFIG_VHOST_USER_VGA. - # Sourcesets are a dime a dozen, so keep it and just disable module buil= ds. - - #hw_display_modules +=3D {'virtio-gpu': virtio_gpu_ss} - softmmu_ss.add_all(virtio_gpu_ss) + hw_display_modules +=3D {'virtio-gpu': virtio_gpu_ss} endif =20 +softmmu_ss.add(when: ['CONFIG_VIRTIO_GPU', 'CONFIG_VIRTIO_PCI'], if_true: = files('virtio-gpu-pci.c')) +softmmu_ss.add(when: ['CONFIG_VHOST_USER_GPU', 'CONFIG_VIRTIO_PCI'], if_tr= ue: files('vhost-user-gpu-pci.c')) +softmmu_ss.add(when: 'CONFIG_VIRTIO_VGA', if_true: files('virtio-vga.c')) +softmmu_ss.add(when: 'CONFIG_VHOST_USER_VGA', if_true: files('vhost-user-v= ga.c')) + specific_ss.add(when: [x11, opengl, 'CONFIG_MILKYMIST_TMU2'], if_true: fil= es('milkymist-tmu2.c')) specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_lcdc.c')) =20 --=20 2.27.0