jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

migration: use "" instead of (null) for tls-authz

run:
(qemu) info migrate_parameters
announce-initial: 50 ms
...
announce-max: 550 ms
multifd-compression: none
xbzrle-cache-size: 4194304
max-postcopy-bandwidth: 0
tls-authz: '(null)'

Migration parameter 'tls-authz' is used to provide the QOM ID
of a QAuthZ subclass instance that provides the access control
check, default is NULL. But the empty string is not a valid
object ID, so use "" instead of the default. Although it will
fail when lookup an object with ID "", it is harmless, just
consistent with tls_creds.

As a bonus, this patch also fixed the bad indentation on the
last line and removed 'has_tls_authz' redundant check in
'hmp_info_migrate_parameters'.

Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
Message-Id: <119f539a9f4d198bc3bcced46b8280520d60bc51.1585100802.git.maozhongyi@cmss.chinamobile.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

authored by

Mao Zhongyi and committed by
Dr. David Alan Gilbert 7cd75cbd b4a1733c

+4 -3
+2 -1
migration/migration.c
··· 790 790 params->has_tls_hostname = true; 791 791 params->tls_hostname = g_strdup(s->parameters.tls_hostname); 792 792 params->has_tls_authz = true; 793 - params->tls_authz = g_strdup(s->parameters.tls_authz); 793 + params->tls_authz = g_strdup(s->parameters.tls_authz ? 794 + s->parameters.tls_authz : ""); 794 795 params->has_max_bandwidth = true; 795 796 params->max_bandwidth = s->parameters.max_bandwidth; 796 797 params->has_downtime_limit = true;
+2 -2
monitor/hmp-cmds.c
··· 459 459 monitor_printf(mon, "%s: %" PRIu64 "\n", 460 460 MigrationParameter_str(MIGRATION_PARAMETER_MAX_POSTCOPY_BANDWIDTH), 461 461 params->max_postcopy_bandwidth); 462 - monitor_printf(mon, " %s: '%s'\n", 462 + monitor_printf(mon, "%s: '%s'\n", 463 463 MigrationParameter_str(MIGRATION_PARAMETER_TLS_AUTHZ), 464 - params->has_tls_authz ? params->tls_authz : ""); 464 + params->tls_authz); 465 465 } 466 466 467 467 qapi_free_MigrationParameters(params);