ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Error reporting patches for 2020-03-09 

-----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAl5mOHASHGFybWJydUBy
 ZWRoYXQuY29tAAoJEDhwtADrkYZTpusP/i/+ZSV8Ldz/6f2Oi7y29YNoV7FvB2qm
 G6R6a8qYDK5kE2I8IZrGF4tDLpHgVYydR/dJC1g64uf7rdxqt/SrHaz1OAOvKhv2
 CieJKvSH5GiL+esH8CEk1C5NWcCuS8yBiqFiTqcFsKYOBbZTEabtUWbdF6Zn0Jks
 yXNDNZUyFF32IQs4ivTQwXS/LBXvLQjGp8pwxmDicfXgfrzTxBN/gpjP7ndAi4Hy
 DHQlA8VeVmpCfKfmvunO/DBnzh7o3MGTFmT/XZVOjIcv8sD/MjoZ1aRYCCzJZ5NS
 chjMTaACnOzJwVYGmeDZaPzi798dsjzN6+DPnyIXuHSTyiTmmz6jdgT2l34HMp/H
 ftX5kM6lGRZ4R+8Ysddwf3Y5PS1XyCy+bMNjfIjTQ0xw6Acq7tifg2DC8wLOV8Je
 Rp2Ey3APup81VkrH1FH6mwwFwL7nL00xFECeaZ4rcdJfgOAMDDjn2FtKDlOH1TPv
 /JkCWiJpXl7Svm5adtGRqR8fHY9ZUZWzH8+ykiTuaSvqX0mGH8ZgNHgGgkhISCbt
 zdoXY4dX+svAC7TkG9LXlqQYuVdnHy93LDEIV0AzpnmZQuYRyyFV2OylMNaOiv06
 HnBF0EOPbDbq9nAKfZzs1YVRUvUEopm9e+8rceFnNQIMKYwwIx77Fd4YJPE0BWfB
 V5vaUSJk5z8Z
 =CH6a
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2020-03-09' into staging

Error reporting patches for 2020-03-09

# gpg: Signature made Mon 09 Mar 2020 12:37:04 GMT
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-error-2020-03-09:
  qga: Fix a memory leak
  qga: Improve error report by calling error_setg_win32()
  util/osdep: Improve error report by calling error_setg_win32()
  chardev: Improve error report by calling error_setg_win32()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2020-03-09 13:51:14 +00:00
parent 7a5853cec4 d1eddab86f
commit dee65a00d1
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chardev/char-pipe.c
View File

@ -70,7 +70,7 @@ static int win_chr_pipe_init(Chardev *chr, const char *filename,
MAXCONNECT, NSENDBUF, NRECVBUF, NTIMEOUT, NULL);
g_free(openname);
if (s->file == INVALID_HANDLE_VALUE) {
error_setg(errp, "Failed CreateNamedPipe (%lu)", GetLastError());
error_setg_win32(errp, GetLastError(), "Failed CreateNamedPipe");
s->file = NULL;
goto fail;
}

2
chardev/char-win.c
View File

@ -96,7 +96,7 @@ int win_chr_serial_init(Chardev *chr, const char *filename, Error **errp)
s->file = CreateFile(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL,
OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 0);
if (s->file == INVALID_HANDLE_VALUE) {
error_setg(errp, "Failed CreateFile (%lu)", GetLastError());
error_setg_win32(errp, GetLastError(), "Failed CreateFile");
s->file = NULL;
goto fail;
}

7
qga/channel-win32.c
View File

@ -302,13 +302,14 @@ static gboolean ga_channel_open(GAChannel *c, GAChannelMethod method,
OPEN_EXISTING,
FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL);
if (c->handle == INVALID_HANDLE_VALUE) {
g_critical("error opening path %s: %s", newpath,
g_win32_error_message(GetLastError()));
g_autofree gchar *emsg = g_win32_error_message(GetLastError());
g_critical("error opening path %s: %s", newpath, emsg);
return false;
}
if (method == GA_CHANNEL_ISA_SERIAL && !SetCommTimeouts(c->handle,&comTimeOut)) {
g_critical("error setting timeout for com port: %lu",GetLastError());
g_autofree gchar *emsg = g_win32_error_message(GetLastError());
g_critical("error setting timeout for com port: %s", emsg);
CloseHandle(c->handle);
return false;
}

8
qga/commands-win32.c
View File

@ -315,8 +315,9 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp)
}
if (!ExitWindowsEx(shutdown_flag, SHTDN_REASON_FLAG_PLANNED)) {
slog("guest-shutdown failed: %lu", GetLastError());
error_setg(errp, QERR_UNDEFINED_ERROR);
g_autofree gchar *emsg = g_win32_error_message(GetLastError());
slog("guest-shutdown failed: %s", emsg);
error_setg_win32(errp, GetLastError(), "guest-shutdown failed");
}
}
@ -1319,7 +1320,8 @@ static DWORD WINAPI do_suspend(LPVOID opaque)
DWORD ret = 0;
if (!SetSuspendState(*mode == GUEST_SUSPEND_MODE_DISK, TRUE, TRUE)) {
slog("failed to suspend guest, %lu", GetLastError());
g_autofree gchar *emsg = g_win32_error_message(GetLastError());
slog("failed to suspend guest: %s", emsg);
ret = -1;
}
g_free(mode);

4
util/osdep.c
View File

@ -82,8 +82,8 @@ static int qemu_mprotect__osdep(void *addr, size_t size, int prot)
DWORD old_protect;
if (!VirtualProtect(addr, size, prot, &old_protect)) {
error_report("%s: VirtualProtect failed with error code %ld",
__func__, GetLastError());
g_autofree gchar *emsg = g_win32_error_message(GetLastError());
error_report("%s: VirtualProtect failed: %s", __func__, emsg);
return -1;
}
return 0;