diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 428b491a7d..d40af312fa 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3685,7 +3685,7 @@ struct SpaprDimmState { static SpaprDimmState *spapr_pending_dimm_unplugs_find(SpaprMachineState *s, PCDIMMDevice *dimm) { - SpaprDimmState *dimm_state = NULL; + SpaprDimmState *dimm_state; QTAILQ_FOREACH(dimm_state, &s->pending_dimm_unplugs, next) { if (dimm_state->dimm == dimm) { diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index 1a21ac7bbf..ab23e3f477 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -460,7 +460,7 @@ static void rtas_event_log_queue(SpaprMachineState *spapr, static SpaprEventLogEntry *rtas_event_log_dequeue(SpaprMachineState *spapr, uint32_t event_mask) { - SpaprEventLogEntry *entry = NULL; + SpaprEventLogEntry *entry; QTAILQ_FOREACH(entry, &spapr->pending_events, next) { const SpaprEventSource *source = @@ -482,7 +482,7 @@ static SpaprEventLogEntry *rtas_event_log_dequeue(SpaprMachineState *spapr, static bool rtas_event_log_contains(SpaprMachineState *spapr, uint32_t event_mask) { - SpaprEventLogEntry *entry = NULL; + SpaprEventLogEntry *entry; QTAILQ_FOREACH(entry, &spapr->pending_events, next) { const SpaprEventSource *source = diff --git a/net/colo-compare.c b/net/colo-compare.c index c356419d6a..abc1326b70 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -1396,7 +1396,7 @@ static void colo_compare_init(Object *obj) void colo_compare_cleanup(void) { - CompareState *tmp = NULL; + CompareState *tmp; CompareState *n = NULL; QTAILQ_FOREACH_SAFE(tmp, &net_compares, next, n) { @@ -1407,7 +1407,7 @@ void colo_compare_cleanup(void) static void colo_compare_finalize(Object *obj) { CompareState *s = COLO_COMPARE(obj); - CompareState *tmp = NULL; + CompareState *tmp; qemu_mutex_lock(&colo_compare_mutex); QTAILQ_FOREACH(tmp, &net_compares, next) { diff --git a/net/net.c b/net/net.c index a176936f9b..2892f1730d 100644 --- a/net/net.c +++ b/net/net.c @@ -653,7 +653,7 @@ static ssize_t filter_receive_iov(NetClientState *nc, NetPacketSent *sent_cb) { ssize_t ret = 0; - NetFilterState *nf = NULL; + NetFilterState *nf; if (direction == NET_FILTER_DIRECTION_TX) { QTAILQ_FOREACH(nf, &nc->filters, next) { diff --git a/target/s390x/kvm/stsi-topology.c b/target/s390x/kvm/stsi-topology.c index c8d6389cd8..301d41b68d 100644 --- a/target/s390x/kvm/stsi-topology.c +++ b/target/s390x/kvm/stsi-topology.c @@ -285,7 +285,7 @@ static void s390_topology_fill_list_sorted(S390TopologyList *topology_list) */ static void s390_topology_empty_list(S390TopologyList *topology_list) { - S390TopologyEntry *entry = NULL; + S390TopologyEntry *entry; S390TopologyEntry *tmp = NULL; QTAILQ_FOREACH_SAFE(entry, topology_list, next, tmp) {