[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v2 15/15] cpu-model/s390: Enable S390 cpu model
From: |
Michael Mueller |
Subject: |
[Qemu-devel] [RFC PATCH v2 15/15] cpu-model/s390: Enable S390 cpu model |
Date: |
Tue, 17 Feb 2015 15:24:13 +0100 |
This patch enables QEMU to instantiate S390 CPUs with cpu model types.
Signed-off-by: Michael Mueller <address@hidden>
---
hw/s390x/s390-virtio.c | 6 ++++++
target-s390x/helper.c | 3 ++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c
index c215cd8..aabd772 100644
--- a/hw/s390x/s390-virtio.c
+++ b/hw/s390x/s390-virtio.c
@@ -32,6 +32,7 @@
#include "hw/virtio/virtio.h"
#include "hw/sysbus.h"
#include "sysemu/kvm.h"
+#include "sysemu/cpus.h"
#include "exec/address-spaces.h"
#include "hw/s390x/s390-virtio-bus.h"
@@ -152,6 +153,11 @@ void s390_init_cpus(const char *cpu_model, uint8_t
*storage_keys)
cpu_model = "host";
}
+ if (is_help_option(cpu_model)) {
+ list_cpus(stdout, &fprintf, cpu_model);
+ exit(0);
+ }
+
ipi_states = g_malloc(sizeof(S390CPU *) * smp_cpus);
for (i = 0; i < smp_cpus; i++) {
diff --git a/target-s390x/helper.c b/target-s390x/helper.c
index 5958343..568428d 100644
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -22,6 +22,7 @@
#include "exec/gdbstub.h"
#include "qemu/timer.h"
#include "exec/cpu_ldst.h"
+#include "cpu-models.h"
#ifndef CONFIG_USER_ONLY
#include "sysemu/sysemu.h"
#endif
@@ -75,7 +76,7 @@ S390CPU *cpu_s390x_init(const char *cpu_model)
{
S390CPU *cpu;
- cpu = S390_CPU(object_new(TYPE_S390_CPU));
+ cpu = S390_CPU(object_new(s390_select_cpu_model(cpu_model)));
object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
--
1.8.3.1
- Re: [Qemu-devel] [RFC PATCH v2 04/15] cpu-model/s390: Introduce S390 CPU models, (continued)
[Qemu-devel] [RFC PATCH v2 15/15] cpu-model/s390: Enable S390 cpu model,
Michael Mueller <=
[Qemu-devel] [RFC PATCH v2 06/15] cpu-model/s390: Define cpu model specific facility lists, Michael Mueller, 2015/02/17
[Qemu-devel] [RFC PATCH v2 08/15] cpu-model/s390: Update linux-headers/asm-s390/kvm.h, Michael Mueller, 2015/02/17
[Qemu-devel] [RFC PATCH v2 01/15] cpu-model: Introduce probe mode for machine none, Michael Mueller, 2015/02/17
[Qemu-devel] [RFC PATCH v2 12/15] cpu-model/s390: Extend QMP command query-cpu-definitions, Michael Mueller, 2015/02/17
[Qemu-devel] [RFC PATCH v2 05/15] cpu-model/s390: Introduce S390 CPU facilities, Michael Mueller, 2015/02/17
[Qemu-devel] [RFC PATCH v2 14/15] cpu-model/s390: Add cpu model selection routine, Michael Mueller, 2015/02/17
[Qemu-devel] [RFC PATCH v2 02/15] cpu-model: Introduce option --probe to switch into probe mode, Michael Mueller, 2015/02/17