|
@@ -763,6 +763,7 @@ void cpu_address_space_init(CPUState *cpu, int asidx,
|
|
|
|
|
|
if (!cpu->cpu_ases) {
|
|
|
cpu->cpu_ases = g_new0(CPUAddressSpace, cpu->num_ases);
|
|
|
+ cpu->cpu_ases_count = cpu->num_ases;
|
|
|
}
|
|
|
|
|
|
newas = &cpu->cpu_ases[asidx];
|
|
@@ -776,6 +777,34 @@ void cpu_address_space_init(CPUState *cpu, int asidx,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+void cpu_address_space_destroy(CPUState *cpu, int asidx)
|
|
|
+{
|
|
|
+ CPUAddressSpace *cpuas;
|
|
|
+
|
|
|
+ assert(cpu->cpu_ases);
|
|
|
+ assert(asidx >= 0 && asidx < cpu->num_ases);
|
|
|
+ /* KVM cannot currently support multiple address spaces. */
|
|
|
+ assert(asidx == 0 || !kvm_enabled());
|
|
|
+
|
|
|
+ cpuas = &cpu->cpu_ases[asidx];
|
|
|
+ if (tcg_enabled()) {
|
|
|
+ memory_listener_unregister(&cpuas->tcg_as_listener);
|
|
|
+ }
|
|
|
+
|
|
|
+ address_space_destroy(cpuas->as);
|
|
|
+ g_free_rcu(cpuas->as, rcu);
|
|
|
+
|
|
|
+ if (asidx == 0) {
|
|
|
+ /* reset the convenience alias for address space 0 */
|
|
|
+ cpu->as = NULL;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (--cpu->cpu_ases_count == 0) {
|
|
|
+ g_free(cpu->cpu_ases);
|
|
|
+ cpu->cpu_ases = NULL;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
AddressSpace *cpu_get_address_space(CPUState *cpu, int asidx)
|
|
|
{
|
|
|
/* Return the AddressSpace corresponding to the specified index */
|