[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 33/54] char: move to chardev/
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 33/54] char: move to chardev/ |
Date: |
Tue, 13 Dec 2016 01:43:04 +0300 |
The following commits will split char.c in several files. Let's put them
in a subdirectory.
Signed-off-by: Marc-André Lureau <address@hidden>
---
qemu-char.c => chardev/char.c | 0
Makefile.objs | 2 +-
chardev/Makefile.objs | 1 +
tests/Makefile.include | 6 +++---
MAINTAINERS | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
rename qemu-char.c => chardev/char.c (100%)
create mode 100644 chardev/Makefile.objs
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/Makefile.objs b/Makefile.objs
index 06f74b8b99..6cf903baa1 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 e98d3b6bb3..ca57fe61d6 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)
@@ -488,7 +488,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-io-obj-y)
+tests/test-char$(EXESUF): tests/test-char.o chardev/char.o qemu-timer.o
$(test-util-obj-y) $(qtest-obj-y) $(test-io-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)
@@ -678,7 +678,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)
diff --git a/MAINTAINERS b/MAINTAINERS
index 4a605791fc..9e4817fd4a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1175,7 +1175,7 @@ T: git git://github.com/jnsnow/qemu.git bitmaps
Character device backends
M: Paolo Bonzini <address@hidden>
S: Maintained
-F: qemu-char.c
+F: chardev/
F: backends/msmouse.c
F: backends/testdev.c
--
2.11.0
- [Qemu-devel] [PATCH 22/54] char-pty: convert to finalize, (continued)
- [Qemu-devel] [PATCH 22/54] char-pty: convert to finalize, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 23/54] char-ringbuf: convert to finalize, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 24/54] char-parallel: convert parallel to finalize, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 25/54] char-stdio: convert to finalize, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 26/54] char-win-stdio: convert to finalize, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 27/54] char-win: do not override chr_free, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 28/54] char-win: convert to finalize, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 29/54] char-fd: convert to finalize, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 30/54] char: remove chr_free, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 31/54] char: get rid of CharDriver, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 33/54] char: move to chardev/,
Marc-André Lureau <=
- [Qemu-devel] [PATCH 32/54] char: remove class kind field, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 34/54] char: create chardev-obj-y, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 35/54] char: make null_chr_write() the default method, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 36/54] char: move null chardev to its own file, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 37/54] char: move mux to its own file, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 38/54] char: move ringbuf/memory to its own file, Marc-André Lureau, 2016/12/12
- [Qemu-devel] [PATCH 40/54] char: remove unused READ_RETRIES, Marc-André Lureau, 2016/12/12