From patchwork Fri Mar 1 13:33:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 224332 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3697E2C02A3 for ; Sat, 2 Mar 2013 00:34:40 +1100 (EST) Received: from localhost ([::1]:56026 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBQ6g-00031m-Bm for incoming@patchwork.ozlabs.org; Fri, 01 Mar 2013 08:34:38 -0500 Received: from eggs.gnu.org ([208.118.235.92]:40563) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBQ66-00031a-My for qemu-devel@nongnu.org; Fri, 01 Mar 2013 08:34:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UBQ64-0007Ma-Hw for qemu-devel@nongnu.org; Fri, 01 Mar 2013 08:34:02 -0500 Received: from mail-qc0-x235.google.com ([2607:f8b0:400d:c01::235]:49150) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBQ64-0007MV-EB for qemu-devel@nongnu.org; Fri, 01 Mar 2013 08:34:00 -0500 Received: by mail-qc0-f181.google.com with SMTP id a22so320068qcs.26 for ; Fri, 01 Mar 2013 05:34:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=70w/7pTzxKR18lLKjsdxlzRrDyFpArPdctwXdWNtcuo=; b=vmf0jXhU64t5uKepUdVy9dEZ1E7shBwmgC19sjYr3uJM1fBw6OS4RNFhTndIbfrUuo cWp+o8kjcC7qzYBkmk0oqOfigckz5NqlPpjyY2k4/RentSjf5gcsXOf0O67qM6Cuen3v LB54X1vuwNmmfEciYq4RUDbMr01KaSi1nW67nVPMVNuYQGibhQhrjH4jujBE2/I+rhlm msTm4b3aR2hsC2rW3qETd1aEGTu6+mAqBz9774gUlmw+FV1vHjOi77ADLSpVl+gIxT2K JdpgB70Fs3BaMEIuqMOOTanKzfGoMlJuoAywCCiWVH/R0t1lwBYoD8j4RnBlutQIUSKY nDVg== X-Received: by 10.229.205.73 with SMTP id fp9mr3772956qcb.21.1362144840026; Fri, 01 Mar 2013 05:34:00 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id hr1sm19338754qeb.3.2013.03.01.05.33.58 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 01 Mar 2013 05:33:59 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 1 Mar 2013 14:33:32 +0100 Message-Id: <1362144829-26979-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1362144829-26979-1-git-send-email-pbonzini@redhat.com> References: <1362144829-26979-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c01::235 Cc: peter.maydell@linaro.org, afaerber@suse.de Subject: [Qemu-devel] [PATCH 01/18] hw: move char backends to backends/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Braille and msmouse support is in hw/, but it is not hardware. Move it to the backends/ directory. Signed-off-by: Paolo Bonzini --- backends/Makefile.objs | 4 ++++ {hw => backends}/baum.c | 4 ++-- {hw => backends}/msmouse.c | 2 +- hw/Makefile.objs | 4 +--- {hw => include/char}/baum.h | 0 {hw => include/char}/msmouse.h | 0 qemu-char.c | 4 ++-- vl.c | 2 +- 8 files changed, 11 insertions(+), 9 deletions(-) rename {hw => backends}/baum.c (99%) rename {hw => backends}/msmouse.c (99%) rename {hw => include/char}/baum.h (100%) rename {hw => include/char}/msmouse.h (100%) diff --git a/backends/Makefile.objs b/backends/Makefile.objs index 8836761..464bc3e 100644 --- a/backends/Makefile.objs +++ b/backends/Makefile.objs @@ -1,2 +1,6 @@ common-obj-y += rng.o rng-egd.o common-obj-$(CONFIG_POSIX) += rng-random.o + +common-obj-y += msmouse.o +common-obj-$(CONFIG_BRLAPI) += baum.o +$(obj)/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS) diff --git a/hw/baum.c b/backends/baum.c similarity index 99% rename from hw/baum.c rename to backends/baum.c index 09dcb9c..37ccca8 100644 --- a/hw/baum.c +++ b/backends/baum.c @@ -24,8 +24,8 @@ #include "qemu-common.h" #include "char/char.h" #include "qemu/timer.h" -#include "usb.h" -#include "baum.h" +#include "hw/usb.h" +#include "char/baum.h" #include #include #include diff --git a/hw/msmouse.c b/backends/msmouse.c similarity index 99% rename from hw/msmouse.c rename to backends/msmouse.c index ef47aed..bf2ff2a 100644 --- a/hw/msmouse.c +++ b/backends/msmouse.c @@ -25,7 +25,7 @@ #include "qemu-common.h" #include "char/char.h" #include "ui/console.h" -#include "msmouse.h" +#include "char/msmouse.h" #define MSMOUSE_LO6(n) ((n) & 0x3f) #define MSMOUSE_HI2(n) (((n) & 0xc0) >> 6) diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 40ebe46..5750332 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -190,10 +190,9 @@ common-obj-$(CONFIG_SSI_SD) += ssi-sd.o common-obj-$(CONFIG_SD) += sd.o common-obj-y += bt.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o common-obj-y += bt-hci-csr.o -common-obj-y += msmouse.o ps2.o +common-obj-y += ps2.o common-obj-y += qdev-monitor.o common-obj-y += qdev-properties-system.o -common-obj-$(CONFIG_BRLAPI) += baum.o # xen backend driver support common-obj-$(CONFIG_XEN_BACKEND) += xen_backend.o xen_devconfig.o @@ -218,5 +217,4 @@ obj-$(CONFIG_KVM) += ivshmem.o obj-$(CONFIG_LINUX) += vfio_pci.o endif -$(obj)/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS) endif diff --git a/hw/baum.h b/include/char/baum.h similarity index 100% rename from hw/baum.h rename to include/char/baum.h diff --git a/hw/msmouse.h b/include/char/msmouse.h similarity index 100% rename from hw/msmouse.h rename to include/char/msmouse.h diff --git a/qemu-char.c b/qemu-char.c index 160decc..6dc1474 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -28,8 +28,8 @@ #include "qemu/timer.h" #include "char/char.h" #include "hw/usb.h" -#include "hw/baum.h" -#include "hw/msmouse.h" +#include "char/baum.h" +#include "char/msmouse.h" #include "qmp-commands.h" #include diff --git a/vl.c b/vl.c index c03edf1..e0a8eeb 100644 --- a/vl.c +++ b/vl.c @@ -119,7 +119,7 @@ int main(int argc, char **argv) #include "hw/pcmcia.h" #include "hw/pc.h" #include "hw/isa.h" -#include "hw/baum.h" +#include "char/baum.h" #include "hw/bt.h" #include "hw/watchdog.h" #include "hw/smbios.h"