jcs.org
qemu with hax to log dma reads & writes
jcs.org/2018/11/12/vfio
qemu-common: Move tcg_enabled() etc. to sysemu/tcg.h
Other accelerators have their own headers: sysemu/hax.h, sysemu/hvf.h,
sysemu/kvm.h, sysemu/whpx.h. Only tcg_enabled() & friends sit in
qemu-common.h. This necessitates inclusion of qemu-common.h into
headers, which is against the rules spelled out in qemu-common.h's
file comment.
Move tcg_enabled() & friends into their own header sysemu/tcg.h, and
adjust #include directives.
Cc: Richard Henderson <rth@twiddle.net>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190523143508.25387-2-armbru@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
[Rebased with conflicts resolved automatically, except for
accel/tcg/tcg-all.c]
+56
-18
+1
MAINTAINERS
+1
MAINTAINERS
+1
accel/tcg/cpu-exec-common.c
+1
accel/tcg/cpu-exec-common.c
+1
-1
accel/tcg/tcg-all.c
+1
-1
accel/tcg/tcg-all.c
+2
-1
accel/tcg/translate-all.c
+2
-1
accel/tcg/translate-all.c
···
16
16
* You should have received a copy of the GNU Lesser General Public
17
17
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
18
18
*/
19
+
19
20
#include "qemu/osdep.h"
20
21
21
-
#include "qemu-common.h"
22
22
#define NO_CPU_IO_DEFS
23
23
#include "cpu.h"
24
24
#include "trace.h"
···
55
55
#include "qemu/main-loop.h"
56
56
#include "exec/log.h"
57
57
#include "sysemu/cpus.h"
58
+
#include "sysemu/tcg.h"
58
59
59
60
/* #define DEBUG_TB_INVALIDATE */
60
61
/* #define DEBUG_TB_FLUSH */
+2
bsd-user/main.c
+2
bsd-user/main.c
···
16
16
* You should have received a copy of the GNU General Public License
17
17
* along with this program; if not, see <http://www.gnu.org/licenses/>.
18
18
*/
19
+
19
20
#include "qemu/osdep.h"
20
21
#include "qemu/units.h"
22
+
#include "sysemu/tcg.h"
21
23
#include "qemu-version.h"
22
24
#include <machine/trap.h>
23
25
+1
cpus.c
+1
cpus.c
+2
exec.c
+2
exec.c
···
16
16
* You should have received a copy of the GNU Lesser General Public
17
17
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
18
18
*/
19
+
19
20
#include "qemu/osdep.h"
20
21
#include "qapi/error.h"
21
22
···
32
33
#endif
33
34
#include "sysemu/kvm.h"
34
35
#include "sysemu/sysemu.h"
36
+
#include "sysemu/tcg.h"
35
37
#include "qemu/timer.h"
36
38
#include "qemu/config-file.h"
37
39
#include "qemu/error-report.h"
+1
hw/i386/pc.c
+1
hw/i386/pc.c
+2
hw/ppc/spapr_caps.c
+2
hw/ppc/spapr_caps.c
···
21
21
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22
22
* THE SOFTWARE.
23
23
*/
24
+
24
25
#include "qemu/osdep.h"
25
26
#include "qemu/error-report.h"
26
27
#include "qapi/error.h"
···
32
33
#include "cpu-models.h"
33
34
#include "kvm_ppc.h"
34
35
#include "sysemu/qtest.h"
36
+
#include "sysemu/tcg.h"
35
37
36
38
#include "hw/ppc/spapr.h"
37
39
+1
hw/s390x/ipl.c
+1
hw/s390x/ipl.c
+1
include/exec/ram_addr.h
+1
include/exec/ram_addr.h
-8
include/qemu-common.h
-8
include/qemu-common.h
···
77
77
sendto(sockfd, buf, len, flags, destaddr, addrlen)
78
78
#endif
79
79
80
-
extern bool tcg_allowed;
81
-
void tcg_exec_init(unsigned long tb_size);
82
-
#ifdef CONFIG_TCG
83
-
#define tcg_enabled() (tcg_allowed)
84
-
#else
85
-
#define tcg_enabled() 0
86
-
#endif
87
-
88
80
void cpu_exec_init_all(void);
89
81
void cpu_exec_step_atomic(CPUState *cpu);
90
82
+19
include/sysemu/tcg.h
+19
include/sysemu/tcg.h
···
1
+
/*
2
+
* QEMU TCG support
3
+
*
4
+
* This work is licensed under the terms of the GNU GPL, version 2 or later.
5
+
* See the COPYING file in the top-level directory.
6
+
*/
7
+
8
+
#ifndef SYSEMU_TCG_H
9
+
#define SYSEMU_TCG_H
10
+
11
+
extern bool tcg_allowed;
12
+
void tcg_exec_init(unsigned long tb_size);
13
+
#ifdef CONFIG_TCG
14
+
#define tcg_enabled() (tcg_allowed)
15
+
#else
16
+
#define tcg_enabled() 0
17
+
#endif
18
+
19
+
#endif
+2
linux-user/main.c
+2
linux-user/main.c
···
16
16
* You should have received a copy of the GNU General Public License
17
17
* along with this program; if not, see <http://www.gnu.org/licenses/>.
18
18
*/
19
+
19
20
#include "qemu/osdep.h"
20
21
#include "qemu/units.h"
22
+
#include "sysemu/tcg.h"
21
23
#include "qemu-version.h"
22
24
#include <sys/syscall.h>
23
25
#include <sys/resource.h>
+1
-1
memory.c
+1
-1
memory.c
···
15
15
16
16
#include "qemu/osdep.h"
17
17
#include "qapi/error.h"
18
-
#include "qemu-common.h"
19
18
#include "cpu.h"
20
19
#include "exec/memory.h"
21
20
#include "exec/address-spaces.h"
···
30
29
#include "exec/ram_addr.h"
31
30
#include "sysemu/kvm.h"
32
31
#include "sysemu/sysemu.h"
32
+
#include "sysemu/tcg.h"
33
33
#include "hw/qdev-properties.h"
34
34
#include "migration/vmstate.h"
35
35
+1
monitor.c
+1
monitor.c
+1
qemu-nbd.c
+1
qemu-nbd.c
+1
-1
qom/cpu.c
+1
-1
qom/cpu.c
···
20
20
21
21
#include "qemu/osdep.h"
22
22
#include "qapi/error.h"
23
-
#include "qemu-common.h"
24
23
#include "qom/cpu.h"
25
24
#include "sysemu/hw_accel.h"
26
25
#include "qemu/notify.h"
···
30
29
#include "qemu/error-report.h"
31
30
#include "qemu/qemu-print.h"
32
31
#include "sysemu/sysemu.h"
32
+
#include "sysemu/tcg.h"
33
33
#include "hw/boards.h"
34
34
#include "hw/qdev-properties.h"
35
35
#include "trace-root.h"
+1
-1
target/arm/cpu.c
+1
-1
target/arm/cpu.c
···
24
24
#include "qapi/visitor.h"
25
25
#include "cpu.h"
26
26
#include "internals.h"
27
-
#include "qemu-common.h"
28
27
#include "exec/exec-all.h"
29
28
#include "hw/qdev-properties.h"
30
29
#if !defined(CONFIG_USER_ONLY)
31
30
#include "hw/loader.h"
32
31
#endif
33
32
#include "sysemu/sysemu.h"
33
+
#include "sysemu/tcg.h"
34
34
#include "sysemu/hw_accel.h"
35
35
#include "kvm_arm.h"
36
36
#include "disas/capstone.h"
+1
target/i386/cpu.c
+1
target/i386/cpu.c
+1
-1
target/i386/cpu.h
+1
-1
target/i386/cpu.h
+1
target/i386/helper.c
+1
target/i386/helper.c
+1
-1
target/i386/machine.c
+1
-1
target/i386/machine.c
+1
target/ppc/translate_init.inc.c
+1
target/ppc/translate_init.inc.c
+1
-1
target/s390x/cpu.c
+1
-1
target/s390x/cpu.c
···
26
26
#include "internal.h"
27
27
#include "kvm_s390x.h"
28
28
#include "sysemu/kvm.h"
29
-
#include "qemu-common.h"
30
29
#include "qemu/timer.h"
31
30
#include "qemu/error-report.h"
32
31
#include "trace.h"
···
39
38
#include "hw/hw.h"
40
39
#include "sysemu/arch_init.h"
41
40
#include "sysemu/sysemu.h"
41
+
#include "sysemu/tcg.h"
42
42
#endif
43
43
#include "fpu/softfloat.h"
44
44
+1
target/s390x/cpu_models.c
+1
target/s390x/cpu_models.c
+2
-1
target/s390x/gdbstub.c
+2
-1
target/s390x/gdbstub.c
···
17
17
* You should have received a copy of the GNU Lesser General Public
18
18
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
19
19
*/
20
+
20
21
#include "qemu/osdep.h"
21
-
#include "qemu-common.h"
22
22
#include "cpu.h"
23
23
#include "internal.h"
24
24
#include "exec/exec-all.h"
25
25
#include "exec/gdbstub.h"
26
26
#include "qemu/bitops.h"
27
27
#include "sysemu/hw_accel.h"
28
+
#include "sysemu/tcg.h"
28
29
29
30
int s390_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)
30
31
{
+1
target/s390x/helper.c
+1
target/s390x/helper.c
+1
target/s390x/interrupt.c
+1
target/s390x/interrupt.c
+1
target/s390x/machine.c
+1
target/s390x/machine.c
+1
target/s390x/mmu_helper.c
+1
target/s390x/mmu_helper.c
+1
-1
target/s390x/sigp.c
+1
-1
target/s390x/sigp.c
···
9
9
*/
10
10
11
11
#include "qemu/osdep.h"
12
-
#include "qemu-common.h"
13
12
#include "cpu.h"
14
13
#include "internal.h"
15
14
#include "sysemu/hw_accel.h"
16
15
#include "exec/address-spaces.h"
17
16
#include "exec/exec-all.h"
18
17
#include "sysemu/sysemu.h"
18
+
#include "sysemu/tcg.h"
19
19
#include "trace.h"
20
20
#include "qapi/qapi-types-misc.h"
21
21