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

accel: Rename 'init' method to 'init_machine' 



Today, all accelerator init functions affect some global state:
* tcg_init() calls tcg_exec_init() and affects globals such as tcg_tcx,
  page size globals, and possibly others;
* kvm_init() changes the kvm_state global, cpu_interrupt_handler, and possibly
  others;
* xen_init() changes the xen_xc global, and registers a change state handler.

With the new accelerator QOM classes, initialization may now be split in two
steps:
* instance_init() will do basic initialization that doesn't affect any global
  state and don't need MachineState or MachineClass data. This will allow
  probing code to safely create multiple accelerator objects on the fly just
  for reporting host/accelerator capabilities, for example.
* accel_init_machine()/init_machine() will save the accelerator object in
  MachineState, and do initialization steps which still affect global state,
  machine state, or that need data from MachineClass or MachineState.

To clarify the difference between those two steps, rename init() to
init_machine().

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

accel.c

+4 −4
Original line number Diff line number Diff line
@@ -57,11 +57,11 @@ static AccelClass *accel_find(const char *opt_name) 
    return ac;

}



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

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

{

    int ret;

    *(acc->allowed) = true;

    ret = acc->init(mc);

    ret = acc->init_machine(mc);

    if (ret < 0) {

        *(acc->allowed) = false;

    }
@@ -98,7 +98,7 @@ int configure_accelerator(MachineClass *mc) 
                   acc->name);

            continue;

        }

        ret = accel_init(acc, mc);

        ret = accel_init_machine(acc, mc);

        if (ret < 0) {

            init_failed = true;

            fprintf(stderr, "failed to initialize %s: %s\n",
@@ -128,7 +128,7 @@ static void tcg_accel_class_init(ObjectClass *oc, void *data) 
{

    AccelClass *ac = ACCEL_CLASS(oc);

    ac->name = "tcg";

    ac->init = tcg_init;

    ac->init_machine = tcg_init;

    ac->allowed = &tcg_allowed;

}

include/sysemu/accel.h

+1 −1
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)(MachineClass *mc);

    int (*init_machine)(MachineClass *mc);

    bool *allowed;

} AccelClass;

kvm-all.c

+1 −1
Original line number Diff line number Diff line
@@ -2233,7 +2233,7 @@ static void kvm_accel_class_init(ObjectClass *oc, void *data) 
{

    AccelClass *ac = ACCEL_CLASS(oc);

    ac->name = "KVM";

    ac->init = kvm_init;

    ac->init_machine = kvm_init;

    ac->allowed = &kvm_allowed;

}

qtest.c

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ static void qtest_accel_class_init(ObjectClass *oc, void *data) 
    AccelClass *ac = ACCEL_CLASS(oc);

    ac->name = "QTest";

    ac->available = qtest_available;

    ac->init = qtest_init_accel;

    ac->init_machine = qtest_init_accel;

    ac->allowed = &qtest_allowed;

}

xen-common.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static void xen_accel_class_init(ObjectClass *oc, void *data) 
{

    AccelClass *ac = ACCEL_CLASS(oc);

    ac->name = "Xen";

    ac->init = xen_init;

    ac->init_machine = xen_init;

    ac->allowed = &xen_allowed;

}