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

qdev: Remove hex8/32/64 property types



Replace them with uint8/32/64.

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 515f2346
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static void adlib_realizefn (DeviceState *dev, Error **errp)
}

static Property adlib_properties[] = {
    DEFINE_PROP_HEX32  ("iobase",  AdlibState, port, 0x220),
    DEFINE_PROP_UINT32 ("iobase",  AdlibState, port, 0x220),
    DEFINE_PROP_UINT32 ("freq",    AdlibState, freq,  44100),
    DEFINE_PROP_END_OF_LIST (),
};
+1 −1
Original line number Diff line number Diff line
@@ -673,7 +673,7 @@ static int cs4231a_init (ISABus *bus)
}

static Property cs4231a_properties[] = {
    DEFINE_PROP_HEX32  ("iobase",  CSState, port, 0x534),
    DEFINE_PROP_UINT32 ("iobase",  CSState, port, 0x534),
    DEFINE_PROP_UINT32 ("irq",     CSState, irq,  9),
    DEFINE_PROP_UINT32 ("dma",     CSState, dma,  3),
    DEFINE_PROP_END_OF_LIST (),
+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static int GUS_init (ISABus *bus)

static Property gus_properties[] = {
    DEFINE_PROP_UINT32 ("freq",    GUSState, freq,        44100),
    DEFINE_PROP_HEX32  ("iobase",  GUSState, port,        0x240),
    DEFINE_PROP_UINT32 ("iobase",  GUSState, port,        0x240),
    DEFINE_PROP_UINT32 ("irq",     GUSState, emu.gusirq,  7),
    DEFINE_PROP_UINT32 ("dma",     GUSState, emu.gusdma,  3),
    DEFINE_PROP_END_OF_LIST (),
+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static void pcspk_realizefn(DeviceState *dev, Error **errp)
}

static Property pcspk_properties[] = {
    DEFINE_PROP_HEX32("iobase", PCSpkState, iobase,  -1),
    DEFINE_PROP_UINT32("iobase", PCSpkState, iobase,  -1),
    DEFINE_PROP_PTR("pit", PCSpkState, pit),
    DEFINE_PROP_END_OF_LIST(),
};
+2 −2
Original line number Diff line number Diff line
@@ -1399,8 +1399,8 @@ static int SB16_init (ISABus *bus)
}

static Property sb16_properties[] = {
    DEFINE_PROP_HEX32  ("version", SB16State, ver,  0x0405), /* 4.5 */
    DEFINE_PROP_HEX32  ("iobase",  SB16State, port, 0x220),
    DEFINE_PROP_UINT32 ("version", SB16State, ver,  0x0405), /* 4.5 */
    DEFINE_PROP_UINT32 ("iobase",  SB16State, port, 0x220),
    DEFINE_PROP_UINT32 ("irq",     SB16State, irq,  5),
    DEFINE_PROP_UINT32 ("dma",     SB16State, dma,  1),
    DEFINE_PROP_UINT32 ("dma16",   SB16State, hdma, 5),
Loading