From patchwork Sun Dec 17 21:28:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 849746 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z0NF35dKcz9s4q for ; Mon, 18 Dec 2017 12:07:51 +1100 (AEDT) Received: from localhost ([::1]:56189 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQjuH-0005mv-ST for incoming@patchwork.ozlabs.org; Sun, 17 Dec 2017 20:07:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45559) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQjrZ-00043A-Ih for qemu-devel@nongnu.org; Sun, 17 Dec 2017 20:05:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQjrU-0007R0-Mo for qemu-devel@nongnu.org; Sun, 17 Dec 2017 20:05:01 -0500 Received: from isrv.corpit.ru ([86.62.121.231]:36583) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQjrU-0007Oi-Eb; Sun, 17 Dec 2017 20:04:56 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 6AF0641197; Mon, 18 Dec 2017 04:04:55 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.corpit.ru (Postfix) with SMTP id 6C93FD01; Mon, 18 Dec 2017 00:25:47 +0300 (MSK) Received: (nullmailer pid 31006 invoked by uid 1000); Sun, 17 Dec 2017 21:28:08 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Mon, 18 Dec 2017 00:28:05 +0300 Message-Id: <8908b72ecbfba7ee66f995529e5a9f0eaebefe22.1513545944.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 60/61] i386/pc: move vmmouse.c to hw/i386/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It's a x86-only device, so it does not make sense to keep it in the shared misc folder. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- hw/i386/Makefile.objs | 1 + hw/{input => i386}/vmmouse.c | 0 hw/input/Makefile.objs | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) rename hw/{input => i386}/vmmouse.c (100%) diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 1548ad1ad0..fd279e7584 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -6,6 +6,7 @@ obj-y += x86-iommu.o intel_iommu.o obj-y += amd_iommu.o obj-$(CONFIG_XEN) += ../xenpv/ xen/ obj-$(CONFIG_VMPORT) += vmport.o +obj-$(CONFIG_VMMOUSE) += vmmouse.o obj-y += kvmvapic.o obj-y += acpi-build.o diff --git a/hw/input/vmmouse.c b/hw/i386/vmmouse.c similarity index 100% rename from hw/input/vmmouse.c rename to hw/i386/vmmouse.c diff --git a/hw/input/Makefile.objs b/hw/input/Makefile.objs index 7715d7230d..636f794b6b 100644 --- a/hw/input/Makefile.objs +++ b/hw/input/Makefile.objs @@ -6,7 +6,6 @@ common-obj-$(CONFIG_PL050) += pl050.o common-obj-y += ps2.o common-obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o common-obj-$(CONFIG_TSC2005) += tsc2005.o -common-obj-$(CONFIG_VMMOUSE) += vmmouse.o common-obj-$(CONFIG_VIRTIO) += virtio-input.o common-obj-$(CONFIG_VIRTIO) += virtio-input-hid.o