Move CPU emulation code to cpu.c

The kvm.c file is getting bigger so move CPU emulation code to a separate file.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>

diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile
index a0cde1875cb2dc6d57568a355887f48d42ac2eed..d53777576681e491931ea3bebbcb056c2a0ecc89 100644 (file)
--- a/tools/kvm/Makefile
+++ b/tools/kvm/Makefile
@@ -1,14 +1,17 @@
 PROGRAM        = kvm
 
 OBJS   += kvm.o
+OBJS   += cpu.o
 
 CFLAGS += -Iinclude
 
 all: $(PROGRAM)
 
-$(PRORAM): $(OBJS)
+$(PROGRAM): $(OBJS)
        $(CC) $(OBJS) -o $@
 
+$(OBJS):
+
 clean:
        rm -f $(OBJS) $(PROGRAM)
 .PHONY: clean

diff --git a/tools/kvm/cpu.c b/tools/kvm/cpu.c
new file mode 100644 (file)
index 0000000..631b2b1
--- /dev/null
+++ b/tools/kvm/cpu.c
@@ -0,0 +1,14 @@
+#include "kvm/cpu.h"
+
+#include <stdlib.h>
+
+struct cpu *cpu__new(void)
+{
+       return calloc(1, sizeof(struct cpu));
+}
+
+void cpu__reset(struct cpu *self)
+{
+       self->regs.eip          = 0x000fff0UL;
+       self->regs.eflags       = 0x0000002UL;
+}

diff --git a/tools/kvm/include/kvm/cpu.h b/tools/kvm/include/kvm/cpu.h
index ced2e5e49fb56366a71662dc02560f9b125725f8..9029f2069db341d3c822245649c11624f5d815f1 100644 (file)
--- a/tools/kvm/include/kvm/cpu.h
+++ b/tools/kvm/include/kvm/cpu.h
@@ -39,4 +39,7 @@ struct cpu {
        struct cpu_registers    regs;   
 };
 
+struct cpu *cpu__new(void);
+void cpu__reset(struct cpu *self);
+
 #endif /* KVM__CPU_H */

diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c
index 4a2a04a607e2d9eabc05bb2bcc38535b0a34f584..9fd377d9e9f13a47dc7657ac250838340f4a02ad 100644 (file)
--- a/tools/kvm/kvm.c
+++ b/tools/kvm/kvm.c
@@ -28,17 +28,6 @@ static void die(const char *s)
        exit(1);
 }
 
-static void cpu__reset(struct cpu *self)
-{
-       self->regs.eip          = 0x000fff0UL;
-       self->regs.eflags       = 0x0000002UL;
-}
-
-static struct cpu *cpu__new(void)
-{
-       return calloc(1, sizeof(struct cpu));
-}
-
 static inline bool kvm__supports_extension(struct kvm *self, unsigned int extension)
 {
        int ret;