1 | The following changes since commit e3debd5e7d0ce031356024878a0a18b9d109354a: | 1 | v2: drop npcm7xx sdhci tests: new tests assert on some platforms. |
---|---|---|---|
2 | 2 | ||
3 | Merge tag 'pull-request-2023-03-24' of https://gitlab.com/thuth/qemu into staging (2023-03-24 16:08:46 +0000) | 3 | -- PMM |
4 | |||
5 | The following changes since commit e670f6d825d4dee248b311197fd4048469d6772b: | ||
6 | |||
7 | Merge remote-tracking branch 'remotes/legoater/tags/pull-ppc-20220218' into staging (2022-02-20 15:05:41 +0000) | ||
4 | 8 | ||
5 | are available in the Git repository at: | 9 | are available in the Git repository at: |
6 | 10 | ||
7 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20230328 | 11 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20220221-1 |
8 | 12 | ||
9 | for you to fetch changes up to 46e3b237c52e0c48bfd81bce020b51fbe300b23a: | 13 | for you to fetch changes up to ca511604925eef8572e22ecbf0d3c758d7277924: |
10 | 14 | ||
11 | target/arm/gdbstub: Only advertise M-profile features if TCG available (2023-03-28 10:53:40 +0100) | 15 | ui/cocoa: Fix the leak of qemu_console_get_label (2022-02-21 13:30:21 +0000) |
12 | 16 | ||
13 | ---------------------------------------------------------------- | 17 | ---------------------------------------------------------------- |
14 | target-arm queue: | 18 | arm, cocoa and misc: |
15 | * fix part of the "TCG-disabled builds are broken" issue | 19 | * MAINTAINERS file updates |
20 | * Mark remaining global TypeInfo instances as const | ||
21 | * checkpatch: Ensure that TypeInfos are const | ||
22 | * arm hvf: Handle unknown ID registers as RES0 | ||
23 | * Make KVM -cpu max exactly like -cpu host | ||
24 | * Fix '-cpu max' for HVF | ||
25 | * Support PAuth extension for hvf | ||
26 | * Kconfig: Add I2C_DEVICES device group | ||
27 | * Kconfig: Add 'imply I2C_DEVICES' on boards with available i2c bus | ||
28 | * hw/arm/armv7m: Handle disconnected clock inputs | ||
29 | * osdep.h: pull out various things into new header files | ||
30 | * hw/timer: fix a9gtimer vmstate | ||
31 | * hw/arm: add initial mori-bmc board | ||
32 | * ui/cocoa: Remove allowedFileTypes restriction in SavePanel | ||
33 | * ui/cocoa: Do not alert even without block devices | ||
34 | * ui/cocoa: Fix the leak of qemu_console_get_label | ||
16 | 35 | ||
17 | ---------------------------------------------------------------- | 36 | ---------------------------------------------------------------- |
37 | Akihiko Odaki (3): | ||
38 | MAINTAINERS: Add Akihiko Odaki to macOS-relateds | ||
39 | ui/cocoa: Do not alert even without block devices | ||
40 | ui/cocoa: Fix the leak of qemu_console_get_label | ||
41 | |||
42 | Alexander Graf (2): | ||
43 | hvf: arm: Use macros for sysreg shift/masking | ||
44 | hvf: arm: Handle unknown ID registers as RES0 | ||
45 | |||
46 | Ani Sinha (1): | ||
47 | MAINTAINERS: Adding myself as a reviewer of some components | ||
48 | |||
49 | Bernhard Beschow (2): | ||
50 | Mark remaining global TypeInfo instances as const | ||
51 | checkpatch: Ensure that TypeInfos are const | ||
52 | |||
53 | Patrick Venture (1): | ||
54 | hw/arm: add initial mori-bmc board | ||
55 | |||
56 | Pavel Dovgalyuk (1): | ||
57 | hw/timer: fix a9gtimer vmstate | ||
58 | |||
59 | Peter Maydell (14): | ||
60 | target/arm: Move '-cpu host' code to cpu64.c | ||
61 | target/arm: Use aarch64_cpu_register() for 'host' CPU type | ||
62 | target/arm: Make KVM -cpu max exactly like -cpu host | ||
63 | target/arm: Unindent unnecessary else-clause | ||
64 | target/arm: Fix '-cpu max' for HVF | ||
65 | target/arm: Support PAuth extension for hvf | ||
66 | Kconfig: Add I2C_DEVICES device group | ||
67 | Kconfig: Add 'imply I2C_DEVICES' on boards with available i2c bus | ||
68 | hw/arm/armv7m: Handle disconnected clock inputs | ||
69 | include: Move qemu_madvise() and related #defines to new qemu/madvise.h | ||
70 | include: Move qemu_mprotect_*() to new qemu/mprotect.h | ||
71 | include: Move QEMU_MAP_* constants to mmap-alloc.h | ||
72 | include: Move qemu_[id]cache_* declarations to new qemu/cacheinfo.h | ||
73 | include: Move hardware version declarations to new qemu/hw-version.h | ||
74 | |||
18 | Philippe Mathieu-Daudé (1): | 75 | Philippe Mathieu-Daudé (1): |
19 | target/arm/gdbstub: Only advertise M-profile features if TCG available | 76 | ui/cocoa: Remove allowedFileTypes restriction in SavePanel |
20 | 77 | ||
21 | target/arm/gdbstub.c | 5 +++-- | 78 | docs/devel/kconfig.rst | 8 +- |
22 | 1 file changed, 3 insertions(+), 2 deletions(-) | 79 | docs/system/arm/nuvoton.rst | 1 + |
80 | include/qemu/cacheinfo.h | 21 +++ | ||
81 | include/qemu/hw-version.h | 27 ++++ | ||
82 | include/qemu/madvise.h | 95 +++++++++++++ | ||
83 | include/qemu/mmap-alloc.h | 23 +++ | ||
84 | include/qemu/mprotect.h | 14 ++ | ||
85 | include/qemu/osdep.h | 132 ------------------ | ||
86 | accel/tcg/translate-all.c | 1 + | ||
87 | backends/hostmem-file.c | 1 + | ||
88 | backends/hostmem.c | 1 + | ||
89 | hw/arm/armv7m.c | 26 +++- | ||
90 | hw/arm/npcm7xx_boards.c | 32 +++++ | ||
91 | hw/arm/nseries.c | 1 + | ||
92 | hw/core/generic-loader.c | 2 +- | ||
93 | hw/core/guest-loader.c | 2 +- | ||
94 | hw/display/bcm2835_fb.c | 2 +- | ||
95 | hw/display/i2c-ddc.c | 2 +- | ||
96 | hw/display/macfb.c | 4 +- | ||
97 | hw/display/virtio-vga.c | 2 +- | ||
98 | hw/dma/bcm2835_dma.c | 2 +- | ||
99 | hw/i386/pc_piix.c | 2 +- | ||
100 | hw/i386/sgx-epc.c | 2 +- | ||
101 | hw/ide/core.c | 1 + | ||
102 | hw/intc/bcm2835_ic.c | 2 +- | ||
103 | hw/intc/bcm2836_control.c | 2 +- | ||
104 | hw/ipmi/ipmi.c | 4 +- | ||
105 | hw/mem/nvdimm.c | 2 +- | ||
106 | hw/mem/pc-dimm.c | 2 +- | ||
107 | hw/misc/bcm2835_mbox.c | 2 +- | ||
108 | hw/misc/bcm2835_powermgt.c | 2 +- | ||
109 | hw/misc/bcm2835_property.c | 2 +- | ||
110 | hw/misc/bcm2835_rng.c | 2 +- | ||
111 | hw/misc/pvpanic-isa.c | 2 +- | ||
112 | hw/misc/pvpanic-pci.c | 2 +- | ||
113 | hw/net/fsl_etsec/etsec.c | 2 +- | ||
114 | hw/ppc/prep_systemio.c | 2 +- | ||
115 | hw/ppc/spapr_iommu.c | 2 +- | ||
116 | hw/s390x/s390-pci-bus.c | 2 +- | ||
117 | hw/s390x/sclp.c | 2 +- | ||
118 | hw/s390x/tod-kvm.c | 2 +- | ||
119 | hw/s390x/tod-tcg.c | 2 +- | ||
120 | hw/s390x/tod.c | 2 +- | ||
121 | hw/scsi/lsi53c895a.c | 2 +- | ||
122 | hw/scsi/megasas.c | 1 + | ||
123 | hw/scsi/scsi-bus.c | 1 + | ||
124 | hw/scsi/scsi-disk.c | 1 + | ||
125 | hw/sd/allwinner-sdhost.c | 2 +- | ||
126 | hw/sd/aspeed_sdhci.c | 2 +- | ||
127 | hw/sd/bcm2835_sdhost.c | 2 +- | ||
128 | hw/sd/cadence_sdhci.c | 2 +- | ||
129 | hw/sd/npcm7xx_sdhci.c | 2 +- | ||
130 | hw/timer/a9gtimer.c | 21 +++ | ||
131 | hw/usb/dev-mtp.c | 2 +- | ||
132 | hw/usb/host-libusb.c | 2 +- | ||
133 | hw/vfio/igd.c | 2 +- | ||
134 | hw/virtio/virtio-balloon.c | 1 + | ||
135 | hw/virtio/virtio-pmem.c | 2 +- | ||
136 | migration/postcopy-ram.c | 1 + | ||
137 | migration/qemu-file.c | 1 + | ||
138 | migration/ram.c | 1 + | ||
139 | plugins/loader.c | 1 + | ||
140 | qom/object.c | 4 +- | ||
141 | softmmu/physmem.c | 1 + | ||
142 | softmmu/vl.c | 1 + | ||
143 | target/arm/cpu.c | 30 ---- | ||
144 | target/arm/cpu64.c | 331 ++++++++++++++++++++++++-------------------- | ||
145 | target/arm/hvf/hvf.c | 83 ++++++++--- | ||
146 | target/i386/cpu.c | 1 + | ||
147 | target/s390x/cpu_models.c | 1 + | ||
148 | tcg/region.c | 3 + | ||
149 | tcg/tcg.c | 1 + | ||
150 | util/atomic64.c | 1 + | ||
151 | util/cacheflush.c | 1 + | ||
152 | util/cacheinfo.c | 1 + | ||
153 | util/osdep.c | 3 + | ||
154 | util/oslib-posix.c | 1 + | ||
155 | MAINTAINERS | 5 + | ||
156 | hw/arm/Kconfig | 10 ++ | ||
157 | hw/i2c/Kconfig | 5 + | ||
158 | hw/rtc/Kconfig | 2 + | ||
159 | hw/sensor/Kconfig | 5 + | ||
160 | scripts/checkpatch.pl | 1 + | ||
161 | ui/cocoa.m | 15 +- | ||
162 | 84 files changed, 606 insertions(+), 393 deletions(-) | ||
163 | create mode 100644 include/qemu/cacheinfo.h | ||
164 | create mode 100644 include/qemu/hw-version.h | ||
165 | create mode 100644 include/qemu/madvise.h | ||
166 | create mode 100644 include/qemu/mprotect.h | ||
23 | 167 | diff view generated by jsdifflib |
Deleted patch | |||
---|---|---|---|
1 | From: Philippe Mathieu-Daudé <philmd@linaro.org> | ||
2 | 1 | ||
3 | Cortex-M profile is only emulable from TCG accelerator. Restrict | ||
4 | the GDBstub features to its availability in order to avoid a link | ||
5 | error when TCG is not enabled: | ||
6 | |||
7 | Undefined symbols for architecture arm64: | ||
8 | "_arm_v7m_get_sp_ptr", referenced from: | ||
9 | _m_sysreg_get in target_arm_gdbstub.c.o | ||
10 | "_arm_v7m_mrs_control", referenced from: | ||
11 | _arm_gdb_get_m_systemreg in target_arm_gdbstub.c.o | ||
12 | ld: symbol(s) not found for architecture arm64 | ||
13 | clang: error: linker command failed with exit code 1 (use -v to see invocation) | ||
14 | |||
15 | Fixes: 7d8b28b8b5 ("target/arm: Implement gdbstub m-profile systemreg and secext") | ||
16 | Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> | ||
17 | Reviewed-by: Richard Henderson <richard.henderson@linaro.org> | ||
18 | Reviewed-by: Alex Bennée <alex.bennee@linaro.org> | ||
19 | Message-id: 20230322142902.69511-3-philmd@linaro.org | ||
20 | [PMM: add #include since I cherry-picked this patch from the series] | ||
21 | Signed-off-by: Peter Maydell <peter.maydell@linaro.org> | ||
22 | --- | ||
23 | target/arm/gdbstub.c | 5 +++-- | ||
24 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
25 | |||
26 | diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c | ||
27 | index XXXXXXX..XXXXXXX 100644 | ||
28 | --- a/target/arm/gdbstub.c | ||
29 | +++ b/target/arm/gdbstub.c | ||
30 | @@ -XXX,XX +XXX,XX @@ | ||
31 | #include "cpu.h" | ||
32 | #include "exec/gdbstub.h" | ||
33 | #include "gdbstub/helpers.h" | ||
34 | +#include "sysemu/tcg.h" | ||
35 | #include "internals.h" | ||
36 | #include "cpregs.h" | ||
37 | |||
38 | @@ -XXX,XX +XXX,XX @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu) | ||
39 | 2, "arm-vfp-sysregs.xml", 0); | ||
40 | } | ||
41 | } | ||
42 | - if (cpu_isar_feature(aa32_mve, cpu)) { | ||
43 | + if (cpu_isar_feature(aa32_mve, cpu) && tcg_enabled()) { | ||
44 | gdb_register_coprocessor(cs, mve_gdb_get_reg, mve_gdb_set_reg, | ||
45 | 1, "arm-m-profile-mve.xml", 0); | ||
46 | } | ||
47 | @@ -XXX,XX +XXX,XX @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu) | ||
48 | arm_gen_dynamic_sysreg_xml(cs, cs->gdb_num_regs), | ||
49 | "system-registers.xml", 0); | ||
50 | |||
51 | - if (arm_feature(env, ARM_FEATURE_M)) { | ||
52 | + if (arm_feature(env, ARM_FEATURE_M) && tcg_enabled()) { | ||
53 | gdb_register_coprocessor(cs, | ||
54 | arm_gdb_get_m_systemreg, arm_gdb_set_m_systemreg, | ||
55 | arm_gen_dynamic_m_systemreg_xml(cs, cs->gdb_num_regs), | ||
56 | -- | ||
57 | 2.34.1 | ||
58 | |||
59 | diff view generated by jsdifflib |