From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55653) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjPzd-0007xm-UE for qemu-devel@nongnu.org; Thu, 02 Mar 2017 07:38:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cjPzc-0005ea-Ng for qemu-devel@nongnu.org; Thu, 02 Mar 2017 07:38:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39980) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cjPzc-0005cU-Hn for qemu-devel@nongnu.org; Thu, 02 Mar 2017 07:38:00 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AF115326BB for ; Thu, 2 Mar 2017 12:38:00 +0000 (UTC) From: "Daniel P. Berrange" Date: Thu, 2 Mar 2017 12:37:46 +0000 Message-Id: <20170302123746.9694-3-berrange@redhat.com> In-Reply-To: <20170302123746.9694-1-berrange@redhat.com> References: <20170302123746.9694-1-berrange@redhat.com> Subject: [Qemu-devel] [PATCH v2 2/2] migration: always report tls-creds & tls-hostname migrate parameters List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , Eric Blake , Juan Quintela , "Dr. David Alan Gilbert" , John Ferlan , Jiri Denemark , "Daniel P. Berrange" Currently the query-migrate-parameters command will omit reporting of the tls-creds & tls-hostname parameters if their value is NULL. This makes it impossible for an app to detect if these parameters are supported by QEMU, without trying to actually set them and catching the error. Since the code is treating "" and NULL as equivalent, we can simply always report these values and give them a value of "". This allows apps like libvirt to detect the fact that these parameters are supported by QEMU. Signed-off-by: Daniel P. Berrange --- migration/migration.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index a8cb56e..760f104 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -581,10 +581,12 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp) params->cpu_throttle_initial = s->parameters.cpu_throttle_initial; params->has_cpu_throttle_increment = true; params->cpu_throttle_increment = s->parameters.cpu_throttle_increment; - params->has_tls_creds = !!s->parameters.tls_creds; - params->tls_creds = g_strdup(s->parameters.tls_creds); - params->has_tls_hostname = !!s->parameters.tls_hostname; - params->tls_hostname = g_strdup(s->parameters.tls_hostname); + params->has_tls_creds = true; + params->tls_creds = g_strdup(s->parameters.tls_creds ? + s->parameters.tls_creds : ""); + params->has_tls_hostname = true; + params->tls_hostname = g_strdup(s->parameters.tls_hostname ? + s->parameters.tls_hostname : ""); params->has_max_bandwidth = true; params->max_bandwidth = s->parameters.max_bandwidth; params->has_downtime_limit = true; -- 2.9.3