From patchwork Thu Jul 23 17:46:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe de Dinechin X-Patchwork-Id: 11681421 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 F256513A4 for ; Thu, 23 Jul 2020 17:48:16 +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 C85352086A for ; Thu, 23 Jul 2020 17:48:16 +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="cSKEf6mM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C85352086A 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]:46628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyfKK-0007qz-1p for patchwork-qemu-devel@patchwork.kernel.org; Thu, 23 Jul 2020 13:48:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyfJL-0005gL-4B for qemu-devel@nongnu.org; Thu, 23 Jul 2020 13:47:15 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:58988 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 1jyfJF-0004Dp-CW for qemu-devel@nongnu.org; Thu, 23 Jul 2020 13:47:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595526428; 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=QVdscPRd6imQsOABcuv9gyX+RdOmajO1F+PXzm8/OCE=; b=cSKEf6mMMLXhOBAdCl2i2OJJp1hs4OEChHler+3yFacxd1ioFIi7Qv0yceGj8IWQi+Cq9l knk6rlw8POrHni9s901nxYwcOMooVJnVFQ4e4V3v7XUW5HCK+i69xNGwWGH5W9ZvIv3C9/ y2/jRDpcBTOlI1GsSj+zIILGCU1wefI= 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-213-MB_heOcnPpKha69IQlc-gQ-1; Thu, 23 Jul 2020 13:47:04 -0400 X-MC-Unique: MB_heOcnPpKha69IQlc-gQ-1 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 8034E193248F; Thu, 23 Jul 2020 17:47:03 +0000 (UTC) Received: from turbo.com (ovpn-113-141.ams2.redhat.com [10.36.113.141]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8CCB369316; Thu, 23 Jul 2020 17:46:55 +0000 (UTC) From: Christophe de Dinechin To: qemu-devel@nongnu.org, kraxel@redhat.com Subject: [PATCH 5/7] spice: Move all the spice-related code in spice-app.so Date: Thu, 23 Jul 2020 19:46:13 +0200 Message-Id: <20200723174615.2370096-6-dinechin@redhat.com> In-Reply-To: <20200723174615.2370096-1-dinechin@redhat.com> References: <20200723174615.2370096-1-dinechin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.120; envelope-from=dinechin@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/22 22:13:02 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_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: Eduardo Habkost , "Michael S. Tsirkin" , "Dr. David Alan Gilbert" , Markus Armbruster , Paolo Bonzini , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" If we want to build spice as a separately loadable module, we need to put all the spice code in one loadable module, because the build system does not know how to deal with dependencies yet. Signed-off-by: Christophe de Dinechin --- audio/Makefile.objs | 2 +- chardev/Makefile.objs | 3 +-- ui/Makefile.objs | 8 ++++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/audio/Makefile.objs b/audio/Makefile.objs index b4a4c11f31..298c895ff5 100644 --- a/audio/Makefile.objs +++ b/audio/Makefile.objs @@ -1,5 +1,5 @@ common-obj-y = audio.o audio_legacy.o noaudio.o wavaudio.o mixeng.o -common-obj-$(CONFIG_SPICE) += spiceaudio.o +spice-app.mo-objs += ../audio/spiceaudio.o common-obj-$(CONFIG_AUDIO_COREAUDIO) += coreaudio.o common-obj-$(CONFIG_AUDIO_DSOUND) += dsoundaudio.o common-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs index 7cf05c9541..2add4319a9 100644 --- a/chardev/Makefile.objs +++ b/chardev/Makefile.objs @@ -26,5 +26,4 @@ baum.o-cflags := $(SDL_CFLAGS) baum.o-libs := $(BRLAPI_LIBS) endif -common-obj-$(CONFIG_SPICE) += spice.mo -spice.mo-objs := spice.o +spice-app.mo-objs += ../chardev/spice.o diff --git a/ui/Makefile.objs b/ui/Makefile.objs index 504b196479..1ab515e23d 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -11,7 +11,6 @@ common-obj-y += keymaps.o console.o cursor.o qemu-pixman.o common-obj-y += input.o input-keymap.o input-legacy.o kbd-state.o common-obj-y += input-barrier.o common-obj-$(CONFIG_LINUX) += input-linux.o -common-obj-$(CONFIG_SPICE) += spice-core.o spice-input.o spice-display.o common-obj-$(CONFIG_COCOA) += cocoa.o common-obj-$(CONFIG_VNC) += $(vnc-obj-y) common-obj-$(call lnot,$(CONFIG_VNC)) += vnc-stubs.o @@ -53,10 +52,11 @@ curses.mo-objs := curses.o curses.mo-cflags := $(CURSES_CFLAGS) $(ICONV_CFLAGS) curses.mo-libs := $(CURSES_LIBS) $(ICONV_LIBS) -ifeq ($(CONFIG_GIO)$(CONFIG_SPICE),yy) -common-obj-$(if $(CONFIG_MODULES),m,y) += spice-app.mo +common-obj-$(CONFIG_SPICE) += spice-app.mo +spice-app.mo-objs += spice-core.o spice-input.o spice-display.o +ifeq ($(CONFIG_GIO)$(CONFIG_SPICE),ym) +spice-app.mo-objs += spice-app.o endif -spice-app.mo-objs := spice-app.o spice-app.mo-cflags := $(GIO_CFLAGS) spice-app.mo-libs := $(GIO_LIBS)