Remove superfluous ERRP_GUARD()
Macro ERRP_GUARD() is only needed when we want to dereference @errp or
pass it to error_prepend() or error_append_hint(). Delete superfluous
ones.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210720125408.387910-15-armbru@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c
index e67a5de..7e84182 100644
--- a/hw/remote/mpqemu-link.c
+++ b/hw/remote/mpqemu-link.c
@@ -34,7 +34,6 @@
*/
bool mpqemu_msg_send(MPQemuMsg *msg, QIOChannel *ioc, Error **errp)
{
- ERRP_GUARD();
bool iolock = qemu_mutex_iothread_locked();
bool iothread = qemu_in_iothread();
struct iovec send[2] = {};
@@ -97,7 +96,6 @@
static ssize_t mpqemu_read(QIOChannel *ioc, void *buf, size_t len, int **fds,
size_t *nfds, Error **errp)
{
- ERRP_GUARD();
struct iovec iov = { .iov_base = buf, .iov_len = len };
bool iolock = qemu_mutex_iothread_locked();
bool iothread = qemu_in_iothread();
@@ -192,7 +190,6 @@
uint64_t mpqemu_msg_send_and_await_reply(MPQemuMsg *msg, PCIProxyDev *pdev,
Error **errp)
{
- ERRP_GUARD();
MPQemuMsg msg_reply = {0};
uint64_t ret = UINT64_MAX;
diff --git a/qga/commands-posix-ssh.c b/qga/commands-posix-ssh.c
index 2dda136..f3a580b 100644
--- a/qga/commands-posix-ssh.c
+++ b/qga/commands-posix-ssh.c
@@ -45,8 +45,6 @@
g_autoptr(GError) err = NULL;
struct passwd *p;
- ERRP_GUARD();
-
p = g_unix_get_passwd_entry_qemu(username, &err);
if (p == NULL) {
error_setg(errp, "failed to lookup user '%s': %s",
@@ -61,8 +59,6 @@
mkdir_for_user(const char *path, const struct passwd *p,
mode_t mode, Error **errp)
{
- ERRP_GUARD();
-
if (g_mkdir(path, mode) == -1) {
error_setg(errp, "failed to create directory '%s': %s",
path, g_strerror(errno));
@@ -87,8 +83,6 @@
static bool
check_openssh_pub_key(const char *key, Error **errp)
{
- ERRP_GUARD();
-
/* simple sanity-check, we may want more? */
if (!key || key[0] == '#' || strchr(key, '\n')) {
error_setg(errp, "invalid OpenSSH public key: '%s'", key);
@@ -104,8 +98,6 @@
size_t n = 0;
strList *k;
- ERRP_GUARD();
-
for (k = keys; k != NULL; k = k->next) {
if (!check_openssh_pub_key(k->value, errp)) {
return false;
@@ -126,8 +118,6 @@
g_autofree char *contents = NULL;
g_autoptr(GError) err = NULL;
- ERRP_GUARD();
-
contents = g_strjoinv("\n", keys);
if (!g_file_set_contents(path, contents, -1, &err)) {
error_setg(errp, "failed to write to '%s': %s", path, err->message);
@@ -155,8 +145,6 @@
g_autoptr(GError) err = NULL;
g_autofree char *contents = NULL;
- ERRP_GUARD();
-
if (!g_file_get_contents(path, &contents, NULL, &err)) {
error_setg(errp, "failed to read '%s': %s", path, err->message);
return NULL;
@@ -178,7 +166,6 @@
strList *k;
size_t nkeys, nauthkeys;
- ERRP_GUARD();
reset = has_reset && reset;
if (!check_openssh_pub_keys(keys, &nkeys, errp)) {
@@ -228,8 +215,6 @@
GStrv a;
size_t nkeys = 0;
- ERRP_GUARD();
-
if (!check_openssh_pub_keys(keys, NULL, errp)) {
return;
}
@@ -277,8 +262,6 @@
g_autoptr(GuestAuthorizedKeys) ret = NULL;
int i;
- ERRP_GUARD();
-
p = get_passwd_entry(username, errp);
if (p == NULL) {
return NULL;
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 7bac0c5..4e84afd 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -976,7 +976,6 @@
GuestDiskInfoList *qmp_guest_get_disks(Error **errp)
{
- ERRP_GUARD();
GuestDiskInfoList *ret = NULL;
HDEVINFO dev_info;
SP_DEVICE_INTERFACE_DATA dev_iface_data;
diff --git a/ui/console.c b/ui/console.c
index 5d2e617..eabbbc9 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1481,7 +1481,6 @@
static bool dpy_compatible_with(QemuConsole *con,
DisplayChangeListener *dcl, Error **errp)
{
- ERRP_GUARD();
int flags;
flags = con->hw_ops->get_flags ? con->hw_ops->get_flags(con->hw) : 0;
