Commit f6a1ef64 authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Paolo Bonzini
Browse files

accel: Pass MachineState object to accel init functions 



Most of the machine options and machine state information is in the
MachineState object, not on the MachineClass. This will allow init
functions to use the MachineState object directly instead of
qemu_get_machine_opts() or the current_machine global.

Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 0d15da8e

accel.c

+6 −5
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
 */



#include "sysemu/accel.h"

#include "hw/boards.h"

#include "qemu-common.h"

#include "sysemu/arch_init.h"

#include "sysemu/sysemu.h"
@@ -35,7 +36,7 @@ 
int tcg_tb_size;

static bool tcg_allowed = true;



static int tcg_init(MachineClass *mc)

static int tcg_init(MachineState *ms)

{

    tcg_exec_init(tcg_tb_size * 1024 * 1024);

    return 0;
@@ -57,18 +58,18 @@ static AccelClass *accel_find(const char *opt_name) 
    return ac;

}



static int accel_init_machine(AccelClass *acc, MachineClass *mc)

static int accel_init_machine(AccelClass *acc, MachineState *ms)

{

    int ret;

    *(acc->allowed) = true;

    ret = acc->init_machine(mc);

    ret = acc->init_machine(ms);

    if (ret < 0) {

        *(acc->allowed) = false;

    }

    return ret;

}



int configure_accelerator(MachineClass *mc)

int configure_accelerator(MachineState *ms)

{

    const char *p;

    char buf[10];
@@ -98,7 +99,7 @@ int configure_accelerator(MachineClass *mc) 
                   acc->name);

            continue;

        }

        ret = accel_init_machine(acc, mc);

        ret = accel_init_machine(acc, ms);

        if (ret < 0) {

            init_failed = true;

            fprintf(stderr, "failed to initialize %s: %s\n",

include/hw/boards.h

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ 
#include "qom/object.h"





typedef struct MachineState MachineState;



typedef void QEMUMachineInitFunc(MachineState *ms);



typedef void QEMUMachineResetFunc(void);

include/qemu/typedefs.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ typedef struct MemoryMappingList MemoryMappingList; 


typedef struct QEMUMachine QEMUMachine;

typedef struct MachineClass MachineClass;

typedef struct MachineState MachineState;

typedef struct NICInfo NICInfo;

typedef struct HCIInfo HCIInfo;

typedef struct AudioState AudioState;

include/sysemu/accel.h

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ typedef struct AccelClass { 
    const char *opt_name;

    const char *name;

    int (*available)(void);

    int (*init_machine)(MachineClass *mc);

    int (*init_machine)(MachineState *ms);

    bool *allowed;

} AccelClass;
@@ -57,6 +57,6 @@ typedef struct AccelClass { 


extern int tcg_tb_size;



int configure_accelerator(MachineClass *mc);

int configure_accelerator(MachineState *ms);



#endif

kvm-all.c

+2 −1
Original line number Diff line number Diff line
@@ -1380,8 +1380,9 @@ static int kvm_max_vcpus(KVMState *s) 
    return (ret) ? ret : kvm_recommended_vcpus(s);

}



static int kvm_init(MachineClass *mc)

static int kvm_init(MachineState *ms)

{

    MachineClass *mc = MACHINE_GET_CLASS(ms);

    static const char upgrade_note[] =

        "Please upgrade to at least kernel 2.6.29 or recent kvm-kmod\n"

        "(see http://sourceforge.net/projects/kvm).\n";