mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 10:13:56 -06:00
Accel & Exec patch queue
- Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander) - Add '-d invalid_mem' logging option (Zoltan) - Create QOM containers explicitly (Peter) - Rename sysemu/ -> system/ (Philippe) - Re-orderning of include/exec/ headers (Philippe) Move a lot of declarations from these legacy mixed bag headers: . "exec/cpu-all.h" . "exec/cpu-common.h" . "exec/cpu-defs.h" . "exec/exec-all.h" . "exec/translate-all" to these more specific ones: . "exec/page-protection.h" . "exec/translation-block.h" . "user/cpu_loop.h" . "user/guest-host.h" . "user/page-protection.h" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8 4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe/// 5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP 9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd +kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6 x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo= =cjz8 -----END PGP SIGNATURE----- Merge tag 'exec-20241220' of https://github.com/philmd/qemu into staging Accel & Exec patch queue - Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander) - Add '-d invalid_mem' logging option (Zoltan) - Create QOM containers explicitly (Peter) - Rename sysemu/ -> system/ (Philippe) - Re-orderning of include/exec/ headers (Philippe) Move a lot of declarations from these legacy mixed bag headers: . "exec/cpu-all.h" . "exec/cpu-common.h" . "exec/cpu-defs.h" . "exec/exec-all.h" . "exec/translate-all" to these more specific ones: . "exec/page-protection.h" . "exec/translation-block.h" . "user/cpu_loop.h" . "user/guest-host.h" . "user/page-protection.h" # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t # wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt # KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K # A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8 # 4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe/// # 5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r # xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl # VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay # ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP # 9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd # +kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6 # x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo= # =cjz8 # -----END PGP SIGNATURE----- # gpg: Signature made Fri 20 Dec 2024 11:45:20 EST # gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE * tag 'exec-20241220' of https://github.com/philmd/qemu: (59 commits) util/qemu-timer: fix indentation meson: Do not define CONFIG_DEVICES on user emulation system/accel-ops: Remove unnecessary 'exec/cpu-common.h' header system/numa: Remove unnecessary 'exec/cpu-common.h' header hw/xen: Remove unnecessary 'exec/cpu-common.h' header target/mips: Drop left-over comment about Jazz machine target/mips: Remove tswap() calls in semihosting uhi_fstat_cb() target/xtensa: Remove tswap() calls in semihosting simcall() helper accel/tcg: Un-inline translator_is_same_page() accel/tcg: Include missing 'exec/translation-block.h' header accel/tcg: Move tcg_cflags_has/set() to 'exec/translation-block.h' accel/tcg: Restrict curr_cflags() declaration to 'internal-common.h' qemu/coroutine: Include missing 'qemu/atomic.h' header exec/translation-block: Include missing 'qemu/atomic.h' header accel/tcg: Declare cpu_loop_exit_requested() in 'exec/cpu-common.h' exec/cpu-all: Include 'cpu.h' earlier so MMU_USER_IDX is always defined target/sparc: Move sparc_restore_state_to_opc() to cpu.c target/sparc: Uninline cpu_get_tb_cpu_state() target/loongarch: Declare loongarch_cpu_dump_state() locally user: Move various declarations out of 'exec/exec-all.h' ... Conflicts: hw/char/riscv_htif.c hw/intc/riscv_aplic.c target/s390x/cpu.c Apply sysemu header path changes to not in the pull request. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
commit
65cb7129f4
1080 changed files with 2575 additions and 2312 deletions
|
@ -610,7 +610,7 @@ static void test_dummy_delchild(void)
|
|||
static void test_qom_partial_path(void)
|
||||
{
|
||||
Object *root = object_get_objects_root();
|
||||
Object *cont1 = container_get(root, "/cont1");
|
||||
Object *cont1 = object_property_add_new_container(root, "cont1");
|
||||
Object *obj1 = object_new(TYPE_DUMMY);
|
||||
Object *obj2a = object_new(TYPE_DUMMY);
|
||||
Object *obj2b = object_new(TYPE_DUMMY);
|
||||
|
|
|
@ -25,9 +25,10 @@
|
|||
#include "qemu/osdep.h"
|
||||
#include "block/block_int.h"
|
||||
#include "block/blockjob_int.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "system/block-backend.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "qemu/clang-tsa.h"
|
||||
#include "iothread.h"
|
||||
|
||||
static QemuEvent done_event;
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#include "qapi/error.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "block/block_int.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "system/block-backend.h"
|
||||
|
||||
static BlockDriver bdrv_pass_through = {
|
||||
.format_name = "pass-through",
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
#include "qemu/osdep.h"
|
||||
#include "block/block.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "system/block-backend.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
|
|
|
@ -26,9 +26,10 @@
|
|||
#include "block/block.h"
|
||||
#include "block/block_int-global-state.h"
|
||||
#include "block/blockjob_int.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "system/block-backend.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qapi/qmp/qdict.h"
|
||||
#include "qemu/clang-tsa.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "iothread.h"
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include "qapi/error.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "block/blockjob_int.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "system/block-backend.h"
|
||||
#include "qapi/qmp/qdict.h"
|
||||
|
||||
typedef struct {
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include "qapi/error.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "block/blockjob_int.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "system/block-backend.h"
|
||||
#include "qapi/qmp/qdict.h"
|
||||
#include "iothread.h"
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
#include "qemu/option.h"
|
||||
#include "qemu/sockets.h"
|
||||
#include "chardev/char-fe.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
#include "system/system.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qapi/qapi-commands-char.h"
|
||||
#include "qapi/qmp/qdict.h"
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#include "qemu/osdep.h"
|
||||
#include "block/block.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "system/block-backend.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qapi/qmp/qdict.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
|
|
@ -71,6 +71,26 @@ static const TypeInfo subclass_type = {
|
|||
.parent = TYPE_STATIC_PROPS,
|
||||
};
|
||||
|
||||
/*
|
||||
* Initialize a fake machine, being prepared for future tests.
|
||||
*
|
||||
* All the tests later (even if to be run in subprocesses.. which will
|
||||
* inherit the global states of the parent process) will try to create qdev
|
||||
* and realize the device.
|
||||
*
|
||||
* Realization of such anonymous qdev (with no parent object) requires both
|
||||
* the machine object and its "unattached" container to be at least present.
|
||||
*/
|
||||
static void test_init_machine(void)
|
||||
{
|
||||
/* This is a fake machine - it doesn't need to be a machine object */
|
||||
Object *machine = object_property_add_new_container(
|
||||
object_get_root(), "machine");
|
||||
|
||||
/* This container must exist for anonymous qdevs to realize() */
|
||||
object_property_add_new_container(machine, "unattached");
|
||||
}
|
||||
|
||||
/* Test simple static property setting to default value */
|
||||
static void test_static_prop_subprocess(void)
|
||||
{
|
||||
|
@ -294,6 +314,8 @@ int main(int argc, char **argv)
|
|||
type_register_static(&nohotplug_type);
|
||||
type_register_static(&nondevice_type);
|
||||
|
||||
test_init_machine();
|
||||
|
||||
g_test_add_func("/qdev/properties/static/default/subprocess",
|
||||
test_static_prop_subprocess);
|
||||
g_test_add_func("/qdev/properties/static/default",
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include "block/replication.h"
|
||||
#include "block/block_int.h"
|
||||
#include "block/qdict.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "system/block-backend.h"
|
||||
|
||||
#define IMG_SIZE (64 * 1024 * 1024)
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include "qemu/osdep.h"
|
||||
#include "qemu/config-file.h"
|
||||
#include "qemu/option.h"
|
||||
#include "sysemu/seccomp.h"
|
||||
#include "system/seccomp.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/module.h"
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include "qemu/main-loop.h"
|
||||
#include "qemu/module.h"
|
||||
#include "block/throttle-groups.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "system/block-backend.h"
|
||||
|
||||
static AioContext *ctx;
|
||||
static LeakyBucket bkt;
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "sysemu/cpu-timers.h"
|
||||
#include "system/cpu-timers.h"
|
||||
#include "qemu/timed-average.h"
|
||||
|
||||
/* This is the clock for QEMU_CLOCK_VIRTUAL */
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include "qemu/module.h"
|
||||
#include "qemu/option.h"
|
||||
#include "chardev/char-fe.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
#include "system/system.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qapi/qapi-commands-char.h"
|
||||
#include "qapi/qapi-types-char.h"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue