From nobody Sun May 5 05:52:31 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=1594413558; cv=none; d=zohomail.com; s=zohoarc; b=aANieFvOq29nAFIohCoV8iVRqaFCCgEIkIdFEzDw99Fl1YjIcEhSBmreGcPN8WR9r1RKqiwFQsaGbWYt0d7r57qDM7DTT/K2r92EDwuqagVFBOCr8/HRLIExArJa02qo5OQAefURQ6YUTAn2VoT/gbZzrKbVDw5WH+L2QjVJfyo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594413558; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=hHZJgsW3IQX4fQJ0rRxzksbH60DRMF5WLNLaOTWN7p0=; b=caOfG9bDO4g7Ohyv7uUhkYBZW+jCBe0Et+ypS9iO4pTc/ZTcvg3Czirmdnm/Leap8bZhvlRCJ8kumvTCxVklLJ/iOxQ+ZTNRCrwEShcJFCc9qbPiJ9J6MwPuQyqlOeY0YS5IIfviH3vEF8LEGjkqggQsT8K08RVzeGKsBiR/WG8= 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 1594413558171199.1819188800381; Fri, 10 Jul 2020 13:39:18 -0700 (PDT) Received: from localhost ([::1]:45390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtznh-0005El-1B for importer@patchew.org; Fri, 10 Jul 2020 16:39:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtzla-0002Jc-Sw for qemu-devel@nongnu.org; Fri, 10 Jul 2020 16:37:06 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:49487 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 1jtzlZ-000598-DD for qemu-devel@nongnu.org; Fri, 10 Jul 2020 16:37:06 -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-425-rO8s2LijPPyf6BUBmb0jaQ-1; Fri, 10 Jul 2020 16:37:00 -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 608121B18BC1; Fri, 10 Jul 2020 20:36:59 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-115-89.ams2.redhat.com [10.36.115.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B2201001B0B; Fri, 10 Jul 2020 20:36:53 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 89BF817447; Fri, 10 Jul 2020 22:36:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594413422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=hHZJgsW3IQX4fQJ0rRxzksbH60DRMF5WLNLaOTWN7p0=; b=Aeei6sczD7d1bj2ZGyfQm9B09eedv0l5S3QEX1sDxYKUVS6Ha1SE/fY8tkrDWGyvsnhuV2 hxuFWxxnFJ6ym9x82/Ek/ie6PBnOhCgUy0KX8+Z47B9J5bUJfo1iuLuNRu9OVKPtyfYGoS 7SEdpJULHAcAe6iY5o5XHwBEL4lrlAM= X-MC-Unique: rO8s2LijPPyf6BUBmb0jaQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 1/2] tests: fix "make check-qtest" for modular builds Date: Fri, 10 Jul 2020 22:36:51 +0200 Message-Id: <20200710203652.9708-2-kraxel@redhat.com> In-Reply-To: <20200710203652.9708-1-kraxel@redhat.com> References: <20200710203652.9708-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=207.211.31.81; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/09 23:35:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: Laurent Vivier , Peter Maydell , Thomas Huth , Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Gerd Hoffmann --- tests/qtest/Makefile.include | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/qtest/Makefile.include b/tests/qtest/Makefile.include index 98af2c2d9338..6a0276fd42dd 100644 --- a/tests/qtest/Makefile.include +++ b/tests/qtest/Makefile.include @@ -277,6 +277,7 @@ tests/qtest/tco-test$(EXESUF): tests/qtest/tco-test.o $= (libqos-pc-obj-y) tests/qtest/virtio-ccw-test$(EXESUF): tests/qtest/virtio-ccw-test.o tests/qtest/display-vga-test$(EXESUF): tests/qtest/display-vga-test.o tests/qtest/qom-test$(EXESUF): tests/qtest/qom-test.o +tests/qtest/modules-test$(EXESUF): tests/qtest/modules-test.o tests/qtest/test-hmp$(EXESUF): tests/qtest/test-hmp.o tests/qtest/machine-none-test$(EXESUF): tests/qtest/machine-none-test.o tests/qtest/device-plug-test$(EXESUF): tests/qtest/device-plug-test.o --=20 2.18.4 From nobody Sun May 5 05:52:31 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=1594413491; cv=none; d=zohomail.com; s=zohoarc; b=d3GxrtgnevOzNLJ9wF8QxmRvDp6y4NnJZDordlv7jGP9uWtySmKCc4KTQE4lyEm1R6nhguoH68ST6v49pRG18aHSO5PJZ5iFUmNx2XfmvaQPbWmIXnM0xGsjNfjB1UhsZLavQ3n/zKu2EKA83Q3k34zzrzskAiETKVeBBIp/rR8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594413491; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=8qlGmGrgHANwfMvpo6+UtQCStftgDKpMZzRk3Hfn5U0=; b=Io2HEZkbUVF/Cf+jafUeU5p9fv/f0DZ9dzVqduYYdQv2JZ9j/Eg1Wa+AZED3NlElQ6FsaEpJB+TpQpDtcxtAuMCCmxUqO3u7uEiudaWoCmE2EJchu1331EPaiVVwiAfWqMEkKixJeKsmDODuzY8AiTx1tSUhHy/bGexX9dkDEFM= 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 1594413491068694.8388347041247; Fri, 10 Jul 2020 13:38:11 -0700 (PDT) Received: from localhost ([::1]:41194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtzmb-0003UW-Qd for importer@patchew.org; Fri, 10 Jul 2020 16:38:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtzlZ-0002Hy-PE for qemu-devel@nongnu.org; Fri, 10 Jul 2020 16:37:05 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:49692 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 1jtzlX-00059F-CV for qemu-devel@nongnu.org; Fri, 10 Jul 2020 16:37:05 -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-106-h9LMx_KqOuqu02HeEBmO4w-1; Fri, 10 Jul 2020 16:36:57 -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 4C61B100A691; Fri, 10 Jul 2020 20:36:56 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-115-89.ams2.redhat.com [10.36.115.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4792874F50; Fri, 10 Jul 2020 20:36:53 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 92F2B17510; Fri, 10 Jul 2020 22:36:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594413422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=8qlGmGrgHANwfMvpo6+UtQCStftgDKpMZzRk3Hfn5U0=; b=TRtIH1HL0P7lzQYOQKT8iDu9ag3iZOkAC6HanR81Clqgkq8r7u7IRfxfFp6cv+3k2ipJqF GKplxp0FmJEw+sF5IzvuVGVwx4Is974U959sT4C3tnGDNAeOYyFvkCWN3eZzY+AXTinLIg XFPEQQOlvwu6Iwkya4hxwudn6ucQUuw= X-MC-Unique: h9LMx_KqOuqu02HeEBmO4w-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 2/2] Revert "vga: build virtio-gpu as module" Date: Fri, 10 Jul 2020 22:36:52 +0200 Message-Id: <20200710203652.9708-3-kraxel@redhat.com> In-Reply-To: <20200710203652.9708-1-kraxel@redhat.com> References: <20200710203652.9708-1-kraxel@redhat.com> 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 X-Mimecast-Originator: redhat.com 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/07/10 15:06:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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=-1, 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: Laurent Vivier , Peter Maydell , Thomas Huth , Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 --- util/module.c | 6 ------ hw/display/Makefile.objs | 23 ++++++++++------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/util/module.c b/util/module.c index 32b0547b8266..90e9bd42c6c7 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" }, }; =20 diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index e907f3182b0c..d619594ad4d3 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -49,19 +49,16 @@ common-obj-m +=3D qxl.mo qxl.mo-objs =3D qxl.o qxl-logger.o qxl-render.o endif =20 -ifeq ($(CONFIG_VIRTIO_GPU),y) -common-obj-m +=3D virtio-gpu.mo -virtio-gpu-obj-$(CONFIG_VIRTIO_GPU) +=3D virtio-gpu-base.o virtio-gpu.o vi= rtio-gpu-3d.o -virtio-gpu-obj-$(CONFIG_VHOST_USER_GPU) +=3D vhost-user-gpu.o -virtio-gpu-obj-$(call land,$(CONFIG_VIRTIO_GPU),$(CONFIG_VIRTIO_PCI)) +=3D= virtio-gpu-pci.o -virtio-gpu-obj-$(call land,$(CONFIG_VHOST_USER_GPU),$(CONFIG_VIRTIO_PCI)) = +=3D vhost-user-gpu-pci.o -virtio-gpu-obj-$(CONFIG_VIRTIO_VGA) +=3D virtio-vga.o -virtio-gpu-obj-$(CONFIG_VHOST_USER_VGA) +=3D vhost-user-vga.o -virtio-gpu.mo-objs :=3D $(virtio-gpu-obj-y) -virtio-gpu.mo-cflags :=3D $(VIRGL_CFLAGS) -virtio-gpu.mo-libs :=3D $(VIRGL_LIBS) -endif - +common-obj-$(CONFIG_VIRTIO_GPU) +=3D virtio-gpu-base.o virtio-gpu.o virtio= -gpu-3d.o +common-obj-$(CONFIG_VHOST_USER_GPU) +=3D vhost-user-gpu.o +common-obj-$(call land,$(CONFIG_VIRTIO_GPU),$(CONFIG_VIRTIO_PCI)) +=3D vir= tio-gpu-pci.o +common-obj-$(call land,$(CONFIG_VHOST_USER_GPU),$(CONFIG_VIRTIO_PCI)) +=3D= vhost-user-gpu-pci.o +common-obj-$(CONFIG_VIRTIO_VGA) +=3D virtio-vga.o +common-obj-$(CONFIG_VHOST_USER_VGA) +=3D vhost-user-vga.o +virtio-gpu.o-cflags :=3D $(VIRGL_CFLAGS) +virtio-gpu.o-libs +=3D $(VIRGL_LIBS) +virtio-gpu-3d.o-cflags :=3D $(VIRGL_CFLAGS) +virtio-gpu-3d.o-libs +=3D $(VIRGL_LIBS) common-obj-$(CONFIG_DPCD) +=3D dpcd.o common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) +=3D xlnx_dp.o =20 --=20 2.18.4