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.

diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
index 5f3ec70d97c73b54c72619ab016559ed2ab4bc33..88e08d299ac988fbb27583c5624bda64c5208904 100644 (file)
--- a/docs/schemas/capability.rng
+++ b/docs/schemas/capability.rng
@@ -262,7 +262,8 @@
     <element name='os_type'>
       <choice>
         <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>exe</value> <!-- For container based virt -->
         <value>uml</value> <!-- user mode linux -->

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 7e4f0af25d09817a224ac57db739d37d78c9f56f..5f74ab1c4c03b13f50f9543a0f211e301e837f75 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -124,8 +124,7 @@ VIR_ENUM_IMPL(virDomainOS, VIR_DOMAIN_OSTYPE_LAST,
               "xen",
               "linux",
               "exe",
-              "uml",
-              "aix")
+              "uml")
 
 VIR_ENUM_IMPL(virDomainBoot, VIR_DOMAIN_BOOT_LAST,
               "fd",

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 0761eee3f62446f4d076bfbc95e10f5dfc835a10..96988ef711dd548d62a40af319cc39f4452e4f71 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -233,7 +233,6 @@ typedef enum {
     VIR_DOMAIN_OSTYPE_LINUX,
     VIR_DOMAIN_OSTYPE_EXE,
     VIR_DOMAIN_OSTYPE_UML,
-    VIR_DOMAIN_OSTYPE_AIX,
 
     VIR_DOMAIN_OSTYPE_LAST
 } virDomainOSType;

diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index e9a31d054f19df514c61afd407d71605c631ffd4..c558c48d4877269288156b81f459b43f29098ecd 100644 (file)
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -1720,7 +1720,7 @@ phypDomainAttachDevice(virDomainPtr domain, const char *xml)
     if (domain_name == NULL)
         goto cleanup;
 
-    def->os.type = VIR_DOMAIN_OSTYPE_AIX;
+    def->os.type = VIR_DOMAIN_OSTYPE_LINUX;
 
     dev = virDomainDeviceDefParse(xml, def, phyp_driver->caps, NULL,
                                   VIR_DOMAIN_DEF_PARSE_INACTIVE);

diff --git a/tests/vircapstest.c b/tests/vircapstest.c
index 5a43d634572ca60b4fa68b9b76f67b5691d1fc93..0c79af8c3d140e244cefec876da34a7db92f1ec1 100644 (file)
--- a/tests/vircapstest.c
+++ b/tests/vircapstest.c
@@ -250,7 +250,7 @@ test_virCapsDomainDataLookupQEMU(const void *data ATTRIBUTE_UNUSED)
         VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_PPC64LE,
         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_MIPS, -1, NULL, NULL);
     CAPS_EXPECT_ERR(-1, VIR_ARCH_AARCH64, VIR_DOMAIN_VIRT_KVM,