kvm: Add a new machine property kvm_type
PATCH 1/1 kvm: Add a new machine property kvm_type
From: "Aneesh Kumar K.V" <[email protected]>
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.
---
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
hw/ppc/e500plat.c +2 -0
@@ -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, };static void e500plat_machine_init (void )
hw/ppc/kvmtype.h new file +18 -0
@@ -0,0 +1,18 @@ +#ifndef PPC_KVMTYPE_H +#define PPC_KVMTYPE_H + +static inline int pr_kvm_type (const char *vm_type) +{ +if (!vm_type) { +return 0 ; + } + +if (!strcmp (vm_type,"PR" )) { +return 2 ; + } + +hw_error ("Unknown kvm_type specified '%s'" , vm_type); +exit (1 ); +} + +#endif
hw/ppc/mac_newworld.c +2 -0
@@ -68,6 +68,7 @@#include "sysemu/blockdev.h" #include "exec/address-spaces.h" #include "hw/sysbus.h" +#include "kvmtype.h" #define MAX_IDE_BUS 2#define CFG_ADDR 0xf0000510
@@ -478,6 +479,7 @@ static QEMUMachine core99_machine = { .init = ppc_core99_init, .max_cpus = MAX_CPUS, .default_boot_order = "cd", + .kvm_type = pr_kvm_type, };static void core99_machine_init (void )
hw/ppc/mac_oldworld.c +2 -0
@@ -42,6 +42,7 @@#include "kvm_ppc.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" +#include "kvmtype.h" #define MAX_IDE_BUS 2#define CFG_ADDR 0xf0000510
@@ -351,6 +352,7 @@ static QEMUMachine heathrow_machine = { .is_default = 1, #endif .default_boot_order = "cd", /* TOFIX "cad" when Mac floppy is implemented */ + .kvm_type = pr_kvm_type, };static void heathrow_machine_init (void )
hw/ppc/ppc440_bamboo.c +2 -0
@@ -28,6 +28,7 @@#include "ppc405.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" +#include "kvmtype.h" #define BINARY_DEVICE_TREE_FILE "bamboo.dtb"
@@ -296,6 +297,7 @@ static QEMUMachine bamboo_machine = { .name = "bamboo", .desc = "bamboo", .init = bamboo_init, + .kvm_type = pr_kvm_type, };static void bamboo_machine_init (void )
hw/ppc/spapr.c +19 -0
@@ -1346,6 +1346,24 @@ static void ppc_spapr_init(QEMUMachineInitArgs *args)assert (spapr->fdt_skel !=NULL ); } +static int spapr_kvm_type (const char *vm_type) +{ +if (!vm_type) { +return 0 ; + } + +if (!strcmp (vm_type,"HV" )) { +return 1 ; + } + +if (!strcmp (vm_type,"PR" )) { +return 2 ; + } + +hw_error ("Unknown kvm_type specified '%s'" , vm_type); +exit (1 ); +} +static QEMUMachine spapr_machine = { .name ="pseries" , .desc ="pSeries Logical Partition (PAPR compliant)" ,
@@ -1356,6 +1374,7 @@ static QEMUMachine spapr_machine = { .max_cpus = MAX_CPUS, .no_parallel = 1, .default_boot_order = NULL, + .kvm_type = spapr_kvm_type, };static void spapr_machine_init (void )
include/hw/boards.h +3 -0
@@ -21,6 +21,8 @@ typedef void QEMUMachineResetFunc(void);typedef void QEMUMachineHotAddCPUFunc (const int64_t id,Error **errp); +typedef int QEMUMachineGetKvmtypeFunc (const char *arg); + typedef struct QEMUMachine { const char *name; const char *alias;
@@ -28,6 +30,7 @@ typedef struct QEMUMachine {QEMUMachineInitFunc *init;QEMUMachineResetFunc *reset;QEMUMachineHotAddCPUFunc *hot_add_cpu; +QEMUMachineGetKvmtypeFunc *kvm_type;BlockInterfaceType block_default_type;int max_cpus; unsigned int no_serial:1,
include/hw/xen/xen.h +2 -1
@@ -36,7 +36,8 @@ void xen_cmos_set_s3_resume(void *opaque, int irq, int level);qemu_irq *xen_interrupt_controller_init (void ); -int xen_init (void ); +typedef struct QEMUMachine QEMUMachine ; +int xen_init (QEMUMachine *machine);int xen_hvm_init (MemoryRegion **ram_memory);void xenstore_store_pv_console_info (int i,struct CharDriverState *chr);
include/sysemu/kvm.h +2 -2
@@ -142,8 +142,8 @@ typedef struct KVMState KVMState;extern KVMState *kvm_state;/* external API */ - -int kvm_init (void ); +typedef struct QEMUMachine QEMUMachine ; +int kvm_init (QEMUMachine *machine);int kvm_has_sync_mmu (void );int kvm_has_vcpu_events (void );
include/sysemu/qtest.h +3 -2
@@ -31,7 +31,8 @@ static inline int qtest_available(void) return 1; } -int qtest_init (void ); +typedef struct QEMUMachine QEMUMachine ; +int qtest_init (QEMUMachine *machine);#else static inline bool qtest_enabled (void ) {
@@ -43,7 +44,7 @@ static inline int qtest_available(void)return 0 ; } -static inline int qtest_init (void ) +static inline int qtest_init (QEMUMachine *machine) {return 0 ; }
kvm-all.c +13 -3
@@ -35,6 +35,8 @@#include "qemu/event_notifier.h" #include "trace.h" +#include "hw/boards.h" +/* This check must be after config-host.h is included */ #ifdef CONFIG_EVENTFD #include <sys/eventfd.h>
@@ -1342,7 +1344,7 @@ static int kvm_max_vcpus(KVMState *s)return 4 ; } -int kvm_init (void ) +int kvm_init (QEMUMachine *machine) {static const char upgrade_note[] ="Please upgrade to at least kernel 2.6.29 or recent kvm-kmod\n"
@@ -1350,8 +1352,9 @@ int kvm_init(void)KVMState *s;const KVMCapabilityInfo *missing_cap;int ret; -int i; +int i, type =0 ;int max_vcpus; +const char *kvm_type; s =g_malloc0 (sizeof (KVMState));
@@ -1407,7 +1410,14 @@ int kvm_init(void) goto err; } - s->vmfd =kvm_ioctl (s,KVM_CREATE_VM ,0 ); + kvm_type =qemu_opt_get (qemu_get_machine_opts (),"kvm_type" ); +if (machine->kvm_type) { + type = machine->kvm_type (kvm_type); + }else if (kvm_type) { +fprintf (stderr,"Invalid argument kvm_type=%s\n" , kvm_type); + goto err; + } + s->vmfd =kvm_ioctl (s,KVM_CREATE_VM , type);if (s->vmfd <0 ) {#ifdef TARGET_S390X fprintf(stderr, "Please add the 'switch_amode' kernel parameter to "
kvm-stub.c +3 -1
@@ -19,6 +19,8 @@#include "hw/pci/msi.h" #endif +#include "hw/boards.h" +KVMState *kvm_state;bool kvm_kernel_irqchip;bool kvm_async_interrupts_allowed;
@@ -33,7 +35,7 @@ int kvm_init_vcpu(CPUState *cpu)return -ENOSYS ; } -int kvm_init (void ) +int kvm_init (QEMUMachine *machine) {return -ENOSYS ; }
qtest.c +1 -1
@@ -502,7 +502,7 @@ static void qtest_event(void *opaque, int event) } } -int qtest_init (void ) +int qtest_init (QEMUMachine *machine) {CharDriverState *chr;
vl.c +11 -6
@@ -427,7 +427,12 @@ static QemuOptsList qemu_machine_opts = { .name = "usb", .type = QEMU_OPT_BOOL, .help = "Set on/off to enable/disable usb", + },{ + .name = "kvm_type", + .type = QEMU_OPT_STRING, + .help = "Specifies the KVM virtualization mode (HV, PR)", }, + {/* End of list */ } }, };
@@ -2608,7 +2613,7 @@ static QEMUMachine *machine_parse(const char *name)exit (!name || !is_help_option (name)); } -static int tcg_init (void ) +static int tcg_init (QEMUMachine *machine) {tcg_exec_init (tcg_tb_size *1024 *1024 );return 0 ;
@@ -2618,7 +2623,7 @@ static struct {const char *opt_name;const char *name;int (*available)(void ); -int (*init)(void ); +int (*init)(QEMUMachine *);bool *allowed; } accel_list[] = { { "tcg", "tcg", tcg_available, tcg_init, &tcg_allowed },
@@ -2627,7 +2632,7 @@ static struct { { "qtest", "QTest", qtest_available, qtest_init, &qtest_allowed }, }; -static int configure_accelerator (void ) +static int configure_accelerator (QEMUMachine *machine) {const char *p;char buf[10 ];
@@ -2654,7 +2659,7 @@ static int configure_accelerator(void)continue ; } *(accel_list[i].allowed) = true; - ret = accel_list[i].init (); + ret = accel_list[i].init (machine);if (ret <0 ) { init_failed = true; fprintf(stderr, "failed to initialize %s: %s\n",
@@ -4037,10 +4042,10 @@ int main(int argc, char **argv, char **envp)exit (0 ); } -configure_accelerator (); +configure_accelerator (machine);if (!qtest_enabled () && qtest_chrdev) { -qtest_init (); +qtest_init (machine); } machine_opts =qemu_get_machine_opts ();
xen-all.c +1 -1
@@ -1000,7 +1000,7 @@ static void xen_exit_notifier(Notifier *n, void *data)xs_daemon_close (state->xenstore); } -int xen_init (void ) +int xen_init (QEMUMachine *machine) { xen_xc =xen_xc_interface_open (0 ,0 ,0 );if (xen_xc ==XC_HANDLER_INITIAL_VALUE ) {
xen-stub.c +1 -1
@@ -47,7 +47,7 @@ qemu_irq *xen_interrupt_controller_init(void)return NULL ; } -int xen_init (void ) +int xen_init (QEMUMachine *machine) {return -ENOSYS ; }
Signature · 1 line
1.8.3.2
Quoted 47 lines · Aneesh Kumar K.V
From: "Aneesh Kumar K.V" <[email protected]>
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_typethat helps in selecting the respective ones We also add a new QEMUMachine callbackget_vm_typethat helps in mapping the string representation of kvm type specified.Signed-off-by Aneesh Kumar K.V <[email protected]>---
Changes from V1:
* changeget_vm_typetokvm_type
* change helper texthw/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.hhw/ppc/e500plat.c +1
-0@@ -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) {
hw/ppc/e500plat.c static QEMUMachine e500plat_machine = { · line 55
Quoted 4 lines
hw/ppc/e500plat.c +1
-0@@ -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
Quoted 13 lines · Alexander Graf
Quoted 11 lines · Aneesh Kumar K.V
From: "Aneesh Kumar K.V" <[email protected]>
hw/ppc/e500plat.c +1
-0@@ -17,6 +17,7 @@#include "hw/pci/pci.h" #include "hw/ppc/openpic.h" #include "kvm_ppc.h" +#include "kvmtype.h"
Quoted 11 lines
hw/ppc/e500plat.c static QEMUMachine e500plat_machine = { · line 55
Quoted 7 lines
hw/ppc/e500plat.c +1
-0static 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.
I don't have access to the hardware to validate. So at this point, I would suggest we change the code such that we don't change the functionality.
Quoted 5 lines
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 :).
Will resend
-aneesh
Quoted 27 lines · Aneesh Kumar K.V
Quoted 13 lines · Alexander Graf
Quoted 11 lines · Aneesh Kumar K.V
From: "Aneesh Kumar K.V" <[email protected]>
hw/ppc/e500plat.c +1
-0@@ -17,6 +17,7 @@#include "hw/pci/pci.h" #include "hw/ppc/openpic.h" #include "kvm_ppc.h" +#include "kvmtype.h" Quoted 11 lines
hw/ppc/e500plat.c static QEMUMachine e500plat_machine = { · line 55
Quoted 7 lines
hw/ppc/e500plat.c +1
-0static 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.
Quoted 3 lines
I don't have access to the hardware to validate. So at this point, I would suggest we change the code such that we don't change the functionality.
Works for me. Please accept neither PR nor HV then, but only leave the default.
Quoted 9 lines
Quoted 6 lines
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 :).
Will resend
Thanks!
Alex