summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit Shah2010-01-21 11:13:26 +0100
committerAnthony Liguori2010-01-26 22:42:02 +0100
commit4c36a2ffac3a14e57fe44718010601fbcef228c1 (patch)
treef4ab6047324df65cf7d15ce1ecb3ade2debd8b69
parentFix generation of config-host.h (diff)
downloadqemu-4c36a2ffac3a14e57fe44718010601fbcef228c1.tar.gz
qemu-4c36a2ffac3a14e57fe44718010601fbcef228c1.tar.xz
qemu-4c36a2ffac3a14e57fe44718010601fbcef228c1.zip
virtio-console: Rename virtio-serial.c back to virtio-console.c
This file was renamed to ease the reviews of the recent changes that went in. Now that the changes are done, rename the file back to its original name. Signed-off-by: Amit Shah <amit.shah@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--Makefile.objs2
-rw-r--r--hw/virtio-console.c (renamed from hw/virtio-serial.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.objs b/Makefile.objs
index 77ff7f6b07..e791dd5c2e 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -127,7 +127,7 @@ user-obj-y += cutils.o cache-utils.o
hw-obj-y =
hw-obj-y += loader.o
-hw-obj-y += virtio.o virtio-serial.o
+hw-obj-y += virtio.o virtio-console.o
hw-obj-y += fw_cfg.o
hw-obj-y += watchdog.o
hw-obj-$(CONFIG_ECC) += ecc.o
diff --git a/hw/virtio-serial.c b/hw/virtio-console.c
index bd44ec6b6e..bd44ec6b6e 100644
--- a/hw/virtio-serial.c
+++ b/hw/virtio-console.c