Commit 104059da authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Andreas Färber
Browse files

qdev: Add enum property types to QAPI schema 



Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent f31c41ff

hw/core/qdev-properties.c

+3 −17
Original line number Diff line number Diff line
@@ -449,36 +449,22 @@ PropertyInfo qdev_prop_macaddr = { 


/* --- lost tick policy --- */



static const char *lost_tick_policy_table[LOST_TICK_MAX+1] = {

    [LOST_TICK_DISCARD] = "discard",

    [LOST_TICK_DELAY] = "delay",

    [LOST_TICK_MERGE] = "merge",

    [LOST_TICK_SLEW] = "slew",

    [LOST_TICK_MAX] = NULL,

};



QEMU_BUILD_BUG_ON(sizeof(LostTickPolicy) != sizeof(int));



PropertyInfo qdev_prop_losttickpolicy = {

    .name  = "LostTickPolicy",

    .enum_table  = lost_tick_policy_table,

    .enum_table  = LostTickPolicy_lookup,

    .get   = get_enum,

    .set   = set_enum,

};



/* --- BIOS CHS translation */



static const char *bios_chs_trans_table[] = {

    [BIOS_ATA_TRANSLATION_AUTO]  = "auto",

    [BIOS_ATA_TRANSLATION_NONE]  = "none",

    [BIOS_ATA_TRANSLATION_LBA]   = "lba",

    [BIOS_ATA_TRANSLATION_LARGE] = "large",

    [BIOS_ATA_TRANSLATION_RECHS] = "rechs",

};

QEMU_BUILD_BUG_ON(sizeof(BiosAtaTranslation) != sizeof(int));



PropertyInfo qdev_prop_bios_chs_trans = {

    .name = "bios-chs-trans",

    .enum_table = bios_chs_trans_table,

    .enum_table = BiosAtaTranslation_lookup,

    .get = get_enum,

    .set = set_enum,

};

hw/i386/kvm/i8254.c

+3 −3
Original line number Diff line number Diff line
@@ -268,9 +268,9 @@ static void kvm_pit_realizefn(DeviceState *dev, Error **errp) 
        return;

    }

    switch (s->lost_tick_policy) {

    case LOST_TICK_DELAY:

    case LOST_TICK_POLICY_DELAY:

        break; /* enabled by default */

    case LOST_TICK_DISCARD:

    case LOST_TICK_POLICY_DISCARD:

        if (kvm_check_extension(kvm_state, KVM_CAP_REINJECT_CONTROL)) {

            struct kvm_reinject_control control = { .pit_reinject = 0 };
@@ -300,7 +300,7 @@ static void kvm_pit_realizefn(DeviceState *dev, Error **errp) 
static Property kvm_pit_properties[] = {

    DEFINE_PROP_UINT32("iobase", PITCommonState, iobase,  -1),

    DEFINE_PROP_LOSTTICKPOLICY("lost_tick_policy", KVMPITState,

                               lost_tick_policy, LOST_TICK_DELAY),

                               lost_tick_policy, LOST_TICK_POLICY_DELAY),

    DEFINE_PROP_END_OF_LIST(),

};

hw/timer/mc146818rtc.c

+7 −7
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static void rtc_periodic_timer(void *opaque) 
    if (s->cmos_data[RTC_REG_B] & REG_B_PIE) {

        s->cmos_data[RTC_REG_C] |= REG_C_IRQF;

#ifdef TARGET_I386

        if (s->lost_tick_policy == LOST_TICK_SLEW) {

        if (s->lost_tick_policy == LOST_TICK_POLICY_SLEW) {

            if (s->irq_reinject_on_ack_count >= RTC_REINJECT_ON_ACK_COUNT)

                s->irq_reinject_on_ack_count = 0;		

            apic_reset_irq_delivered();
@@ -708,7 +708,7 @@ static int rtc_post_load(void *opaque, int version_id) 


#ifdef TARGET_I386

    if (version_id >= 2) {

        if (s->lost_tick_policy == LOST_TICK_SLEW) {

        if (s->lost_tick_policy == LOST_TICK_POLICY_SLEW) {

            rtc_coalesced_timer_update(s);

        }

    }
@@ -749,7 +749,7 @@ static void rtc_notify_clock_reset(Notifier *notifier, void *data) 
    periodic_timer_update(s, now);

    check_update_timer(s);

#ifdef TARGET_I386

    if (s->lost_tick_policy == LOST_TICK_SLEW) {

    if (s->lost_tick_policy == LOST_TICK_POLICY_SLEW) {

        rtc_coalesced_timer_update(s);

    }

#endif
@@ -774,7 +774,7 @@ static void rtc_reset(void *opaque) 
    qemu_irq_lower(s->irq);



#ifdef TARGET_I386

    if (s->lost_tick_policy == LOST_TICK_SLEW) {

    if (s->lost_tick_policy == LOST_TICK_POLICY_SLEW) {

        s->irq_coalesced = 0;

    }

#endif
@@ -835,11 +835,11 @@ static void rtc_realizefn(DeviceState *dev, Error **errp) 


#ifdef TARGET_I386

    switch (s->lost_tick_policy) {

    case LOST_TICK_SLEW:

    case LOST_TICK_POLICY_SLEW:

        s->coalesced_timer =

            timer_new_ns(rtc_clock, rtc_coalesced_timer, s);

        break;

    case LOST_TICK_DISCARD:

    case LOST_TICK_POLICY_DISCARD:

        break;

    default:

        error_setg(errp, "Invalid lost tick policy.");
@@ -890,7 +890,7 @@ ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq) 
static Property mc146818rtc_properties[] = {

    DEFINE_PROP_INT32("base_year", RTCState, base_year, 1980),

    DEFINE_PROP_LOSTTICKPOLICY("lost_tick_policy", RTCState,

                               lost_tick_policy, LOST_TICK_DISCARD),

                               lost_tick_policy, LOST_TICK_POLICY_DISCARD),

    DEFINE_PROP_END_OF_LIST(),

};

include/hw/block/block.h

+0 −6
Original line number Diff line number Diff line
@@ -65,12 +65,6 @@ int blkconf_geometry(BlockConf *conf, int *trans, 


/* Hard disk geometry */



#define BIOS_ATA_TRANSLATION_AUTO   0

#define BIOS_ATA_TRANSLATION_NONE   1

#define BIOS_ATA_TRANSLATION_LBA    2

#define BIOS_ATA_TRANSLATION_LARGE  3

#define BIOS_ATA_TRANSLATION_RECHS  4



void hd_geometry_guess(BlockDriverState *bs,

                       uint32_t *pcyls, uint32_t *pheads, uint32_t *psecs,

                       int *ptrans);

include/qemu-common.h

+0 −8
Original line number Diff line number Diff line
@@ -261,14 +261,6 @@ typedef int (*DMA_transfer_handler) (void *opaque, int nchan, int pos, int size) 


typedef uint64_t pcibus_t;



typedef enum LostTickPolicy {

    LOST_TICK_DISCARD,

    LOST_TICK_DELAY,

    LOST_TICK_MERGE,

    LOST_TICK_SLEW,

    LOST_TICK_MAX

} LostTickPolicy;



typedef struct PCIHostDeviceAddress {

    unsigned int domain;

    unsigned int bus;