From 3a87d00910ef64a2eece4aad25d96ea10683fc5c Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 22 Jan 2016 15:09:21 +0000 Subject: fpu: Replace uint32 typedef with uint32_t Replace the uint32 softfloat-specific typedef with uint32_t. This change was made with find include hw fpu target-* -name '*.[ch]' | xargs sed -i -e 's/\buint32\b/uint32_t/g' together with manual removal of the typedef definition, manual undoing of various mis-hits, and another couple of fixes found via test compilation. All the uses in hw/ were using the wrong type by mistake. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Aurelien Jarno Acked-by: Leon Alrae Acked-by: James Hogan Message-id: 1452603315-27030-5-git-send-email-peter.maydell@linaro.org --- hw/i386/pc.c | 2 +- hw/misc/imx25_ccm.c | 2 +- hw/misc/imx31_ccm.c | 2 +- hw/net/vmxnet3.c | 2 +- hw/ppc/spapr_events.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'hw') diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 293e22a7e1..838636cfba 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1454,7 +1454,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, ISADevice **rtc_state, bool create_fdctrl, bool no_vmport, - uint32 hpet_irqs) + uint32_t hpet_irqs) { int i; DriveInfo *fd[MAX_FD]; diff --git a/hw/misc/imx25_ccm.c b/hw/misc/imx25_ccm.c index 23759ca648..90752fd7a1 100644 --- a/hw/misc/imx25_ccm.c +++ b/hw/misc/imx25_ccm.c @@ -249,7 +249,7 @@ static void imx25_ccm_reset(DeviceState *dev) static uint64_t imx25_ccm_read(void *opaque, hwaddr offset, unsigned size) { - uint32 value = 0; + uint32_t value = 0; IMX25CCMState *s = (IMX25CCMState *)opaque; if (offset < 0x70) { diff --git a/hw/misc/imx31_ccm.c b/hw/misc/imx31_ccm.c index 47d6ead5ad..c47b96f2ac 100644 --- a/hw/misc/imx31_ccm.c +++ b/hw/misc/imx31_ccm.c @@ -261,7 +261,7 @@ static void imx31_ccm_reset(DeviceState *dev) static uint64_t imx31_ccm_read(void *opaque, hwaddr offset, unsigned size) { - uint32 value = 0; + uint32_t value = 0; IMX31CCMState *s = (IMX31CCMState *)opaque; if ((offset >> 2) < IMX31_CCM_MAX_REG) { diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 67abad3598..5147f05bd2 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -522,7 +522,7 @@ vmxnet3_dec_rx_completion_counter(VMXNET3State *s, int qidx) vmxnet3_ring_dec(&s->rxq_descr[qidx].comp_ring); } -static void vmxnet3_complete_packet(VMXNET3State *s, int qidx, uint32 tx_ridx) +static void vmxnet3_complete_packet(VMXNET3State *s, int qidx, uint32_t tx_ridx) { struct Vmxnet3_TxCompDesc txcq_descr; diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index 744ea62ac0..333e6ff27b 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -459,7 +459,7 @@ void spapr_hotplug_req_add_by_index(sPAPRDRConnector *drc) { sPAPRDRConnectorClass *drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc); sPAPRDRConnectorType drc_type = drck->get_type(drc); - uint32 index = drck->get_index(drc); + uint32_t index = drck->get_index(drc); spapr_hotplug_req_event(RTAS_LOG_V6_HP_ID_DRC_INDEX, RTAS_LOG_V6_HP_ACTION_ADD, drc_type, index); @@ -469,7 +469,7 @@ void spapr_hotplug_req_remove_by_index(sPAPRDRConnector *drc) { sPAPRDRConnectorClass *drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc); sPAPRDRConnectorType drc_type = drck->get_type(drc); - uint32 index = drck->get_index(drc); + uint32_t index = drck->get_index(drc); spapr_hotplug_req_event(RTAS_LOG_V6_HP_ID_DRC_INDEX, RTAS_LOG_V6_HP_ACTION_REMOVE, drc_type, index); -- cgit v1.2.3-55-g7522