From nobody Fri May 3 23:56: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=1600091376; cv=none; d=zohomail.com; s=zohoarc; b=KOxaFlCiPjkmZmMXwk5ZTxRlS3EM8w9AblKyzdYzazT0hyw24yUNU4ni3SR6pjQjwB/XzKFbmtGHQgwTf17opw9tJbFmrrJJ94N72GClZLL9cC026NJ9j8+m1jS7AEaOY+e3Ia8aKeqNkWDPsEbTtPeCDk1bNjVEVN4YeJGATiY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600091376; 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=OoOQQ/TcONqnDSGYe6BQp0f/Vy3VYLfnj+Ju0OAuWVc=; b=G/5ZYJPfg2Hp9T+Pbvts7hhZ4MjDrhbUvtMWHLNqsdNST+p0b759FZE0UqhpDt5gZm93oJ/YNmW3d0uY+u+/ZBbvxTBMjAnchy7YJpITiyqmKWGFRU60obmJvyIl9gPI0BRgHS9XisPj9mJN0bEF7W6qoanuDukYLMaLhFw5tB4= 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 1600091376133698.9972903811764; Mon, 14 Sep 2020 06:49:36 -0700 (PDT) Received: from localhost ([::1]:45598 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHorP-0004H6-3C for importer@patchew.org; Mon, 14 Sep 2020 09:49:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHokj-0002dr-L3 for qemu-devel@nongnu.org; Mon, 14 Sep 2020 09:42:41 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:34958 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 1kHokg-00036B-SS for qemu-devel@nongnu.org; Mon, 14 Sep 2020 09:42:41 -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-182-hZDmXGsIMIa2UOE6oXEG8Q-1; Mon, 14 Sep 2020 09:42:35 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DAD2D425CF for ; Mon, 14 Sep 2020 13:42:34 +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 206501002D41; Mon, 14 Sep 2020 13:42:26 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 9E6A6204AE; Mon, 14 Sep 2020 15:42:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600090957; 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=OoOQQ/TcONqnDSGYe6BQp0f/Vy3VYLfnj+Ju0OAuWVc=; b=Q2wzXKxeIOCtT0FUIz6FHieMxGfbdu2+B/bDYMmHidHhMns1wqvau+GOtctSsYr3nApOTz CTOaAlDX1BKNoHAOOEHdyVwuLtRbiVg+PZMueGlkX6z1tJDaajDn85dhSLLaF6qicBnfws UjSt6m9ZYmgDkXLQiLBpMFLMb0Tbd10= X-MC-Unique: hZDmXGsIMIa2UOE6oXEG8Q-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v2 1/6] meson: fix qxl dependencies Date: Mon, 14 Sep 2020 15:42:19 +0200 Message-Id: <20200914134224.29769-2-kraxel@redhat.com> In-Reply-To: <20200914134224.29769-1-kraxel@redhat.com> References: <20200914134224.29769-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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/14 01:39:17 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -38 X-Spam_score: -3.9 X-Spam_bar: --- X-Spam_report: (-3.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.792, 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , 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 --- 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 Fri May 3 23:56: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=1600091282; cv=none; d=zohomail.com; s=zohoarc; b=bikSj4+dmr5TkEQ4IETYGY9rAAPZbnZabUm4eaWBwwNDrfV9mDUjxfiSdhnczlm3Wp5CSxbnagsLaIcQpponjZag04jDGwDxzvLs9E8/jbr0uTGPv+RXxflH66yteYG0WVBWjWUfmnJr+rLp2GVJtSMwXogpE+p05v2DpDO5Gpw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600091282; 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=7hgBi1fj4i50aEdtokug8walGsuvJV4M+wKGBRuWCcc=; b=GvZw61Pr2s+SZ+q2C/EVXszqwnekDB3DtBFvo9vNfyFUKfc6pv22HBgPWD6EimnGtPg5vtwTEsJJscD6C8uED95BzoESmvAQgDzd2cg8rxD2I7HHiKyEvoy0/FsLHlKVZ8UluG0LXP5vcC2trPIE0d14fsgjzNvZvVqq5wewwyQ= 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 160009128213028.214889988126856; Mon, 14 Sep 2020 06:48:02 -0700 (PDT) Received: from localhost ([::1]:39222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHops-0001e6-QG for importer@patchew.org; Mon, 14 Sep 2020 09:48:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHokj-0002d0-22 for qemu-devel@nongnu.org; Mon, 14 Sep 2020 09:42:41 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:60065 helo=us-smtp-delivery-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 1kHokf-00035j-C1 for qemu-devel@nongnu.org; Mon, 14 Sep 2020 09:42:40 -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-352-Ma0u58WqNBiwCchJdwWaUg-1; Mon, 14 Sep 2020 09:42:34 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D306C1084D62 for ; Mon, 14 Sep 2020 13:42:33 +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 127057B7B6; Mon, 14 Sep 2020 13:42:26 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A75C431E63; Mon, 14 Sep 2020 15:42:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600090956; 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=7hgBi1fj4i50aEdtokug8walGsuvJV4M+wKGBRuWCcc=; b=YPdYrCrpnlnalll4oVBqcNthgbJKKEohDJFGROI5fVFKTHwjxnJkOEQiJ/fli2QdLKpsl/ h+JENtArQYLGbW7C3yoFmo8UKq3gm4SzKnR/Z0Y2Z+aDg3LtO4Y/OT4Q3LwQHNuFoWKlhe SrOKY2TBAH+xO9axtwzdzAfz/9Rwhfo= X-MC-Unique: Ma0u58WqNBiwCchJdwWaUg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v2 2/6] meson: fix module config Date: Mon, 14 Sep 2020 15:42:20 +0200 Message-Id: <20200914134224.29769-3-kraxel@redhat.com> In-Reply-To: <20200914134224.29769-1-kraxel@redhat.com> References: <20200914134224.29769-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.61; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/14 02:33:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -38 X-Spam_score: -3.9 X-Spam_bar: --- X-Spam_report: (-3.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.792, 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , 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 --- 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 Fri May 3 23:56: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=1600091032; cv=none; d=zohomail.com; s=zohoarc; b=BnZGZVIQXoKZXMjQfw0BvzX8PNirkRjiNzj+q95FjGl0rVbI12IXOZh3BNKbOlkQTLCK0+6IyDySiZHHEN2flZHvG4zV7XX6Ng+VlJ1XD1Oips+NRRWQ7cP5wEve5Zb+ib8X/aWkCOV7iNXz1Q0ylXwYOg+6Pq8fcD4Xabk4b/Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600091032; 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=RHmnfKTHgb67jiCf5qFHais7ZvKSxP8oR29nwoZS+ao=; b=kue5+YQ1CUMp34cnlaFUzNadRKoZtkAsBh3NWAsOLOyKT/tz/kGN7jk1kiKdZYK+P+jCjhrNsSY12QM3aC9PIyebYE1V4NbHusx6RVuaaoiWyZb1mSk1UtJdKxSKEmNPFnxSyld/tafvXzjiz+qv2v8woDTqTG+5GYv12TE+uVM= 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 1600091032838147.35458435050407; Mon, 14 Sep 2020 06:43:52 -0700 (PDT) Received: from localhost ([::1]:53792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHolr-0004O1-Mw for importer@patchew.org; Mon, 14 Sep 2020 09:43:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHoki-0002cX-9b for qemu-devel@nongnu.org; Mon, 14 Sep 2020 09:42:40 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:31191 helo=us-smtp-delivery-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 1kHokf-00035c-9f for qemu-devel@nongnu.org; Mon, 14 Sep 2020 09:42:39 -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-64-EWPUx9PmP5iDvB37IEW26w-1; Mon, 14 Sep 2020 09:42:33 -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 3D40D1882FBA for ; Mon, 14 Sep 2020 13:42:32 +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 1A9EF60BE2; Mon, 14 Sep 2020 13:42:26 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B038231E67; Mon, 14 Sep 2020 15:42:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600090955; 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=RHmnfKTHgb67jiCf5qFHais7ZvKSxP8oR29nwoZS+ao=; b=NbXsnLuBhdTf4Vpv4rX7WeF97sWS9k79miPddCA+ohUiycUvw5SqaWEThnb56mKoaHnL+6 VICNg58HSKETMvQeIreWWGd1o+r8L5sJmeSZAxeQfNgbLcWmtGbCZozjMfye6/X4U2ks2x VUOgejWhi5VqZnp6QKUNvsMpNA6Vk60= X-MC-Unique: EWPUx9PmP5iDvB37IEW26w-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v2 3/6] meson: remove duplicate qxl sources Date: Mon, 14 Sep 2020 15:42:21 +0200 Message-Id: <20200914134224.29769-4-kraxel@redhat.com> In-Reply-To: <20200914134224.29769-1-kraxel@redhat.com> References: <20200914134224.29769-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.61; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/14 02:33:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -38 X-Spam_score: -3.9 X-Spam_bar: --- X-Spam_report: (-3.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.792, 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , 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 --- 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 Fri May 3 23:56: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=1600091033; cv=none; d=zohomail.com; s=zohoarc; b=lRZjps52UQrHK1NFccRPoK+niY7uoO3+4N4S8rVdWzcAAqH9eutJvJ1RpC4dYuWpuk6K4l2YO1XLE+Tl96g2pd2LT0ixVtrGL0ZPjR/MqKxtNSgqWoANTdhH5AlnPufiH+582b7oeBvNeSjrUA547VgO2i+wujZtl5K0/22Rksg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600091033; 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=ozdCNqPxHUIVCYpTw7BPVWd2I2aNiWMludowt4idVAA=; b=TYflXI+BTxersTTdcitNgnxBhChhzKHF6KQKHZ0iVbTmxa6ct1JX99OhASSG7LQUofKEqz63UakV+4fOyqwFYT7pqjJ4gO8k74DZCcPP7LXJF/G3wC8xdD+3v4akTydqeUXrolb/mND8zss6I6dwXzFznJ0xc/ROGKwnACljOGs= 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 1600091033201273.87725270720864; Mon, 14 Sep 2020 06:43:53 -0700 (PDT) Received: from localhost ([::1]:53832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHols-0004P3-0x for importer@patchew.org; Mon, 14 Sep 2020 09:43:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34264) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHokl-0002fa-2X for qemu-devel@nongnu.org; Mon, 14 Sep 2020 09:42:43 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:23505 helo=us-smtp-delivery-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 1kHokf-00035g-Ht for qemu-devel@nongnu.org; Mon, 14 Sep 2020 09:42:42 -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-408-8OVHnPqgOUKDYtbupMS6yg-1; Mon, 14 Sep 2020 09:42:34 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C5D191882FA1 for ; Mon, 14 Sep 2020 13:42:33 +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 242C27B7B8; Mon, 14 Sep 2020 13:42:26 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B946B31E68; Mon, 14 Sep 2020 15:42:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600090956; 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=ozdCNqPxHUIVCYpTw7BPVWd2I2aNiWMludowt4idVAA=; b=QF0tP8zY0HLzYFhcOJgd/hCptCFt+9cVGSJWrDHKtshE6HYXsFJt0XK5v1LyyoHKyl7dCN lR3kQQlEZe1yUy3V5GFScBQbuG4908ypI98SAcXCciHUtAyHUFa2z7+3cWg3fmEm2bCIWq pjVggl/pHDzeZXuMNpWVuhuN9JzyAkU= X-MC-Unique: 8OVHnPqgOUKDYtbupMS6yg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v2 4/6] object_initialize: try module load Date: Mon, 14 Sep 2020 15:42:22 +0200 Message-Id: <20200914134224.29769-5-kraxel@redhat.com> In-Reply-To: <20200914134224.29769-1-kraxel@redhat.com> References: <20200914134224.29769-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.61; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/14 02:33:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -38 X-Spam_score: -3.9 X-Spam_bar: --- X-Spam_report: (-3.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.792, 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , 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 --- 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 Fri May 3 23:56: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=1600091454; cv=none; d=zohomail.com; s=zohoarc; b=bypmS6k7Mx8x3d3gzSWe64UdEoidK+n52QN92S8aAlBccuzxpjRntq6WRMGzRy/VdcAKZouqoxm/6tRgkAH00npQje7YwE1L5kMGAHiB8cqHnPJ3G6H1te0A1YSLey2TkOdJuBiPHdFPqqHj31KB0kjNfb/vFbKvbbml93WQf8Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600091454; 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=tF8qpzdaZ/T6Te/ZEiZs8KXYQcEQMACXlftO9ZA3/MU=; b=nSpf/gZ2mAeAxJysCp1vgKcst+bjfgl47yXRhbBMe2FoPxyPClc3IbvTJcenNVhqUXMIdwNsHOLjTd4PrzEhwL8LimDvppYjRFEOkrm1hmfnGN1yHKOxdQMfNN7zchmP99tqPs+xKhliA6VFsioAOgVP/paimL0uQJdEN2wbdeU= 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 1600091454647294.05967474652664; Mon, 14 Sep 2020 06:50:54 -0700 (PDT) Received: from localhost ([::1]:50296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHosf-0006EB-4D for importer@patchew.org; Mon, 14 Sep 2020 09:50:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHokp-0002mt-AY for qemu-devel@nongnu.org; Mon, 14 Sep 2020 09:42:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:42224) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kHokm-00037D-AJ for qemu-devel@nongnu.org; Mon, 14 Sep 2020 09:42:47 -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-526-CBhB85IvNTGaYlL1jsoW5g-1; Mon, 14 Sep 2020 09:42:41 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 24A8A1006701 for ; Mon, 14 Sep 2020 13:42:40 +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 C34627BE5B; Mon, 14 Sep 2020 13:42:33 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C5BF131F73; Mon, 14 Sep 2020 15:42:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600090962; 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=tF8qpzdaZ/T6Te/ZEiZs8KXYQcEQMACXlftO9ZA3/MU=; b=L8pVlIeRo/Y6sTxoupCixDmo9GFPjQrE9Z7TPAs0e/60gWOVvqnwCIC+7PpDwShErWbKdu RYq8vCgdPGSnX78eSk9CvgqqUDaFDxeWUXsTfVlsXK5poL+BN7DB6tKy2HOqJ0DEkp+kL2 0eVx7PgbvmkWfeuEF2/vOLPJ7U/9BIQ= X-MC-Unique: CBhB85IvNTGaYlL1jsoW5g-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v2 5/6] virtio-gpu: make virtio_gpu_ops static Date: Mon, 14 Sep 2020 15:42:23 +0200 Message-Id: <20200914134224.29769-6-kraxel@redhat.com> In-Reply-To: <20200914134224.29769-1-kraxel@redhat.com> References: <20200914134224.29769-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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/14 02:55:39 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -38 X-Spam_score: -3.9 X-Spam_bar: --- X-Spam_report: (-3.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.792, 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , 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 --- 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 Fri May 3 23:56: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=1600091143; cv=none; d=zohomail.com; s=zohoarc; b=MPpkNJJ7DZ05S5izV2+ma22zM+6aancu0Ox/Fmqydew9uoJrmK4nOnVfgInSkUhak3j7StFQMHRiDmL1vEfR06mlK+JtW95c7Y/Rwy1KvoVZPCtP0lFuCIRPY02FJC1Zn4wer9qg4qomDZiCffG9UBWRch9JNDs+l6lRlrlRZ6U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600091143; 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=DNF5p4z28QeaG1x2EHLQbdMaA+dic2WIodXw1q9aFQc=; b=igvycxK+HGyoJuz6FPJ0NR58SXFFnq0NS5cOGV2NZCJgoWpg73ILI5x7aO+nGG8wjNdn+ioOXmYQ4Gn72d8NMizszD04+OOVQf0mopCDbSy4vwrcQlFPlirZbWqPbDM8Rr3m/RHXxMw8DSq4mefllbNjGvf11BGKlI2J+FEgfIE= 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 16000911439219.139739492585022; Mon, 14 Sep 2020 06:45:43 -0700 (PDT) Received: from localhost ([::1]:33108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHone-0007Tc-K0 for importer@patchew.org; Mon, 14 Sep 2020 09:45:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHokj-0002dR-CS for qemu-devel@nongnu.org; Mon, 14 Sep 2020 09:42:41 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:59910 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 1kHokf-00035t-Of for qemu-devel@nongnu.org; Mon, 14 Sep 2020 09:42:40 -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-142-0FHz_ex0MOqV-c5rpCRedg-1; Mon, 14 Sep 2020 09:42:35 -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 1DD65425CD for ; Mon, 14 Sep 2020 13:42:34 +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 B7A5360BE2; Mon, 14 Sep 2020 13:42:33 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id D3E7931FC1; Mon, 14 Sep 2020 15:42:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600090956; 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=DNF5p4z28QeaG1x2EHLQbdMaA+dic2WIodXw1q9aFQc=; b=Vmj/WpXf/OpiHZuiZ/vURb91EgCjQ6x6fmBDZBuRcxJ2tZns+8hd/AUZkgdXdUIdlmwdon bsOGYqcEwPfh4/CPQYWg/5DQiFJfl2zo/dVyoZ9zp4rRYFFzpSkBIN17pv0WN5tUkduEQr lERpnpDOMeCMg30ezpMlAZ5+BnYknn0= X-MC-Unique: 0FHz_ex0MOqV-c5rpCRedg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v2 6/6] virtio-gpu: build modular Date: Mon, 14 Sep 2020 15:42:24 +0200 Message-Id: <20200914134224.29769-7-kraxel@redhat.com> In-Reply-To: <20200914134224.29769-1-kraxel@redhat.com> References: <20200914134224.29769-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/14 01:39:17 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -38 X-Spam_score: -3.9 X-Spam_bar: --- X-Spam_report: (-3.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.792, 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , 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 --- 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