diff options
| -rw-r--r-- | hw/i386/acpi-build.c | 4 | ||||
| -rw-r--r-- | include/qom/cpu.h | 31 | ||||
| -rw-r--r-- | qom/cpu.c | 34 |
3 files changed, 67 insertions, 2 deletions
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index b9c245c9bb..98dd424678 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1862,9 +1862,9 @@ static Aml *build_q35_osc_method(void) /* * Always allow native PME, AER (no dependencies) - * Never allow SHPC (no SHPC controller in this system) + * Allow SHPC (PCI bridges can have SHPC controller) */ - aml_append(if_ctx, aml_and(a_ctrl, aml_int(0x1D), a_ctrl)); + aml_append(if_ctx, aml_and(a_ctrl, aml_int(0x1F), a_ctrl)); if_ctx2 = aml_if(aml_lnot(aml_equal(aml_arg(1), aml_int(1)))); /* Unknown revision */ diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 25eefea7ab..e9d30c52b4 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -162,6 +162,10 @@ typedef struct CPUClass { void (*dump_statistics)(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf, int flags); int64_t (*get_arch_id)(CPUState *cpu); + void * (*alloc_env)(CPUState *cpu); + void (*get_env)(CPUState *cpu, void *env); + void (*set_env)(CPUState *cpu, void *env); + void (*free_env)(CPUState *cpu, void *env); bool (*get_paging_enabled)(const CPUState *cpu); void (*get_memory_mapping)(CPUState *cpu, MemoryMappingList *list, Error **errp); @@ -440,6 +444,33 @@ extern bool mttcg_enabled; #define qemu_tcg_mttcg_enabled() (mttcg_enabled) /** + * cpu_alloc_env: allocate CPU environment structure + * @cpu: allocate environment structure for this CPU + */ +void *cpu_alloc_env(CPUState *cpu); + +/** + * cpu_get_env: retrieve CPU environment structure + * @cpu: CPU to use + * @env: environment structure to use + */ +void cpu_get_env(CPUState *cpu, void *env); + +/** + * cpu_set_env: switch to given CPU environment + * @cpu: CPU to use + * @env: environment structure to use + */ +void cpu_set_env(CPUState *cpu, void *env); + +/** + * cpu_free_env: free CPU environment structure + * @cpu: free environment structure for this CPU + * @env: structure to free + */ +void cpu_free_env(CPUState *cpu, void *env); + +/** * cpu_paging_enabled: * @cpu: The CPU whose state is to be inspected. * @@ -89,6 +89,40 @@ out: return cpu; } +void *cpu_alloc_env(CPUState *cpu) +{ + CPUClass *cc = CPU_GET_CLASS(cpu); + + return cc->alloc_env ? cc->alloc_env(cpu) : NULL; +} + +void cpu_get_env(CPUState *cpu, void *env) +{ + CPUClass *cc = CPU_GET_CLASS(cpu); + + if (cc->get_env) { + cc->get_env(cpu, env); + } +} + +void cpu_set_env(CPUState *cpu, void *env) +{ + CPUClass *cc = CPU_GET_CLASS(cpu); + + if (cc->set_env) { + cc->set_env(cpu, env); + } +} + +void cpu_free_env(CPUState *cpu, void *env) +{ + CPUClass *cc = CPU_GET_CLASS(cpu); + + if (cc->free_env) { + cc->free_env(cpu, env); + } +} + bool cpu_paging_enabled(const CPUState *cpu) { CPUClass *cc = CPU_GET_CLASS(cpu); |