From cd93d4eb526c1ae29eba8e5ddf866bc5a19b3426 Mon Sep 17 00:00:00 2001
From: Peter Xu <peterx@redhat.com>
Date: Mon, 5 Mar 2018 14:41:19 -0500
Subject: [PATCH] cpu: suffix cpu address spaces with cpu index

Renaming cpu address space names so that they won't be the same when
there are more than one.

Backports commit 87a621d857be1b2b3dd1d0847ca311a863dbcb53 from qemu
---
 qemu/exec.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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);