shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-04 21:47:16 +03:00
Code Releases Activity

parallels: use newly introduced VIR_DOMAIN_VIRT_VZ

Browse Source 
As soon as we keep backward compatibility we treat this constant
as synonym to VIR_DOMAIN_VIRT_PARALLELS.

Signed-off-by: Maxim Nestratov <mnestratov@parallels.com>
This commit is contained in:
Maxim Nestratov 2015-05-26 20:12:00 +03:00 committed by Dmitry Guryanov
parent 23b0f4511e
commit a7f98a92cb
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/conf/domain_conf.c
View File

@ -9646,7 +9646,8 @@ virDomainInputDefParseXML(const virDomainDef *dom,
goto error; goto error;
} }
} else { } else {
if (dom->virtType == VIR_DOMAIN_VIRT_PARALLELS) { if (dom->virtType == VIR_DOMAIN_VIRT_VZ ||
dom->virtType == VIR_DOMAIN_VIRT_PARALLELS) {
if (def->bus != VIR_DOMAIN_INPUT_BUS_PARALLELS) { if (def->bus != VIR_DOMAIN_INPUT_BUS_PARALLELS) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("parallels containers don't support " _("parallels containers don't support "
@ -9682,7 +9683,8 @@ virDomainInputDefParseXML(const virDomainDef *dom,
} else if (dom->os.type == VIR_DOMAIN_OSTYPE_XEN) { } else if (dom->os.type == VIR_DOMAIN_OSTYPE_XEN) {
def->bus = VIR_DOMAIN_INPUT_BUS_XEN; def->bus = VIR_DOMAIN_INPUT_BUS_XEN;
} else { } else {
if ((dom->virtType == VIR_DOMAIN_VIRT_PARALLELS)) if ((dom->virtType == VIR_DOMAIN_VIRT_VZ ||
dom->virtType == VIR_DOMAIN_VIRT_PARALLELS))
def->bus = VIR_DOMAIN_INPUT_BUS_PARALLELS; def->bus = VIR_DOMAIN_INPUT_BUS_PARALLELS;
} }
} }
@ -11172,6 +11174,7 @@ virDomainVideoDefaultType(const virDomainDef *def)
case VIR_DOMAIN_VIRT_VMWARE: case VIR_DOMAIN_VIRT_VMWARE:
return VIR_DOMAIN_VIDEO_TYPE_VMVGA; return VIR_DOMAIN_VIDEO_TYPE_VMVGA;
case VIR_DOMAIN_VIRT_VZ:
case VIR_DOMAIN_VIRT_PARALLELS: case VIR_DOMAIN_VIRT_PARALLELS:
if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) if (def->os.type == VIR_DOMAIN_OSTYPE_HVM)
return VIR_DOMAIN_VIDEO_TYPE_VGA; return VIR_DOMAIN_VIDEO_TYPE_VGA;
@ -15320,7 +15323,8 @@ virDomainDefParseXML(xmlDocPtr xml,
(input->type == VIR_DOMAIN_INPUT_TYPE_MOUSE || (input->type == VIR_DOMAIN_INPUT_TYPE_MOUSE ||
input->type == VIR_DOMAIN_INPUT_TYPE_KBD)) || input->type == VIR_DOMAIN_INPUT_TYPE_KBD)) ||
(def->os.type == VIR_DOMAIN_OSTYPE_EXE && (def->os.type == VIR_DOMAIN_OSTYPE_EXE &&
def->virtType == VIR_DOMAIN_VIRT_PARALLELS && (def->virtType == VIR_DOMAIN_VIRT_VZ ||
def->virtType == VIR_DOMAIN_VIRT_PARALLELS) &&
input->bus == VIR_DOMAIN_INPUT_BUS_PARALLELS && input->bus == VIR_DOMAIN_INPUT_BUS_PARALLELS &&
(input->type == VIR_DOMAIN_INPUT_TYPE_MOUSE || (input->type == VIR_DOMAIN_INPUT_TYPE_MOUSE ||
input->type == VIR_DOMAIN_INPUT_TYPE_KBD))) { input->type == VIR_DOMAIN_INPUT_TYPE_KBD))) {
@ -15356,7 +15360,8 @@ virDomainDefParseXML(xmlDocPtr xml,
if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) if (def->os.type == VIR_DOMAIN_OSTYPE_HVM)
input_bus = VIR_DOMAIN_INPUT_BUS_PS2; input_bus = VIR_DOMAIN_INPUT_BUS_PS2;
if (def->os.type == VIR_DOMAIN_OSTYPE_EXE && if (def->os.type == VIR_DOMAIN_OSTYPE_EXE &&
def->virtType == VIR_DOMAIN_VIRT_PARALLELS) (def->virtType == VIR_DOMAIN_VIRT_VZ ||
def->virtType == VIR_DOMAIN_VIRT_PARALLELS))
input_bus = VIR_DOMAIN_INPUT_BUS_PARALLELS; input_bus = VIR_DOMAIN_INPUT_BUS_PARALLELS;
if (virDomainDefMaybeAddInput(def, if (virDomainDefMaybeAddInput(def,
@ -21625,7 +21630,8 @@ virDomainDefFormatInternal(virDomainDefPtr def,
if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) if (def->os.type == VIR_DOMAIN_OSTYPE_HVM)
autoInput.bus = VIR_DOMAIN_INPUT_BUS_PS2; autoInput.bus = VIR_DOMAIN_INPUT_BUS_PS2;
else if (def->os.type == VIR_DOMAIN_OSTYPE_EXE && else if (def->os.type == VIR_DOMAIN_OSTYPE_EXE &&
def->virtType == VIR_DOMAIN_VIRT_PARALLELS) (def->virtType == VIR_DOMAIN_VIRT_VZ ||
def->virtType == VIR_DOMAIN_VIRT_PARALLELS))
autoInput.bus = VIR_DOMAIN_INPUT_BUS_PARALLELS; autoInput.bus = VIR_DOMAIN_INPUT_BUS_PARALLELS;
else else
autoInput.bus = VIR_DOMAIN_INPUT_BUS_XEN; autoInput.bus = VIR_DOMAIN_INPUT_BUS_XEN;