mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
libxl: move video default logic to driver
The logic setting a device default should be in the post parse function of individual driver code. Signed-off-by: Rafael Fonseca <r4f4rfs@gmail.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
a11a0e6e84
commit
624f905403
@ -15716,7 +15716,6 @@ virDomainVideoDefaultType(const virDomainDef *def)
|
|||||||
{
|
{
|
||||||
switch ((virDomainVirtType)def->virtType) {
|
switch ((virDomainVirtType)def->virtType) {
|
||||||
case VIR_DOMAIN_VIRT_TEST:
|
case VIR_DOMAIN_VIRT_TEST:
|
||||||
case VIR_DOMAIN_VIRT_XEN:
|
|
||||||
if (def->os.type == VIR_DOMAIN_OSTYPE_XEN ||
|
if (def->os.type == VIR_DOMAIN_OSTYPE_XEN ||
|
||||||
def->os.type == VIR_DOMAIN_OSTYPE_LINUX)
|
def->os.type == VIR_DOMAIN_OSTYPE_LINUX)
|
||||||
return VIR_DOMAIN_VIDEO_TYPE_XEN;
|
return VIR_DOMAIN_VIDEO_TYPE_XEN;
|
||||||
@ -15737,6 +15736,7 @@ virDomainVideoDefaultType(const virDomainDef *def)
|
|||||||
return VIR_DOMAIN_VIDEO_TYPE_VGA;
|
return VIR_DOMAIN_VIDEO_TYPE_VGA;
|
||||||
else
|
else
|
||||||
return VIR_DOMAIN_VIDEO_TYPE_PARALLELS;
|
return VIR_DOMAIN_VIDEO_TYPE_PARALLELS;
|
||||||
|
case VIR_DOMAIN_VIRT_XEN:
|
||||||
case VIR_DOMAIN_VIRT_BHYVE:
|
case VIR_DOMAIN_VIRT_BHYVE:
|
||||||
case VIR_DOMAIN_VIRT_QEMU:
|
case VIR_DOMAIN_VIRT_QEMU:
|
||||||
case VIR_DOMAIN_VIRT_KQEMU:
|
case VIR_DOMAIN_VIRT_KQEMU:
|
||||||
|
@ -315,7 +315,18 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
|
|||||||
pcisrc->backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN;
|
pcisrc->backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dev->type == VIR_DOMAIN_DEVICE_VIDEO && def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
|
if (dev->type == VIR_DOMAIN_DEVICE_VIDEO) {
|
||||||
|
if (dev->data.video->type == VIR_DOMAIN_VIDEO_TYPE_DEFAULT) {
|
||||||
|
if (def->os.type == VIR_DOMAIN_OSTYPE_XEN ||
|
||||||
|
def->os.type == VIR_DOMAIN_OSTYPE_LINUX)
|
||||||
|
dev->data.video->type = VIR_DOMAIN_VIDEO_TYPE_XEN;
|
||||||
|
else if (ARCH_IS_PPC64(def->os.arch))
|
||||||
|
dev->data.video->type = VIR_DOMAIN_VIDEO_TYPE_VGA;
|
||||||
|
else
|
||||||
|
dev->data.video->type = VIR_DOMAIN_VIDEO_TYPE_CIRRUS;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
|
||||||
int dm_type = libxlDomainGetEmulatorType(def);
|
int dm_type = libxlDomainGetEmulatorType(def);
|
||||||
|
|
||||||
switch (dev->data.video->type) {
|
switch (dev->data.video->type) {
|
||||||
@ -342,6 +353,7 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (dev->type == VIR_DOMAIN_DEVICE_DISK) {
|
if (dev->type == VIR_DOMAIN_DEVICE_DISK) {
|
||||||
virDomainDiskDefPtr disk = dev->data.disk;
|
virDomainDiskDefPtr disk = dev->data.disk;
|
||||||
|
Loading…
Reference in New Issue
Block a user