From a7bb2c7b68dbecefe103717eefdcfb3c3258268e Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Sun, 16 Apr 2023 15:44:57 +0000 Subject: [PATCH] virtio@pci: Fix assertion on detach. If the child never attached in the first place, it's OK for it to not have detached. XXX This should not be a set of flags; this should be a state enumeration, because some flags make no sense, like FINISHED|FAILED. XXX This should not be asserted separately in each bus; there should be a single place in virtio.c to assert this, uniformly in all buses. XXX pullup-10 --- sys/dev/pci/virtio_pci.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/dev/pci/virtio_pci.c b/sys/dev/pci/virtio_pci.c index 471bafb089b2..2a12a359fcc1 100644 --- a/sys/dev/pci/virtio_pci.c +++ b/sys/dev/pci/virtio_pci.c @@ -333,8 +333,11 @@ virtio_pci_detach(device_t self, int flags) if (r != 0) return r; - /* Check that child detached properly */ - KASSERT(ISSET(sc->sc_child_flags, VIRTIO_CHILD_DETACHED)); + /* Check that child never attached, or detached properly */ + KASSERTMSG(!ISSET(sc->sc_child_flags, + (VIRTIO_CHILD_ATTACH_FINISHED|VIRTIO_CHILD_ATTACH_FAILED)) || + ISSET(sc->sc_child_flags, VIRTIO_CHILD_DETACHED), + "%s: child flags %x", device_xname(self), sc->sc_child_flags); KASSERT(sc->sc_vqs == NULL); KASSERT(psc->sc_ihs_num == 0);