Commit dc0ca80e authored by Eric Auger's avatar Eric Auger Committed by Peter Maydell
Browse files

hw/boards: Add a MachineState parameter to kvm_type callback 



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: default avatarEric Auger <eric.auger@redhat.com>
Acked-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Message-id: 20190304101339.25970-5-eric.auger@redhat.com
[ppc parts]
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 350a9c9e

accel/kvm/kvm-all.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

hw/ppc/mac_newworld.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

hw/ppc/mac_oldworld.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

hw/ppc/spapr.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/hw/boards.h

+4 −1
Original line number Diff line number Diff line
@@ -156,6 +156,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 >*/
@@ -171,7 +174,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;