2008-05-22 16:18:40 +00:00
|
|
|
#include <config.h>
|
2008-06-26 09:37:51 +00:00
|
|
|
#ifdef WITH_QEMU
|
2010-03-09 18:22:22 +00:00
|
|
|
# include <stdlib.h>
|
2008-05-16 16:51:30 +00:00
|
|
|
|
2010-03-09 18:22:22 +00:00
|
|
|
# include "testutilsqemu.h"
|
|
|
|
# include "testutils.h"
|
2012-12-12 18:06:53 +00:00
|
|
|
# include "viralloc.h"
|
2010-04-16 06:01:59 +00:00
|
|
|
# include "cpu_conf.h"
|
2010-04-20 21:22:49 +00:00
|
|
|
# include "qemu/qemu_driver.h"
|
2010-12-17 16:41:51 +00:00
|
|
|
# include "qemu/qemu_domain.h"
|
2008-05-16 16:51:30 +00:00
|
|
|
|
2009-09-10 09:16:27 +00:00
|
|
|
static virCapsGuestMachinePtr *testQemuAllocMachines(int *nmachines)
|
|
|
|
{
|
|
|
|
virCapsGuestMachinePtr *machines;
|
|
|
|
static const char *const x86_machines[] = {
|
|
|
|
"pc", "isapc"
|
|
|
|
};
|
|
|
|
|
|
|
|
machines = virCapabilitiesAllocMachines(x86_machines,
|
|
|
|
ARRAY_CARDINALITY(x86_machines));
|
|
|
|
if (machines == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
*nmachines = ARRAY_CARDINALITY(x86_machines);
|
|
|
|
|
|
|
|
return machines;
|
|
|
|
}
|
|
|
|
|
2009-09-10 10:19:12 +00:00
|
|
|
/* Newer versions of qemu have versioned machine types to allow
|
|
|
|
* compatibility with older releases.
|
|
|
|
* The 'pc' machine type is an alias of the newest machine type.
|
|
|
|
*/
|
|
|
|
static virCapsGuestMachinePtr *testQemuAllocNewerMachines(int *nmachines)
|
|
|
|
{
|
|
|
|
virCapsGuestMachinePtr *machines;
|
|
|
|
char *canonical;
|
|
|
|
static const char *const x86_machines[] = {
|
|
|
|
"pc-0.11", "pc", "pc-0.10", "isapc"
|
|
|
|
};
|
|
|
|
|
|
|
|
if ((canonical = strdup(x86_machines[0])) == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
machines = virCapabilitiesAllocMachines(x86_machines,
|
|
|
|
ARRAY_CARDINALITY(x86_machines));
|
|
|
|
if (machines == NULL) {
|
|
|
|
VIR_FREE(canonical);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
machines[1]->canonical = canonical;
|
|
|
|
|
|
|
|
*nmachines = ARRAY_CARDINALITY(x86_machines);
|
|
|
|
|
|
|
|
return machines;
|
|
|
|
}
|
|
|
|
|
2012-11-09 15:00:36 +00:00
|
|
|
static int testQemuDefaultConsoleType(const char *ostype ATTRIBUTE_UNUSED,
|
2012-12-18 19:32:23 +00:00
|
|
|
virArch arch)
|
Fix default console type setting
The default console type may vary based on the OS type. ie a Xen
paravirt guests wants a 'xen' console, while a fullvirt guests
wants a 'serial' console.
A plain integer default console type in the capabilities does
not suffice. Instead introduce a callback that is passed the
OS type.
* src/conf/capabilities.h: Use a callback for default console
type
* src/conf/domain_conf.c, src/conf/domain_conf.h: Use callback
for default console type. Add missing LXC/OpenVZ console types.
* src/esx/esx_driver.c, src/libxl/libxl_conf.c,
src/lxc/lxc_conf.c, src/openvz/openvz_conf.c,
src/phyp/phyp_driver.c, src/qemu/qemu_capabilities.c,
src/uml/uml_conf.c, src/vbox/vbox_tmpl.c,
src/vmware/vmware_conf.c, src/xen/xen_hypervisor.c,
src/xenapi/xenapi_driver.c: Set default console type callback
2011-10-20 13:56:20 +00:00
|
|
|
{
|
2012-12-18 19:32:23 +00:00
|
|
|
if (arch == VIR_ARCH_S390 ||
|
|
|
|
arch == VIR_ARCH_S390X)
|
2012-11-09 15:00:36 +00:00
|
|
|
return VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO;
|
|
|
|
else
|
|
|
|
return VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL;
|
Fix default console type setting
The default console type may vary based on the OS type. ie a Xen
paravirt guests wants a 'xen' console, while a fullvirt guests
wants a 'serial' console.
A plain integer default console type in the capabilities does
not suffice. Instead introduce a callback that is passed the
OS type.
* src/conf/capabilities.h: Use a callback for default console
type
* src/conf/domain_conf.c, src/conf/domain_conf.h: Use callback
for default console type. Add missing LXC/OpenVZ console types.
* src/esx/esx_driver.c, src/libxl/libxl_conf.c,
src/lxc/lxc_conf.c, src/openvz/openvz_conf.c,
src/phyp/phyp_driver.c, src/qemu/qemu_capabilities.c,
src/uml/uml_conf.c, src/vbox/vbox_tmpl.c,
src/vmware/vmware_conf.c, src/xen/xen_hypervisor.c,
src/xenapi/xenapi_driver.c: Set default console type callback
2011-10-20 13:56:20 +00:00
|
|
|
}
|
|
|
|
|
2011-12-12 23:39:33 +00:00
|
|
|
static int testQemuAddPPC64Guest(virCapsPtr caps)
|
|
|
|
{
|
|
|
|
static const char *machine[] = { "pseries" };
|
|
|
|
virCapsGuestMachinePtr *machines = NULL;
|
|
|
|
virCapsGuestPtr guest;
|
|
|
|
|
|
|
|
machines = virCapabilitiesAllocMachines(machine, 1);
|
|
|
|
if (!machines)
|
|
|
|
goto error;
|
|
|
|
|
2012-12-18 19:32:23 +00:00
|
|
|
guest = virCapabilitiesAddGuest(caps, "hvm", VIR_ARCH_PPC64,
|
2011-12-12 23:39:33 +00:00
|
|
|
"/usr/bin/qemu-system-ppc64", NULL,
|
|
|
|
1, machines);
|
|
|
|
if (!guest)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
if (!virCapabilitiesAddGuestDomain(guest, "qemu", NULL, NULL, 0, NULL))
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
error:
|
|
|
|
/* No way to free a guest? */
|
|
|
|
virCapabilitiesFreeMachines(machines, 1);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-06-29 15:02:07 +00:00
|
|
|
static int testQemuAddS390Guest(virCapsPtr caps)
|
|
|
|
{
|
|
|
|
static const char *s390_machines[] = { "s390-virtio"};
|
|
|
|
virCapsGuestMachinePtr *machines = NULL;
|
|
|
|
virCapsGuestPtr guest;
|
|
|
|
|
|
|
|
machines = virCapabilitiesAllocMachines(s390_machines,
|
|
|
|
ARRAY_CARDINALITY(s390_machines));
|
|
|
|
if (!machines)
|
|
|
|
goto error;
|
|
|
|
|
2012-12-18 19:32:23 +00:00
|
|
|
guest = virCapabilitiesAddGuest(caps, "hvm", VIR_ARCH_S390X,
|
2012-06-29 15:02:07 +00:00
|
|
|
"/usr/bin/qemu-system-s390x", NULL,
|
|
|
|
ARRAY_CARDINALITY(s390_machines),
|
|
|
|
machines);
|
|
|
|
if (!guest)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
if (!virCapabilitiesAddGuestDomain(guest, "qemu", NULL, NULL, 0, NULL))
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
error:
|
|
|
|
virCapabilitiesFreeMachines(machines, ARRAY_CARDINALITY(s390_machines));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-05-16 16:51:30 +00:00
|
|
|
virCapsPtr testQemuCapsInit(void) {
|
|
|
|
virCapsPtr caps;
|
|
|
|
virCapsGuestPtr guest;
|
2010-04-22 15:00:30 +00:00
|
|
|
virCapsGuestMachinePtr *machines = NULL;
|
|
|
|
int nmachines = 0;
|
2008-05-16 16:51:30 +00:00
|
|
|
static const char *const xen_machines[] = {
|
|
|
|
"xenner"
|
|
|
|
};
|
2010-04-16 06:01:59 +00:00
|
|
|
static virCPUFeatureDef host_cpu_features[] = {
|
|
|
|
{ (char *) "lahf_lm", -1 },
|
|
|
|
{ (char *) "xtpr", -1 },
|
|
|
|
{ (char *) "cx16", -1 },
|
|
|
|
{ (char *) "tm2", -1 },
|
|
|
|
{ (char *) "est", -1 },
|
|
|
|
{ (char *) "vmx", -1 },
|
|
|
|
{ (char *) "ds_cpl", -1 },
|
|
|
|
{ (char *) "pbe", -1 },
|
|
|
|
{ (char *) "tm", -1 },
|
|
|
|
{ (char *) "ht", -1 },
|
|
|
|
{ (char *) "ss", -1 },
|
|
|
|
{ (char *) "acpi", -1 },
|
|
|
|
{ (char *) "ds", -1 }
|
|
|
|
};
|
|
|
|
static virCPUDef host_cpu = {
|
|
|
|
VIR_CPU_TYPE_HOST, /* type */
|
2011-08-18 10:14:36 +00:00
|
|
|
0, /* mode */
|
2010-04-16 06:01:59 +00:00
|
|
|
0, /* match */
|
2012-12-18 19:32:23 +00:00
|
|
|
VIR_ARCH_X86_64, /* arch */
|
2010-04-16 06:01:59 +00:00
|
|
|
(char *) "core2duo", /* model */
|
2012-06-28 10:21:17 +00:00
|
|
|
NULL, /* vendor_id */
|
2011-12-21 13:27:16 +00:00
|
|
|
0, /* fallback */
|
2010-07-02 15:51:59 +00:00
|
|
|
(char *) "Intel", /* vendor */
|
2010-04-16 06:01:59 +00:00
|
|
|
1, /* sockets */
|
|
|
|
2, /* cores */
|
|
|
|
1, /* threads */
|
|
|
|
ARRAY_CARDINALITY(host_cpu_features), /* nfeatures */
|
2010-08-17 21:41:51 +00:00
|
|
|
ARRAY_CARDINALITY(host_cpu_features), /* nfeatures_max */
|
2012-04-06 02:04:23 +00:00
|
|
|
host_cpu_features, /* features */
|
|
|
|
0, /* ncells */
|
|
|
|
0, /* ncells_max */
|
|
|
|
NULL, /* cells */
|
|
|
|
0, /* cells_cpus */
|
2010-04-16 06:01:59 +00:00
|
|
|
};
|
2008-05-16 16:51:30 +00:00
|
|
|
|
2011-02-15 14:24:39 +00:00
|
|
|
if ((caps = virCapabilitiesNew(host_cpu.arch,
|
2008-05-16 16:51:30 +00:00
|
|
|
0, 0)) == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
Fix default console type setting
The default console type may vary based on the OS type. ie a Xen
paravirt guests wants a 'xen' console, while a fullvirt guests
wants a 'serial' console.
A plain integer default console type in the capabilities does
not suffice. Instead introduce a callback that is passed the
OS type.
* src/conf/capabilities.h: Use a callback for default console
type
* src/conf/domain_conf.c, src/conf/domain_conf.h: Use callback
for default console type. Add missing LXC/OpenVZ console types.
* src/esx/esx_driver.c, src/libxl/libxl_conf.c,
src/lxc/lxc_conf.c, src/openvz/openvz_conf.c,
src/phyp/phyp_driver.c, src/qemu/qemu_capabilities.c,
src/uml/uml_conf.c, src/vbox/vbox_tmpl.c,
src/vmware/vmware_conf.c, src/xen/xen_hypervisor.c,
src/xenapi/xenapi_driver.c: Set default console type callback
2011-10-20 13:56:20 +00:00
|
|
|
caps->defaultConsoleTargetType = testQemuDefaultConsoleType;
|
|
|
|
|
2010-04-16 06:01:59 +00:00
|
|
|
if ((caps->host.cpu = virCPUDefCopy(&host_cpu)) == NULL ||
|
|
|
|
(machines = testQemuAllocMachines(&nmachines)) == NULL)
|
2009-07-23 17:31:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2010-12-17 16:41:51 +00:00
|
|
|
qemuDomainSetNamespaceHooks(caps);
|
2010-04-20 21:22:49 +00:00
|
|
|
|
2012-12-18 19:32:23 +00:00
|
|
|
if ((guest = virCapabilitiesAddGuest(caps, "hvm", VIR_ARCH_I686,
|
2008-05-16 16:51:30 +00:00
|
|
|
"/usr/bin/qemu", NULL,
|
2011-02-15 14:24:39 +00:00
|
|
|
nmachines, machines)) == NULL ||
|
|
|
|
!virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0))
|
2008-05-16 16:51:30 +00:00
|
|
|
goto cleanup;
|
2009-07-23 17:31:34 +00:00
|
|
|
machines = NULL;
|
|
|
|
|
2008-05-16 16:51:30 +00:00
|
|
|
if (virCapabilitiesAddGuestDomain(guest,
|
|
|
|
"qemu",
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
0,
|
|
|
|
NULL) == NULL)
|
|
|
|
goto cleanup;
|
|
|
|
|
2009-09-10 10:19:12 +00:00
|
|
|
if ((machines = testQemuAllocNewerMachines(&nmachines)) == NULL)
|
2009-07-23 17:31:34 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2012-12-18 19:32:23 +00:00
|
|
|
if ((guest = virCapabilitiesAddGuest(caps, "hvm", VIR_ARCH_X86_64,
|
2008-05-16 16:51:30 +00:00
|
|
|
"/usr/bin/qemu-system-x86_64", NULL,
|
2011-02-15 14:24:39 +00:00
|
|
|
nmachines, machines)) == NULL ||
|
|
|
|
!virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0))
|
2008-05-16 16:51:30 +00:00
|
|
|
goto cleanup;
|
2009-07-23 17:31:34 +00:00
|
|
|
machines = NULL;
|
|
|
|
|
2008-05-16 16:51:30 +00:00
|
|
|
if (virCapabilitiesAddGuestDomain(guest,
|
|
|
|
"qemu",
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
0,
|
|
|
|
NULL) == NULL)
|
|
|
|
goto cleanup;
|
2009-09-10 10:22:32 +00:00
|
|
|
|
|
|
|
if ((machines = testQemuAllocMachines(&nmachines)) == NULL)
|
|
|
|
goto cleanup;
|
|
|
|
|
2008-05-16 16:51:30 +00:00
|
|
|
if (virCapabilitiesAddGuestDomain(guest,
|
|
|
|
"kvm",
|
|
|
|
"/usr/bin/kvm",
|
|
|
|
NULL,
|
2009-09-10 10:22:32 +00:00
|
|
|
nmachines,
|
|
|
|
machines) == NULL)
|
2008-05-16 16:51:30 +00:00
|
|
|
goto cleanup;
|
2009-09-10 10:22:32 +00:00
|
|
|
machines = NULL;
|
2008-05-16 16:51:30 +00:00
|
|
|
|
2009-09-10 09:16:27 +00:00
|
|
|
nmachines = ARRAY_CARDINALITY(xen_machines);
|
2009-07-23 17:31:34 +00:00
|
|
|
if ((machines = virCapabilitiesAllocMachines(xen_machines, nmachines)) == NULL)
|
|
|
|
goto cleanup;
|
|
|
|
|
2012-12-18 19:32:23 +00:00
|
|
|
if ((guest = virCapabilitiesAddGuest(caps, "xen", VIR_ARCH_X86_64,
|
2008-05-16 16:51:30 +00:00
|
|
|
"/usr/bin/xenner", NULL,
|
2009-09-10 09:16:27 +00:00
|
|
|
nmachines, machines)) == NULL)
|
2008-05-16 16:51:30 +00:00
|
|
|
goto cleanup;
|
2009-07-23 17:31:34 +00:00
|
|
|
machines = NULL;
|
|
|
|
|
2008-05-16 16:51:30 +00:00
|
|
|
if (virCapabilitiesAddGuestDomain(guest,
|
|
|
|
"kvm",
|
|
|
|
"/usr/bin/kvm",
|
|
|
|
NULL,
|
|
|
|
0,
|
|
|
|
NULL) == NULL)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-12-12 23:39:33 +00:00
|
|
|
if (testQemuAddPPC64Guest(caps))
|
|
|
|
goto cleanup;
|
|
|
|
|
2012-06-29 15:02:07 +00:00
|
|
|
if (testQemuAddS390Guest(caps))
|
|
|
|
goto cleanup;
|
|
|
|
|
2009-11-30 19:01:31 +00:00
|
|
|
if (virTestGetDebug()) {
|
2009-09-10 10:07:20 +00:00
|
|
|
char *caps_str;
|
|
|
|
|
|
|
|
caps_str = virCapabilitiesFormatXML(caps);
|
|
|
|
if (!caps_str)
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
fprintf(stderr, "QEMU driver capabilities:\n%s", caps_str);
|
|
|
|
|
|
|
|
VIR_FREE(caps_str);
|
|
|
|
}
|
|
|
|
|
2008-05-16 16:51:30 +00:00
|
|
|
return caps;
|
|
|
|
|
|
|
|
cleanup:
|
2009-07-23 17:31:34 +00:00
|
|
|
virCapabilitiesFreeMachines(machines, nmachines);
|
2008-05-16 16:51:30 +00:00
|
|
|
virCapabilitiesFree(caps);
|
|
|
|
return NULL;
|
|
|
|
}
|
2008-06-26 09:37:51 +00:00
|
|
|
#endif
|