da34e65cb4
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.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
107 lines
2.4 KiB
C
107 lines
2.4 KiB
C
/*
|
|
* NMI monitor handler class and helpers.
|
|
*
|
|
* Copyright IBM Corp., 2014
|
|
*
|
|
* Author: Alexey Kardashevskiy <aik@ozlabs.ru>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License,
|
|
* or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "hw/nmi.h"
|
|
#include "qapi/error.h"
|
|
#include "qapi/qmp/qerror.h"
|
|
#include "monitor/monitor.h"
|
|
|
|
struct do_nmi_s {
|
|
int cpu_index;
|
|
Error *err;
|
|
bool handled;
|
|
};
|
|
|
|
static void nmi_children(Object *o, struct do_nmi_s *ns);
|
|
|
|
static int do_nmi(Object *o, void *opaque)
|
|
{
|
|
struct do_nmi_s *ns = opaque;
|
|
NMIState *n = (NMIState *) object_dynamic_cast(o, TYPE_NMI);
|
|
|
|
if (n) {
|
|
NMIClass *nc = NMI_GET_CLASS(n);
|
|
|
|
ns->handled = true;
|
|
nc->nmi_monitor_handler(n, ns->cpu_index, &ns->err);
|
|
if (ns->err) {
|
|
return -1;
|
|
}
|
|
}
|
|
nmi_children(o, ns);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void nmi_children(Object *o, struct do_nmi_s *ns)
|
|
{
|
|
object_child_foreach(o, do_nmi, ns);
|
|
}
|
|
|
|
void nmi_monitor_handle(int cpu_index, Error **errp)
|
|
{
|
|
struct do_nmi_s ns = {
|
|
.cpu_index = cpu_index,
|
|
.err = NULL,
|
|
.handled = false
|
|
};
|
|
|
|
nmi_children(object_get_root(), &ns);
|
|
if (ns.handled) {
|
|
error_propagate(errp, ns.err);
|
|
} else {
|
|
error_setg(errp, QERR_UNSUPPORTED);
|
|
}
|
|
}
|
|
|
|
void inject_nmi(void)
|
|
{
|
|
#if defined(TARGET_I386)
|
|
CPUState *cs;
|
|
|
|
CPU_FOREACH(cs) {
|
|
X86CPU *cpu = X86_CPU(cs);
|
|
|
|
if (!cpu->apic_state) {
|
|
cpu_interrupt(cs, CPU_INTERRUPT_NMI);
|
|
} else {
|
|
apic_deliver_nmi(cpu->apic_state);
|
|
}
|
|
}
|
|
#else
|
|
nmi_monitor_handle(0, NULL);
|
|
#endif
|
|
}
|
|
|
|
static const TypeInfo nmi_info = {
|
|
.name = TYPE_NMI,
|
|
.parent = TYPE_INTERFACE,
|
|
.class_size = sizeof(NMIClass),
|
|
};
|
|
|
|
static void nmi_register_types(void)
|
|
{
|
|
type_register_static(&nmi_info);
|
|
}
|
|
|
|
type_init(nmi_register_types)
|