mirrors-yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn synced 2024-11-24 20:58:19 +00:00
Code Issues Projects Releases Packages Wiki Activity
unicorn/qemu/hw/core/machine.c

69 lines
1.4 KiB
C
Raw Normal View History

import
2015-08-21 07:04:50 +00:00
/*
* QEMU Machine
*
* Copyright (C) 2014 Red Hat Inc
*
* Authors:
* Marcel Apfelbaum <marcel.a@redhat.com>
*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
include/qemu/osdep.h: Don't include qapi/error.h Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the Error typedef. Since then, we've moved to include qemu/osdep.h everywhere. Its file comment explains: "To avoid getting into possible circular include dependencies, this file should not include any other QEMU headers, with the exceptions of config-host.h, compiler.h, os-posix.h and os-win32.h, all of which are doing a similar job to this file and are under similar constraints." qapi/error.h doesn't do a similar job, and it doesn't adhere to similar constraints: it includes qapi-types.h. That's in excess of 100KiB of crap most .c files don't actually need. Add the typedef to qemu/typedefs.h, and include that instead of qapi/error.h. Include qapi/error.h in .c files that need it and don't get it now. Include qapi-types.h in qom/object.h for uint16List. Update scripts/clean-includes accordingly. Update it further to match reality: replace config.h by config-target.h, add sysemu/os-posix.h, sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h comment quoted above similarly. This reduces the number of objects depending on qapi/error.h from "all of them" to less than a third. Unfortunately, the number depending on qapi-types.h shrinks only a little. More work is needed for that one. Backports commit da34e65cb4025728566d6504a99916f6e7e1dd6a from qemu
2018-02-22 04:05:15 +00:00
#include "qemu/osdep.h"
import
2015-08-21 07:04:50 +00:00
#include "hw/boards.h"
include/qemu/osdep.h: Don't include qapi/error.h Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the Error typedef. Since then, we've moved to include qemu/osdep.h everywhere. Its file comment explains: "To avoid getting into possible circular include dependencies, this file should not include any other QEMU headers, with the exceptions of config-host.h, compiler.h, os-posix.h and os-win32.h, all of which are doing a similar job to this file and are under similar constraints." qapi/error.h doesn't do a similar job, and it doesn't adhere to similar constraints: it includes qapi-types.h. That's in excess of 100KiB of crap most .c files don't actually need. Add the typedef to qemu/typedefs.h, and include that instead of qapi/error.h. Include qapi/error.h in .c files that need it and don't get it now. Include qapi-types.h in qom/object.h for uint16List. Update scripts/clean-includes accordingly. Update it further to match reality: replace config.h by config-target.h, add sysemu/os-posix.h, sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h comment quoted above similarly. This reduces the number of objects depending on qapi/error.h from "all of them" to less than a third. Unfortunately, the number depending on qapi-types.h shrinks only a little. More work is needed for that one. Backports commit da34e65cb4025728566d6504a99916f6e7e1dd6a from qemu
2018-02-22 04:05:15 +00:00
#include "qapi/error.h"
util: move declarations out of qemu-common.h Move declarations out of qemu-common.h for functions declared in utils/ files: e.g. include/qemu/path.h for utils/path.c. Move inline functions out of qemu-common.h and into new files (e.g. include/qemu/bcd.h) Backports commit f348b6d1a53e5271cf1c9f9acc4646b4b98c1771 from qemu
2018-02-22 14:24:12 +00:00
#include "qemu/cutils.h"
import
2015-08-21 07:04:50 +00:00
machine: Set MachineClass::name automatically Now all TYPE_MACHINE subclasses use MACHINE_TYPE_NAME to generate the class name. So instead of requiring each subclass to set MachineClass::name manually, we can now set it automatically at the TYPE_MACHINE class_base_init() function. Backports commit 98cec76a7076c4a38e16f1a9de170a7942b3be54 from qemu
2018-03-11 18:37:36 +00:00
static void machine_class_base_init(struct uc_struct *uc, ObjectClass *oc, void *data)
machine: Ensure all TYPE_MACHINE subclasses have the right suffix Now that all non-abstract TYPE_MACHINE subclasses have the -machine suffix, add an assert to ensure this will be always true. Backports commit dcb3d601115eed77aef543fe3a920adc17544e06 from qemu
2018-03-11 18:29:19 +00:00
{
if (!object_class_is_abstract(oc)) {
machine: Set MachineClass::name automatically Now all TYPE_MACHINE subclasses use MACHINE_TYPE_NAME to generate the class name. So instead of requiring each subclass to set MachineClass::name manually, we can now set it automatically at the TYPE_MACHINE class_base_init() function. Backports commit 98cec76a7076c4a38e16f1a9de170a7942b3be54 from qemu
2018-03-11 18:37:36 +00:00
MachineClass *mc = MACHINE_CLASS(uc, oc);
machine: Ensure all TYPE_MACHINE subclasses have the right suffix Now that all non-abstract TYPE_MACHINE subclasses have the -machine suffix, add an assert to ensure this will be always true. Backports commit dcb3d601115eed77aef543fe3a920adc17544e06 from qemu
2018-03-11 18:29:19 +00:00
const char *cname = object_class_get_name(oc);
assert(g_str_has_suffix(cname, TYPE_MACHINE_SUFFIX));
machine: Set MachineClass::name automatically Now all TYPE_MACHINE subclasses use MACHINE_TYPE_NAME to generate the class name. So instead of requiring each subclass to set MachineClass::name manually, we can now set it automatically at the TYPE_MACHINE class_base_init() function. Backports commit 98cec76a7076c4a38e16f1a9de170a7942b3be54 from qemu
2018-03-11 18:37:36 +00:00
mc->name = g_strndup(cname,
strlen(cname) - strlen(TYPE_MACHINE_SUFFIX));
machine: Ensure all TYPE_MACHINE subclasses have the right suffix Now that all non-abstract TYPE_MACHINE subclasses have the -machine suffix, add an assert to ensure this will be always true. Backports commit dcb3d601115eed77aef543fe3a920adc17544e06 from qemu
2018-03-11 18:29:19 +00:00
}
}
machine: use class base init generated name machine_class_base_init() member name is allocated by machine_class_base_init(), but not freed by machine_class_finalize(). Simply freeing there doesn't work, because DEFINE_PC_MACHINE() overwrites it with a literal string. Fix DEFINE_PC_MACHINE() not to overwrite it, and add the missing free to machine_class_finalize(). Backports commit 8ea753718b2d1a42e9ce7b8db9f5e4e1f330e827 from qemu
2018-03-11 20:52:40 +00:00
static void machine_class_finalize(struct uc_struct *uc, ObjectClass *klass, void *data)
{
MachineClass *mc = MACHINE_CLASS(uc, klass);
g_free(mc->name);
}
import
2015-08-21 07:04:50 +00:00
static void machine_initfn(struct uc_struct *uc, Object *obj, void *opaque)
{
}
static void machine_finalize(struct uc_struct *uc, Object *obj, void *opaque)
{
}
static const TypeInfo machine_info = {
Unicorn interface working with test app in 32bit and 64bit builds.
2017-01-20 06:27:22 +00:00
TYPE_MACHINE,
TYPE_OBJECT,
cleanup after msvc port
2017-01-22 13:27:17 +00:00
Unicorn interface working with test app in 32bit and 64bit builds.
2017-01-20 06:27:22 +00:00
sizeof(MachineClass),
sizeof(MachineState),
Automated leading tab to spaces conversion.
2017-01-21 01:28:22 +00:00
NULL,
Unicorn interface working with test app in 32bit and 64bit builds.
2017-01-20 06:27:22 +00:00
machine_initfn,
Automated leading tab to spaces conversion.
2017-01-21 01:28:22 +00:00
NULL,
Unicorn interface working with test app in 32bit and 64bit builds.
2017-01-20 06:27:22 +00:00
machine_finalize,
cleanup after msvc port
2017-01-22 13:27:17 +00:00
Automated leading tab to spaces conversion.
2017-01-21 01:28:22 +00:00
NULL,
Unicorn interface working with test app in 32bit and 64bit builds.
2017-01-20 06:27:22 +00:00
Automated leading tab to spaces conversion.
2017-01-21 01:28:22 +00:00
NULL,
machine: Ensure all TYPE_MACHINE subclasses have the right suffix Now that all non-abstract TYPE_MACHINE subclasses have the -machine suffix, add an assert to ensure this will be always true. Backports commit dcb3d601115eed77aef543fe3a920adc17544e06 from qemu
2018-03-11 18:29:19 +00:00
machine_class_base_init,
machine: use class base init generated name machine_class_base_init() member name is allocated by machine_class_base_init(), but not freed by machine_class_finalize(). Simply freeing there doesn't work, because DEFINE_PC_MACHINE() overwrites it with a literal string. Fix DEFINE_PC_MACHINE() not to overwrite it, and add the missing free to machine_class_finalize(). Backports commit 8ea753718b2d1a42e9ce7b8db9f5e4e1f330e827 from qemu
2018-03-11 20:52:40 +00:00
machine_class_finalize,
Unicorn interface working with test app in 32bit and 64bit builds.
2017-01-20 06:27:22 +00:00
Automated leading tab to spaces conversion.
2017-01-21 01:28:22 +00:00
true,
import
2015-08-21 07:04:50 +00:00
};
void machine_register_types(struct uc_struct *uc)
{
type_register_static(uc, &machine_info);
}
Reference in a new issue Copy permalink