mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-07-28 12:53:53 -06:00

- 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>
340 lines
10 KiB
C
340 lines
10 KiB
C
/*
|
|
* Test code for qdev global-properties handling
|
|
*
|
|
* Copyright (c) 2012 Red Hat Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
|
|
#include "hw/qdev-properties.h"
|
|
#include "qom/object.h"
|
|
#include "qapi/error.h"
|
|
#include "qapi/visitor.h"
|
|
|
|
|
|
#define TYPE_STATIC_PROPS "static_prop_type"
|
|
typedef struct MyType MyType;
|
|
DECLARE_INSTANCE_CHECKER(MyType, STATIC_TYPE,
|
|
TYPE_STATIC_PROPS)
|
|
|
|
#define TYPE_SUBCLASS "static_prop_subtype"
|
|
|
|
#define PROP_DEFAULT 100
|
|
|
|
struct MyType {
|
|
DeviceState parent_obj;
|
|
|
|
uint32_t prop1;
|
|
uint32_t prop2;
|
|
};
|
|
|
|
static const Property static_props[] = {
|
|
DEFINE_PROP_UINT32("prop1", MyType, prop1, PROP_DEFAULT),
|
|
DEFINE_PROP_UINT32("prop2", MyType, prop2, PROP_DEFAULT),
|
|
};
|
|
|
|
static void static_prop_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
|
|
dc->realize = NULL;
|
|
device_class_set_props(dc, static_props);
|
|
}
|
|
|
|
static const TypeInfo static_prop_type = {
|
|
.name = TYPE_STATIC_PROPS,
|
|
.parent = TYPE_DEVICE,
|
|
.instance_size = sizeof(MyType),
|
|
.class_init = static_prop_class_init,
|
|
};
|
|
|
|
static const TypeInfo subclass_type = {
|
|
.name = TYPE_SUBCLASS,
|
|
.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)
|
|
{
|
|
MyType *mt;
|
|
|
|
mt = STATIC_TYPE(object_new(TYPE_STATIC_PROPS));
|
|
qdev_realize(DEVICE(mt), NULL, &error_fatal);
|
|
|
|
g_assert_cmpuint(mt->prop1, ==, PROP_DEFAULT);
|
|
}
|
|
|
|
static void test_static_prop(void)
|
|
{
|
|
g_test_trap_subprocess("/qdev/properties/static/default/subprocess", 0, 0);
|
|
g_test_trap_assert_passed();
|
|
g_test_trap_assert_stderr("");
|
|
g_test_trap_assert_stdout("");
|
|
}
|
|
|
|
static void register_global_properties(GlobalProperty *props)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; props[i].driver != NULL; i++) {
|
|
qdev_prop_register_global(props + i);
|
|
}
|
|
}
|
|
|
|
|
|
/* Test setting of static property using global properties */
|
|
static void test_static_globalprop_subprocess(void)
|
|
{
|
|
MyType *mt;
|
|
static GlobalProperty props[] = {
|
|
{ TYPE_STATIC_PROPS, "prop1", "200" },
|
|
{}
|
|
};
|
|
|
|
register_global_properties(props);
|
|
|
|
mt = STATIC_TYPE(object_new(TYPE_STATIC_PROPS));
|
|
qdev_realize(DEVICE(mt), NULL, &error_fatal);
|
|
|
|
g_assert_cmpuint(mt->prop1, ==, 200);
|
|
g_assert_cmpuint(mt->prop2, ==, PROP_DEFAULT);
|
|
}
|
|
|
|
static void test_static_globalprop(void)
|
|
{
|
|
g_test_trap_subprocess("/qdev/properties/static/global/subprocess", 0, 0);
|
|
g_test_trap_assert_passed();
|
|
g_test_trap_assert_stderr("");
|
|
g_test_trap_assert_stdout("");
|
|
}
|
|
|
|
#define TYPE_DYNAMIC_PROPS "dynamic-prop-type"
|
|
DECLARE_INSTANCE_CHECKER(MyType, DYNAMIC_TYPE,
|
|
TYPE_DYNAMIC_PROPS)
|
|
|
|
#define TYPE_UNUSED_HOTPLUG "hotplug-type"
|
|
#define TYPE_UNUSED_NOHOTPLUG "nohotplug-type"
|
|
|
|
static void prop1_accessor(Object *obj, Visitor *v, const char *name,
|
|
void *opaque, Error **errp)
|
|
{
|
|
MyType *mt = DYNAMIC_TYPE(obj);
|
|
|
|
visit_type_uint32(v, name, &mt->prop1, errp);
|
|
}
|
|
|
|
static void prop2_accessor(Object *obj, Visitor *v, const char *name,
|
|
void *opaque, Error **errp)
|
|
{
|
|
MyType *mt = DYNAMIC_TYPE(obj);
|
|
|
|
visit_type_uint32(v, name, &mt->prop2, errp);
|
|
}
|
|
|
|
static void dynamic_instance_init(Object *obj)
|
|
{
|
|
object_property_add(obj, "prop1", "uint32", prop1_accessor, prop1_accessor,
|
|
NULL, NULL);
|
|
object_property_add(obj, "prop2", "uint32", prop2_accessor, prop2_accessor,
|
|
NULL, NULL);
|
|
}
|
|
|
|
static void dynamic_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
|
|
dc->realize = NULL;
|
|
}
|
|
|
|
|
|
static const TypeInfo dynamic_prop_type = {
|
|
.name = TYPE_DYNAMIC_PROPS,
|
|
.parent = TYPE_DEVICE,
|
|
.instance_size = sizeof(MyType),
|
|
.instance_init = dynamic_instance_init,
|
|
.class_init = dynamic_class_init,
|
|
};
|
|
|
|
static void hotplug_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
|
|
dc->realize = NULL;
|
|
dc->hotpluggable = true;
|
|
}
|
|
|
|
static const TypeInfo hotplug_type = {
|
|
.name = TYPE_UNUSED_HOTPLUG,
|
|
.parent = TYPE_DEVICE,
|
|
.instance_size = sizeof(MyType),
|
|
.instance_init = dynamic_instance_init,
|
|
.class_init = hotplug_class_init,
|
|
};
|
|
|
|
static void nohotplug_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
|
|
dc->realize = NULL;
|
|
dc->hotpluggable = false;
|
|
}
|
|
|
|
static const TypeInfo nohotplug_type = {
|
|
.name = TYPE_UNUSED_NOHOTPLUG,
|
|
.parent = TYPE_DEVICE,
|
|
.instance_size = sizeof(MyType),
|
|
.instance_init = dynamic_instance_init,
|
|
.class_init = nohotplug_class_init,
|
|
};
|
|
|
|
#define TYPE_NONDEVICE "nondevice-type"
|
|
|
|
static const TypeInfo nondevice_type = {
|
|
.name = TYPE_NONDEVICE,
|
|
.parent = TYPE_OBJECT,
|
|
};
|
|
|
|
/* Test setting of dynamic properties using global properties */
|
|
static void test_dynamic_globalprop_subprocess(void)
|
|
{
|
|
MyType *mt;
|
|
static GlobalProperty props[] = {
|
|
{ TYPE_DYNAMIC_PROPS, "prop1", "101", },
|
|
{ TYPE_DYNAMIC_PROPS, "prop2", "102", },
|
|
{ TYPE_DYNAMIC_PROPS"-bad", "prop3", "103", },
|
|
{ TYPE_UNUSED_HOTPLUG, "prop4", "104", },
|
|
{ TYPE_UNUSED_NOHOTPLUG, "prop5", "105", },
|
|
{ TYPE_NONDEVICE, "prop6", "106", },
|
|
{}
|
|
};
|
|
int global_error;
|
|
|
|
register_global_properties(props);
|
|
|
|
mt = DYNAMIC_TYPE(object_new(TYPE_DYNAMIC_PROPS));
|
|
qdev_realize(DEVICE(mt), NULL, &error_fatal);
|
|
|
|
g_assert_cmpuint(mt->prop1, ==, 101);
|
|
g_assert_cmpuint(mt->prop2, ==, 102);
|
|
global_error = qdev_prop_check_globals();
|
|
g_assert_cmpuint(global_error, ==, 1);
|
|
g_assert(props[0].used);
|
|
g_assert(props[1].used);
|
|
g_assert(!props[2].used);
|
|
g_assert(!props[3].used);
|
|
g_assert(!props[4].used);
|
|
g_assert(!props[5].used);
|
|
}
|
|
|
|
static void test_dynamic_globalprop(void)
|
|
{
|
|
g_test_trap_subprocess("/qdev/properties/dynamic/global/subprocess", 0, 0);
|
|
g_test_trap_assert_passed();
|
|
g_test_trap_assert_stderr_unmatched("*prop1*");
|
|
g_test_trap_assert_stderr_unmatched("*prop2*");
|
|
g_test_trap_assert_stderr(
|
|
"*warning: global dynamic-prop-type-bad.prop3 has invalid class name*");
|
|
g_test_trap_assert_stderr_unmatched("*prop4*");
|
|
g_test_trap_assert_stderr(
|
|
"*warning: global nohotplug-type.prop5=105 not used*");
|
|
g_test_trap_assert_stderr(
|
|
"*warning: global nondevice-type.prop6 has invalid class name*");
|
|
g_test_trap_assert_stdout("");
|
|
}
|
|
|
|
/* Test if global props affecting subclasses are applied in the right order */
|
|
static void test_subclass_global_props(void)
|
|
{
|
|
MyType *mt;
|
|
/* Global properties must be applied in the order they were registered */
|
|
static GlobalProperty props[] = {
|
|
{ TYPE_STATIC_PROPS, "prop1", "101" },
|
|
{ TYPE_SUBCLASS, "prop1", "102" },
|
|
{ TYPE_SUBCLASS, "prop2", "103" },
|
|
{ TYPE_STATIC_PROPS, "prop2", "104" },
|
|
{}
|
|
};
|
|
|
|
register_global_properties(props);
|
|
|
|
mt = STATIC_TYPE(object_new(TYPE_SUBCLASS));
|
|
qdev_realize(DEVICE(mt), NULL, &error_fatal);
|
|
|
|
g_assert_cmpuint(mt->prop1, ==, 102);
|
|
g_assert_cmpuint(mt->prop2, ==, 104);
|
|
}
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
g_test_init(&argc, &argv, NULL);
|
|
|
|
module_call_init(MODULE_INIT_QOM);
|
|
type_register_static(&static_prop_type);
|
|
type_register_static(&subclass_type);
|
|
type_register_static(&dynamic_prop_type);
|
|
type_register_static(&hotplug_type);
|
|
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",
|
|
test_static_prop);
|
|
|
|
g_test_add_func("/qdev/properties/static/global/subprocess",
|
|
test_static_globalprop_subprocess);
|
|
g_test_add_func("/qdev/properties/static/global",
|
|
test_static_globalprop);
|
|
|
|
g_test_add_func("/qdev/properties/dynamic/global/subprocess",
|
|
test_dynamic_globalprop_subprocess);
|
|
g_test_add_func("/qdev/properties/dynamic/global",
|
|
test_dynamic_globalprop);
|
|
|
|
g_test_add_func("/qdev/properties/global/subclass",
|
|
test_subclass_global_props);
|
|
|
|
g_test_run();
|
|
|
|
return 0;
|
|
}
|