Skip to content

Commit d45a527

Browse files
pm215pm215
committed
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-6.1-pull-request' into staging
Trivial patches pull request 20210503 # gpg: Signature made Mon 03 May 2021 09:34:56 BST # gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C # gpg: issuer "[email protected]" # gpg: Good signature from "Laurent Vivier <[email protected]>" [full] # gpg: aka "Laurent Vivier <[email protected]>" [full] # gpg: aka "Laurent Vivier (Red Hat) <[email protected]>" [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier2/tags/trivial-branch-for-6.1-pull-request: (23 commits) hw/rx/rx-gdbsim: Do not accept invalid memory size docs: More precisely describe memory-backend-*::id's user scripts: fix generation update-binfmts templates docs/system: Document the removal of "compat" property for POWER CPUs mc146818rtc: put it into the 'misc' category Do not include exec/address-spaces.h if it's not really necessary Do not include cpu.h if it's not really necessary Do not include hw/boards.h if it's not really necessary Do not include sysemu/sysemu.h if it's not really necessary hw: Do not include qemu/log.h if it is not necessary hw: Do not include hw/irq.h if it is not necessary hw: Do not include hw/sysbus.h if it is not necessary hw: Remove superfluous includes of hw/hw.h ui: Fix memory leak in qemu_xkeymap_mapping_table() hw/usb: Constify VMStateDescription hw/display/qxl: Constify VMStateDescription hw/arm: Constify VMStateDescription vmstate: Constify some VMStateDescriptions Fix typo in CFI build documentation hw/pcmcia: Do not register PCMCIA type if not required ... Signed-off-by: Peter Maydell <[email protected]>
2 parents 87c6cef + 9197b5d commit d45a527

File tree

371 files changed

+53
-507
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

371 files changed

+53
-507
lines changed

‎accel/kvm/kvm-all.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,9 @@
3030
#include "sysemu/kvm_int.h"
3131
#include "sysemu/runstate.h"
3232
#include "sysemu/cpus.h"
33-
#include "sysemu/sysemu.h"
3433
#include "qemu/bswap.h"
3534
#include "exec/memory.h"
3635
#include "exec/ram_addr.h"
37-
#include "exec/address-spaces.h"
3836
#include "qemu/event_notifier.h"
3937
#include "qemu/main-loop.h"
4038
#include "trace.h"
@@ -2269,7 +2267,7 @@ static int kvm_handle_internal_error(CPUState *cpu, struct kvm_run *run)
22692267
int i;
22702268

22712269
for (i = 0; i < run->internal.ndata; ++i) {
2272-
fprintf(stderr, "extra data[%d]: %"PRIx64"\n",
2270+
fprintf(stderr, "extra data[%d]: 0x%016"PRIx64"\n",
22732271
i, (uint64_t)run->internal.data[i]);
22742272
}
22752273
}

‎accel/stubs/kvm-stub.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
*/
1212

1313
#include "qemu/osdep.h"
14-
#include "cpu.h"
1514
#include "sysemu/kvm.h"
1615

1716
#ifndef CONFIG_USER_ONLY

‎accel/stubs/tcg-stub.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
*/
1212

1313
#include "qemu/osdep.h"
14-
#include "cpu.h"
1514
#include "exec/exec-all.h"
1615

1716
void tb_flush(CPUState *cpu)

‎accel/tcg/cpu-exec-common.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919

2020
#include "qemu/osdep.h"
21-
#include "cpu.h"
2221
#include "sysemu/cpus.h"
2322
#include "sysemu/tcg.h"
2423
#include "exec/exec-all.h"

‎accel/tcg/cpu-exec.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "qemu/osdep.h"
2121
#include "qemu-common.h"
2222
#include "qemu/qemu-print.h"
23-
#include "cpu.h"
2423
#include "hw/core/tcg-cpu-ops.h"
2524
#include "trace.h"
2625
#include "disas/disas.h"

‎accel/tcg/cputlb.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@
1919

2020
#include "qemu/osdep.h"
2121
#include "qemu/main-loop.h"
22-
#include "cpu.h"
2322
#include "hw/core/tcg-cpu-ops.h"
2423
#include "exec/exec-all.h"
2524
#include "exec/memory.h"
26-
#include "exec/address-spaces.h"
2725
#include "exec/cpu_ldst.h"
2826
#include "exec/cputlb.h"
2927
#include "exec/tb-hash.h"

‎accel/tcg/plugin-gen.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
* CPU's index into a TCG temp, since the first callback did it already.
4444
*/
4545
#include "qemu/osdep.h"
46-
#include "cpu.h"
4746
#include "tcg/tcg.h"
4847
#include "tcg/tcg-op.h"
4948
#include "trace/mem.h"

‎accel/tcg/tcg-accel-ops-icount.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "qemu/main-loop.h"
3131
#include "qemu/guest-random.h"
3232
#include "exec/exec-all.h"
33-
#include "hw/boards.h"
3433

3534
#include "tcg-accel-ops.h"
3635
#include "tcg-accel-ops-icount.h"

‎accel/tcg/tcg-accel-ops-rr.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "qemu/main-loop.h"
3131
#include "qemu/guest-random.h"
3232
#include "exec/exec-all.h"
33-
#include "hw/boards.h"
3433

3534
#include "tcg-accel-ops.h"
3635
#include "tcg-accel-ops-rr.h"

‎accel/tcg/tcg-accel-ops.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#include "qemu/main-loop.h"
3333
#include "qemu/guest-random.h"
3434
#include "exec/exec-all.h"
35-
#include "hw/boards.h"
3635

3736
#include "tcg-accel-ops.h"
3837
#include "tcg-accel-ops-mttcg.h"

0 commit comments

Comments
 (0)