mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-03 04:45:46 +00:00
domain: conf: Drop unused OSTYPE_AIX
The phyp driver stuffed it into a DomainDefPtr during its attachdevice routine, but the value is never advertised via capabilities so it should be safe to drop. Have the phyp driver use OSTYPE_LINUX, which is what it advertises via capabilities.
This commit is contained in:
parent
99725f946c
commit
066f7c7c3a
@ -262,7 +262,8 @@
|
|||||||
<element name='os_type'>
|
<element name='os_type'>
|
||||||
<choice>
|
<choice>
|
||||||
<value>xen</value> <!-- Xen 3.0 pv -->
|
<value>xen</value> <!-- Xen 3.0 pv -->
|
||||||
<value>linux</value> <!-- same as 'xen' - legacy -->
|
<value>linux</value> <!-- same as 'xen' - meant to be legacy,
|
||||||
|
but is also used by phyp driver -->
|
||||||
<value>hvm</value> <!-- unmodified OS -->
|
<value>hvm</value> <!-- unmodified OS -->
|
||||||
<value>exe</value> <!-- For container based virt -->
|
<value>exe</value> <!-- For container based virt -->
|
||||||
<value>uml</value> <!-- user mode linux -->
|
<value>uml</value> <!-- user mode linux -->
|
||||||
|
@ -124,8 +124,7 @@ VIR_ENUM_IMPL(virDomainOS, VIR_DOMAIN_OSTYPE_LAST,
|
|||||||
"xen",
|
"xen",
|
||||||
"linux",
|
"linux",
|
||||||
"exe",
|
"exe",
|
||||||
"uml",
|
"uml")
|
||||||
"aix")
|
|
||||||
|
|
||||||
VIR_ENUM_IMPL(virDomainBoot, VIR_DOMAIN_BOOT_LAST,
|
VIR_ENUM_IMPL(virDomainBoot, VIR_DOMAIN_BOOT_LAST,
|
||||||
"fd",
|
"fd",
|
||||||
|
@ -233,7 +233,6 @@ typedef enum {
|
|||||||
VIR_DOMAIN_OSTYPE_LINUX,
|
VIR_DOMAIN_OSTYPE_LINUX,
|
||||||
VIR_DOMAIN_OSTYPE_EXE,
|
VIR_DOMAIN_OSTYPE_EXE,
|
||||||
VIR_DOMAIN_OSTYPE_UML,
|
VIR_DOMAIN_OSTYPE_UML,
|
||||||
VIR_DOMAIN_OSTYPE_AIX,
|
|
||||||
|
|
||||||
VIR_DOMAIN_OSTYPE_LAST
|
VIR_DOMAIN_OSTYPE_LAST
|
||||||
} virDomainOSType;
|
} virDomainOSType;
|
||||||
|
@ -1720,7 +1720,7 @@ phypDomainAttachDevice(virDomainPtr domain, const char *xml)
|
|||||||
if (domain_name == NULL)
|
if (domain_name == NULL)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
def->os.type = VIR_DOMAIN_OSTYPE_AIX;
|
def->os.type = VIR_DOMAIN_OSTYPE_LINUX;
|
||||||
|
|
||||||
dev = virDomainDeviceDefParse(xml, def, phyp_driver->caps, NULL,
|
dev = virDomainDeviceDefParse(xml, def, phyp_driver->caps, NULL,
|
||||||
VIR_DOMAIN_DEF_PARSE_INACTIVE);
|
VIR_DOMAIN_DEF_PARSE_INACTIVE);
|
||||||
|
@ -250,7 +250,7 @@ test_virCapsDomainDataLookupQEMU(const void *data ATTRIBUTE_UNUSED)
|
|||||||
VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_PPC64LE,
|
VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_PPC64LE,
|
||||||
VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-ppc64", "pseries");
|
VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-ppc64", "pseries");
|
||||||
|
|
||||||
CAPS_EXPECT_ERR(VIR_DOMAIN_OSTYPE_AIX, VIR_ARCH_NONE, -1, NULL, NULL);
|
CAPS_EXPECT_ERR(VIR_DOMAIN_OSTYPE_LINUX, VIR_ARCH_NONE, -1, NULL, NULL);
|
||||||
CAPS_EXPECT_ERR(-1, VIR_ARCH_PPC64LE, -1, NULL, "pc");
|
CAPS_EXPECT_ERR(-1, VIR_ARCH_PPC64LE, -1, NULL, "pc");
|
||||||
CAPS_EXPECT_ERR(-1, VIR_ARCH_MIPS, -1, NULL, NULL);
|
CAPS_EXPECT_ERR(-1, VIR_ARCH_MIPS, -1, NULL, NULL);
|
||||||
CAPS_EXPECT_ERR(-1, VIR_ARCH_AARCH64, VIR_DOMAIN_VIRT_KVM,
|
CAPS_EXPECT_ERR(-1, VIR_ARCH_AARCH64, VIR_DOMAIN_VIRT_KVM,
|
||||||
|
Loading…
Reference in New Issue
Block a user