D51735.id159748.diff
No OneTemporary
Actions

Size

836 B

Referenced Files

None

Subscribers

None

D51735.id159748.diff
View Options

	diff --git a/usr.sbin/bhyve/pci_xhci.c b/usr.sbin/bhyve/pci_xhci.c
	--- a/usr.sbin/bhyve/pci_xhci.c
	+++ b/usr.sbin/bhyve/pci_xhci.c
	@@ -709,6 +709,8 @@
	free(devep->ep_sctx_trbs);

	if (devep->ep_xfer != NULL) {
	+ if (dev->dev_ue->ue_cancel)
	+ dev->dev_ue->ue_cancel(devep->ep_xfer);
	free(devep->ep_xfer);
	devep->ep_xfer = NULL;
	}
	diff --git a/usr.sbin/bhyve/usb_emul.h b/usr.sbin/bhyve/usb_emul.h
	--- a/usr.sbin/bhyve/usb_emul.h
	+++ b/usr.sbin/bhyve/usb_emul.h
	@@ -62,6 +62,7 @@
	int (ue_remove)(void sc);
	int (ue_stop)(void sc);
	int (ue_snapshot)(void scarg, struct vm_snapshot_meta *meta);
	+ void (ue_cancel)(struct usb_data_xfer xfer);
	};
	#define USB_EMUL_SET(x) DATA_SET(usb_emu_set, x)

	@@ -111,6 +112,7 @@
	int head;
	int tail;
	pthread_mutex_t mtx;
	+ void *tr_softc;
	};

	enum USB_ERRCODE {