Commit 11ae7a0a authored by Andrea Spadaccini's avatar Andrea Spadaccini Committed by Guido Trotter
Browse files

Fixed potential unreferenced variable usage



I noticed a path in the code that would use spice_ip_version even if
it was not initialized. This patch fixes it.
Signed-off-by: default avatarAndrea Spadaccini <spadaccio@google.com>
Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent 3ef02bec
......@@ -721,6 +721,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
kvm_cmd.extend(["-serial", "none"])
spice_bind = hvp[constants.HV_KVM_SPICE_BIND]
spice_ip_version = None
if spice_bind:
if netutils.IsValidInterface(spice_bind):
# The user specified a network interface, we have to figure out the IP
......@@ -756,11 +757,10 @@ class KVMHypervisor(hv_base.BaseHypervisor):
# ValidateParameters checked it.
spice_address = spice_bind
spice_arg = "addr=%s,ipv%s,port=%s" % (spice_address,
spice_ip_version,
instance.network_port)
spice_arg = "%s,disable-ticketing" % spice_arg
spice_arg = "addr=%s,port=%s,disable-ticketing" % (spice_address,
instance.network_port)
if spice_ip_version:
spice_arg = "%s,ipv%s" % (spice_arg, spice_ip_version)
logging.info("KVM: SPICE will listen on port %s", instance.network_port)
kvm_cmd.extend(["-spice", spice_arg])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment