there are two accelerators in qemu, kvm and tcg. kvm
accelerator is defined in kvm-all.c, but tcg accelerator
is defined in accel.c file. we split tcg accelerator from
accel.c file and create one new accel directory,which will
include kvm and tcg accel files.
Signed-off-by: Yang Zhong
---
Makefile.objs | 1 -
Makefile.target | 1 +
accel.c | 155
accel/Makefile.objs | 2 +
accel/accel.c | 128 +++
accel/tcg/Makefile.objs | 1 +
accel/tcg/tcg-all.c | 61 +++
7 files changed, 193 insertions(+), 156 deletions(-)
delete mode 100644 accel.c
create mode 100644 accel/Makefile.objs
create mode 100644 accel/accel.c
create mode 100644 accel/tcg/Makefile.objs
create mode 100644 accel/tcg/tcg-all.c
diff --git a/Makefile.objs b/Makefile.objs
index 6167e7b..2a8de77 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -55,7 +55,6 @@ common-obj-$(CONFIG_SPICE) += spice-qemu-char.o
common-obj-y += audio/
common-obj-y += hw/
-common-obj-y += accel.o
common-obj-y += replay/
diff --git a/Makefile.target b/Makefile.target
index 465a633..ba893a8 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -143,6 +143,7 @@ obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o
ioport.o numa.o
obj-y += qtest.o bootdevice.o
obj-y += hw/
obj-$(CONFIG_KVM) += kvm-all.o
+obj-y += accel/
obj-y += memory.o cputlb.o
obj-y += memory_mapping.o
obj-y += dump.o
diff --git a/accel.c b/accel.c
deleted file mode 100644
index 664bb88..000
--- a/accel.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * QEMU System Emulator, accelerator interfaces
- *
- * Copyright (c) 2003-2008 Fabrice Bellard
- * Copyright (c) 2014 Red Hat Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "qemu/osdep.h"
-#include "sysemu/accel.h"
-#include "hw/boards.h"
-#include "qemu-common.h"
-#include "sysemu/arch_init.h"
-#include "sysemu/sysemu.h"
-#include "sysemu/kvm.h"
-#include "sysemu/qtest.h"
-#include "hw/xen/xen.h"
-#include "qom/object.h"
-
-int tcg_tb_size;
-static bool tcg_allowed = true;
-
-static int tcg_init(MachineState *ms)
-{
-tcg_exec_init(tcg_tb_size * 1024 * 1024);
-return 0;
-}
-
-static const TypeInfo accel_type = {
-.name = TYPE_ACCEL,
-.parent = TYPE_OBJECT,
-.class_size = sizeof(AccelClass),
-.instance_size = sizeof(AccelState),
-};
-
-/* Lookup AccelClass from opt_name. Returns NULL if not found */
-static AccelClass *accel_find(const char *opt_name)
-{
-char *class_name = g_strdup_printf(ACCEL_CLASS_NAME("%s"), opt_name);
-AccelClass *ac = ACCEL_CLASS(object_class_by_name(class_name));
-g_free(class_name);
-return ac;
-}
-
-static int accel_init_machine(AccelClass *acc, MachineState *ms)
-{
-ObjectClass *oc = OBJECT_CLASS(acc);
-const char *cname = object_class_get_name(oc);
-AccelState *accel = ACCEL(object_new(cname));
-int ret;
-ms->accelerator = accel;
-*(acc->allowed) = true;
-ret = acc->init_machine(ms);
-if (ret < 0) {
-ms->accelerator = NULL;
-*(acc->allowed) = false;
-object_unref(OBJECT(accel));
-}
-return ret;
-}
-
-void configure_accelerator(MachineState *ms)
-{
-const char *p;
-char buf[10];
-int ret;
-bool accel_initialised = false;
-bool init_failed = false;
-AccelClass *acc = NULL;
-
-p = qemu_opt_get(qemu_get_machine_opts(), "accel");
-if (p == NULL) {
-/* Use the default "accelerator", tcg */
-p = "tcg";
-}
-
-while (!accel_initialised && *p != '\0') {
-if (*p == ':') {
-p++;
-}
-p = get_opt_name(buf, sizeof(buf), p, ':');
-acc = accel_find(buf);
-if (!acc) {
-fprintf(stderr, "\"%s\" accelerator not found.\n", buf);
-continue;
-}
-if (acc->available && !acc->avai
