diff --git a/qemu/exec.c b/qemu/exec.c
index 536769c2..6d03d286 100644
--- a/qemu/exec.c
+++ b/qemu/exec.c
@@ -538,9 +538,12 @@ void cpu_address_space_init(CPUState *cpu, int asidx,
 {
     CPUAddressSpace *newas;
     AddressSpace *as = g_new0(AddressSpace, 1);
+    char *as_name;
 
     assert(mr);
-    address_space_init(cpu->uc, as, mr, prefix);
+    as_name = g_strdup_printf("%s-%d", prefix, cpu->cpu_index);
+    address_space_init(cpu->uc, as, mr, as_name);
+    g_free(as_name);
 
     /* Target code should have set num_ases before calling us */
     assert(asidx < cpu->num_ases);