On 07.11.2013, at 15:27, Aneesh Kumar K.V <aneesh.ku...@linux.vnet.ibm.com>
wrote:
> From: "Aneesh Kumar K.V" <aneesh.ku...@linux.vnet.ibm.com>
>
> Targets like ppc64 support different typed of KVM, one which use
> hypervisor mode and the other which doesn't. Add a new machine
> property kvm_type that helps in selecting the respective ones
> We also add a new QEMUMachine callback get_vm_type that helps
> in mapping the string representation of kvm type specified.
>
> Signed-off-by: Aneesh Kumar K.V <aneesh.ku...@linux.vnet.ibm.com>
> ---
>
> Changes from V1:
> * change get_vm_type to kvm_type
> * change helper text
>
> hw/ppc/e500plat.c | 2 ++
> hw/ppc/kvmtype.h | 18 ++++++++++++++++++
> hw/ppc/mac_newworld.c | 2 ++
> hw/ppc/mac_oldworld.c | 2 ++
> hw/ppc/ppc440_bamboo.c | 2 ++
> hw/ppc/spapr.c | 19 +++++++++++++++++++
> include/hw/boards.h | 3 +++
> include/hw/xen/xen.h | 3 ++-
> include/sysemu/kvm.h | 4 ++--
> include/sysemu/qtest.h | 5 +++--
> kvm-all.c | 16 +++++++++++++---
> kvm-stub.c | 4 +++-
> qtest.c | 2 +-
> vl.c | 17 +++++++++++------
> xen-all.c | 2 +-
> xen-stub.c | 2 +-
> 16 files changed, 85 insertions(+), 18 deletions(-)
> create mode 100644 hw/ppc/kvmtype.h
>
> diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
> index 2e964b2..4be4b24 100644
> --- a/hw/ppc/e500plat.c
> +++ b/hw/ppc/e500plat.c
> @@ -17,6 +17,7 @@
> #include "hw/pci/pci.h"
> #include "hw/ppc/openpic.h"
> #include "kvm_ppc.h"
> +#include "kvmtype.h"
>
> static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt)
> {
> @@ -51,6 +52,7 @@ static QEMUMachine e500plat_machine = {
> .desc = "generic paravirt e500 platform",
> .init = e500plat_init,
> .max_cpus = 32,
> + .kvm_type = pr_kvm_type,
What about mpc8544ds? Also, e500plat can definitely support HV (e500mc+) and PR
(e500v2) mode. So you probably want the same check here as you have in spapr.
Unfortunately the patch doesn't apply anymore. Would you care to rebase it? I
think it's also more targeted towards the kvm queue rather than the ppc queue,
so I'd either like an ack from Paolo or would defer to his tree for inclusion
:).
Alex
