diff mbox

[19/40] char: move to chardev/

Message ID 20170111172956.11255-20-marcandre.lureau@redhat.com
State New
Headers show

Commit Message

Marc-André Lureau Jan. 11, 2017, 5:29 p.m. UTC 
The following commits will split char.c in several files. Let's put them
in a subdirectory.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 qemu-char.c => chardev/char.c | 0
 MAINTAINERS                   | 2 +-
 Makefile.objs                 | 2 +-
 chardev/Makefile.objs         | 1 +
 tests/Makefile.include        | 6 +++---
 5 files changed, 6 insertions(+), 5 deletions(-)
 rename qemu-char.c => chardev/char.c (100%)
 create mode 100644 chardev/Makefile.objs

Comments

Eric Blake Jan. 12, 2017, 7:06 p.m. UTC | #1 
On 01/11/2017 11:29 AM, Marc-André Lureau wrote:
> The following commits will split char.c in several files. Let's put them
> in a subdirectory.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  qemu-char.c => chardev/char.c | 0

Yay - one less file in the top level :)

>  MAINTAINERS                   | 2 +-
>  Makefile.objs                 | 2 +-
>  chardev/Makefile.objs         | 1 +
>  tests/Makefile.include        | 6 +++---
>  5 files changed, 6 insertions(+), 5 deletions(-)
>  rename qemu-char.c => chardev/char.c (100%)
>  create mode 100644 chardev/Makefile.objs
> 

> +++ b/tests/Makefile.include
> @@ -9,7 +9,7 @@ SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \
>  check-unit-y = tests/check-qdict$(EXESUF)
>  gcov-files-check-qdict-y = qobject/qdict.c
>  check-unit-y += tests/test-char$(EXESUF)
> -gcov-files-check-qdict-y = qemu-char.c
> +gcov-files-check-qdict-y = chardev/char.c
>  check-unit-y += tests/check-qfloat$(EXESUF)
>  gcov-files-check-qfloat-y = qobject/qfloat.c
>  check-unit-y += tests/check-qint$(EXESUF)
> @@ -489,7 +489,7 @@ tests/check-qjson$(EXESUF): tests/check-qjson.o $(test-util-obj-y)
>  tests/check-qom-interface$(EXESUF): tests/check-qom-interface.o $(test-qom-obj-y)
>  tests/check-qom-proplist$(EXESUF): tests/check-qom-proplist.o $(test-qom-obj-y)
>  
> -tests/test-char$(EXESUF): tests/test-char.o qemu-char.o qemu-timer.o $(test-util-obj-y) $(qtest-obj-y) $(test-block-obj-y)
> +tests/test-char$(EXESUF): tests/test-char.o chardev/char.o qemu-timer.o $(test-util-obj-y) $(qtest-obj-y) $(test-block-obj-y)

Pre-existing so you just kept it, but maybe we should use \ line
wrapping to avoid long lines.

With or without wrapping,
Reviewed-by: Eric Blake <eblake@redhat.com>
diff mbox

Patch

diff --git a/qemu-char.c b/chardev/char.c
similarity index 100%
rename from qemu-char.c
rename to chardev/char.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 1444b26dc0..7454501020 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1173,7 +1173,7 @@  T: git git://github.com/jnsnow/qemu.git bitmaps
 Character device backends
 M: Paolo Bonzini <pbonzini@redhat.com>
 S: Maintained
-F: qemu-char.c
+F: chardev/
 F: backends/msmouse.c
 F: backends/testdev.c
 
diff --git a/Makefile.objs b/Makefile.objs
index 01cef866e4..cad4c54740 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -51,7 +51,7 @@  common-obj-$(CONFIG_POSIX) += os-posix.o
 common-obj-$(CONFIG_LINUX) += fsdev/
 
 common-obj-y += migration/
-common-obj-y += qemu-char.o #aio.o
+common-obj-y += chardev/ #aio.o
 common-obj-y += page_cache.o
 
 common-obj-$(CONFIG_SPICE) += spice-qemu-char.o
diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs
new file mode 100644
index 0000000000..3fc5539518
--- /dev/null
+++ b/chardev/Makefile.objs
@@ -0,0 +1 @@ 
+common-obj-y += char.o
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 8368254ddd..a85e97b220 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -9,7 +9,7 @@  SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \
 check-unit-y = tests/check-qdict$(EXESUF)
 gcov-files-check-qdict-y = qobject/qdict.c
 check-unit-y += tests/test-char$(EXESUF)
-gcov-files-check-qdict-y = qemu-char.c
+gcov-files-check-qdict-y = chardev/char.c
 check-unit-y += tests/check-qfloat$(EXESUF)
 gcov-files-check-qfloat-y = qobject/qfloat.c
 check-unit-y += tests/check-qint$(EXESUF)
@@ -489,7 +489,7 @@  tests/check-qjson$(EXESUF): tests/check-qjson.o $(test-util-obj-y)
 tests/check-qom-interface$(EXESUF): tests/check-qom-interface.o $(test-qom-obj-y)
 tests/check-qom-proplist$(EXESUF): tests/check-qom-proplist.o $(test-qom-obj-y)
 
-tests/test-char$(EXESUF): tests/test-char.o qemu-char.o qemu-timer.o $(test-util-obj-y) $(qtest-obj-y) $(test-block-obj-y)
+tests/test-char$(EXESUF): tests/test-char.o chardev/char.o qemu-timer.o $(test-util-obj-y) $(qtest-obj-y) $(test-block-obj-y)
 tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(test-block-obj-y)
 tests/test-aio$(EXESUF): tests/test-aio.o $(test-block-obj-y)
 tests/test-throttle$(EXESUF): tests/test-throttle.o $(test-block-obj-y)
@@ -680,7 +680,7 @@  tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-usb-obj-y)
 tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o $(libqos-usb-obj-y)
 tests/pc-cpu-test$(EXESUF): tests/pc-cpu-test.o
 tests/postcopy-test$(EXESUF): tests/postcopy-test.o
-tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o qemu-char.o qemu-timer.o $(qtest-obj-y) $(test-io-obj-y) $(libqos-virtio-obj-y) $(libqos-pc-obj-y)
+tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o chardev/char.o qemu-timer.o $(qtest-obj-y) $(test-io-obj-y) $(libqos-virtio-obj-y) $(libqos-pc-obj-y)
 tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o
 tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y)
 tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o $(test-block-obj-y)