[PATCH 04/22] hw/core/loader: Get cpu first addr space with cpu_get_address_space()

["Philippe Mathieu-Daudé" <philmd@linaro.org>]

In order to remove the convenient CPUState::as field, access
the vcpu first address space using the cpu_get_address_space()
helper.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/core/generic-loader.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c
index e72bbde2a23..cc8eacdf067 100644
--- a/hw/core/generic-loader.c
+++ b/hw/core/generic-loader.c
@@ -52,8 +52,9 @@ static void generic_loader_reset(void *opaque)
     }
 
     if (s->data_len) {
+        AddressSpace *as = cpu_get_address_space(s->cpu, 0);
         assert(s->data_len <= sizeof(s->data));
-        dma_memory_write(s->cpu->as, s->addr, &s->data, s->data_len,
+        dma_memory_write(as, s->addr, &s->data, s->data_len,
                          MEMTXATTRS_UNSPECIFIED);
     }
 }
@@ -130,7 +131,7 @@ static void generic_loader_realize(DeviceState *dev, Error **errp)
     }
 
     if (s->file) {
-        AddressSpace *as = s->cpu ? s->cpu->as :  NULL;
+        AddressSpace *as = cpu_get_address_space(s->cpu, 0);
 
         if (!s->force_raw) {
             size = load_elf_as(s->file, NULL, NULL, NULL, &entry, NULL, NULL,
-- 
2.51.0