From 4ac4f0c681b3f4147a4adb163b448495ace3dc31 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Sun, 9 Jan 2011 13:02:04 +0200 Subject: [PATCH] kvm: Rename early_printk.c to 8250-serial.c The 8250 emulation is no longer there to just support early_printk() so rename the source file to reflect that. Signed-off-by: Pekka Enberg --- tools/kvm/{early_printk.c => 8250-serial.c} | 4 ++-- tools/kvm/Makefile | 2 +- tools/kvm/include/kvm/8250-serial.h | 9 +++++++++ tools/kvm/include/kvm/early_printk.h | 9 --------- tools/kvm/main.c | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) rename tools/kvm/{early_printk.c => 8250-serial.c} (98%) create mode 100644 tools/kvm/include/kvm/8250-serial.h delete mode 100644 tools/kvm/include/kvm/early_printk.h diff --git a/tools/kvm/early_printk.c b/tools/kvm/8250-serial.c similarity index 98% rename from tools/kvm/early_printk.c rename to tools/kvm/8250-serial.c index af3070f8e14f..b2101cc04e96 100644 --- a/tools/kvm/early_printk.c +++ b/tools/kvm/8250-serial.c @@ -1,4 +1,4 @@ -#include "kvm/early_printk.h" +#include "kvm/8250-serial.h" #include "kvm/ioport.h" #include "kvm/util.h" @@ -171,7 +171,7 @@ static struct ioport_operations serial8250_ops = { .io_out = serial8250_out, }; -void early_printk__init(void) +void serial8250__init(void) { ioport__register(device.iobase, &serial8250_ops, 8); } diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile index f100f020aecf..906d5d97f1ee 100644 --- a/tools/kvm/Makefile +++ b/tools/kvm/Makefile @@ -9,10 +9,10 @@ export E Q PROGRAM = kvm +OBJS += 8250-serial.o OBJS += blk-virtio.o OBJS += cpuid.o OBJS += disk-image.o -OBJS += early_printk.o OBJS += interrupt.o OBJS += ioport.o OBJS += kvm.o diff --git a/tools/kvm/include/kvm/8250-serial.h b/tools/kvm/include/kvm/8250-serial.h new file mode 100644 index 000000000000..d899f4fe83bd --- /dev/null +++ b/tools/kvm/include/kvm/8250-serial.h @@ -0,0 +1,9 @@ +#ifndef KVM__8250_SERIAL_H +#define KVM__8250_SERIAL_H + +struct kvm; + +void serial8250__init(void); +void serial8250__interrupt(struct kvm *self); + +#endif /* KVM__8250_SERIAL_H */ diff --git a/tools/kvm/include/kvm/early_printk.h b/tools/kvm/include/kvm/early_printk.h deleted file mode 100644 index 156717c3e2db..000000000000 --- a/tools/kvm/include/kvm/early_printk.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef KVM__EARLY_PRINTK_H -#define KVM__EARLY_PRINTK_H - -struct kvm; - -void early_printk__init(void); -void serial8250__interrupt(struct kvm *self); - -#endif /* KVM__EARLY_PRINTK_H */ diff --git a/tools/kvm/main.c b/tools/kvm/main.c index 748719cf92f2..7a3d66c03eaf 100644 --- a/tools/kvm/main.c +++ b/tools/kvm/main.c @@ -1,6 +1,6 @@ #include "kvm/kvm.h" -#include "kvm/early_printk.h" +#include "kvm/8250-serial.h" #include "kvm/blk-virtio.h" #include "kvm/disk-image.h" #include "kvm/util.h" @@ -168,7 +168,7 @@ int main(int argc, char *argv[]) if (single_step) kvm__enable_singlestep(kvm); - early_printk__init(); + serial8250__init(); pci__init(); blk_virtio__init(kvm); -- 2.39.5