From 50cecbee87a5d7745880fa211aa8a377f28f7108771847664175f48d3b7ee58e Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 8 Aug 2020 01:17:49 +0000 Subject: [PATCH] Accepting request 824917 from home:lwfinger:branches:Virtualization - Delete temporary USBpassthru test patch. OBS-URL: https://build.opensuse.org/request/show/824917 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=566 --- debug_USB_passthru.patch | 73 ---------------------------------------- virtualbox.changes | 5 +++ 2 files changed, 5 insertions(+), 73 deletions(-) delete mode 100644 debug_USB_passthru.patch diff --git a/debug_USB_passthru.patch b/debug_USB_passthru.patch deleted file mode 100644 index 8446707..0000000 --- a/debug_USB_passthru.patch +++ /dev/null @@ -1,73 +0,0 @@ -Index: VirtualBox-6.1.12/src/VBox/Main/src-server/HostImpl.cpp -=================================================================== ---- VirtualBox-6.1.12.orig/src/VBox/Main/src-server/HostImpl.cpp -+++ VirtualBox-6.1.12/src/VBox/Main/src-server/HostImpl.cpp -@@ -3189,13 +3189,14 @@ HRESULT Host::i_checkUSBProxyService() - { - /* disable the USB controller completely to avoid assertions if the - * USB proxy service could not start. */ -- -+ LogRel(("USB proxy could not start\n")); - switch (m->pUSBProxyService->getLastError()) - { - case VERR_FILE_NOT_FOUND: /** @todo what does this mean? */ - return setWarning(E_FAIL, - tr("Could not load the Host USB Proxy Service (VERR_FILE_NOT_FOUND). The service might not be installed on the host computer")); - case VERR_VUSB_USB_DEVICE_PERMISSION: -+ LogRel(("m->pUSBProxyService->getLastError() is VERR_VUSB_USB_DEVICE_PERMISSION\n")); - return setWarning(E_FAIL, - tr("VirtualBox is not currently allowed to access USB devices. You can change this by adding your user to the 'vboxusers' group. Please see the user manual for a more detailed explanation")); - case VERR_VUSB_USBFS_PERMISSION: -Index: VirtualBox-6.1.12/src/VBox/Main/src-server/USBProxyBackend.cpp -=================================================================== ---- VirtualBox-6.1.12.orig/src/VBox/Main/src-server/USBProxyBackend.cpp -+++ VirtualBox-6.1.12/src/VBox/Main/src-server/USBProxyBackend.cpp -@@ -282,8 +282,10 @@ int USBProxyBackend::start(void) - AssertRC(rc); - if (RT_SUCCESS(rc)) - LogFlowThisFunc(("started mThread=%RTthrd\n", mThread)); -- else -+ else { -+ LogRel(("USB proxy failed to start\n")); - mThread = NIL_RTTHREAD; -+ } - } - } - else -Index: VirtualBox-6.1.12/src/VBox/Runtime/common/misc/thread.cpp -=================================================================== ---- VirtualBox-6.1.12.orig/src/VBox/Runtime/common/misc/thread.cpp -+++ VirtualBox-6.1.12/src/VBox/Runtime/common/misc/thread.cpp -@@ -772,20 +772,24 @@ RTDECL(int) RTThreadCreate(PRTTHREAD pTh - if (!VALID_PTR(pThread) && pThread) - { - Assert(VALID_PTR(pThread)); -+ LogRel(("pThread is invalid\n")); - return VERR_INVALID_PARAMETER; - } - if (!VALID_PTR(pfnThread)) - { - Assert(VALID_PTR(pfnThread)); -+ LogRel(("pfnThread is invalid\n")); - return VERR_INVALID_PARAMETER; - } - if (!pszName || !*pszName || strlen(pszName) >= RTTHREAD_NAME_LEN) - { -+ LogRel(("pszName=%s (max len is %d because of logging)\n", pszName, RTTHREAD_NAME_LEN - 1)); - AssertMsgFailed(("pszName=%s (max len is %d because of logging)\n", pszName, RTTHREAD_NAME_LEN - 1)); - return VERR_INVALID_PARAMETER; - } - if (fFlags & ~RTTHREADFLAGS_MASK) - { -+ LogRel(("fFlags=%#x\n", fFlags)); - AssertMsgFailed(("fFlags=%#x\n", fFlags)); - return VERR_INVALID_PARAMETER; - } -@@ -819,6 +823,7 @@ RTDECL(int) RTThreadCreate(PRTTHREAD pTh - else - rc = VERR_NO_TMP_MEMORY; - LogFlow(("RTThreadCreate: Failed to create thread, rc=%Rrc\n", rc)); -+ LogRel(("RTThreadCreate: Failed to create thread, rc=%Rrc\n", rc)); - AssertReleaseRC(rc); - return rc; - } diff --git a/virtualbox.changes b/virtualbox.changes index 073cfd0..5fd7e93 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Aug 8 01:14:12 UTC 2020 - Larry Finger + +- Delete temporary USBpassthru test patch. + ------------------------------------------------------------------- Fri Aug 7 22:19:20 UTC 2020 - Larry Finger