From nobody Mon Feb 9 01:06:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571755566; cv=none; d=zoho.com; s=zohoarc; b=RNhZ9cke61gznBNA4OjPIoKNHtG3NdODFiVai0i+UHTaxsNtmUpVVuZuKCKcEzEYRVEBOK6+o/+fhosJhXGMHyWO2DA7bVZWNKUa/zDmDn4GGIPTYL7lMbJ7wP62xRlxw8IQKjlJVLRrwGlgiUdB/O9WdMta7FQJiyjRe88L+fI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571755566; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QW6vwaSeWzO4KrBw2ZL02WWMkaDUFjNejKbDbqv1uFk=; b=AK1HoB1jSimi5rcF1Pw3uxmVW7Tbem+ckpB9s3pwjEzc0O0fQKPplHt9gGJV4iuKI7VwV1vu2xfwn7TAQd8JL+ZnKllDP1w1XowPzS6NDeXzj2i7y9XpEuM8Ikkza8s+DECEDefBqlEwb5f3qP+gTN3cJltWmY3r5Kvww5EPA9M= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571755566040157.10484681411117; Tue, 22 Oct 2019 07:46:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-53-YwcxV-mOMiu_elaORc6I1g-1; Tue, 22 Oct 2019 10:46:01 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 470941005500; Tue, 22 Oct 2019 14:45:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1AE6F5DE5C; Tue, 22 Oct 2019 14:45:56 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D02D94E58C; Tue, 22 Oct 2019 14:45:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MEjs69006460 for ; Tue, 22 Oct 2019 10:45:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 04C4B52D1; Tue, 22 Oct 2019 14:45:54 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0E42052CC; Tue, 22 Oct 2019 14:45:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571755564; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=QW6vwaSeWzO4KrBw2ZL02WWMkaDUFjNejKbDbqv1uFk=; b=i3oA95z7wQCvXzbBhp49csRTLiph7Mttw8CpKJL1+dh8W44QJEnfWX5Qu33P0aafDX2WHP 0sF9jzZUWZAKI2mcWQwsZCr+bjnWxDuZGF5rSsnyzRZN8ECmE8/fklwuZsDi++aI4qwxvn CxYudSZRY5mdg4JyAJ0uw+3Xbr+VkGY= From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 16:45:44 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 1/4] remote: dispatch: Remove return value from make_nonnull_* helpers X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: YwcxV-mOMiu_elaORc6I1g-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" After convertion to g_strdup, the helpers now always return success. Remove the return value to simplify the callers. Note that many occurences of these is in the code generated by gendispatch.pl. Since gendispatch aggregates many cases together a incremental conversion would require more invasive changes to gendispatch for the time of coversion which doesn't make sense. Also in many cases the helper was the last place where the 'error:' label was used and thus also those conversions must be included in this patch. Signed-off-by: Peter Krempa --- src/admin/admin_server_dispatch.c | 6 +- src/remote/remote_daemon_dispatch.c | 321 ++++++---------------------- src/rpc/gendispatch.pl | 19 +- 3 files changed, 75 insertions(+), 271 deletions(-) diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dis= patch.c index 0956084301..485f7d967c 100644 --- a/src/admin/admin_server_dispatch.c +++ b/src/admin/admin_server_dispatch.c @@ -135,12 +135,11 @@ get_nonnull_server(virNetDaemonPtr dmn, admin_nonnull= _server srv) return virNetDaemonGetServer(dmn, srv.name); } -static int G_GNUC_WARN_UNUSED_RESULT +static void make_nonnull_server(admin_nonnull_server *srv_dst, virNetServerPtr srv_src) { srv_dst->name =3D g_strdup(virNetServerGetName(srv_src)); - return 0; } static virNetServerClientPtr @@ -149,14 +148,13 @@ get_nonnull_client(virNetServerPtr srv, admin_nonnull= _client clnt) return virNetServerGetClient(srv, clnt.id); } -static int +static void make_nonnull_client(admin_nonnull_client *clt_dst, virNetServerClientPtr clt_src) { clt_dst->id =3D virNetServerClientGetID(clt_src); clt_dst->timestamp =3D virNetServerClientGetTimestamp(clt_src); clt_dst->transport =3D virNetServerClientGetTransport(clt_src); - return 0; } /* Functions */ diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index 203aeff8c3..f53c79fec8 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -95,18 +95,18 @@ static virNWFilterBindingPtr get_nonnull_nwfilter_bindi= ng(virConnectPtr conn, re static virDomainCheckpointPtr get_nonnull_domain_checkpoint(virDomainPtr d= om, remote_nonnull_domain_checkpoint checkpoint); static virDomainSnapshotPtr get_nonnull_domain_snapshot(virDomainPtr dom, = remote_nonnull_domain_snapshot snapshot); static virNodeDevicePtr get_nonnull_node_device(virConnectPtr conn, remote= _nonnull_node_device dev); -static int make_nonnull_domain(remote_nonnull_domain *dom_dst, virDomainPt= r dom_src) G_GNUC_WARN_UNUSED_RESULT; -static int make_nonnull_network(remote_nonnull_network *net_dst, virNetwor= kPtr net_src) G_GNUC_WARN_UNUSED_RESULT; -static int make_nonnull_network_port(remote_nonnull_network_port *port_dst= , virNetworkPortPtr port_src) G_GNUC_WARN_UNUSED_RESULT; -static int make_nonnull_interface(remote_nonnull_interface *interface_dst,= virInterfacePtr interface_src) G_GNUC_WARN_UNUSED_RESULT; -static int make_nonnull_storage_pool(remote_nonnull_storage_pool *pool_dst= , virStoragePoolPtr pool_src) G_GNUC_WARN_UNUSED_RESULT; -static int make_nonnull_storage_vol(remote_nonnull_storage_vol *vol_dst, v= irStorageVolPtr vol_src) G_GNUC_WARN_UNUSED_RESULT; -static int make_nonnull_node_device(remote_nonnull_node_device *dev_dst, v= irNodeDevicePtr dev_src) G_GNUC_WARN_UNUSED_RESULT; -static int make_nonnull_secret(remote_nonnull_secret *secret_dst, virSecre= tPtr secret_src) G_GNUC_WARN_UNUSED_RESULT; -static int make_nonnull_nwfilter(remote_nonnull_nwfilter *net_dst, virNWFi= lterPtr nwfilter_src) G_GNUC_WARN_UNUSED_RESULT; -static int make_nonnull_nwfilter_binding(remote_nonnull_nwfilter_binding *= binding_dst, virNWFilterBindingPtr binding_src) G_GNUC_WARN_UNUSED_RESULT; -static int make_nonnull_domain_checkpoint(remote_nonnull_domain_checkpoint= *checkpoint_dst, virDomainCheckpointPtr checkpoint_src) G_GNUC_WARN_UNUSED= _RESULT; -static int make_nonnull_domain_snapshot(remote_nonnull_domain_snapshot *sn= apshot_dst, virDomainSnapshotPtr snapshot_src) G_GNUC_WARN_UNUSED_RESULT; +static void make_nonnull_domain(remote_nonnull_domain *dom_dst, virDomainP= tr dom_src); +static void make_nonnull_network(remote_nonnull_network *net_dst, virNetwo= rkPtr net_src); +static void make_nonnull_network_port(remote_nonnull_network_port *port_ds= t, virNetworkPortPtr port_src); +static void make_nonnull_interface(remote_nonnull_interface *interface_dst= , virInterfacePtr interface_src); +static void make_nonnull_storage_pool(remote_nonnull_storage_pool *pool_ds= t, virStoragePoolPtr pool_src); +static void make_nonnull_storage_vol(remote_nonnull_storage_vol *vol_dst, = virStorageVolPtr vol_src); +static void make_nonnull_node_device(remote_nonnull_node_device *dev_dst, = virNodeDevicePtr dev_src); +static void make_nonnull_secret(remote_nonnull_secret *secret_dst, virSecr= etPtr secret_src); +static void make_nonnull_nwfilter(remote_nonnull_nwfilter *net_dst, virNWF= ilterPtr nwfilter_src); +static void make_nonnull_nwfilter_binding(remote_nonnull_nwfilter_binding = *binding_dst, virNWFilterBindingPtr binding_src); +static void make_nonnull_domain_checkpoint(remote_nonnull_domain_checkpoin= t *checkpoint_dst, virDomainCheckpointPtr checkpoint_src); +static void make_nonnull_domain_snapshot(remote_nonnull_domain_snapshot *s= napshot_dst, virDomainSnapshotPtr snapshot_src); static int remoteSerializeDomainDiskErrors(virDomainDiskErrorPtr errors, @@ -329,8 +329,7 @@ remoteRelayDomainEventLifecycle(virConnectPtr conn, /* build return data */ memset(&data, 0, sizeof(data)); - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); data.event =3D event; data.detail =3D detail; @@ -350,11 +349,6 @@ remoteRelayDomainEventLifecycle(virConnectPtr conn, } return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_domain_event_lifecycle_msg, - (char *) &data); - return -1; } static int @@ -374,8 +368,7 @@ remoteRelayDomainEventReboot(virConnectPtr conn, /* build return data */ memset(&data, 0, sizeof(data)); - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); if (callback->legacy) { remoteDispatchObjectEventSend(callback->client, remoteProgram, @@ -391,11 +384,6 @@ remoteRelayDomainEventReboot(virConnectPtr conn, } return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_domain_event_reboot_msg, - (char *) &data); - return -1; } @@ -418,8 +406,7 @@ remoteRelayDomainEventRTCChange(virConnectPtr conn, /* build return data */ memset(&data, 0, sizeof(data)); - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); data.offset =3D offset; if (callback->legacy) { @@ -436,11 +423,6 @@ remoteRelayDomainEventRTCChange(virConnectPtr conn, } return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_domain_event_rtc_change_msg, - (char *) &data); - return -1; } @@ -462,8 +444,7 @@ remoteRelayDomainEventWatchdog(virConnectPtr conn, /* build return data */ memset(&data, 0, sizeof(data)); - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); data.action =3D action; if (callback->legacy) { @@ -480,11 +461,6 @@ remoteRelayDomainEventWatchdog(virConnectPtr conn, } return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_domain_event_watchdog_msg, - (char *) &data); - return -1; } @@ -511,8 +487,7 @@ remoteRelayDomainEventIOError(virConnectPtr conn, memset(&data, 0, sizeof(data)); data.srcPath =3D g_strdup(srcPath); data.devAlias =3D g_strdup(devAlias); - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); data.action =3D action; if (callback->legacy) { @@ -529,10 +504,6 @@ remoteRelayDomainEventIOError(virConnectPtr conn, } return 0; - error: - xdr_free((xdrproc_t)xdr_remote_domain_event_io_error_msg, - (char *) &data); - return -1; } @@ -562,9 +533,7 @@ remoteRelayDomainEventIOErrorReason(virConnectPtr conn, data.devAlias =3D g_strdup(devAlias); data.reason =3D g_strdup(reason); data.action =3D action; - - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); if (callback->legacy) { remoteDispatchObjectEventSend(callback->client, remoteProgram, @@ -580,11 +549,6 @@ remoteRelayDomainEventIOErrorReason(virConnectPtr conn, } return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_domain_event_io_error_reason_msg, - (char *) &data); - return -1; } @@ -639,8 +603,7 @@ remoteRelayDomainEventGraphics(virConnectPtr conn, data.subject.subject_val[i].type =3D g_strdup(subject->identities[= i].type); data.subject.subject_val[i].name =3D g_strdup(subject->identities[= i].name); } - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); if (callback->legacy) { remoteDispatchObjectEventSend(callback->client, remoteProgram, @@ -658,7 +621,7 @@ remoteRelayDomainEventGraphics(virConnectPtr conn, return 0; error: - xdr_free((xdrproc_t)xdr_remote_domain_event_graphics_msg, + xdr_free((xdrproc_t)xdr_remote_domain_event_lifecycle_msg, (char *) &data); return -1; } @@ -686,8 +649,7 @@ remoteRelayDomainEventBlockJob(virConnectPtr conn, data.path =3D g_strdup(path); data.type =3D type; data.status =3D status; - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); if (callback->legacy) { remoteDispatchObjectEventSend(callback->client, remoteProgram, @@ -703,11 +665,6 @@ remoteRelayDomainEventBlockJob(virConnectPtr conn, } return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_domain_event_block_job_msg, - (char *) &data); - return -1; } @@ -728,8 +685,7 @@ remoteRelayDomainEventControlError(virConnectPtr conn, /* build return data */ memset(&data, 0, sizeof(data)); - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); if (callback->legacy) { remoteDispatchObjectEventSend(callback->client, remoteProgram, @@ -745,11 +701,6 @@ remoteRelayDomainEventControlError(virConnectPtr conn, } return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_domain_event_control_error_msg, - (char *) &data); - return -1; } @@ -789,9 +740,7 @@ remoteRelayDomainEventDiskChange(virConnectPtr conn, data.devAlias =3D g_strdup(devAlias); data.reason =3D reason; - - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); if (callback->legacy) { remoteDispatchObjectEventSend(callback->client, remoteProgram, @@ -837,9 +786,7 @@ remoteRelayDomainEventTrayChange(virConnectPtr conn, data.devAlias =3D g_strdup(devAlias); data.reason =3D reason; - - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); if (callback->legacy) { remoteDispatchObjectEventSend(callback->client, remoteProgram, @@ -855,11 +802,6 @@ remoteRelayDomainEventTrayChange(virConnectPtr conn, } return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_domain_event_tray_change_msg, - (char *) &data); - return -1; } static int @@ -880,8 +822,7 @@ remoteRelayDomainEventPMWakeup(virConnectPtr conn, /* build return data */ memset(&data, 0, sizeof(data)); - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); if (callback->legacy) { remoteDispatchObjectEventSend(callback->client, remoteProgram, @@ -897,11 +838,6 @@ remoteRelayDomainEventPMWakeup(virConnectPtr conn, } return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_domain_event_pmwakeup_msg, - (char *) &data); - return -1; } static int @@ -922,8 +858,7 @@ remoteRelayDomainEventPMSuspend(virConnectPtr conn, /* build return data */ memset(&data, 0, sizeof(data)); - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); if (callback->legacy) { remoteDispatchObjectEventSend(callback->client, remoteProgram, @@ -939,11 +874,6 @@ remoteRelayDomainEventPMSuspend(virConnectPtr conn, } return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_domain_event_pmsuspend_msg, - (char *) &data); - return -1; } static int @@ -964,8 +894,7 @@ remoteRelayDomainEventBalloonChange(virConnectPtr conn, /* build return data */ memset(&data, 0, sizeof(data)); - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); data.actual =3D actual; if (callback->legacy) { @@ -982,11 +911,6 @@ remoteRelayDomainEventBalloonChange(virConnectPtr conn, } return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_domain_event_balloon_change_msg, - (char *) &data); - return -1; } @@ -1008,8 +932,7 @@ remoteRelayDomainEventPMSuspendDisk(virConnectPtr conn, /* build return data */ memset(&data, 0, sizeof(data)); - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); if (callback->legacy) { remoteDispatchObjectEventSend(callback->client, remoteProgram, @@ -1025,11 +948,6 @@ remoteRelayDomainEventPMSuspendDisk(virConnectPtr con= n, } return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_domain_event_pmsuspend_disk_msg, - (char *) &data); - return -1; } static int @@ -1053,8 +971,7 @@ remoteRelayDomainEventDeviceRemoved(virConnectPtr conn, data.devAlias =3D g_strdup(devAlias); - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); if (callback->legacy) { remoteDispatchObjectEventSend(callback->client, remoteProgram, @@ -1072,11 +989,6 @@ remoteRelayDomainEventDeviceRemoved(virConnectPtr con= n, } return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_domain_event_device_removed_msg, - (char *) &data); - return -1; } @@ -1104,19 +1016,13 @@ remoteRelayDomainEventBlockJob2(virConnectPtr conn, data.dst =3D g_strdup(dst); data.type =3D type; data.status =3D status; - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); remoteDispatchObjectEventSend(callback->client, remoteProgram, REMOTE_PROC_DOMAIN_EVENT_BLOCK_JOB_2, (xdrproc_t)xdr_remote_domain_event_block= _job_2_msg, &data); return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_domain_event_block_job_2_msg, - (char *) &data); - return -1; } @@ -1140,8 +1046,7 @@ remoteRelayDomainEventTunable(virConnectPtr conn, /* build return data */ memset(&data, 0, sizeof(data)); data.callbackID =3D callback->callbackID; - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); if (virTypedParamsSerialize(params, nparams, REMOTE_DOMAIN_EVENT_TUNABLE_MAX, @@ -1186,9 +1091,7 @@ remoteRelayDomainEventAgentLifecycle(virConnectPtr co= nn, /* build return data */ memset(&data, 0, sizeof(data)); data.callbackID =3D callback->callbackID; - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; - + make_nonnull_domain(&data.dom, dom); data.state =3D state; data.reason =3D reason; @@ -1198,11 +1101,6 @@ remoteRelayDomainEventAgentLifecycle(virConnectPtr c= onn, &data); return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_domain_event_callback_agent_lifecycle_m= sg, - (char *) &data); - return -1; } @@ -1226,9 +1124,7 @@ remoteRelayDomainEventDeviceAdded(virConnectPtr conn, memset(&data, 0, sizeof(data)); data.devAlias =3D g_strdup(devAlias); - - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); data.callbackID =3D callback->callbackID; remoteDispatchObjectEventSend(callback->client, remoteProgram, @@ -1237,11 +1133,6 @@ remoteRelayDomainEventDeviceAdded(virConnectPtr conn, &data); return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_domain_event_callback_device_added_msg, - (char *) &data); - return -1; } @@ -1265,8 +1156,7 @@ remoteRelayDomainEventMigrationIteration(virConnectPt= r conn, /* build return data */ memset(&data, 0, sizeof(data)); data.callbackID =3D callback->callbackID; - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); data.iteration =3D iteration; @@ -1276,11 +1166,6 @@ remoteRelayDomainEventMigrationIteration(virConnectP= tr conn, &data); return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_domain_event_callback_migration_iterati= on_msg, - (char *) &data); - return -1; } @@ -1305,8 +1190,7 @@ remoteRelayDomainEventJobCompleted(virConnectPtr conn, /* build return data */ memset(&data, 0, sizeof(data)); data.callbackID =3D callback->callbackID; - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); if (virTypedParamsSerialize(params, nparams, REMOTE_DOMAIN_JOB_STATS_MAX, @@ -1350,8 +1234,7 @@ remoteRelayDomainEventDeviceRemovalFailed(virConnectP= tr conn, data.devAlias =3D g_strdup(devAlias); - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); data.callbackID =3D callback->callbackID; remoteDispatchObjectEventSend(callback->client, remoteProgram, @@ -1360,11 +1243,6 @@ remoteRelayDomainEventDeviceRemovalFailed(virConnect= Ptr conn, &data); return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_domain_event_callback_device_removal_fa= iled_msg, - (char *) &data); - return -1; } @@ -1395,8 +1273,7 @@ remoteRelayDomainEventMetadataChange(virConnectPtr co= nn, *(data.nsuri) =3D g_strdup(nsuri); } - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); data.callbackID =3D callback->callbackID; remoteDispatchObjectEventSend(callback->client, remoteProgram, @@ -1443,8 +1320,7 @@ remoteRelayDomainEventBlockThreshold(virConnectPtr co= nn, } data.threshold =3D threshold; data.excess =3D excess; - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); remoteDispatchObjectEventSend(callback->client, remoteProgram, REMOTE_PROC_DOMAIN_EVENT_BLOCK_THRESHOLD, @@ -1508,8 +1384,7 @@ remoteRelayNetworkEventLifecycle(virConnectPtr conn, /* build return data */ memset(&data, 0, sizeof(data)); - if (make_nonnull_network(&data.net, net) < 0) - goto error; + make_nonnull_network(&data.net, net); data.callbackID =3D callback->callbackID; data.event =3D event; data.detail =3D detail; @@ -1519,11 +1394,6 @@ remoteRelayNetworkEventLifecycle(virConnectPtr conn, (xdrproc_t)xdr_remote_network_event_life= cycle_msg, &data); return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_network_event_lifecycle_msg, - (char *) &data); - return -1; } static virConnectNetworkEventGenericCallback networkEventCallbacks[] =3D { @@ -1551,8 +1421,7 @@ remoteRelayStoragePoolEventLifecycle(virConnectPtr co= nn, /* build return data */ memset(&data, 0, sizeof(data)); - if (make_nonnull_storage_pool(&data.pool, pool) < 0) - goto error; + make_nonnull_storage_pool(&data.pool, pool); data.callbackID =3D callback->callbackID; data.event =3D event; data.detail =3D detail; @@ -1563,11 +1432,6 @@ remoteRelayStoragePoolEventLifecycle(virConnectPtr c= onn, &data); return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_storage_pool_event_lifecycle_msg, - (char *) &data); - return -1; } static int @@ -1587,8 +1451,7 @@ remoteRelayStoragePoolEventRefresh(virConnectPtr conn, /* build return data */ memset(&data, 0, sizeof(data)); - if (make_nonnull_storage_pool(&data.pool, pool) < 0) - goto error; + make_nonnull_storage_pool(&data.pool, pool); data.callbackID =3D callback->callbackID; remoteDispatchObjectEventSend(callback->client, remoteProgram, @@ -1597,11 +1460,6 @@ remoteRelayStoragePoolEventRefresh(virConnectPtr con= n, &data); return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_storage_pool_event_refresh_msg, - (char *) &data); - return -1; } static virConnectStoragePoolEventGenericCallback storageEventCallbacks[] = =3D { @@ -1630,8 +1488,7 @@ remoteRelayNodeDeviceEventLifecycle(virConnectPtr con= n, /* build return data */ memset(&data, 0, sizeof(data)); - if (make_nonnull_node_device(&data.dev, dev) < 0) - goto error; + make_nonnull_node_device(&data.dev, dev); data.callbackID =3D callback->callbackID; data.event =3D event; data.detail =3D detail; @@ -1642,11 +1499,6 @@ remoteRelayNodeDeviceEventLifecycle(virConnectPtr co= nn, &data); return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_node_device_event_lifecycle_msg, - (char *) &data); - return -1; } static int @@ -1666,8 +1518,7 @@ remoteRelayNodeDeviceEventUpdate(virConnectPtr conn, /* build return data */ memset(&data, 0, sizeof(data)); - if (make_nonnull_node_device(&data.dev, dev) < 0) - goto error; + make_nonnull_node_device(&data.dev, dev); data.callbackID =3D callback->callbackID; remoteDispatchObjectEventSend(callback->client, remoteProgram, @@ -1676,11 +1527,6 @@ remoteRelayNodeDeviceEventUpdate(virConnectPtr conn, &data); return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_node_device_event_update_msg, - (char *) &data); - return -1; } static virConnectNodeDeviceEventGenericCallback nodeDeviceEventCallbacks[]= =3D { @@ -1709,8 +1555,7 @@ remoteRelaySecretEventLifecycle(virConnectPtr conn, /* build return data */ memset(&data, 0, sizeof(data)); - if (make_nonnull_secret(&data.secret, secret) < 0) - goto error; + make_nonnull_secret(&data.secret, secret); data.callbackID =3D callback->callbackID; data.event =3D event; data.detail =3D detail; @@ -1721,11 +1566,6 @@ remoteRelaySecretEventLifecycle(virConnectPtr conn, &data); return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_secret_event_lifecycle_msg, - (char *) &data); - return -1; } static int @@ -1745,8 +1585,7 @@ remoteRelaySecretEventValueChanged(virConnectPtr conn, /* build return data */ memset(&data, 0, sizeof(data)); - if (make_nonnull_secret(&data.secret, secret) < 0) - goto error; + make_nonnull_secret(&data.secret, secret); data.callbackID =3D callback->callbackID; remoteDispatchObjectEventSend(callback->client, remoteProgram, @@ -1755,11 +1594,6 @@ remoteRelaySecretEventValueChanged(virConnectPtr con= n, &data); return 0; - - error: - xdr_free((xdrproc_t)xdr_remote_secret_event_value_changed_msg, - (char *) &data); - return -1; } static virConnectSecretEventGenericCallback secretEventCallbacks[] =3D { @@ -1800,8 +1634,7 @@ remoteRelayDomainQemuMonitorEvent(virConnectPtr conn, goto error; *(data.details) =3D g_strdup(details); } - if (make_nonnull_domain(&data.dom, dom) < 0) - goto error; + make_nonnull_domain(&data.dom, dom); remoteDispatchObjectEventSend(callback->client, qemuProgram, QEMU_PROC_DOMAIN_MONITOR_EVENT, @@ -5115,8 +4948,7 @@ remoteDispatchDomainMigrateFinish3(virNetServerPtr se= rver G_GNUC_UNUSED, args->cancelled))) goto cleanup; - if (make_nonnull_domain(&ret->dom, dom) < 0) - goto cleanup; + make_nonnull_domain(&ret->dom, dom); /* remoteDispatchClientRequest will free cookie */ @@ -5995,8 +5827,7 @@ remoteDispatchDomainMigrateFinish3Params(virNetServer= Ptr server G_GNUC_UNUSED, if (!dom) goto cleanup; - if (make_nonnull_domain(&ret->dom, dom) < 0) - goto cleanup; + make_nonnull_domain(&ret->dom, dom); ret->cookie_out.cookie_out_len =3D cookieoutlen; ret->cookie_out.cookie_out_val =3D cookieout; @@ -6142,8 +5973,7 @@ remoteDispatchDomainCreateXMLWithFiles(virNetServerPt= r server G_GNUC_UNUSED, args->flags)) =3D=3D NULL) goto cleanup; - if (make_nonnull_domain(&ret->dom, dom) < 0) - goto cleanup; + make_nonnull_domain(&ret->dom, dom); rv =3D 0; @@ -6191,8 +6021,7 @@ static int remoteDispatchDomainCreateWithFiles(virNet= ServerPtr server G_GNUC_UNU args->flags) < 0) goto cleanup; - if (make_nonnull_domain(&ret->dom, dom) < 0) - goto cleanup; + make_nonnull_domain(&ret->dom, dom); rv =3D 0; @@ -7068,8 +6897,7 @@ remoteDispatchConnectGetAllDomainStats(virNetServerPt= r server G_GNUC_UNUSED, for (i =3D 0; i < nrecords; i++) { remote_domain_stats_record *dst =3D ret->retStats.retStats_val= + i; - if (make_nonnull_domain(&dst->dom, retStats[i]->dom) < 0) - goto cleanup; + make_nonnull_domain(&dst->dom, retStats[i]->dom); if (virTypedParamsSerialize(retStats[i]->params, retStats[i]->nparams, @@ -7534,111 +7362,92 @@ get_nonnull_node_device(virConnectPtr conn, remote= _nonnull_node_device dev) return virGetNodeDevice(conn, dev.name); } -/* Make remote_nonnull_domain and remote_nonnull_network. */ -static int +static void make_nonnull_domain(remote_nonnull_domain *dom_dst, virDomainPtr dom_src) { dom_dst->id =3D dom_src->id; dom_dst->name =3D g_strdup(dom_src->name); memcpy(dom_dst->uuid, dom_src->uuid, VIR_UUID_BUFLEN); - return 0; } -static int +static void make_nonnull_network(remote_nonnull_network *net_dst, virNetworkPtr net_sr= c) { net_dst->name =3D g_strdup(net_src->name); memcpy(net_dst->uuid, net_src->uuid, VIR_UUID_BUFLEN); - return 0; } -static int +static void make_nonnull_network_port(remote_nonnull_network_port *port_dst, virNetwor= kPortPtr port_src) { port_dst->net.name =3D g_strdup(port_src->net->name); memcpy(port_dst->net.uuid, port_src->net->uuid, VIR_UUID_BUFLEN); memcpy(port_dst->uuid, port_src->uuid, VIR_UUID_BUFLEN); - return 0; } -static int +static void make_nonnull_interface(remote_nonnull_interface *interface_dst, virInterfacePtr interface_src) { interface_dst->name =3D g_strdup(interface_src->name); interface_dst->mac =3D g_strdup(interface_src->mac); - return 0; } -static int +static void make_nonnull_storage_pool(remote_nonnull_storage_pool *pool_dst, virStorag= ePoolPtr pool_src) { pool_dst->name =3D g_strdup(pool_src->name); memcpy(pool_dst->uuid, pool_src->uuid, VIR_UUID_BUFLEN); - return 0; } -static int +static void make_nonnull_storage_vol(remote_nonnull_storage_vol *vol_dst, virStorageVo= lPtr vol_src) { vol_dst->pool =3D g_strdup(vol_src->pool); vol_dst->name =3D g_strdup(vol_src->name); vol_dst->key =3D g_strdup(vol_src->key); - return 0; } -static int +static void make_nonnull_node_device(remote_nonnull_node_device *dev_dst, virNodeDevic= ePtr dev_src) { dev_dst->name =3D g_strdup(dev_src->name); - return 0; } -static int +static void make_nonnull_secret(remote_nonnull_secret *secret_dst, virSecretPtr secret= _src) { memcpy(secret_dst->uuid, secret_src->uuid, VIR_UUID_BUFLEN); secret_dst->usageType =3D secret_src->usageType; secret_dst->usageID =3D g_strdup(secret_src->usageID); - return 0; } -static int +static void make_nonnull_nwfilter(remote_nonnull_nwfilter *nwfilter_dst, virNWFilterPt= r nwfilter_src) { nwfilter_dst->name =3D g_strdup(nwfilter_src->name); memcpy(nwfilter_dst->uuid, nwfilter_src->uuid, VIR_UUID_BUFLEN); - return 0; } -static int +static void make_nonnull_nwfilter_binding(remote_nonnull_nwfilter_binding *binding_dst= , virNWFilterBindingPtr binding_src) { binding_dst->portdev =3D g_strdup(binding_src->portdev); binding_dst->filtername =3D g_strdup(binding_src->filtername); - return 0; } -static int +static void make_nonnull_domain_checkpoint(remote_nonnull_domain_checkpoint *checkpoin= t_dst, virDomainCheckpointPtr checkpoint_src) { checkpoint_dst->name =3D g_strdup(checkpoint_src->name); - if (make_nonnull_domain(&checkpoint_dst->dom, checkpoint_src->domain) = < 0) { - VIR_FREE(checkpoint_dst->name); - return -1; - } - return 0; + make_nonnull_domain(&checkpoint_dst->dom, checkpoint_src->domain); } -static int +static void make_nonnull_domain_snapshot(remote_nonnull_domain_snapshot *snapshot_dst,= virDomainSnapshotPtr snapshot_src) { snapshot_dst->name =3D g_strdup(snapshot_src->name); - if (make_nonnull_domain(&snapshot_dst->dom, snapshot_src->domain) < 0)= { - VIR_FREE(snapshot_dst->name); - return -1; - } - return 0; + make_nonnull_domain(&snapshot_dst->dom, snapshot_src->domain); } static int diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index fab4513fd1..7c868191d1 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -805,12 +805,12 @@ elsif ($mode eq "server") { if ($call->{ProcName} eq "DomainCreateWithFlags") { # SPECIAL: virDomainCreateWithFlags updates the gi= ven # domain object instead of returning a ne= w one - push(@ret_list, "if (make_nonnull_$1(&ret->$2, $2)= < 0)\n goto cleanup;\n"); + push(@ret_list, "make_nonnull_$1(&ret->$2, $2);\n"= ); $single_ret_var =3D undef; $single_ret_by_ref =3D 1; } else { push(@vars_list, "vir${type_name}Ptr $2 =3D NULL"); - push(@ret_list, "if (make_nonnull_$1(&ret->$2, $2)= < 0)\n goto cleanup;\n"); + push(@ret_list, "make_nonnull_$1(&ret->$2, $2);\n"= ); push(@free_list, " virObjectUnref($2);"); $single_ret_var =3D $2; @@ -926,11 +926,11 @@ elsif ($mode eq "server") { if ($1 eq "client") { push(@vars_list, "virNetServer${type_name}Ptr $2 = =3D NULL"); - push(@ret_list, "if (make_nonnull_$1(&ret->$2, $2)= < 0)\n goto cleanup;\n"); - push(@ret_list, "if (make_nonnull_server(&ret->$2.= srv, srv) < 0)\n goto cleanup;\n"); + push(@ret_list, "make_nonnull_$1(&ret->$2, $2);\n"= ); + push(@ret_list, "make_nonnull_server(&ret->$2.srv,= srv);\n"); } else { push(@vars_list, "virNet${type_name}Ptr $2 =3D NUL= L"); - push(@ret_list, "if (make_nonnull_$1(&ret->$2, $2)= < 0)\n goto cleanup;\n"); + push(@ret_list, "make_nonnull_$1(&ret->$2, $2);"); } push(@free_list, @@ -1187,15 +1187,12 @@ elsif ($mode eq "server") { print " ret->$single_ret_list_name.${single_ret_list_na= me}_len =3D nresults;\n"; if ($modern_ret_is_nested) { print " for (i =3D 0; i < nresults; i++) {\n"; - print " if (make_nonnull_$modern_ret_struct_nam= e(ret->$single_ret_list_name.${single_ret_list_name}_val + i, result[i]) < = 0)\n"; - print " goto cleanup;\n"; - print " if (make_nonnull_$modern_ret_nested_str= uct_name(&ret->$single_ret_list_name.${single_ret_list_name}_val[i].srv, sr= v) < 0)\n"; - print " goto cleanup;\n"; + print " make_nonnull_$modern_ret_struct_name(re= t->$single_ret_list_name.${single_ret_list_name}_val + i, result[i]);\n"; + print " make_nonnull_$modern_ret_nested_struct_= name(&ret->$single_ret_list_name.${single_ret_list_name}_val[i].srv, srv);\= n"; print " }\n"; } else { print " for (i =3D 0; i < nresults; i++)\n"; - print " if (make_nonnull_$modern_ret_struct_nam= e(ret->$single_ret_list_name.${single_ret_list_name}_val + i, result[i]) < = 0)\n"; - print " goto cleanup;\n"; + print " make_nonnull_$modern_ret_struct_name(re= t->$single_ret_list_name.${single_ret_list_name}_val + i, result[i]);\n"; } print " } else {\n"; print " ret->$single_ret_list_name.${single_ret_list_na= me}_len =3D 0;\n"; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list