From: Ján Tomko <jtomko@redhat.com>
Date: Thu, 25 Feb 2016 11:53:35 +0000 (+0100)
Subject: Revert "Error out on missing machine type in machine configs"
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5f265fa0dbdacd474250a681ff7725dbe229630b;p=libvirt.git

Revert "Error out on missing machine type in machine configs"

Revert commit 55e6d8cd9eac7eb2aaa4d221585e9402cf7269d5.

This fix for https://bugzilla.redhat.com/show_bug.cgi?id=1267256
unconditionally required a machine type for all machine types
even though qemu is the only emulator using them.

Revert it to fix persistent configs for drivers with no machine type:
https://www.redhat.com/archives/libvir-list/2016-February/msg01228.html
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 3b15cb46d9..79758d42d8 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -14851,12 +14851,6 @@ virDomainDefParseXML(xmlDocPtr xml,
             goto error;
         }
         VIR_FREE(capsdata);
-    } else {
-        if (!def->os.machine) {
-            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                           _("Missing machine type"));
-            goto error;
-        }
     }
 
     /* Extract domain name */