fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vfio scsi ui: Error-check qio_channel_socket_connect_sync() the same way

Browse source 
qio_channel_socket_connect_sync() returns 0 on success, and -1 on
failure, with errp set.  Some callers check the return value, and some
check whether errp was set.

For consistency, always check the return value, and always check it's
negative.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20250723133257.1497640-3-armbru@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
This commit is contained in:
Markus Armbruster 2025-07-23 15:32:57 +02:00
parent b2e4534a2c
commit ec14a3de62
3 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/vfio-user/proxy.c
View file

@ -885,7 +885,7 @@ VFIOUserProxy *vfio_user_connect_dev(SocketAddress *addr, Error **errp)
sioc = qio_channel_socket_new(); sioc = qio_channel_socket_new();
ioc = QIO_CHANNEL(sioc); ioc = QIO_CHANNEL(sioc);
if (qio_channel_socket_connect_sync(sioc, addr, errp)) { if (qio_channel_socket_connect_sync(sioc, addr, errp) < 0) {
object_unref(OBJECT(ioc)); object_unref(OBJECT(ioc));
return NULL; return NULL;
} }

9
scsi/pr-manager-helper.c
View file

@ -105,20 +105,15 @@ static int pr_manager_helper_initialize(PRManagerHelper *pr_mgr,
.u.q_unix.path = path .u.q_unix.path = path
}; };
QIOChannelSocket *sioc = qio_channel_socket_new(); QIOChannelSocket *sioc = qio_channel_socket_new();
Error *local_err = NULL;
uint32_t flags; uint32_t flags;
int r; int r;
assert(!pr_mgr->ioc); assert(!pr_mgr->ioc);
qio_channel_set_name(QIO_CHANNEL(sioc), "pr-manager-helper"); qio_channel_set_name(QIO_CHANNEL(sioc), "pr-manager-helper");
qio_channel_socket_connect_sync(sioc, r = qio_channel_socket_connect_sync(sioc, &saddr, errp);
&saddr,
&local_err);
g_free(path); g_free(path);
if (local_err) { if (r < 0) {
object_unref(OBJECT(sioc)); object_unref(OBJECT(sioc));
error_propagate(errp, local_err);
return -ENOTCONN; return -ENOTCONN;
} }

5
ui/input-barrier.c
View file

@ -490,7 +490,6 @@ static gboolean input_barrier_event(QIOChannel *ioc G_GNUC_UNUSED,
static void input_barrier_complete(UserCreatable *uc, Error **errp) static void input_barrier_complete(UserCreatable *uc, Error **errp)
{ {
InputBarrier *ib = INPUT_BARRIER(uc); InputBarrier *ib = INPUT_BARRIER(uc);
Error *local_err = NULL;
if (!ib->name) { if (!ib->name) {
error_setg(errp, QERR_MISSING_PARAMETER, "name"); error_setg(errp, QERR_MISSING_PARAMETER, "name");
@ -506,9 +505,7 @@ static void input_barrier_complete(UserCreatable *uc, Error **errp)
ib->sioc = qio_channel_socket_new(); ib->sioc = qio_channel_socket_new();
qio_channel_set_name(QIO_CHANNEL(ib->sioc), "barrier-client"); qio_channel_set_name(QIO_CHANNEL(ib->sioc), "barrier-client");
qio_channel_socket_connect_sync(ib->sioc, &ib->saddr, &local_err); if (qio_channel_socket_connect_sync(ib->sioc, &ib->saddr, errp) < 0) {
if (local_err) {
error_propagate(errp, local_err);
return; return;
} }