* More SVM fixes (Lara)
* Module annotation database (Gerd) * Memory leak fixes (myself) * Build fixes (myself) * --with-devices-* support (Alex) -----BEGIN PGP SIGNATURE----- iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmDoeBgUHHBib256aW5p QHJlZGhhdC5jb20ACgkQv/vSX3jHroMtFAgAippmxRt3lt+tcdSrCOZlKmxW6veK nUidtzfH5uE8vQsh5Q98WCEq871C/C+St1gK+q2H/MLrJeAqZD39DV+SKTuZ6Tcp 3jL0iYC+oO0OjkHppDQTUDweF9KrsAW1WEeNz2th1OUDSjBXuXbZ+N497taouX18 p2UN0gKNsOO2/QFrKL5KO7vSC56eBGoZz6gKtw/7dDtJBtizf1xKBRHW43b+CnQJ mHLs7Tj6oMC+vnMHkUKLH/6za3WJF1XHs5fp2isRgqoOSP8m0r6CMg8JnFIvmQf/ tbLospKSWqcgD5C5PlFm2wSOjdU7zuPKM7wchhKrrEIvdDPhXaKrlpwi5Q== =GFX1 -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging * More SVM fixes (Lara) * Module annotation database (Gerd) * Memory leak fixes (myself) * Build fixes (myself) * --with-devices-* support (Alex) # gpg: Signature made Fri 09 Jul 2021 17:23:52 BST # gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83 # gpg: issuer "pbonzini@redhat.com" # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full] # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full] # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini-gitlab/tags/for-upstream: (48 commits) meson: Use input/output for entitlements target configure: allow the selection of alternate config in the build configs: rename default-configs to configs and reorganise hw/arm: move CONFIG_V7M out of default-devices hw/arm: add dependency on OR_IRQ for XLNX_VERSAL meson: Introduce target-specific Kconfig meson: switch function tests from compilation to linking vl: fix leak of qdict_crumple return value target/i386: fix exceptions for MOV to DR target/i386: Added DR6 and DR7 consistency checks target/i386: Added MSRPM and IOPM size check monitor/tcg: move tcg hmp commands to accel/tcg, register them dynamically usb: build usb-host as module monitor/usb: register 'info usbhost' dynamically usb: drop usb_host_dev_is_scsi_storage hook monitor: allow register hmp commands accel: build tcg modular accel: add tcg module annotations accel: build qtest modular accel: add qtest module annotations ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>stable-6.1
Peter Maydell
commit
d1987c8114
1
Kconfig
1
Kconfig
|
|
@ -1,5 +1,6 @@
|
|||
source Kconfig.host
|
||||
source backends/Kconfig
|
||||
source accel/Kconfig
|
||||
source target/Kconfig
|
||||
source hw/Kconfig
|
||||
source semihosting/Kconfig
|
||||
|
|
|
|||
22
MAINTAINERS
22
MAINTAINERS
|
|
@ -87,7 +87,7 @@ S390 general architecture support
|
|||
M: Cornelia Huck <cohuck@redhat.com>
|
||||
M: Thomas Huth <thuth@redhat.com>
|
||||
S: Supported
|
||||
F: default-configs/*/s390x-softmmu.mak
|
||||
F: configs/devices/s390x-softmmu/default.mak
|
||||
F: gdb-xml/s390*.xml
|
||||
F: hw/char/sclp*.[hc]
|
||||
F: hw/char/terminal3270.c
|
||||
|
|
@ -196,7 +196,7 @@ F: target/hexagon/
|
|||
F: linux-user/hexagon/
|
||||
F: tests/tcg/hexagon/
|
||||
F: disas/hexagon.c
|
||||
F: default-configs/targets/hexagon-linux-user.mak
|
||||
F: configs/targets/hexagon-linux-user/default.mak
|
||||
F: docker/dockerfiles/debian-hexagon-cross.docker
|
||||
F: docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh
|
||||
|
||||
|
|
@ -229,7 +229,7 @@ R: Jiaxun Yang <jiaxun.yang@flygoat.com>
|
|||
R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
|
||||
S: Odd Fixes
|
||||
F: target/mips/
|
||||
F: default-configs/*/*mips*
|
||||
F: configs/devices/mips*/*
|
||||
F: disas/mips.c
|
||||
F: docs/system/cpu-models-mips.rst.inc
|
||||
F: hw/intc/mips_gic.c
|
||||
|
|
@ -255,7 +255,7 @@ S: Maintained
|
|||
F: target/nios2/
|
||||
F: hw/nios2/
|
||||
F: disas/nios2.c
|
||||
F: default-configs/*/nios2-softmmu.mak
|
||||
F: configs/devices/nios2-softmmu/default.mak
|
||||
|
||||
OpenRISC TCG CPUs
|
||||
M: Stafford Horne <shorne@gmail.com>
|
||||
|
|
@ -342,7 +342,7 @@ F: hw/xtensa/
|
|||
F: tests/tcg/xtensa/
|
||||
F: disas/xtensa.c
|
||||
F: include/hw/xtensa/xtensa-isa.h
|
||||
F: default-configs/*/xtensa*.mak
|
||||
F: configs/devices/xtensa*/default.mak
|
||||
|
||||
TriCore TCG CPUs
|
||||
M: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
|
||||
|
|
@ -1057,7 +1057,7 @@ AVR Machines
|
|||
AVR MCUs
|
||||
M: Michael Rolnik <mrolnik@gmail.com>
|
||||
S: Maintained
|
||||
F: default-configs/*/avr-softmmu.mak
|
||||
F: configs/devices/avr-softmmu/default.mak
|
||||
F: hw/avr/
|
||||
F: include/hw/char/avr_usart.h
|
||||
F: hw/char/avr_usart.c
|
||||
|
|
@ -1085,7 +1085,7 @@ HP B160L
|
|||
M: Richard Henderson <richard.henderson@linaro.org>
|
||||
R: Helge Deller <deller@gmx.de>
|
||||
S: Odd Fixes
|
||||
F: default-configs/*/hppa-softmmu.mak
|
||||
F: configs/devices/hppa-softmmu/default.mak
|
||||
F: hw/hppa/
|
||||
F: pc-bios/hppa-firmware.img
|
||||
|
||||
|
|
@ -1524,7 +1524,7 @@ F: hw/s390x/
|
|||
F: include/hw/s390x/
|
||||
F: hw/watchdog/wdt_diag288.c
|
||||
F: include/hw/watchdog/wdt_diag288.h
|
||||
F: default-configs/*/s390x-softmmu.mak
|
||||
F: configs/devices/s390x-softmmu/default.mak
|
||||
F: tests/acceptance/machine_s390_ccw_virtio.py
|
||||
T: git https://gitlab.com/cohuck/qemu.git s390-next
|
||||
T: git https://github.com/borntraeger/qemu.git s390-next
|
||||
|
|
@ -1731,7 +1731,6 @@ F: hw/pci-bridge/*
|
|||
F: qapi/pci.json
|
||||
F: docs/pci*
|
||||
F: docs/specs/*pci*
|
||||
F: default-configs/pci.mak
|
||||
|
||||
ACPI/SMBIOS
|
||||
M: Michael S. Tsirkin <mst@redhat.com>
|
||||
|
|
@ -1836,7 +1835,6 @@ F: docs/usb2.txt
|
|||
F: docs/usb-storage.txt
|
||||
F: include/hw/usb.h
|
||||
F: include/hw/usb/
|
||||
F: default-configs/usb.mak
|
||||
|
||||
USB (serial adapter)
|
||||
M: Gerd Hoffmann <kraxel@redhat.com>
|
||||
|
|
@ -2995,14 +2993,14 @@ M: Warner Losh <imp@bsdimp.com>
|
|||
R: Kyle Evans <kevans@freebsd.org>
|
||||
S: Maintained
|
||||
F: bsd-user/
|
||||
F: default-configs/targets/*-bsd-user.mak
|
||||
F: configs/targets/*-bsd-user.mak
|
||||
T: git https://github.com/qemu-bsd-user/qemu-bsd-user bsd-user-rebase-3.1
|
||||
|
||||
Linux user
|
||||
M: Laurent Vivier <laurent@vivier.eu>
|
||||
S: Maintained
|
||||
F: linux-user/
|
||||
F: default-configs/targets/*linux-user.mak
|
||||
F: configs/targets/*linux-user.mak
|
||||
F: scripts/qemu-binfmt-conf.sh
|
||||
F: scripts/update-syscalltbl.sh
|
||||
F: scripts/update-mips-syscall-args.sh
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ static const TypeInfo accel_type = {
|
|||
AccelClass *accel_find(const char *opt_name)
|
||||
{
|
||||
char *class_name = g_strdup_printf(ACCEL_CLASS_NAME("%s"), opt_name);
|
||||
AccelClass *ac = ACCEL_CLASS(object_class_by_name(class_name));
|
||||
AccelClass *ac = ACCEL_CLASS(module_object_class_by_name(class_name));
|
||||
g_free(class_name);
|
||||
return ac;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ void accel_init_ops_interfaces(AccelClass *ac)
|
|||
g_assert(ac_name != NULL);
|
||||
|
||||
ops_name = g_strdup_printf("%s" ACCEL_OPS_SUFFIX, ac_name);
|
||||
ops = ACCEL_OPS_CLASS(object_class_by_name(ops_name));
|
||||
ops = ACCEL_OPS_CLASS(module_object_class_by_name(ops_name));
|
||||
g_free(ops_name);
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,6 +1,2 @@
|
|||
qtest_ss = ss.source_set()
|
||||
qtest_ss.add(files(
|
||||
'qtest.c',
|
||||
))
|
||||
|
||||
specific_ss.add_all(when: ['CONFIG_SOFTMMU', 'CONFIG_POSIX'], if_true: qtest_ss)
|
||||
qtest_module_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_POSIX'],
|
||||
if_true: files('qtest.c'))
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@ static const TypeInfo qtest_accel_type = {
|
|||
.parent = TYPE_ACCEL,
|
||||
.class_init = qtest_accel_class_init,
|
||||
};
|
||||
module_obj(TYPE_QTEST_ACCEL);
|
||||
|
||||
static void qtest_accel_ops_class_init(ObjectClass *oc, void *data)
|
||||
{
|
||||
|
|
@ -61,6 +62,7 @@ static const TypeInfo qtest_accel_ops_type = {
|
|||
.class_init = qtest_accel_ops_class_init,
|
||||
.abstract = true,
|
||||
};
|
||||
module_obj(ACCEL_OPS_NAME("qtest"));
|
||||
|
||||
static void qtest_type_init(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
#include "qemu/osdep.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "exec/exec-all.h"
|
||||
#include "monitor/monitor.h"
|
||||
#include "sysemu/tcg.h"
|
||||
|
||||
static void hmp_info_jit(Monitor *mon, const QDict *qdict)
|
||||
{
|
||||
if (!tcg_enabled()) {
|
||||
error_report("JIT information is only available with accel=tcg");
|
||||
return;
|
||||
}
|
||||
|
||||
dump_exec_info();
|
||||
dump_drift_info();
|
||||
}
|
||||
|
||||
static void hmp_info_opcount(Monitor *mon, const QDict *qdict)
|
||||
{
|
||||
dump_opcount_info();
|
||||
}
|
||||
|
||||
static void hmp_tcg_register(void)
|
||||
{
|
||||
monitor_register_hmp("jit", true, hmp_info_jit);
|
||||
monitor_register_hmp("opcount", true, hmp_info_opcount);
|
||||
}
|
||||
|
||||
type_init(hmp_tcg_register);
|
||||
|
|
@ -15,8 +15,12 @@ specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss)
|
|||
|
||||
specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files(
|
||||
'cputlb.c',
|
||||
'hmp.c',
|
||||
))
|
||||
|
||||
tcg_module_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files(
|
||||
'tcg-accel-ops.c',
|
||||
'tcg-accel-ops-mttcg.c',
|
||||
'tcg-accel-ops-icount.c',
|
||||
'tcg-accel-ops-rr.c'
|
||||
'tcg-accel-ops-rr.c',
|
||||
))
|
||||
|
|
|
|||
|
|
@ -124,6 +124,7 @@ static const TypeInfo tcg_accel_ops_type = {
|
|||
.class_init = tcg_accel_ops_class_init,
|
||||
.abstract = true,
|
||||
};
|
||||
module_obj(ACCEL_OPS_NAME("tcg"));
|
||||
|
||||
static void tcg_accel_ops_register_types(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -238,6 +238,7 @@ static const TypeInfo tcg_accel_type = {
|
|||
.class_init = tcg_accel_class_init,
|
||||
.instance_size = sizeof(TCGState),
|
||||
};
|
||||
module_obj(TYPE_TCG_ACCEL);
|
||||
|
||||
static void register_accel_types(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -317,3 +317,5 @@ static void register_audio_spice(void)
|
|||
audio_driver_register(&spice_audio_driver);
|
||||
}
|
||||
type_init(register_audio_spice);
|
||||
|
||||
module_dep("ui-spice-core");
|
||||
|
|
|
|||
|
|
@ -68,3 +68,4 @@ static void iscsi_block_opts_init(void)
|
|||
}
|
||||
|
||||
block_init(iscsi_block_opts_init);
|
||||
module_opts("iscsi");
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ block_ss.add(when: libiscsi, if_true: files('iscsi-opts.c'))
|
|||
block_ss.add(when: 'CONFIG_LINUX', if_true: files('nvme.c'))
|
||||
block_ss.add(when: 'CONFIG_REPLICATION', if_true: files('replication.c'))
|
||||
block_ss.add(when: ['CONFIG_LINUX_AIO', libaio], if_true: files('linux-aio.c'))
|
||||
block_ss.add(when: ['CONFIG_LINUX_IO_URING', linux_io_uring], if_true: files('io_uring.c'))
|
||||
block_ss.add(when: linux_io_uring, if_true: files('io_uring.c'))
|
||||
|
||||
block_modules = {}
|
||||
|
||||
|
|
|
|||
|
|
@ -680,6 +680,7 @@ static const TypeInfo char_braille_type_info = {
|
|||
.instance_finalize = char_braille_finalize,
|
||||
.class_init = char_braille_class_init,
|
||||
};
|
||||
module_obj(TYPE_CHARDEV_BRAILLE);
|
||||
|
||||
static void register_types(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -366,6 +366,7 @@ static const TypeInfo char_spice_type_info = {
|
|||
.class_init = char_spice_class_init,
|
||||
.abstract = true,
|
||||
};
|
||||
module_obj(TYPE_CHARDEV_SPICE);
|
||||
|
||||
static void char_spicevmc_class_init(ObjectClass *oc, void *data)
|
||||
{
|
||||
|
|
@ -396,6 +397,7 @@ static const TypeInfo char_spiceport_type_info = {
|
|||
.parent = TYPE_CHARDEV_SPICE,
|
||||
.class_init = char_spiceport_class_init,
|
||||
};
|
||||
module_obj(TYPE_CHARDEV_SPICEPORT);
|
||||
|
||||
static void register_types(void)
|
||||
{
|
||||
|
|
@ -405,3 +407,5 @@ static void register_types(void)
|
|||
}
|
||||
|
||||
type_init(register_types);
|
||||
|
||||
module_dep("ui-spice-core");
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Default configuration for aarch64-softmmu
|
||||
|
||||
# We support all the 32 bit boards so need all their config
|
||||
include arm-softmmu.mak
|
||||
include ../arm-softmmu/default.mak
|
||||
|
||||
CONFIG_XLNX_ZYNQMP_ARM=y
|
||||
CONFIG_XLNX_VERSAL=y
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
#
|
||||
# A minimal version of the config that only supports only a few
|
||||
# virtual machines. This avoids bringing in any of numerous legacy
|
||||
# features from the 32bit platform (although virt still supports 32bit
|
||||
# itself)
|
||||
#
|
||||
|
||||
CONFIG_ARM_VIRT=y
|
||||
CONFIG_SBSA_REF=y
|
||||
|
|
@ -1,8 +1,5 @@
|
|||
# Default configuration for arm-softmmu
|
||||
|
||||
# TODO: ARM_V7M is currently always required - make this more flexible!
|
||||
CONFIG_ARM_V7M=y
|
||||
|
||||
# CONFIG_PCI_DEVICES=n
|
||||
# CONFIG_TEST_DEVICES=n
|
||||
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
# Default configuration for microblazeel-softmmu
|
||||
|
||||
include microblaze-softmmu.mak
|
||||
include ../microblaze-softmmu/default.mak
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
# Default configuration for mips-softmmu
|
||||
|
||||
include mips-softmmu-common.mak
|
||||
include common.mak
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
# Default configuration for mips64-softmmu
|
||||
|
||||
include mips-softmmu-common.mak
|
||||
include ../mips-softmmu/common.mak
|
||||
CONFIG_JAZZ=y
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Default configuration for mips64el-softmmu
|
||||
|
||||
include mips-softmmu-common.mak
|
||||
include ../mips-softmmu/common.mak
|
||||
CONFIG_IDE_VIA=y
|
||||
CONFIG_FULOONG=y
|
||||
CONFIG_LOONGSON3V=y
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
# Default configuration for mipsel-softmmu
|
||||
|
||||
include mips-softmmu-common.mak
|
||||
include ../mips-softmmu/common.mak
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Default configuration for ppc64-softmmu
|
||||
|
||||
# Include all 32-bit boards
|
||||
include ppc-softmmu.mak
|
||||
include ../ppc-softmmu/default.mak
|
||||
|
||||
# For PowerNV
|
||||
CONFIG_POWERNV=y
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
# Default configuration for sh4eb-softmmu
|
||||
|
||||
include sh4-softmmu.mak
|
||||
include ../sh4-softmmu/default.mak
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
# Default configuration for x86_64-softmmu
|
||||
|
||||
include i386-softmmu.mak
|
||||
include ../i386-softmmu/default.mak
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# Default configuration for Xtensa
|
||||
|
||||
include ../xtensa-softmmu/default.mak
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue