[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v3 02/15] hw/boards: Add a MachineState parameter to k
From: |
Eric Auger |
Subject: |
[Qemu-devel] [RFC v3 02/15] hw/boards: Add a MachineState parameter to kvm_type callback |
Date: |
Tue, 3 Jul 2018 09:19:45 +0200 |
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]
---
accel/kvm/kvm-all.c | 2 +-
hw/ppc/mac_newworld.c | 2 +-
hw/ppc/mac_oldworld.c | 2 +-
hw/ppc/spapr.c | 2 +-
include/hw/boards.h | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index eb7db92..37ac834 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -1549,7 +1549,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 ff715ff..606b827 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -511,7 +511,7 @@ static void ppc_core99_init(MachineState *machine)
qemu_register_boot_set(fw_cfg_boot_set, fw_cfg);
}
-static int core99_kvm_type(const char *arg)
+static int core99_kvm_type(MachineState *ms, const char *arg)
{
/* Always force PR KVM */
return 2;
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 4608bab..1211fcd 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -363,7 +363,7 @@ static void ppc_heathrow_init(MachineState *machine)
qemu_register_boot_set(fw_cfg_boot_set, fw_cfg);
}
-static int heathrow_kvm_type(const char *arg)
+static int heathrow_kvm_type(MachineState *ms, const char *arg)
{
/* Always force PR KVM */
return 2;
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index b32b971..db6b018 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2841,7 +2841,7 @@ static void spapr_machine_init(MachineState *machine)
}
}
-static int spapr_kvm_type(const char *vm_type)
+static int spapr_kvm_type(MachineState *ms, const char *vm_type)
{
if (!vm_type) {
return 0;
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 79069dd..3ac9594 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -173,7 +173,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 *ms, const char *arg);
BlockInterfaceType block_default_type;
int units_per_default_bus;
--
2.5.5
- Re: [Qemu-devel] [RFC v3 06/15] hw/arm/virt: Allocate device_memory, (continued)
- Re: [Qemu-devel] [RFC v3 06/15] hw/arm/virt: Allocate device_memory, Shameerali Kolothum Thodi, 2018/07/05
- Re: [Qemu-devel] [RFC v3 06/15] hw/arm/virt: Allocate device_memory, Auger Eric, 2018/07/05
- Re: [Qemu-devel] [RFC v3 06/15] hw/arm/virt: Allocate device_memory, Igor Mammedov, 2018/07/11
- Re: [Qemu-devel] [RFC v3 06/15] hw/arm/virt: Allocate device_memory, Auger Eric, 2018/07/12
- Re: [Qemu-devel] [RFC v3 06/15] hw/arm/virt: Allocate device_memory, Andrew Jones, 2018/07/12
- Re: [Qemu-devel] [RFC v3 06/15] hw/arm/virt: Allocate device_memory, Auger Eric, 2018/07/12
- Re: [Qemu-devel] [RFC v3 06/15] hw/arm/virt: Allocate device_memory, Andrew Jones, 2018/07/12
- Re: [Qemu-devel] [RFC v3 06/15] hw/arm/virt: Allocate device_memory, Igor Mammedov, 2018/07/18
Re: [Qemu-devel] [RFC v3 06/15] hw/arm/virt: Allocate device_memory, Igor Mammedov, 2018/07/18
[Qemu-devel] [RFC v3 11/15] hw/arm/virt-acpi-build: Add PC-DIMM in SRAT, Eric Auger, 2018/07/03
[Qemu-devel] [RFC v3 02/15] hw/boards: Add a MachineState parameter to kvm_type callback,
Eric Auger <=
[Qemu-devel] [RFC v3 04/15] hw/arm/virt: support kvm_type property, Eric Auger, 2018/07/03
[Qemu-devel] [RFC v3 09/15] hw/arm/boot: Expose the PC-DIMM nodes in the DT, Eric Auger, 2018/07/03
[Qemu-devel] [RFC v3 03/15] kvm: add kvm_arm_get_max_vm_phys_shift, Eric Auger, 2018/07/03
[Qemu-devel] [RFC v3 05/15] hw/arm/virt: handle max_vm_phys_shift conflicts on migration, Eric Auger, 2018/07/03
[Qemu-devel] [RFC v3 07/15] hw/arm/virt: Add memory hotplug framework, Eric Auger, 2018/07/03