diff --git a/daemon/qemu_dispatch_prototypes.h b/daemon/qemu_dispatch_prototypes.h
index e6c83ba90951df439e2f2b8fb6645d6b2da6849e..4ec1ab4c02cf2628b921c068ca2d225e90e705ba 100644
--- a/daemon/qemu_dispatch_prototypes.h
+++ b/daemon/qemu_dispatch_prototypes.h
@@ -7,6 +7,6 @@ static int qemuDispatchMonitorCommand(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     qemu_monitor_command_args *args,
     qemu_monitor_command_ret *ret);
diff --git a/daemon/remote_dispatch_prototypes.h b/daemon/remote_dispatch_prototypes.h
index 18bf41d555959cb655235da6ca098d4137f9f096..cf2f38c6e46d8e3be9e26da3ffc7e6f279bcc2e7 100644
--- a/daemon/remote_dispatch_prototypes.h
+++ b/daemon/remote_dispatch_prototypes.h
@@ -7,7 +7,7 @@ static int remoteDispatchAuthList(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_auth_list_ret *ret);
 static int remoteDispatchAuthPolkit(
@@ -15,7 +15,7 @@ static int remoteDispatchAuthPolkit(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_auth_polkit_ret *ret);
 static int remoteDispatchAuthSaslInit(
@@ -23,7 +23,7 @@ static int remoteDispatchAuthSaslInit(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_auth_sasl_init_ret *ret);
 static int remoteDispatchAuthSaslStart(
@@ -31,7 +31,7 @@ static int remoteDispatchAuthSaslStart(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_auth_sasl_start_args *args,
     remote_auth_sasl_start_ret *ret);
 static int remoteDispatchAuthSaslStep(
@@ -39,7 +39,7 @@ static int remoteDispatchAuthSaslStep(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_auth_sasl_step_args *args,
     remote_auth_sasl_step_ret *ret);
 static int remoteDispatchClose(
@@ -47,7 +47,7 @@ static int remoteDispatchClose(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     void *ret);
 static int remoteDispatchCpuBaseline(
@@ -55,7 +55,7 @@ static int remoteDispatchCpuBaseline(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_cpu_baseline_args *args,
     remote_cpu_baseline_ret *ret);
 static int remoteDispatchCpuCompare(
@@ -63,7 +63,7 @@ static int remoteDispatchCpuCompare(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_cpu_compare_args *args,
     remote_cpu_compare_ret *ret);
 static int remoteDispatchDomainAbortJob(
@@ -71,7 +71,7 @@ static int remoteDispatchDomainAbortJob(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_abort_job_args *args,
     void *ret);
 static int remoteDispatchDomainAttachDevice(
@@ -79,7 +79,7 @@ static int remoteDispatchDomainAttachDevice(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_attach_device_args *args,
     void *ret);
 static int remoteDispatchDomainAttachDeviceFlags(
@@ -87,7 +87,7 @@ static int remoteDispatchDomainAttachDeviceFlags(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_attach_device_flags_args *args,
     void *ret);
 static int remoteDispatchDomainBlockPeek(
@@ -95,7 +95,7 @@ static int remoteDispatchDomainBlockPeek(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_block_peek_args *args,
     remote_domain_block_peek_ret *ret);
 static int remoteDispatchDomainBlockStats(
@@ -103,7 +103,7 @@ static int remoteDispatchDomainBlockStats(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_block_stats_args *args,
     remote_domain_block_stats_ret *ret);
 static int remoteDispatchDomainCoreDump(
@@ -111,7 +111,7 @@ static int remoteDispatchDomainCoreDump(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_core_dump_args *args,
     void *ret);
 static int remoteDispatchDomainCreate(
@@ -119,7 +119,7 @@ static int remoteDispatchDomainCreate(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_create_args *args,
     void *ret);
 static int remoteDispatchDomainCreateWithFlags(
@@ -127,7 +127,7 @@ static int remoteDispatchDomainCreateWithFlags(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_create_with_flags_args *args,
     remote_domain_create_with_flags_ret *ret);
 static int remoteDispatchDomainCreateXml(
@@ -135,7 +135,7 @@ static int remoteDispatchDomainCreateXml(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_create_xml_args *args,
     remote_domain_create_xml_ret *ret);
 static int remoteDispatchDomainDefineXml(
@@ -143,7 +143,7 @@ static int remoteDispatchDomainDefineXml(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_define_xml_args *args,
     remote_domain_define_xml_ret *ret);
 static int remoteDispatchDomainDestroy(
@@ -151,7 +151,7 @@ static int remoteDispatchDomainDestroy(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_destroy_args *args,
     void *ret);
 static int remoteDispatchDomainDetachDevice(
@@ -159,7 +159,7 @@ static int remoteDispatchDomainDetachDevice(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_detach_device_args *args,
     void *ret);
 static int remoteDispatchDomainDetachDeviceFlags(
@@ -167,7 +167,7 @@ static int remoteDispatchDomainDetachDeviceFlags(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_detach_device_flags_args *args,
     void *ret);
 static int remoteDispatchDomainDumpXml(
@@ -175,7 +175,7 @@ static int remoteDispatchDomainDumpXml(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_dump_xml_args *args,
     remote_domain_dump_xml_ret *ret);
 static int remoteDispatchDomainEventsDeregister(
@@ -183,7 +183,7 @@ static int remoteDispatchDomainEventsDeregister(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_domain_events_deregister_ret *ret);
 static int remoteDispatchDomainEventsDeregisterAny(
@@ -191,7 +191,7 @@ static int remoteDispatchDomainEventsDeregisterAny(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_events_deregister_any_args *args,
     void *ret);
 static int remoteDispatchDomainEventsRegister(
@@ -199,7 +199,7 @@ static int remoteDispatchDomainEventsRegister(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_domain_events_register_ret *ret);
 static int remoteDispatchDomainEventsRegisterAny(
@@ -207,7 +207,7 @@ static int remoteDispatchDomainEventsRegisterAny(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_events_register_any_args *args,
     void *ret);
 static int remoteDispatchDomainGetAutostart(
@@ -215,7 +215,7 @@ static int remoteDispatchDomainGetAutostart(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_get_autostart_args *args,
     remote_domain_get_autostart_ret *ret);
 static int remoteDispatchDomainGetBlkioParameters(
@@ -223,7 +223,7 @@ static int remoteDispatchDomainGetBlkioParameters(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_get_blkio_parameters_args *args,
     remote_domain_get_blkio_parameters_ret *ret);
 static int remoteDispatchDomainGetBlockInfo(
@@ -231,7 +231,7 @@ static int remoteDispatchDomainGetBlockInfo(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_get_block_info_args *args,
     remote_domain_get_block_info_ret *ret);
 static int remoteDispatchDomainGetInfo(
@@ -239,7 +239,7 @@ static int remoteDispatchDomainGetInfo(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_get_info_args *args,
     remote_domain_get_info_ret *ret);
 static int remoteDispatchDomainGetJobInfo(
@@ -247,7 +247,7 @@ static int remoteDispatchDomainGetJobInfo(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_get_job_info_args *args,
     remote_domain_get_job_info_ret *ret);
 static int remoteDispatchDomainGetMaxMemory(
@@ -255,7 +255,7 @@ static int remoteDispatchDomainGetMaxMemory(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_get_max_memory_args *args,
     remote_domain_get_max_memory_ret *ret);
 static int remoteDispatchDomainGetMaxVcpus(
@@ -263,7 +263,7 @@ static int remoteDispatchDomainGetMaxVcpus(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_get_max_vcpus_args *args,
     remote_domain_get_max_vcpus_ret *ret);
 static int remoteDispatchDomainGetMemoryParameters(
@@ -271,7 +271,7 @@ static int remoteDispatchDomainGetMemoryParameters(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_get_memory_parameters_args *args,
     remote_domain_get_memory_parameters_ret *ret);
 static int remoteDispatchDomainGetOsType(
@@ -279,7 +279,7 @@ static int remoteDispatchDomainGetOsType(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_get_os_type_args *args,
     remote_domain_get_os_type_ret *ret);
 static int remoteDispatchDomainGetSchedulerParameters(
@@ -287,7 +287,7 @@ static int remoteDispatchDomainGetSchedulerParameters(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_get_scheduler_parameters_args *args,
     remote_domain_get_scheduler_parameters_ret *ret);
 static int remoteDispatchDomainGetSchedulerType(
@@ -295,7 +295,7 @@ static int remoteDispatchDomainGetSchedulerType(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_get_scheduler_type_args *args,
     remote_domain_get_scheduler_type_ret *ret);
 static int remoteDispatchDomainGetSecurityLabel(
@@ -303,7 +303,7 @@ static int remoteDispatchDomainGetSecurityLabel(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_get_security_label_args *args,
     remote_domain_get_security_label_ret *ret);
 static int remoteDispatchDomainGetVcpus(
@@ -311,7 +311,7 @@ static int remoteDispatchDomainGetVcpus(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_get_vcpus_args *args,
     remote_domain_get_vcpus_ret *ret);
 static int remoteDispatchDomainGetVcpusFlags(
@@ -319,7 +319,7 @@ static int remoteDispatchDomainGetVcpusFlags(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_get_vcpus_flags_args *args,
     remote_domain_get_vcpus_flags_ret *ret);
 static int remoteDispatchDomainHasCurrentSnapshot(
@@ -327,7 +327,7 @@ static int remoteDispatchDomainHasCurrentSnapshot(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_has_current_snapshot_args *args,
     remote_domain_has_current_snapshot_ret *ret);
 static int remoteDispatchDomainHasManagedSaveImage(
@@ -335,7 +335,7 @@ static int remoteDispatchDomainHasManagedSaveImage(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_has_managed_save_image_args *args,
     remote_domain_has_managed_save_image_ret *ret);
 static int remoteDispatchDomainInterfaceStats(
@@ -343,7 +343,7 @@ static int remoteDispatchDomainInterfaceStats(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_interface_stats_args *args,
     remote_domain_interface_stats_ret *ret);
 static int remoteDispatchDomainIsActive(
@@ -351,7 +351,7 @@ static int remoteDispatchDomainIsActive(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_is_active_args *args,
     remote_domain_is_active_ret *ret);
 static int remoteDispatchDomainIsPersistent(
@@ -359,7 +359,7 @@ static int remoteDispatchDomainIsPersistent(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_is_persistent_args *args,
     remote_domain_is_persistent_ret *ret);
 static int remoteDispatchDomainIsUpdated(
@@ -367,7 +367,7 @@ static int remoteDispatchDomainIsUpdated(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_is_updated_args *args,
     remote_domain_is_updated_ret *ret);
 static int remoteDispatchDomainLookupById(
@@ -375,7 +375,7 @@ static int remoteDispatchDomainLookupById(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_lookup_by_id_args *args,
     remote_domain_lookup_by_id_ret *ret);
 static int remoteDispatchDomainLookupByName(
@@ -383,7 +383,7 @@ static int remoteDispatchDomainLookupByName(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_lookup_by_name_args *args,
     remote_domain_lookup_by_name_ret *ret);
 static int remoteDispatchDomainLookupByUuid(
@@ -391,7 +391,7 @@ static int remoteDispatchDomainLookupByUuid(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_lookup_by_uuid_args *args,
     remote_domain_lookup_by_uuid_ret *ret);
 static int remoteDispatchDomainManagedSave(
@@ -399,7 +399,7 @@ static int remoteDispatchDomainManagedSave(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_managed_save_args *args,
     void *ret);
 static int remoteDispatchDomainManagedSaveRemove(
@@ -407,7 +407,7 @@ static int remoteDispatchDomainManagedSaveRemove(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_managed_save_remove_args *args,
     void *ret);
 static int remoteDispatchDomainMemoryPeek(
@@ -415,7 +415,7 @@ static int remoteDispatchDomainMemoryPeek(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_memory_peek_args *args,
     remote_domain_memory_peek_ret *ret);
 static int remoteDispatchDomainMemoryStats(
@@ -423,7 +423,7 @@ static int remoteDispatchDomainMemoryStats(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_memory_stats_args *args,
     remote_domain_memory_stats_ret *ret);
 static int remoteDispatchDomainMigrateFinish(
@@ -431,7 +431,7 @@ static int remoteDispatchDomainMigrateFinish(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_migrate_finish_args *args,
     remote_domain_migrate_finish_ret *ret);
 static int remoteDispatchDomainMigrateFinish2(
@@ -439,7 +439,7 @@ static int remoteDispatchDomainMigrateFinish2(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_migrate_finish2_args *args,
     remote_domain_migrate_finish2_ret *ret);
 static int remoteDispatchDomainMigratePerform(
@@ -447,7 +447,7 @@ static int remoteDispatchDomainMigratePerform(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_migrate_perform_args *args,
     void *ret);
 static int remoteDispatchDomainMigratePrepare(
@@ -455,7 +455,7 @@ static int remoteDispatchDomainMigratePrepare(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_migrate_prepare_args *args,
     remote_domain_migrate_prepare_ret *ret);
 static int remoteDispatchDomainMigratePrepare2(
@@ -463,7 +463,7 @@ static int remoteDispatchDomainMigratePrepare2(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_migrate_prepare2_args *args,
     remote_domain_migrate_prepare2_ret *ret);
 static int remoteDispatchDomainMigratePrepareTunnel(
@@ -471,7 +471,7 @@ static int remoteDispatchDomainMigratePrepareTunnel(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_migrate_prepare_tunnel_args *args,
     void *ret);
 static int remoteDispatchDomainMigrateSetMaxDowntime(
@@ -479,7 +479,7 @@ static int remoteDispatchDomainMigrateSetMaxDowntime(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_migrate_set_max_downtime_args *args,
     void *ret);
 static int remoteDispatchDomainMigrateSetMaxSpeed(
@@ -487,7 +487,7 @@ static int remoteDispatchDomainMigrateSetMaxSpeed(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_migrate_set_max_speed_args *args,
     void *ret);
 static int remoteDispatchDomainOpenConsole(
@@ -495,7 +495,7 @@ static int remoteDispatchDomainOpenConsole(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_open_console_args *args,
     void *ret);
 static int remoteDispatchDomainPinVcpu(
@@ -503,7 +503,7 @@ static int remoteDispatchDomainPinVcpu(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_pin_vcpu_args *args,
     void *ret);
 static int remoteDispatchDomainReboot(
@@ -511,7 +511,7 @@ static int remoteDispatchDomainReboot(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_reboot_args *args,
     void *ret);
 static int remoteDispatchDomainRestore(
@@ -519,7 +519,7 @@ static int remoteDispatchDomainRestore(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_restore_args *args,
     void *ret);
 static int remoteDispatchDomainResume(
@@ -527,7 +527,7 @@ static int remoteDispatchDomainResume(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_resume_args *args,
     void *ret);
 static int remoteDispatchDomainRevertToSnapshot(
@@ -535,7 +535,7 @@ static int remoteDispatchDomainRevertToSnapshot(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_revert_to_snapshot_args *args,
     void *ret);
 static int remoteDispatchDomainSave(
@@ -543,7 +543,7 @@ static int remoteDispatchDomainSave(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_save_args *args,
     void *ret);
 static int remoteDispatchDomainSetAutostart(
@@ -551,7 +551,7 @@ static int remoteDispatchDomainSetAutostart(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_set_autostart_args *args,
     void *ret);
 static int remoteDispatchDomainSetBlkioParameters(
@@ -559,7 +559,7 @@ static int remoteDispatchDomainSetBlkioParameters(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_set_blkio_parameters_args *args,
     void *ret);
 static int remoteDispatchDomainSetMaxMemory(
@@ -567,7 +567,7 @@ static int remoteDispatchDomainSetMaxMemory(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_set_max_memory_args *args,
     void *ret);
 static int remoteDispatchDomainSetMemory(
@@ -575,7 +575,7 @@ static int remoteDispatchDomainSetMemory(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_set_memory_args *args,
     void *ret);
 static int remoteDispatchDomainSetMemoryFlags(
@@ -583,7 +583,7 @@ static int remoteDispatchDomainSetMemoryFlags(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_set_memory_flags_args *args,
     void *ret);
 static int remoteDispatchDomainSetMemoryParameters(
@@ -591,7 +591,7 @@ static int remoteDispatchDomainSetMemoryParameters(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_set_memory_parameters_args *args,
     void *ret);
 static int remoteDispatchDomainSetSchedulerParameters(
@@ -599,7 +599,7 @@ static int remoteDispatchDomainSetSchedulerParameters(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_set_scheduler_parameters_args *args,
     void *ret);
 static int remoteDispatchDomainSetVcpus(
@@ -607,7 +607,7 @@ static int remoteDispatchDomainSetVcpus(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_set_vcpus_args *args,
     void *ret);
 static int remoteDispatchDomainSetVcpusFlags(
@@ -615,7 +615,7 @@ static int remoteDispatchDomainSetVcpusFlags(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_set_vcpus_flags_args *args,
     void *ret);
 static int remoteDispatchDomainShutdown(
@@ -623,7 +623,7 @@ static int remoteDispatchDomainShutdown(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_shutdown_args *args,
     void *ret);
 static int remoteDispatchDomainSnapshotCreateXml(
@@ -631,7 +631,7 @@ static int remoteDispatchDomainSnapshotCreateXml(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_snapshot_create_xml_args *args,
     remote_domain_snapshot_create_xml_ret *ret);
 static int remoteDispatchDomainSnapshotCurrent(
@@ -639,7 +639,7 @@ static int remoteDispatchDomainSnapshotCurrent(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_snapshot_current_args *args,
     remote_domain_snapshot_current_ret *ret);
 static int remoteDispatchDomainSnapshotDelete(
@@ -647,7 +647,7 @@ static int remoteDispatchDomainSnapshotDelete(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_snapshot_delete_args *args,
     void *ret);
 static int remoteDispatchDomainSnapshotDumpXml(
@@ -655,7 +655,7 @@ static int remoteDispatchDomainSnapshotDumpXml(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_snapshot_dump_xml_args *args,
     remote_domain_snapshot_dump_xml_ret *ret);
 static int remoteDispatchDomainSnapshotListNames(
@@ -663,7 +663,7 @@ static int remoteDispatchDomainSnapshotListNames(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_snapshot_list_names_args *args,
     remote_domain_snapshot_list_names_ret *ret);
 static int remoteDispatchDomainSnapshotLookupByName(
@@ -671,7 +671,7 @@ static int remoteDispatchDomainSnapshotLookupByName(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_snapshot_lookup_by_name_args *args,
     remote_domain_snapshot_lookup_by_name_ret *ret);
 static int remoteDispatchDomainSnapshotNum(
@@ -679,7 +679,7 @@ static int remoteDispatchDomainSnapshotNum(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_snapshot_num_args *args,
     remote_domain_snapshot_num_ret *ret);
 static int remoteDispatchDomainSuspend(
@@ -687,7 +687,7 @@ static int remoteDispatchDomainSuspend(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_suspend_args *args,
     void *ret);
 static int remoteDispatchDomainUndefine(
@@ -695,7 +695,7 @@ static int remoteDispatchDomainUndefine(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_undefine_args *args,
     void *ret);
 static int remoteDispatchDomainUpdateDeviceFlags(
@@ -703,7 +703,7 @@ static int remoteDispatchDomainUpdateDeviceFlags(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_update_device_flags_args *args,
     void *ret);
 static int remoteDispatchDomainXmlFromNative(
@@ -711,7 +711,7 @@ static int remoteDispatchDomainXmlFromNative(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_xml_from_native_args *args,
     remote_domain_xml_from_native_ret *ret);
 static int remoteDispatchDomainXmlToNative(
@@ -719,7 +719,7 @@ static int remoteDispatchDomainXmlToNative(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_domain_xml_to_native_args *args,
     remote_domain_xml_to_native_ret *ret);
 static int remoteDispatchFindStoragePoolSources(
@@ -727,7 +727,7 @@ static int remoteDispatchFindStoragePoolSources(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_find_storage_pool_sources_args *args,
     remote_find_storage_pool_sources_ret *ret);
 static int remoteDispatchGetCapabilities(
@@ -735,7 +735,7 @@ static int remoteDispatchGetCapabilities(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_get_capabilities_ret *ret);
 static int remoteDispatchGetHostname(
@@ -743,7 +743,7 @@ static int remoteDispatchGetHostname(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_get_hostname_ret *ret);
 static int remoteDispatchGetLibVersion(
@@ -751,7 +751,7 @@ static int remoteDispatchGetLibVersion(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_get_lib_version_ret *ret);
 static int remoteDispatchGetMaxVcpus(
@@ -759,7 +759,7 @@ static int remoteDispatchGetMaxVcpus(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_get_max_vcpus_args *args,
     remote_get_max_vcpus_ret *ret);
 static int remoteDispatchGetSysinfo(
@@ -767,7 +767,7 @@ static int remoteDispatchGetSysinfo(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_get_sysinfo_args *args,
     remote_get_sysinfo_ret *ret);
 static int remoteDispatchGetType(
@@ -775,7 +775,7 @@ static int remoteDispatchGetType(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_get_type_ret *ret);
 static int remoteDispatchGetUri(
@@ -783,7 +783,7 @@ static int remoteDispatchGetUri(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_get_uri_ret *ret);
 static int remoteDispatchGetVersion(
@@ -791,7 +791,7 @@ static int remoteDispatchGetVersion(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_get_version_ret *ret);
 static int remoteDispatchInterfaceCreate(
@@ -799,7 +799,7 @@ static int remoteDispatchInterfaceCreate(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_interface_create_args *args,
     void *ret);
 static int remoteDispatchInterfaceDefineXml(
@@ -807,7 +807,7 @@ static int remoteDispatchInterfaceDefineXml(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_interface_define_xml_args *args,
     remote_interface_define_xml_ret *ret);
 static int remoteDispatchInterfaceDestroy(
@@ -815,7 +815,7 @@ static int remoteDispatchInterfaceDestroy(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_interface_destroy_args *args,
     void *ret);
 static int remoteDispatchInterfaceGetXmlDesc(
@@ -823,7 +823,7 @@ static int remoteDispatchInterfaceGetXmlDesc(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_interface_get_xml_desc_args *args,
     remote_interface_get_xml_desc_ret *ret);
 static int remoteDispatchInterfaceIsActive(
@@ -831,7 +831,7 @@ static int remoteDispatchInterfaceIsActive(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_interface_is_active_args *args,
     remote_interface_is_active_ret *ret);
 static int remoteDispatchInterfaceLookupByMacString(
@@ -839,7 +839,7 @@ static int remoteDispatchInterfaceLookupByMacString(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_interface_lookup_by_mac_string_args *args,
     remote_interface_lookup_by_mac_string_ret *ret);
 static int remoteDispatchInterfaceLookupByName(
@@ -847,7 +847,7 @@ static int remoteDispatchInterfaceLookupByName(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_interface_lookup_by_name_args *args,
     remote_interface_lookup_by_name_ret *ret);
 static int remoteDispatchInterfaceUndefine(
@@ -855,7 +855,7 @@ static int remoteDispatchInterfaceUndefine(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_interface_undefine_args *args,
     void *ret);
 static int remoteDispatchIsSecure(
@@ -863,7 +863,7 @@ static int remoteDispatchIsSecure(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_is_secure_ret *ret);
 static int remoteDispatchListDefinedDomains(
@@ -871,7 +871,7 @@ static int remoteDispatchListDefinedDomains(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_list_defined_domains_args *args,
     remote_list_defined_domains_ret *ret);
 static int remoteDispatchListDefinedInterfaces(
@@ -879,7 +879,7 @@ static int remoteDispatchListDefinedInterfaces(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_list_defined_interfaces_args *args,
     remote_list_defined_interfaces_ret *ret);
 static int remoteDispatchListDefinedNetworks(
@@ -887,7 +887,7 @@ static int remoteDispatchListDefinedNetworks(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_list_defined_networks_args *args,
     remote_list_defined_networks_ret *ret);
 static int remoteDispatchListDefinedStoragePools(
@@ -895,7 +895,7 @@ static int remoteDispatchListDefinedStoragePools(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_list_defined_storage_pools_args *args,
     remote_list_defined_storage_pools_ret *ret);
 static int remoteDispatchListDomains(
@@ -903,7 +903,7 @@ static int remoteDispatchListDomains(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_list_domains_args *args,
     remote_list_domains_ret *ret);
 static int remoteDispatchListInterfaces(
@@ -911,7 +911,7 @@ static int remoteDispatchListInterfaces(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_list_interfaces_args *args,
     remote_list_interfaces_ret *ret);
 static int remoteDispatchListNetworks(
@@ -919,7 +919,7 @@ static int remoteDispatchListNetworks(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_list_networks_args *args,
     remote_list_networks_ret *ret);
 static int remoteDispatchListNwfilters(
@@ -927,7 +927,7 @@ static int remoteDispatchListNwfilters(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_list_nwfilters_args *args,
     remote_list_nwfilters_ret *ret);
 static int remoteDispatchListSecrets(
@@ -935,7 +935,7 @@ static int remoteDispatchListSecrets(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_list_secrets_args *args,
     remote_list_secrets_ret *ret);
 static int remoteDispatchListStoragePools(
@@ -943,7 +943,7 @@ static int remoteDispatchListStoragePools(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_list_storage_pools_args *args,
     remote_list_storage_pools_ret *ret);
 static int remoteDispatchNetworkCreate(
@@ -951,7 +951,7 @@ static int remoteDispatchNetworkCreate(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_network_create_args *args,
     void *ret);
 static int remoteDispatchNetworkCreateXml(
@@ -959,7 +959,7 @@ static int remoteDispatchNetworkCreateXml(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_network_create_xml_args *args,
     remote_network_create_xml_ret *ret);
 static int remoteDispatchNetworkDefineXml(
@@ -967,7 +967,7 @@ static int remoteDispatchNetworkDefineXml(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_network_define_xml_args *args,
     remote_network_define_xml_ret *ret);
 static int remoteDispatchNetworkDestroy(
@@ -975,7 +975,7 @@ static int remoteDispatchNetworkDestroy(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_network_destroy_args *args,
     void *ret);
 static int remoteDispatchNetworkDumpXml(
@@ -983,7 +983,7 @@ static int remoteDispatchNetworkDumpXml(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_network_dump_xml_args *args,
     remote_network_dump_xml_ret *ret);
 static int remoteDispatchNetworkGetAutostart(
@@ -991,7 +991,7 @@ static int remoteDispatchNetworkGetAutostart(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_network_get_autostart_args *args,
     remote_network_get_autostart_ret *ret);
 static int remoteDispatchNetworkGetBridgeName(
@@ -999,7 +999,7 @@ static int remoteDispatchNetworkGetBridgeName(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_network_get_bridge_name_args *args,
     remote_network_get_bridge_name_ret *ret);
 static int remoteDispatchNetworkIsActive(
@@ -1007,7 +1007,7 @@ static int remoteDispatchNetworkIsActive(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_network_is_active_args *args,
     remote_network_is_active_ret *ret);
 static int remoteDispatchNetworkIsPersistent(
@@ -1015,7 +1015,7 @@ static int remoteDispatchNetworkIsPersistent(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_network_is_persistent_args *args,
     remote_network_is_persistent_ret *ret);
 static int remoteDispatchNetworkLookupByName(
@@ -1023,7 +1023,7 @@ static int remoteDispatchNetworkLookupByName(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_network_lookup_by_name_args *args,
     remote_network_lookup_by_name_ret *ret);
 static int remoteDispatchNetworkLookupByUuid(
@@ -1031,7 +1031,7 @@ static int remoteDispatchNetworkLookupByUuid(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_network_lookup_by_uuid_args *args,
     remote_network_lookup_by_uuid_ret *ret);
 static int remoteDispatchNetworkSetAutostart(
@@ -1039,7 +1039,7 @@ static int remoteDispatchNetworkSetAutostart(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_network_set_autostart_args *args,
     void *ret);
 static int remoteDispatchNetworkUndefine(
@@ -1047,7 +1047,7 @@ static int remoteDispatchNetworkUndefine(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_network_undefine_args *args,
     void *ret);
 static int remoteDispatchNodeDeviceCreateXml(
@@ -1055,7 +1055,7 @@ static int remoteDispatchNodeDeviceCreateXml(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_node_device_create_xml_args *args,
     remote_node_device_create_xml_ret *ret);
 static int remoteDispatchNodeDeviceDestroy(
@@ -1063,7 +1063,7 @@ static int remoteDispatchNodeDeviceDestroy(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_node_device_destroy_args *args,
     void *ret);
 static int remoteDispatchNodeDeviceDettach(
@@ -1071,7 +1071,7 @@ static int remoteDispatchNodeDeviceDettach(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_node_device_dettach_args *args,
     void *ret);
 static int remoteDispatchNodeDeviceDumpXml(
@@ -1079,7 +1079,7 @@ static int remoteDispatchNodeDeviceDumpXml(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_node_device_dump_xml_args *args,
     remote_node_device_dump_xml_ret *ret);
 static int remoteDispatchNodeDeviceGetParent(
@@ -1087,7 +1087,7 @@ static int remoteDispatchNodeDeviceGetParent(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_node_device_get_parent_args *args,
     remote_node_device_get_parent_ret *ret);
 static int remoteDispatchNodeDeviceListCaps(
@@ -1095,7 +1095,7 @@ static int remoteDispatchNodeDeviceListCaps(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_node_device_list_caps_args *args,
     remote_node_device_list_caps_ret *ret);
 static int remoteDispatchNodeDeviceLookupByName(
@@ -1103,7 +1103,7 @@ static int remoteDispatchNodeDeviceLookupByName(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_node_device_lookup_by_name_args *args,
     remote_node_device_lookup_by_name_ret *ret);
 static int remoteDispatchNodeDeviceNumOfCaps(
@@ -1111,7 +1111,7 @@ static int remoteDispatchNodeDeviceNumOfCaps(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_node_device_num_of_caps_args *args,
     remote_node_device_num_of_caps_ret *ret);
 static int remoteDispatchNodeDeviceReAttach(
@@ -1119,7 +1119,7 @@ static int remoteDispatchNodeDeviceReAttach(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_node_device_re_attach_args *args,
     void *ret);
 static int remoteDispatchNodeDeviceReset(
@@ -1127,7 +1127,7 @@ static int remoteDispatchNodeDeviceReset(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_node_device_reset_args *args,
     void *ret);
 static int remoteDispatchNodeGetCellsFreeMemory(
@@ -1135,7 +1135,7 @@ static int remoteDispatchNodeGetCellsFreeMemory(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_node_get_cells_free_memory_args *args,
     remote_node_get_cells_free_memory_ret *ret);
 static int remoteDispatchNodeGetFreeMemory(
@@ -1143,7 +1143,7 @@ static int remoteDispatchNodeGetFreeMemory(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_node_get_free_memory_ret *ret);
 static int remoteDispatchNodeGetInfo(
@@ -1151,7 +1151,7 @@ static int remoteDispatchNodeGetInfo(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_node_get_info_ret *ret);
 static int remoteDispatchNodeGetSecurityModel(
@@ -1159,7 +1159,7 @@ static int remoteDispatchNodeGetSecurityModel(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_node_get_security_model_ret *ret);
 static int remoteDispatchNodeListDevices(
@@ -1167,7 +1167,7 @@ static int remoteDispatchNodeListDevices(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_node_list_devices_args *args,
     remote_node_list_devices_ret *ret);
 static int remoteDispatchNodeNumOfDevices(
@@ -1175,7 +1175,7 @@ static int remoteDispatchNodeNumOfDevices(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_node_num_of_devices_args *args,
     remote_node_num_of_devices_ret *ret);
 static int remoteDispatchNumOfDefinedDomains(
@@ -1183,7 +1183,7 @@ static int remoteDispatchNumOfDefinedDomains(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_num_of_defined_domains_ret *ret);
 static int remoteDispatchNumOfDefinedInterfaces(
@@ -1191,7 +1191,7 @@ static int remoteDispatchNumOfDefinedInterfaces(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_num_of_defined_interfaces_ret *ret);
 static int remoteDispatchNumOfDefinedNetworks(
@@ -1199,7 +1199,7 @@ static int remoteDispatchNumOfDefinedNetworks(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_num_of_defined_networks_ret *ret);
 static int remoteDispatchNumOfDefinedStoragePools(
@@ -1207,7 +1207,7 @@ static int remoteDispatchNumOfDefinedStoragePools(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_num_of_defined_storage_pools_ret *ret);
 static int remoteDispatchNumOfDomains(
@@ -1215,7 +1215,7 @@ static int remoteDispatchNumOfDomains(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_num_of_domains_ret *ret);
 static int remoteDispatchNumOfInterfaces(
@@ -1223,7 +1223,7 @@ static int remoteDispatchNumOfInterfaces(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_num_of_interfaces_ret *ret);
 static int remoteDispatchNumOfNetworks(
@@ -1231,7 +1231,7 @@ static int remoteDispatchNumOfNetworks(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_num_of_networks_ret *ret);
 static int remoteDispatchNumOfNwfilters(
@@ -1239,7 +1239,7 @@ static int remoteDispatchNumOfNwfilters(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_num_of_nwfilters_ret *ret);
 static int remoteDispatchNumOfSecrets(
@@ -1247,7 +1247,7 @@ static int remoteDispatchNumOfSecrets(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_num_of_secrets_ret *ret);
 static int remoteDispatchNumOfStoragePools(
@@ -1255,7 +1255,7 @@ static int remoteDispatchNumOfStoragePools(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     void *args,
     remote_num_of_storage_pools_ret *ret);
 static int remoteDispatchNwfilterDefineXml(
@@ -1263,7 +1263,7 @@ static int remoteDispatchNwfilterDefineXml(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_nwfilter_define_xml_args *args,
     remote_nwfilter_define_xml_ret *ret);
 static int remoteDispatchNwfilterGetXmlDesc(
@@ -1271,7 +1271,7 @@ static int remoteDispatchNwfilterGetXmlDesc(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_nwfilter_get_xml_desc_args *args,
     remote_nwfilter_get_xml_desc_ret *ret);
 static int remoteDispatchNwfilterLookupByName(
@@ -1279,7 +1279,7 @@ static int remoteDispatchNwfilterLookupByName(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_nwfilter_lookup_by_name_args *args,
     remote_nwfilter_lookup_by_name_ret *ret);
 static int remoteDispatchNwfilterLookupByUuid(
@@ -1287,7 +1287,7 @@ static int remoteDispatchNwfilterLookupByUuid(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_nwfilter_lookup_by_uuid_args *args,
     remote_nwfilter_lookup_by_uuid_ret *ret);
 static int remoteDispatchNwfilterUndefine(
@@ -1295,7 +1295,7 @@ static int remoteDispatchNwfilterUndefine(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_nwfilter_undefine_args *args,
     void *ret);
 static int remoteDispatchOpen(
@@ -1303,7 +1303,7 @@ static int remoteDispatchOpen(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_open_args *args,
     void *ret);
 static int remoteDispatchSecretDefineXml(
@@ -1311,7 +1311,7 @@ static int remoteDispatchSecretDefineXml(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_secret_define_xml_args *args,
     remote_secret_define_xml_ret *ret);
 static int remoteDispatchSecretGetValue(
@@ -1319,7 +1319,7 @@ static int remoteDispatchSecretGetValue(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_secret_get_value_args *args,
     remote_secret_get_value_ret *ret);
 static int remoteDispatchSecretGetXmlDesc(
@@ -1327,7 +1327,7 @@ static int remoteDispatchSecretGetXmlDesc(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_secret_get_xml_desc_args *args,
     remote_secret_get_xml_desc_ret *ret);
 static int remoteDispatchSecretLookupByUsage(
@@ -1335,7 +1335,7 @@ static int remoteDispatchSecretLookupByUsage(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_secret_lookup_by_usage_args *args,
     remote_secret_lookup_by_usage_ret *ret);
 static int remoteDispatchSecretLookupByUuid(
@@ -1343,7 +1343,7 @@ static int remoteDispatchSecretLookupByUuid(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_secret_lookup_by_uuid_args *args,
     remote_secret_lookup_by_uuid_ret *ret);
 static int remoteDispatchSecretSetValue(
@@ -1351,7 +1351,7 @@ static int remoteDispatchSecretSetValue(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_secret_set_value_args *args,
     void *ret);
 static int remoteDispatchSecretUndefine(
@@ -1359,7 +1359,7 @@ static int remoteDispatchSecretUndefine(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_secret_undefine_args *args,
     void *ret);
 static int remoteDispatchStoragePoolBuild(
@@ -1367,7 +1367,7 @@ static int remoteDispatchStoragePoolBuild(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_pool_build_args *args,
     void *ret);
 static int remoteDispatchStoragePoolCreate(
@@ -1375,7 +1375,7 @@ static int remoteDispatchStoragePoolCreate(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_pool_create_args *args,
     void *ret);
 static int remoteDispatchStoragePoolCreateXml(
@@ -1383,7 +1383,7 @@ static int remoteDispatchStoragePoolCreateXml(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_pool_create_xml_args *args,
     remote_storage_pool_create_xml_ret *ret);
 static int remoteDispatchStoragePoolDefineXml(
@@ -1391,7 +1391,7 @@ static int remoteDispatchStoragePoolDefineXml(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_pool_define_xml_args *args,
     remote_storage_pool_define_xml_ret *ret);
 static int remoteDispatchStoragePoolDelete(
@@ -1399,7 +1399,7 @@ static int remoteDispatchStoragePoolDelete(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_pool_delete_args *args,
     void *ret);
 static int remoteDispatchStoragePoolDestroy(
@@ -1407,7 +1407,7 @@ static int remoteDispatchStoragePoolDestroy(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_pool_destroy_args *args,
     void *ret);
 static int remoteDispatchStoragePoolDumpXml(
@@ -1415,7 +1415,7 @@ static int remoteDispatchStoragePoolDumpXml(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_pool_dump_xml_args *args,
     remote_storage_pool_dump_xml_ret *ret);
 static int remoteDispatchStoragePoolGetAutostart(
@@ -1423,7 +1423,7 @@ static int remoteDispatchStoragePoolGetAutostart(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_pool_get_autostart_args *args,
     remote_storage_pool_get_autostart_ret *ret);
 static int remoteDispatchStoragePoolGetInfo(
@@ -1431,7 +1431,7 @@ static int remoteDispatchStoragePoolGetInfo(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_pool_get_info_args *args,
     remote_storage_pool_get_info_ret *ret);
 static int remoteDispatchStoragePoolIsActive(
@@ -1439,7 +1439,7 @@ static int remoteDispatchStoragePoolIsActive(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_pool_is_active_args *args,
     remote_storage_pool_is_active_ret *ret);
 static int remoteDispatchStoragePoolIsPersistent(
@@ -1447,7 +1447,7 @@ static int remoteDispatchStoragePoolIsPersistent(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_pool_is_persistent_args *args,
     remote_storage_pool_is_persistent_ret *ret);
 static int remoteDispatchStoragePoolListVolumes(
@@ -1455,7 +1455,7 @@ static int remoteDispatchStoragePoolListVolumes(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_pool_list_volumes_args *args,
     remote_storage_pool_list_volumes_ret *ret);
 static int remoteDispatchStoragePoolLookupByName(
@@ -1463,7 +1463,7 @@ static int remoteDispatchStoragePoolLookupByName(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_pool_lookup_by_name_args *args,
     remote_storage_pool_lookup_by_name_ret *ret);
 static int remoteDispatchStoragePoolLookupByUuid(
@@ -1471,7 +1471,7 @@ static int remoteDispatchStoragePoolLookupByUuid(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_pool_lookup_by_uuid_args *args,
     remote_storage_pool_lookup_by_uuid_ret *ret);
 static int remoteDispatchStoragePoolLookupByVolume(
@@ -1479,7 +1479,7 @@ static int remoteDispatchStoragePoolLookupByVolume(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_pool_lookup_by_volume_args *args,
     remote_storage_pool_lookup_by_volume_ret *ret);
 static int remoteDispatchStoragePoolNumOfVolumes(
@@ -1487,7 +1487,7 @@ static int remoteDispatchStoragePoolNumOfVolumes(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_pool_num_of_volumes_args *args,
     remote_storage_pool_num_of_volumes_ret *ret);
 static int remoteDispatchStoragePoolRefresh(
@@ -1495,7 +1495,7 @@ static int remoteDispatchStoragePoolRefresh(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_pool_refresh_args *args,
     void *ret);
 static int remoteDispatchStoragePoolSetAutostart(
@@ -1503,7 +1503,7 @@ static int remoteDispatchStoragePoolSetAutostart(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_pool_set_autostart_args *args,
     void *ret);
 static int remoteDispatchStoragePoolUndefine(
@@ -1511,7 +1511,7 @@ static int remoteDispatchStoragePoolUndefine(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_pool_undefine_args *args,
     void *ret);
 static int remoteDispatchStorageVolCreateXml(
@@ -1519,7 +1519,7 @@ static int remoteDispatchStorageVolCreateXml(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_vol_create_xml_args *args,
     remote_storage_vol_create_xml_ret *ret);
 static int remoteDispatchStorageVolCreateXmlFrom(
@@ -1527,7 +1527,7 @@ static int remoteDispatchStorageVolCreateXmlFrom(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_vol_create_xml_from_args *args,
     remote_storage_vol_create_xml_from_ret *ret);
 static int remoteDispatchStorageVolDelete(
@@ -1535,7 +1535,7 @@ static int remoteDispatchStorageVolDelete(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_vol_delete_args *args,
     void *ret);
 static int remoteDispatchStorageVolDownload(
@@ -1543,7 +1543,7 @@ static int remoteDispatchStorageVolDownload(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_vol_download_args *args,
     void *ret);
 static int remoteDispatchStorageVolDumpXml(
@@ -1551,7 +1551,7 @@ static int remoteDispatchStorageVolDumpXml(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_vol_dump_xml_args *args,
     remote_storage_vol_dump_xml_ret *ret);
 static int remoteDispatchStorageVolGetInfo(
@@ -1559,7 +1559,7 @@ static int remoteDispatchStorageVolGetInfo(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_vol_get_info_args *args,
     remote_storage_vol_get_info_ret *ret);
 static int remoteDispatchStorageVolGetPath(
@@ -1567,7 +1567,7 @@ static int remoteDispatchStorageVolGetPath(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_vol_get_path_args *args,
     remote_storage_vol_get_path_ret *ret);
 static int remoteDispatchStorageVolLookupByKey(
@@ -1575,7 +1575,7 @@ static int remoteDispatchStorageVolLookupByKey(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_vol_lookup_by_key_args *args,
     remote_storage_vol_lookup_by_key_ret *ret);
 static int remoteDispatchStorageVolLookupByName(
@@ -1583,7 +1583,7 @@ static int remoteDispatchStorageVolLookupByName(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_vol_lookup_by_name_args *args,
     remote_storage_vol_lookup_by_name_ret *ret);
 static int remoteDispatchStorageVolLookupByPath(
@@ -1591,7 +1591,7 @@ static int remoteDispatchStorageVolLookupByPath(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_vol_lookup_by_path_args *args,
     remote_storage_vol_lookup_by_path_ret *ret);
 static int remoteDispatchStorageVolUpload(
@@ -1599,7 +1599,7 @@ static int remoteDispatchStorageVolUpload(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_vol_upload_args *args,
     void *ret);
 static int remoteDispatchStorageVolWipe(
@@ -1607,7 +1607,7 @@ static int remoteDispatchStorageVolWipe(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_storage_vol_wipe_args *args,
     void *ret);
 static int remoteDispatchSupportsFeature(
@@ -1615,6 +1615,6 @@ static int remoteDispatchSupportsFeature(
     struct qemud_client *client,
     virConnectPtr conn,
     remote_message_header *hdr,
-    remote_error *err,
+    remote_error *rerr,
     remote_supports_feature_args *args,
     remote_supports_feature_ret *ret);
diff --git a/daemon/remote_generate_stubs.pl b/daemon/remote_generate_stubs.pl
index a8c4e6dd38ebebb1980a2f55c9a7fa4f7a2fac79..dbde7da8bca041d5a145ba11dcd6ed5f7b768b74 100755
--- a/daemon/remote_generate_stubs.pl
+++ b/daemon/remote_generate_stubs.pl
@@ -132,7 +132,7 @@ elsif ($opt_p) {
 	print "    struct qemud_client *client,\n";
 	print "    virConnectPtr conn,\n";
 	print "    remote_message_header *hdr,\n";
-	print "    remote_error *err,\n";
+	print "    remote_error *rerr,\n";
 	print "    $calls{$_}->{args} *args,\n";
 	print "    $calls{$_}->{ret} *ret);\n";
     }