[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v11 04/10] hw/boards: Add a MachineState parameter to
From: |
Eric Auger |
Subject: |
[Qemu-arm] [PATCH v11 04/10] hw/boards: Add a MachineState parameter to kvm_type callback |
Date: |
Fri, 1 Mar 2019 14:47:03 +0100 |
On ARM, the kvm_type will be resolved by querying the KVMState.
Let's add the MachineState handle to the callback so that we
can retrieve the KVMState handle. in kvm_init, when the callback
is called, the kvm_state variable is not yet set.
Signed-off-by: Eric Auger <address@hidden>
Acked-by: David Gibson <address@hidden>
[ppc parts]
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
---
v7 -> v8: added Igor's R-b
v6 -> v7:
- add a comment for kvm_type
- use machine instead of ms in the declaration
- add Peter's R-b
---
accel/kvm/kvm-all.c | 2 +-
hw/ppc/mac_newworld.c | 3 +--
hw/ppc/mac_oldworld.c | 2 +-
hw/ppc/spapr.c | 2 +-
include/hw/boards.h | 5 ++++-
5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index fd92b6f375..241db496c3 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -1593,7 +1593,7 @@ static int kvm_init(MachineState *ms)
kvm_type = qemu_opt_get(qemu_get_machine_opts(), "kvm-type");
if (mc->kvm_type) {
- type = mc->kvm_type(kvm_type);
+ type = mc->kvm_type(ms, kvm_type);
} else if (kvm_type) {
ret = -EINVAL;
fprintf(stderr, "Invalid argument kvm-type=%s\n", kvm_type);
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 98461052ac..97e8817145 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -564,8 +564,7 @@ static char *core99_fw_dev_path(FWPathProvider *p, BusState
*bus,
return NULL;
}
-
-static int core99_kvm_type(const char *arg)
+static int core99_kvm_type(MachineState *machine, const char *arg)
{
/* Always force PR KVM */
return 2;
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 284431ddd6..cc1e463466 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -420,7 +420,7 @@ static char *heathrow_fw_dev_path(FWPathProvider *p,
BusState *bus,
return NULL;
}
-static int heathrow_kvm_type(const char *arg)
+static int heathrow_kvm_type(MachineState *machine, const char *arg)
{
/* Always force PR KVM */
return 2;
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index b6a571b6f1..d7850ada7d 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3023,7 +3023,7 @@ static void spapr_machine_init(MachineState *machine)
}
}
-static int spapr_kvm_type(const char *vm_type)
+static int spapr_kvm_type(MachineState *machine, const char *vm_type)
{
if (!vm_type) {
return 0;
diff --git a/include/hw/boards.h b/include/hw/boards.h
index b55c9cc087..f7ce553aa1 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -157,6 +157,9 @@ typedef struct {
* should instead use "unimplemented-device" for all memory ranges where
* the guest will attempt to probe for a device that QEMU doesn't
* implement and a stub device is required.
+ * @kvm_type:
+ * Return the type of KVM corresponding to the kvm-type string option or
+ * computed based on other criteria such as the host kernel capabilities.
*/
struct MachineClass {
/*< private >*/
@@ -172,7 +175,7 @@ struct MachineClass {
void (*init)(MachineState *state);
void (*reset)(void);
void (*hot_add_cpu)(const int64_t id, Error **errp);
- int (*kvm_type)(const char *arg);
+ int (*kvm_type)(MachineState *machine, const char *arg);
BlockInterfaceType block_default_type;
int units_per_default_bus;
--
2.20.1
- [Qemu-arm] [PATCH v11 00/10] ARM virt: Initial RAM expansion and extended memory map, Eric Auger, 2019/03/01
- [Qemu-arm] [PATCH v11 01/10] hw/arm/boot: introduce fdt_add_memory_node helper, Eric Auger, 2019/03/01
- [Qemu-arm] [PATCH v11 02/10] hw/arm/virt: Rename highmem IO regions, Eric Auger, 2019/03/01
- [Qemu-arm] [PATCH v11 03/10] hw/arm/virt: Split the memory map description, Eric Auger, 2019/03/01
- [Qemu-arm] [PATCH v11 04/10] hw/boards: Add a MachineState parameter to kvm_type callback,
Eric Auger <=
- [Qemu-arm] [PATCH v11 06/10] vl: Set machine ram_size, maxram_size and ram_slots earlier, Eric Auger, 2019/03/01
- [Qemu-arm] [PATCH v11 05/10] kvm: add kvm_arm_get_max_vm_ipa_size, Eric Auger, 2019/03/01
- [Qemu-arm] [PATCH v11 08/10] hw/arm/virt: Implement kvm_type function for 4.0 machine, Eric Auger, 2019/03/01
- [Qemu-arm] [PATCH v11 09/10] hw/arm/virt: Check the VCPU PA range in TCG mode, Eric Auger, 2019/03/01
- [Qemu-arm] [PATCH v11 10/10] hw/arm/virt: Bump the 255GB initial RAM limit, Eric Auger, 2019/03/01
- [Qemu-arm] [PATCH v11 07/10] hw/arm/virt: Dynamic memory map depending on RAM requirements, Eric Auger, 2019/03/01