From e76ab520423b9fa2af952a66f839ecd5a331cfa9 Mon Sep 17 00:00:00 2001 From: mikeb Date: Thu, 21 Jul 2016 10:21:00 +0000 Subject: [PATCH] Remove a few debugging leftovers --- sys/dev/pv/hyperv.c | 7 ------- sys/dev/pv/if_hvn.c | 33 --------------------------------- 2 files changed, 40 deletions(-) diff --git a/sys/dev/pv/hyperv.c b/sys/dev/pv/hyperv.c index d99d9f8f29d..94d21473a69 100644 --- a/sys/dev/pv/hyperv.c +++ b/sys/dev/pv/hyperv.c @@ -1899,15 +1899,8 @@ hv_attach_devices(struct hv_softc *sc) TAILQ_FOREACH(ch, &sc->sc_channels, ch_entry) { if (ch->ch_state != HV_CHANSTATE_OFFERED) continue; -#if 0 - if (strcmp(ch->ch_ident, "network") != 0 && - strcmp(ch->ch_ident, "scsi") != 0 && - strcmp(ch->ch_ident, "ide") != 0) - continue; -#else if (!(ch->ch_flags & CHF_MONITOR)) continue; -#endif dv = malloc(sizeof(*dv), M_DEVBUF, M_ZERO | M_NOWAIT); if (dv == NULL) { printf("%s: failed to allocate device object\n", diff --git a/sys/dev/pv/if_hvn.c b/sys/dev/pv/if_hvn.c index f8e53145073..c3aebfa9fb9 100644 --- a/sys/dev/pv/if_hvn.c +++ b/sys/dev/pv/if_hvn.c @@ -154,7 +154,6 @@ int hvn_iff(struct hvn_softc *); void hvn_init(struct hvn_softc *); void hvn_stop(struct hvn_softc *); void hvn_start(struct ifnet *); -void hvn_intr(void *); void hvn_txeof(struct hvn_softc *, uint64_t); void hvn_rxeof(struct hvn_softc *, void *); int hvn_rx_ring_create(struct hvn_softc *); @@ -424,24 +423,6 @@ hvn_start(struct ifnet *ifp) } } -#if 0 -void -hvn_intr(void *arg) -{ - struct hvn_softc *sc = arg; - struct ifnet *ifp = &sc->sc_ac.ac_if; - uint64_t rid; - uint32_t rlen; - int rv; - - if (!(ifp->if_flags & IFF_RUNNING)) - return; - - if (ifq_is_oactive(&ifp->if_snd)) - ifq_restart(&ifp->if_snd); -} -#endif - void hvn_txeof(struct hvn_softc *sc, uint64_t tid) { @@ -862,20 +843,6 @@ hvn_nvsp_detach(struct hvn_softc *sc) } } -static inline void -hexdump(const char *header, void *data, size_t size) -{ - uint8_t *ptr = data; - int i; - - for (i = 0; i < size; i++) { - if ((i % 16) == 0) - printf("%s%s+0x%02x:", i > 0 ? "\n" : "", header, i); - printf(" %02x", ptr[i]); - } - printf("\n"); -} - static inline struct rndis_cmd * hvn_alloc_cmd(struct hvn_softc *sc) { -- 2.20.1