{
size_t i;
+ if (!def->os.type) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("hypervisor type must be specified"));
+ return -1;
+ }
+
/* verify init path for container based domains */
if (STREQ(def->os.type, "exe") && !def->os.init) {
virReportError(VIR_ERR_XML_ERROR, "%s",
#include "qemu_capabilities.h"
#include "qemu_bridge_filter.h"
#include "cpu/cpu.h"
+#include "dirname.h"
#include "passfd.h"
#include "viralloc.h"
#include "virlog.h"
if (VIR_STRDUP(def->emulator, progargv[0]) < 0)
goto error;
- if (strstr(def->emulator, "kvm")) {
- def->virtType = VIR_DOMAIN_VIRT_KVM;
- def->features |= (1 << VIR_DOMAIN_FEATURE_PAE);
- }
-
+ if (!(path = last_component(def->emulator)))
+ goto error;
- if (strstr(def->emulator, "xenner")) {
+ if (strstr(path, "xenner")) {
def->virtType = VIR_DOMAIN_VIRT_KVM;
if (VIR_STRDUP(def->os.type, "xen") < 0)
goto error;
} else {
if (VIR_STRDUP(def->os.type, "hvm") < 0)
goto error;
+ if (strstr(path, "kvm")) {
+ def->virtType = VIR_DOMAIN_VIRT_KVM;
+ def->features |= (1 << VIR_DOMAIN_FEATURE_PAE);
+ }
}
- if (STRPREFIX(def->emulator, "qemu"))
- path = def->emulator;
- else
- path = strstr(def->emulator, "qemu");
if (def->virtType == VIR_DOMAIN_VIRT_KVM)
def->os.arch = qemuCaps->host.arch;
- else if (path &&
- STRPREFIX(path, "qemu-system-"))
+ else if (STRPREFIX(path, "qemu-system-"))
def->os.arch = virArchFromString(path + strlen("qemu-system-"));
else
def->os.arch = VIR_ARCH_I686;
(def->os.arch == VIR_ARCH_X86_64))
def->features |= (1 << VIR_DOMAIN_FEATURE_ACPI)
/*| (1 << VIR_DOMAIN_FEATURE_APIC)*/;
+
#define WANT_VALUE() \
const char *val = progargv[++i]; \
if (!val) { \