From patchwork Thu Jun 4 13:16:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 11587933 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BCB991392 for ; Thu, 4 Jun 2020 13:17:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 93E5A206C3 for ; Thu, 4 Jun 2020 13:17:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VXiyubk6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 93E5A206C3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:55322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jgpkd-0000si-PR for patchwork-qemu-devel@patchwork.kernel.org; Thu, 04 Jun 2020 09:17:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jgpjy-0007nD-Si for qemu-devel@nongnu.org; Thu, 04 Jun 2020 09:17:02 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:44050 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 1jgpjx-00023a-VW for qemu-devel@nongnu.org; Thu, 04 Jun 2020 09:17:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591276621; 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=rwADNlbQAqsl3T+blUbudp6HvmyTiZL+19PTG8I3YdY=; b=VXiyubk6Opf500jSxQUfp6grr6WG1pPFLqPnrCDr0LqyMkxtAyMYAkdNfpHjT4mCR7k31s mQ/JRGi8mZ1krXpQHjPW0XrtNnGKduC9YHpNOjLzj/CVJGNCq7St+ipLHtGbLef/13e073 iu2fEnp5riNoMh5FVn4jS0yuOzyUW3o= 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-493-4kS9q_LpMrOAxTmzgtrZHw-1; Thu, 04 Jun 2020 09:16:57 -0400 X-MC-Unique: 4kS9q_LpMrOAxTmzgtrZHw-1 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 D725E18B6492 for ; Thu, 4 Jun 2020 13:16:55 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-50.ams2.redhat.com [10.36.113.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0DA4961B8F; Thu, 4 Jun 2020 13:16:55 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0CCCD17532; Thu, 4 Jun 2020 15:16:44 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v2 5/7] vga: build qxl as module Date: Thu, 4 Jun 2020 15:16:41 +0200 Message-Id: <20200604131643.1776-6-kraxel@redhat.com> In-Reply-To: <20200604131643.1776-1-kraxel@redhat.com> References: <20200604131643.1776-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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/06/04 01:31:23 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=0.001, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: dinechin@redhat.com, Paolo Bonzini , =?utf-8?q?Dani?= =?utf-8?q?el_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Gerd Hoffmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" First step in making spice support modular. Signed-off-by: Gerd Hoffmann --- hw/core/qdev.c | 2 ++ hw/Makefile.objs | 1 + hw/display/Makefile.objs | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index cab971758b26..70cf84bb67d0 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -159,6 +159,8 @@ static struct { { .type = "ccid-card-passthru", .mod = "usb-smartcard" }, { .type = "ccid-card-emulated", .mod = "usb-smartcard" }, { .type = "usb-redir", .mod = "usb-redirect" }, + { .type = "qxl-vga", .mod = "display-qxl" }, + { .type = "qxl", .mod = "display-qxl" }, }; static bool qdev_module_loaded_all; diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 71843591fe43..fd6519e8af3f 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -43,5 +43,6 @@ devices-dirs-y += smbios/ endif common-obj-y += $(devices-dirs-y) +common-obj-m += display/ common-obj-m += usb/ obj-y += $(devices-dirs-y) diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 77a7d622bd2d..76b3571e4902 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -44,7 +44,10 @@ common-obj-$(CONFIG_ARTIST) += artist.o obj-$(CONFIG_VGA) += vga.o -common-obj-$(CONFIG_QXL) += qxl.o qxl-logger.o qxl-render.o +ifeq ($(CONFIG_QXL),y) +common-obj-m += qxl.mo +qxl.mo-objs = qxl.o qxl-logger.o qxl-render.o +endif obj-$(CONFIG_VIRTIO_GPU) += virtio-gpu-base.o virtio-gpu.o virtio-gpu-3d.o obj-$(CONFIG_VHOST_USER_GPU) += vhost-user-gpu.o