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

accel: Move qtest accel registration to qtest.c 



As qtest_availble() returns 1 only when CONFIG_POSIX is set, keep
setting AccelClass.available to keep current behavior (this is different
from what we did for KVM and Xen).

This also allows us to make qtest_init_accel() static.

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 b152b05a

accel.c

+0 −18
Original line number Diff line number Diff line
@@ -132,28 +132,10 @@ static const TypeInfo tcg_accel_type = { 
    .class_init = tcg_accel_class_init,

};



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->allowed = &qtest_allowed;

}



#define TYPE_QTEST_ACCEL ACCEL_CLASS_NAME("qtest")



static const TypeInfo qtest_accel_type = {

    .name = TYPE_QTEST_ACCEL,

    .parent = TYPE_ACCEL,

    .class_init = qtest_accel_class_init,

};



static void register_accel_types(void)

{

    type_register_static(&accel_type);

    type_register_static(&tcg_accel_type);

    type_register_static(&qtest_accel_type);

}



type_init(register_accel_types);

include/sysemu/qtest.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ static inline bool qtest_enabled(void) 


bool qtest_driver(void);



int qtest_init_accel(MachineClass *mc);

void qtest_init(const char *qtest_chrdev, const char *qtest_log, Error **errp);



static inline int qtest_available(void)

qtest.c

+26 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "exec/ioport.h"

#include "exec/memory.h"

#include "hw/irq.h"

#include "sysemu/accel.h"

#include "sysemu/sysemu.h"

#include "sysemu/cpus.h"

#include "qemu/config-file.h"
@@ -519,7 +520,7 @@ static void configure_qtest_icount(const char *options) 
    qemu_opts_del(opts);

}



int qtest_init_accel(MachineClass *mc)

static int qtest_init_accel(MachineClass *mc)

{

    configure_qtest_icount("0");

    return 0;
@@ -557,3 +558,27 @@ bool qtest_driver(void) 
{

    return qtest_chr;

}



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->allowed = &qtest_allowed;

}



#define TYPE_QTEST_ACCEL ACCEL_CLASS_NAME("qtest")



static const TypeInfo qtest_accel_type = {

    .name = TYPE_QTEST_ACCEL,

    .parent = TYPE_ACCEL,

    .class_init = qtest_accel_class_init,

};



static void qtest_type_init(void)

{

    type_register_static(&qtest_accel_type);

}



type_init(qtest_type_init);