From patchwork Sat Jul 11 17:07:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 235304 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp1467777ilg; Sat, 11 Jul 2020 10:13:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw2ZeUe4OGlFMzU+/tieln+Lo+xitulk02rHM1DJEjaYovWt+xOdkNzZ83wAjt3P/ysd2M7 X-Received: by 2002:a25:4143:: with SMTP id o64mr39074291yba.226.1594487596443; Sat, 11 Jul 2020 10:13:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594487596; cv=none; d=google.com; s=arc-20160816; b=bPmZlEmyPkfVn6DyDOFOh6h0YgchSLamunWrqv88CKxXvAi+D6C839IVTCHjydn/y8 h+fP+ZaqMnaTvZ6EFNq8LdEBF2DZPHCd14IyWhhBYBeM2P6PcC/j41jg2xE/hHbI7ixJ hgthTAYC48yEdDquHf5h1EtzWwFTNl6JSoLn2ro6eHl+6qVGLX4JJXOeV8BuKsTGqyMh joKCl60ia/2Fx2HuQV5R3N8bWct6kPpyD1+2sGn6nZ2FAu7YJsBTUBto5/iznH0DT2IL aAup+HF1BlnAqNS/WsfdpnhlhKIOj1E3kmHg8p46n5aexic8ZDJJ1ye9eqSzAT83TdmE 0J3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=x+AzDxkpTb7rSHxhkwf/D/VC9fOGKV8MMi1S7eP7yLg=; b=PJbI8eccEVmmgYXXLlDAN+QyTbeXj3cxlV3v/mkPwwouxO6GkYAg02Hkpdac5xukJn wN5kQXb7knmeHiHjrPt0KzlvfKUDDtiqNNdPOco5ruGS9WMZKdnEmL7sSzfMwIbb6m3F 4e3e4qHJSLE5ynWlKdTIb0M0ZXnYexB4KurZYnFNHTVWil6JxFS4m31OBH2U9NinffdJ 10oEJlrBZmsbcFjNMH0pOVxTz7q1E6/tRFX9a2Bl3BrWgDMIQdfKMHV4aQNDsWtuwLXg f6Tf3FDXuFVY909ogxU3HKpyOEWLV5iC136GYXp9fH/Hkzv5cAJgEOugApmyvpQpx3vp C6AA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=b0ISBmmw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p3si8353368ybl.18.2020.07.11.10.13.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 11 Jul 2020 10:13:16 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=b0ISBmmw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juJ3r-0003vL-Vp for patch@linaro.org; Sat, 11 Jul 2020 13:13:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juIya-0003df-10 for qemu-devel@nongnu.org; Sat, 11 Jul 2020 13:07:48 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:42232) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juIyY-0006iJ-FF for qemu-devel@nongnu.org; Sat, 11 Jul 2020 13:07:47 -0400 Received: by mail-wr1-x436.google.com with SMTP id o11so8994954wrv.9 for ; Sat, 11 Jul 2020 10:07:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=x+AzDxkpTb7rSHxhkwf/D/VC9fOGKV8MMi1S7eP7yLg=; b=b0ISBmmwSLHrsPPL8Pgxic/FKa1pjNeLJAiyx9UMIUumR40K1+hRk+mDCTI02YdqUP BvwmQAVyLV/hGU5A9vnC/QcdpO+QDPDXgjWXCy6Fesi7BIJzSyL2CPNe/k6PTjYj299U PFOuu9fWX7bk7y0cDGVcw/Uy4ksxD9FmpTTpPgPsEsDbABAnxnW3719DUTtpXAPTwout oDIXee6bDZQjasYdC11N/XUNhIiF3cqj/lEKsihhWWhFbh2I88zxZ/bAQmeVP2k1sT0f uP/FiMeiUB0rHriAYeXz9kVfWDTQRIlj6kqHP20oTBrYHRWE1vWhFrL3oGS94U+tqOKT bv0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=x+AzDxkpTb7rSHxhkwf/D/VC9fOGKV8MMi1S7eP7yLg=; b=SdX2NRNXr8ZhRn6TA/9gjoBNkLpKokib0MTKHqrCv/1+VwBHhzO3ADsOO6C9fxz6vQ JfRiTh98J0G52f8ADj7mUhJCRH6SoTTWXvz1lBIl9g+xemPqEibTIhwCpes9gk0UjKmD tkvgJyqYZ3U7ed+EmXku9UXIgcUD6xUVvqC6ZpgLqgyKLhkMxxqoI9HHNF+avcO2SlXs RLbFqQh+pjl9r8ObwLS1ei7PEkrFrMoTNefW2GUWAnOeG1LjfzrFmmYvkekXpCA/tYPr VD72svGBqf0vBXmkfr/HZDOxG9U5XRE3rIKrTV0UokyVYX4/FPAp80py2NwCUMpBgO8z 5SGg== X-Gm-Message-State: AOAM531wf030wcUNOLTEgGvIABfFa4eHzBQGGr3ldIVwPRlwTMcjw00Z Pq9kbZkkU+MRFhsTqUQ9BuBZlg== X-Received: by 2002:a5d:60c7:: with SMTP id x7mr68124856wrt.138.1594487265195; Sat, 11 Jul 2020 10:07:45 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i6sm3838854wrp.92.2020.07.11.10.07.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2020 10:07:39 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EA7AA1FF98; Sat, 11 Jul 2020 18:07:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v2 49/50] Revert "vga: build virtio-gpu as module" Date: Sat, 11 Jul 2020 18:07:31 +0100 Message-Id: <20200711170732.26213-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200711170732.26213-1-alex.bennee@linaro.org> References: <20200711170732.26213-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Gerd Hoffmann Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Gerd Hoffmann This reverts commit 8d5a24c83dba90b08ef163bbf166d6dfbad9019b. Compiling all virtio-gpu objects into a single module isn't a good plan because the individual objects have different CONFIG_* dependencies. Leads to module load failures on s390x due to vga support being disabled, which in turn breaks '-device virtio-gpu-device' (flagged by travis ci). So back to the drawing board for modular virtio-gpu ... Signed-off-by: Gerd Hoffmann Signed-off-by: Alex Bennée Message-Id: <20200710203652.9708-3-kraxel@redhat.com> -- 2.20.1 diff --git a/util/module.c b/util/module.c index 32b0547b82..90e9bd42c6 100644 --- a/util/module.c +++ b/util/module.c @@ -266,12 +266,6 @@ static struct { { "usb-redir", "hw-", "usb-redirect" }, { "qxl-vga", "hw-", "display-qxl" }, { "qxl", "hw-", "display-qxl" }, - { "virtio-gpu-device", "hw-", "display-virtio-gpu" }, - { "virtio-gpu-pci", "hw-", "display-virtio-gpu" }, - { "virtio-vga", "hw-", "display-virtio-gpu" }, - { "vhost-user-gpu-device", "hw-", "display-virtio-gpu" }, - { "vhost-user-gpu-pci", "hw-", "display-virtio-gpu" }, - { "vhost-user-vga", "hw-", "display-virtio-gpu" }, { "chardev-braille", "chardev-", "baum" }, }; diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index e907f3182b..d619594ad4 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -49,19 +49,16 @@ common-obj-m += qxl.mo qxl.mo-objs = qxl.o qxl-logger.o qxl-render.o endif -ifeq ($(CONFIG_VIRTIO_GPU),y) -common-obj-m += virtio-gpu.mo -virtio-gpu-obj-$(CONFIG_VIRTIO_GPU) += virtio-gpu-base.o virtio-gpu.o virtio-gpu-3d.o -virtio-gpu-obj-$(CONFIG_VHOST_USER_GPU) += vhost-user-gpu.o -virtio-gpu-obj-$(call land,$(CONFIG_VIRTIO_GPU),$(CONFIG_VIRTIO_PCI)) += virtio-gpu-pci.o -virtio-gpu-obj-$(call land,$(CONFIG_VHOST_USER_GPU),$(CONFIG_VIRTIO_PCI)) += vhost-user-gpu-pci.o -virtio-gpu-obj-$(CONFIG_VIRTIO_VGA) += virtio-vga.o -virtio-gpu-obj-$(CONFIG_VHOST_USER_VGA) += vhost-user-vga.o -virtio-gpu.mo-objs := $(virtio-gpu-obj-y) -virtio-gpu.mo-cflags := $(VIRGL_CFLAGS) -virtio-gpu.mo-libs := $(VIRGL_LIBS) -endif - +common-obj-$(CONFIG_VIRTIO_GPU) += virtio-gpu-base.o virtio-gpu.o virtio-gpu-3d.o +common-obj-$(CONFIG_VHOST_USER_GPU) += vhost-user-gpu.o +common-obj-$(call land,$(CONFIG_VIRTIO_GPU),$(CONFIG_VIRTIO_PCI)) += virtio-gpu-pci.o +common-obj-$(call land,$(CONFIG_VHOST_USER_GPU),$(CONFIG_VIRTIO_PCI)) += vhost-user-gpu-pci.o +common-obj-$(CONFIG_VIRTIO_VGA) += virtio-vga.o +common-obj-$(CONFIG_VHOST_USER_VGA) += vhost-user-vga.o +virtio-gpu.o-cflags := $(VIRGL_CFLAGS) +virtio-gpu.o-libs += $(VIRGL_LIBS) +virtio-gpu-3d.o-cflags := $(VIRGL_CFLAGS) +virtio-gpu-3d.o-libs += $(VIRGL_LIBS) common-obj-$(CONFIG_DPCD) += dpcd.o common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dp.o