details: Fix listing/removal of serial/parallel combinations

This commit is contained in:
Cole Robinson 2010-09-03 14:03:30 -04:00
parent 965f68133f
commit c7f385b0ff

View File

@ -603,8 +603,8 @@ class vmmDomainBase(vmmLibvirtObject):
# [device type, unique, display string, target_port, # [device type, unique, display string, target_port,
# char device type, source_path, is_console_dup_of_serial? # char device type, source_path, is_console_dup_of_serial?
dev = [char_type, target_port, disp = "%s:%s" % (char_type, target_port)
"%s:%s" % (char_type, target_port), target_port, dev = [char_type, disp, disp, target_port,
dev_type, source_path, False] dev_type, source_path, False]
if node.name == "console": if node.name == "console":
@ -811,6 +811,8 @@ class vmmDomainBase(vmmLibvirtObject):
elif (dev_type == "parallel" or elif (dev_type == "parallel" or
dev_type == "console" or dev_type == "console" or
dev_type == "serial"): dev_type == "serial"):
if dev_id_info.count(":"):
ignore, dev_id_info = dev_id_info.split(":")
xpath = ("/domain/devices/%s[target/@port='%s'][1]" % xpath = ("/domain/devices/%s[target/@port='%s'][1]" %
(dev_type, dev_id_info)) (dev_type, dev_id_info))