External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

vbox: Introduce vboxUniformedPFN::GetException()

Browse Source 
The GetException() method can be used to obtain the latest
exception that occurred in VirtualBox. Calling the method does
not reset the exception though. For that we'll need to call
another method (introduced in following commit).

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Michal Privoznik 2023-01-19 17:34:04 +01:00
parent 2a690fc172
commit 52aefc9d31
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/vbox/vbox_common.h
View File

@ -109,6 +109,7 @@ typedef unsigned long PRUword;
#define nsnull 0
typedef PRUint32 nsresult;
#define HRESULT nsresult
#if defined(__GNUC__) && (__GNUC__ > 2)
# define NS_LIKELY(x) (__builtin_expect((x), 1))
@ -362,6 +363,7 @@ typedef nsISupports IHostNetworkInterface;
typedef nsISupports IDHCPServer;
typedef nsISupports IKeyboard;
typedef nsISupports IVirtualBoxErrorInfo;
typedef struct nsIException nsIException;
/* Macros for all vbox drivers. */

6
src/vbox/vbox_tmpl.c
View File

@ -481,6 +481,11 @@ static int _pfnUtf8ToUtf16(PCVBOXXPCOM pFuncs, const char *pszString, PRUnichar
return pFuncs->pfnUtf8ToUtf16(pszString, ppwszString);
}
static HRESULT _pfnGetException(PCVBOXXPCOM pFuncs, IErrorInfo **ppException)
{
return pFuncs->pfnGetException(ppException);
}
static void _vboxIIDInitialize(vboxIID *iid)
{
memset(iid, 0, sizeof(vboxIID));
@ -2218,6 +2223,7 @@ static vboxUniformedPFN _UPFN = {
.Utf8Free = _pfnUtf8Free,
.Utf16ToUtf8 = _pfnUtf16ToUtf8,
.Utf8ToUtf16 = _pfnUtf8ToUtf16,
.GetException = _pfnGetException,
};
static vboxUniformedIID _UIID = {

1
src/vbox/vbox_uniformed_api.h
View File

@ -109,6 +109,7 @@ typedef struct {
void (*Utf8Free)(PCVBOXXPCOM pFuncs, char *pszString);
int (*Utf16ToUtf8)(PCVBOXXPCOM pFuncs, const PRUnichar *pwszString, char **ppszString);
int (*Utf8ToUtf16)(PCVBOXXPCOM pFuncs, const char *pszString, PRUnichar **ppwszString);
HRESULT (*GetException)(PCVBOXXPCOM pFuncs, nsIException **ppException);
} vboxUniformedPFN;
/* Functions for vboxIID */