Commit 2e5b09fd authored by Markus Armbruster's avatar Markus Armbruster
Browse files

hw/core: Move cpu.c, cpu.h from qom/ to hw/core/ 



Suggested-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20190709152053.16670-2-armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
[Rebased onto merge commit 95a9457f; missed instances of qom/cpu.h
in comments replaced]
parent 17dc5799

MAINTAINERS

+2 −4
Original line number Diff line number Diff line
@@ -1274,6 +1274,7 @@ Machine core 
M: Eduardo Habkost <ehabkost@redhat.com>

M: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>

S: Supported

F: hw/core/cpu.c

F: hw/core/machine-qmp-cmds.c

F: hw/core/machine.c

F: hw/core/null-machine.c
@@ -1281,10 +1282,9 @@ F: hw/core/numa.c 
F: hw/cpu/cluster.c

F: qapi/machine.json

F: qapi/machine-target.json

F: qom/cpu.c

F: include/hw/boards.h

F: include/hw/core/cpu.h

F: include/hw/cpu/cluster.h

F: include/qom/cpu.h

F: include/sysemu/numa.h

T: git https://github.com/ehabkost/qemu.git machine-next
@@ -2048,12 +2048,10 @@ F: hw/core/qdev* 
F: include/hw/qdev*

F: include/monitor/qdev.h

F: include/qom/

X: include/qom/cpu.h

F: qapi/qom.json

F: qapi/qdev.json

F: qdev-monitor.c

F: qom/

X: qom/cpu.c

F: tests/check-qom-interface.c

F: tests/check-qom-proplist.c

F: tests/test-qdev-global-props.c

accel/tcg/user-exec-stub.c

+1 −1
Original line number Diff line number Diff line 
#include "qemu/osdep.h"

#include "qom/cpu.h"

#include "hw/core/cpu.h"

#include "sysemu/replay.h"

#include "sysemu/sysemu.h"

cpus-common.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include "qemu/osdep.h"

#include "qemu/main-loop.h"

#include "exec/cpu-common.h"

#include "qom/cpu.h"

#include "hw/core/cpu.h"

#include "sysemu/cpus.h"



static QemuMutex qemu_cpu_list_lock;

exec.c

+1 −1
Original line number Diff line number Diff line
@@ -937,7 +937,7 @@ void cpu_exec_unrealizefn(CPUState *cpu) 
Property cpu_common_props[] = {

#ifndef CONFIG_USER_ONLY

    /* Create a memory property for softmmu CPU object,

     * so users can wire up its memory. (This can't go in qom/cpu.c

     * so users can wire up its memory. (This can't go in hw/core/cpu.c

     * because that file is compiled only once for both user-mode

     * and system builds.) The default if no link is set up is to use

     * the system address space.

hw/acpi/cpu_hotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include "qemu/osdep.h"

#include "hw/acpi/cpu_hotplug.h"

#include "qapi/error.h"

#include "qom/cpu.h"

#include "hw/core/cpu.h"

#include "hw/i386/pc.h"

#include "qemu/error-report.h"