2008-01-30 02:15:54 +08:00
|
|
|
#include <config.h>
|
2007-11-26 20:03:34 +08:00
|
|
|
|
2007-07-19 05:34:22 +08:00
|
|
|
#include <stdio.h>
|
2007-11-26 20:03:34 +08:00
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <unistd.h>
|
2007-07-19 05:34:22 +08:00
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
|
2007-11-26 20:03:34 +08:00
|
|
|
#ifdef WITH_QEMU
|
|
|
|
|
|
2010-03-10 02:22:22 +08:00
|
|
|
# include "internal.h"
|
|
|
|
|
# include "testutils.h"
|
2011-11-01 09:29:07 +08:00
|
|
|
# include "util/memory.h"
|
2010-12-18 00:41:51 +08:00
|
|
|
# include "qemu/qemu_capabilities.h"
|
|
|
|
|
# include "qemu/qemu_command.h"
|
2011-07-12 01:29:09 +08:00
|
|
|
# include "qemu/qemu_domain.h"
|
2010-03-10 02:22:22 +08:00
|
|
|
# include "datatypes.h"
|
2010-04-16 14:21:23 +08:00
|
|
|
# include "cpu/cpu_map.h"
|
2007-07-19 05:34:22 +08:00
|
|
|
|
2010-03-10 02:22:22 +08:00
|
|
|
# include "testutilsqemu.h"
|
2008-05-17 00:51:30 +08:00
|
|
|
|
2010-04-16 14:21:23 +08:00
|
|
|
static const char *abs_top_srcdir;
|
2008-01-14 22:04:33 +08:00
|
|
|
static struct qemud_driver driver;
|
2007-07-19 05:34:22 +08:00
|
|
|
|
2011-11-01 09:29:07 +08:00
|
|
|
static unsigned char *
|
|
|
|
|
fakeSecretGetValue(virSecretPtr obj ATTRIBUTE_UNUSED,
|
|
|
|
|
size_t *value_size,
|
|
|
|
|
unsigned int fakeflags ATTRIBUTE_UNUSED,
|
|
|
|
|
unsigned int internalFlags ATTRIBUTE_UNUSED)
|
|
|
|
|
{
|
|
|
|
|
char *secret = strdup("AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A");
|
|
|
|
|
*value_size = strlen(secret);
|
|
|
|
|
return (unsigned char *) secret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static virSecretPtr
|
|
|
|
|
fakeSecretLookupByUsage(virConnectPtr conn,
|
|
|
|
|
int usageType ATTRIBUTE_UNUSED,
|
|
|
|
|
const char *usageID)
|
|
|
|
|
{
|
|
|
|
|
virSecretPtr ret = NULL;
|
|
|
|
|
int err;
|
|
|
|
|
if (STRNEQ(usageID, "mycluster_myname"))
|
|
|
|
|
return NULL;
|
|
|
|
|
err = VIR_ALLOC(ret);
|
|
|
|
|
if (err < 0)
|
|
|
|
|
return NULL;
|
|
|
|
|
ret->magic = VIR_SECRET_MAGIC;
|
|
|
|
|
ret->refs = 1;
|
|
|
|
|
ret->usageID = strdup(usageID);
|
|
|
|
|
if (!ret->usageID)
|
|
|
|
|
return NULL;
|
|
|
|
|
ret->conn = conn;
|
|
|
|
|
conn->refs++;
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
fakeSecretClose(virConnectPtr conn ATTRIBUTE_UNUSED)
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static virSecretDriver fakeSecretDriver = {
|
|
|
|
|
.name = "fake_secret",
|
|
|
|
|
.open = NULL,
|
|
|
|
|
.close = fakeSecretClose,
|
|
|
|
|
.numOfSecrets = NULL,
|
|
|
|
|
.listSecrets = NULL,
|
|
|
|
|
.lookupByUUID = NULL,
|
|
|
|
|
.lookupByUsage = fakeSecretLookupByUsage,
|
|
|
|
|
.defineXML = NULL,
|
|
|
|
|
.getXMLDesc = NULL,
|
|
|
|
|
.setValue = NULL,
|
|
|
|
|
.getValue = fakeSecretGetValue,
|
|
|
|
|
.undefine = NULL,
|
|
|
|
|
};
|
|
|
|
|
|
2008-10-11 00:52:20 +08:00
|
|
|
static int testCompareXMLToArgvFiles(const char *xml,
|
2010-11-23 07:09:13 +08:00
|
|
|
const char *cmdline,
|
2011-02-08 22:22:39 +08:00
|
|
|
virBitmapPtr extraFlags,
|
2010-10-23 00:50:34 +08:00
|
|
|
const char *migrateFrom,
|
2010-12-23 06:13:29 +08:00
|
|
|
int migrateFd,
|
2011-06-16 00:49:58 +08:00
|
|
|
bool json,
|
2011-12-21 21:27:16 +08:00
|
|
|
bool expectError,
|
|
|
|
|
bool expectFailure)
|
2011-04-25 06:25:10 +08:00
|
|
|
{
|
|
|
|
|
char *expectargv = NULL;
|
2010-11-23 07:09:13 +08:00
|
|
|
int len;
|
2007-07-19 05:34:22 +08:00
|
|
|
char *actualargv = NULL;
|
2010-11-23 07:09:13 +08:00
|
|
|
int ret = -1;
|
2008-07-12 03:34:11 +08:00
|
|
|
virDomainDefPtr vmdef = NULL;
|
2011-01-08 07:36:25 +08:00
|
|
|
virDomainChrSourceDef monitor_chr;
|
2010-02-10 21:19:17 +08:00
|
|
|
virConnectPtr conn;
|
2010-10-23 00:50:34 +08:00
|
|
|
char *log = NULL;
|
2010-04-16 14:20:33 +08:00
|
|
|
char *emulator = NULL;
|
2010-11-23 07:09:13 +08:00
|
|
|
virCommandPtr cmd = NULL;
|
2010-02-10 21:19:17 +08:00
|
|
|
|
|
|
|
|
if (!(conn = virGetConnect()))
|
2011-12-21 21:27:16 +08:00
|
|
|
goto out;
|
2011-11-01 09:29:07 +08:00
|
|
|
conn->secretDriver = &fakeSecretDriver;
|
2007-07-19 05:34:22 +08:00
|
|
|
|
2010-02-10 02:58:01 +08:00
|
|
|
if (!(vmdef = virDomainDefParseFile(driver.caps, xml,
|
2011-07-12 01:29:09 +08:00
|
|
|
QEMU_EXPECTED_VIRT_TYPES,
|
2008-12-04 20:02:59 +08:00
|
|
|
VIR_DOMAIN_XML_INACTIVE)))
|
2011-12-21 21:27:16 +08:00
|
|
|
goto out;
|
2007-07-19 05:34:22 +08:00
|
|
|
|
2010-04-16 14:20:33 +08:00
|
|
|
/*
|
|
|
|
|
* For test purposes, we may want to fake emulator's output by providing
|
|
|
|
|
* our own script instead of a real emulator. For this to work we need to
|
|
|
|
|
* specify a relative path in <emulator/> element, which, however, is not
|
|
|
|
|
* allowed by RelaxNG schema for domain XML. To work around it we add an
|
|
|
|
|
* extra '/' at the beginning of relative emulator path so that it looks
|
|
|
|
|
* like, e.g., "/./qemu.sh" or "/../emulator/qemu.sh" instead of
|
|
|
|
|
* "./qemu.sh" or "../emulator/qemu.sh" respectively. The following code
|
|
|
|
|
* detects such paths, strips the extra '/' and makes the path absolute.
|
|
|
|
|
*/
|
|
|
|
|
if (vmdef->emulator && STRPREFIX(vmdef->emulator, "/.")) {
|
|
|
|
|
if (!(emulator = strdup(vmdef->emulator + 1)))
|
2011-12-21 21:27:16 +08:00
|
|
|
goto out;
|
2012-02-03 07:16:43 +08:00
|
|
|
VIR_FREE(vmdef->emulator);
|
2010-04-16 14:20:33 +08:00
|
|
|
vmdef->emulator = NULL;
|
|
|
|
|
if (virAsprintf(&vmdef->emulator, "%s/qemuxml2argvdata/%s",
|
|
|
|
|
abs_srcdir, emulator) < 0)
|
2011-12-21 21:27:16 +08:00
|
|
|
goto out;
|
2010-04-16 14:20:33 +08:00
|
|
|
}
|
|
|
|
|
|
2011-02-08 22:08:12 +08:00
|
|
|
if (qemuCapsGet(extraFlags, QEMU_CAPS_DOMID))
|
2009-04-19 22:50:01 +08:00
|
|
|
vmdef->id = 6;
|
2008-11-05 06:15:30 +08:00
|
|
|
else
|
2009-04-19 22:50:01 +08:00
|
|
|
vmdef->id = -1;
|
2007-09-22 05:20:32 +08:00
|
|
|
|
Convert character devices over to use -device
The current character device syntax uses either
-serial tty,path=/dev/ttyS2
Or
-chardev tty,id=serial0,path=/dev/ttyS2 -serial chardev:serial0
With the new -device support, we now prefer
-chardev file,id=serial0,path=/tmp/serial.log -device isa-serial,chardev=serial0
This patch changes the existing -chardev syntax to use this new
scheme, and fallbacks to the old plain -serial syntax for old
QEMU.
The monitor device changes to
-chardev socket,id=monitor,path=/tmp/test-monitor,server,nowait -mon chardev=monitor
In addition, this patch adds --nodefaults, which kills off the
default serial, parallel, vga and nic devices. THis avoids the
need for us to explicitly turn each off
2009-12-15 02:04:35 +08:00
|
|
|
memset(&monitor_chr, 0, sizeof(monitor_chr));
|
2011-01-08 07:36:25 +08:00
|
|
|
monitor_chr.type = VIR_DOMAIN_CHR_TYPE_UNIX;
|
|
|
|
|
monitor_chr.data.nix.path = (char *)"/tmp/test-monitor";
|
|
|
|
|
monitor_chr.data.nix.listen = true;
|
2009-07-10 01:06:38 +08:00
|
|
|
|
2011-02-08 22:22:39 +08:00
|
|
|
qemuCapsSetList(extraFlags,
|
|
|
|
|
QEMU_CAPS_VNC_COLON,
|
|
|
|
|
QEMU_CAPS_NO_REBOOT,
|
2011-12-20 09:08:29 +08:00
|
|
|
QEMU_CAPS_NO_ACPI,
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_LAST);
|
2007-07-19 05:34:22 +08:00
|
|
|
|
2009-09-10 18:09:06 +08:00
|
|
|
if (qemudCanonicalizeMachine(&driver, vmdef) < 0)
|
2011-12-21 21:27:16 +08:00
|
|
|
goto out;
|
2009-09-10 18:09:06 +08:00
|
|
|
|
2011-02-08 22:22:39 +08:00
|
|
|
if (qemuCapsGet(extraFlags, QEMU_CAPS_DEVICE)) {
|
2010-01-28 01:03:54 +08:00
|
|
|
qemuDomainPCIAddressSetPtr pciaddrs;
|
2012-01-13 11:39:24 +08:00
|
|
|
|
|
|
|
|
if (qemuDomainAssignSpaprVIOAddresses(vmdef)) {
|
|
|
|
|
if (expectError)
|
|
|
|
|
goto ok;
|
2011-12-21 21:27:16 +08:00
|
|
|
goto out;
|
2012-01-13 11:39:24 +08:00
|
|
|
}
|
|
|
|
|
|
2010-01-28 01:03:54 +08:00
|
|
|
if (!(pciaddrs = qemuDomainPCIAddressSetCreate(vmdef)))
|
2011-12-21 21:27:16 +08:00
|
|
|
goto out;
|
2010-01-28 01:03:54 +08:00
|
|
|
|
|
|
|
|
if (qemuAssignDevicePCISlots(vmdef, pciaddrs) < 0)
|
2011-12-21 21:27:16 +08:00
|
|
|
goto out;
|
2010-01-28 01:03:54 +08:00
|
|
|
|
|
|
|
|
qemuDomainPCIAddressSetFree(pciaddrs);
|
|
|
|
|
}
|
|
|
|
|
|
2012-02-03 07:16:43 +08:00
|
|
|
log = virtTestLogContentAndReset();
|
|
|
|
|
VIR_FREE(log);
|
2010-11-29 21:11:53 +08:00
|
|
|
virResetLastError();
|
2010-10-23 00:50:34 +08:00
|
|
|
|
2011-02-10 10:19:38 +08:00
|
|
|
/* We do not call qemuCapsExtractVersionInfo() before calling
|
2011-02-07 22:54:08 +08:00
|
|
|
* qemuBuildCommandLine(), so we should set QEMU_CAPS_PCI_MULTIBUS for
|
2011-02-10 10:19:38 +08:00
|
|
|
* x86_64 and i686 architectures here.
|
|
|
|
|
*/
|
|
|
|
|
if (STREQLEN(vmdef->os.arch, "x86_64", 6) ||
|
|
|
|
|
STREQLEN(vmdef->os.arch, "i686", 4)) {
|
2011-02-08 22:22:39 +08:00
|
|
|
qemuCapsSet(extraFlags, QEMU_CAPS_PCI_MULTIBUS);
|
2011-02-10 10:19:38 +08:00
|
|
|
}
|
|
|
|
|
|
2011-10-20 20:45:12 +08:00
|
|
|
if (qemuAssignDeviceAliases(vmdef, extraFlags) < 0)
|
2011-12-21 21:27:16 +08:00
|
|
|
goto out;
|
2011-10-20 20:45:12 +08:00
|
|
|
|
2010-12-18 00:41:51 +08:00
|
|
|
if (!(cmd = qemuBuildCommandLine(conn, &driver,
|
2011-06-16 00:49:58 +08:00
|
|
|
vmdef, &monitor_chr, json, extraFlags,
|
2010-12-23 06:13:29 +08:00
|
|
|
migrateFrom, migrateFd, NULL,
|
2011-12-21 21:27:16 +08:00
|
|
|
VIR_NETDEV_VPORT_PROFILE_OP_NO_OP))) {
|
|
|
|
|
if (expectFailure) {
|
|
|
|
|
ret = 0;
|
|
|
|
|
virResetLastError();
|
|
|
|
|
}
|
|
|
|
|
goto out;
|
|
|
|
|
} else if (expectFailure) {
|
|
|
|
|
if (virTestGetDebug())
|
|
|
|
|
fprintf(stderr, "qemuBuildCommandLine should have failed\n");
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
2007-07-19 05:34:22 +08:00
|
|
|
|
2010-11-29 21:11:53 +08:00
|
|
|
if (!!virGetLastError() != expectError) {
|
|
|
|
|
if (virTestGetDebug() && (log = virtTestLogContentAndReset()))
|
2010-10-23 00:50:34 +08:00
|
|
|
fprintf(stderr, "\n%s", log);
|
2011-12-21 21:27:16 +08:00
|
|
|
goto out;
|
2010-10-23 00:50:34 +08:00
|
|
|
}
|
|
|
|
|
|
2010-11-23 07:09:13 +08:00
|
|
|
if (!(actualargv = virCommandToString(cmd)))
|
2011-12-21 21:27:16 +08:00
|
|
|
goto out;
|
2010-11-23 07:09:13 +08:00
|
|
|
|
|
|
|
|
if (emulator) {
|
|
|
|
|
/* Skip the abs_srcdir portion of replacement emulator. */
|
|
|
|
|
char *start_skip = strstr(actualargv, abs_srcdir);
|
|
|
|
|
char *end_skip = strstr(actualargv, emulator);
|
|
|
|
|
if (!start_skip || !end_skip)
|
2011-12-21 21:27:16 +08:00
|
|
|
goto out;
|
2010-11-23 07:09:13 +08:00
|
|
|
memmove(start_skip, end_skip, strlen(end_skip) + 1);
|
2007-07-19 05:34:22 +08:00
|
|
|
}
|
|
|
|
|
|
2011-12-21 21:27:16 +08:00
|
|
|
len = virtTestLoadFile(cmdline, &expectargv);
|
|
|
|
|
if (len < 0)
|
|
|
|
|
goto out;
|
|
|
|
|
if (len && expectargv[len - 1] == '\n')
|
|
|
|
|
expectargv[len - 1] = '\0';
|
|
|
|
|
|
2008-04-26 04:46:13 +08:00
|
|
|
if (STRNEQ(expectargv, actualargv)) {
|
|
|
|
|
virtTestDifference(stderr, expectargv, actualargv);
|
2011-12-21 21:27:16 +08:00
|
|
|
goto out;
|
2007-07-19 05:34:22 +08:00
|
|
|
}
|
|
|
|
|
|
2012-01-13 11:39:24 +08:00
|
|
|
ok:
|
|
|
|
|
if (expectError) {
|
|
|
|
|
/* need to suppress the errors */
|
|
|
|
|
virResetLastError();
|
|
|
|
|
}
|
|
|
|
|
|
2007-07-19 05:34:22 +08:00
|
|
|
ret = 0;
|
|
|
|
|
|
2011-12-21 21:27:16 +08:00
|
|
|
out:
|
2012-02-03 07:16:43 +08:00
|
|
|
VIR_FREE(log);
|
|
|
|
|
VIR_FREE(emulator);
|
|
|
|
|
VIR_FREE(expectargv);
|
|
|
|
|
VIR_FREE(actualargv);
|
2010-11-23 07:09:13 +08:00
|
|
|
virCommandFree(cmd);
|
2008-07-12 03:34:11 +08:00
|
|
|
virDomainDefFree(vmdef);
|
2010-02-10 21:19:17 +08:00
|
|
|
virUnrefConnect(conn);
|
2007-07-19 05:34:22 +08:00
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-05-10 00:41:19 +08:00
|
|
|
struct testInfo {
|
|
|
|
|
const char *name;
|
2011-02-08 22:22:39 +08:00
|
|
|
virBitmapPtr extraFlags;
|
2009-01-30 01:27:54 +08:00
|
|
|
const char *migrateFrom;
|
2010-12-23 06:13:29 +08:00
|
|
|
int migrateFd;
|
2010-10-23 00:50:34 +08:00
|
|
|
bool expectError;
|
2011-12-21 21:27:16 +08:00
|
|
|
bool expectFailure;
|
2008-05-10 00:41:19 +08:00
|
|
|
};
|
|
|
|
|
|
2011-04-25 06:25:10 +08:00
|
|
|
static int
|
|
|
|
|
testCompareXMLToArgvHelper(const void *data)
|
|
|
|
|
{
|
|
|
|
|
int result = -1;
|
2008-05-10 00:41:19 +08:00
|
|
|
const struct testInfo *info = data;
|
2011-04-25 06:25:10 +08:00
|
|
|
char *xml = NULL;
|
|
|
|
|
char *args = NULL;
|
|
|
|
|
|
|
|
|
|
if (virAsprintf(&xml, "%s/qemuxml2argvdata/qemuxml2argv-%s.xml",
|
|
|
|
|
abs_srcdir, info->name) < 0 ||
|
|
|
|
|
virAsprintf(&args, "%s/qemuxml2argvdata/qemuxml2argv-%s.args",
|
|
|
|
|
abs_srcdir, info->name) < 0)
|
|
|
|
|
goto cleanup;
|
|
|
|
|
|
|
|
|
|
result = testCompareXMLToArgvFiles(xml, args, info->extraFlags,
|
2011-06-16 00:49:58 +08:00
|
|
|
info->migrateFrom, info->migrateFd,
|
2011-10-21 04:36:32 +08:00
|
|
|
qemuCapsGet(info->extraFlags,
|
|
|
|
|
QEMU_CAPS_MONITOR_JSON),
|
2011-12-21 21:27:16 +08:00
|
|
|
info->expectError,
|
|
|
|
|
info->expectFailure);
|
2011-04-25 06:25:10 +08:00
|
|
|
|
|
|
|
|
cleanup:
|
2012-02-03 07:16:43 +08:00
|
|
|
VIR_FREE(xml);
|
|
|
|
|
VIR_FREE(args);
|
2011-04-25 06:25:10 +08:00
|
|
|
return result;
|
2007-07-19 05:34:22 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2008-05-29 23:31:49 +08:00
|
|
|
static int
|
2011-04-30 00:21:20 +08:00
|
|
|
mymain(void)
|
2007-07-19 05:34:22 +08:00
|
|
|
{
|
|
|
|
|
int ret = 0;
|
2011-04-25 06:25:10 +08:00
|
|
|
char *map = NULL;
|
2007-07-19 05:34:22 +08:00
|
|
|
|
2010-04-16 14:21:23 +08:00
|
|
|
abs_top_srcdir = getenv("abs_top_srcdir");
|
|
|
|
|
if (!abs_top_srcdir)
|
|
|
|
|
abs_top_srcdir = "..";
|
|
|
|
|
|
2008-05-29 23:31:49 +08:00
|
|
|
if ((driver.caps = testQemuCapsInit()) == NULL)
|
|
|
|
|
return EXIT_FAILURE;
|
Support configuration of huge pages in guests
Add option to domain XML for
<memoryBacking>
<hugepages/>
</memoryBacking>
* configure.in: Add check for mntent.h
* qemud/libvirtd_qemu.aug, qemud/test_libvirtd_qemu.aug, src/qemu.conf
Add 'hugetlbfs_mount' config parameter
* src/qemu_conf.c, src/qemu_conf.h: Check for -mem-path flag in QEMU,
and pass it when hugepages are requested.
Load hugetlbfs_mount config parameter, search for mount if not given.
* src/qemu_driver.c: Free hugetlbfs_mount/path parameter in driver shutdown.
Create directory for QEMU hugepage usage, chowning if required.
* docs/formatdomain.html.in: Document memoryBacking/hugepages elements
* docs/schemas/domain.rng: Add memoryBacking/hugepages elements to schema
* src/util.c, src/util.h, src/libvirt_private.syms: Add virFileFindMountPoint
helper API
* tests/qemuhelptest.c: Add -mem-path constants
* tests/qemuxml2argvtest.c, tests/qemuxml2xmltest.c: Add tests for hugepage
handling
* tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml,
tests/qemuxml2argvdata/qemuxml2argv-hugepages.args: Data files for
hugepage tests
2009-08-25 22:05:18 +08:00
|
|
|
if ((driver.stateDir = strdup("/nowhere")) == NULL)
|
|
|
|
|
return EXIT_FAILURE;
|
|
|
|
|
if ((driver.hugetlbfs_mount = strdup("/dev/hugepages")) == NULL)
|
|
|
|
|
return EXIT_FAILURE;
|
|
|
|
|
if ((driver.hugepage_path = strdup("/dev/hugepages/libvirt/qemu")) == NULL)
|
2008-12-18 23:22:49 +08:00
|
|
|
return EXIT_FAILURE;
|
2010-03-06 04:31:50 +08:00
|
|
|
driver.spiceTLS = 1;
|
|
|
|
|
if (!(driver.spiceTLSx509certdir = strdup("/etc/pki/libvirt-spice")))
|
|
|
|
|
return EXIT_FAILURE;
|
|
|
|
|
if (!(driver.spicePassword = strdup("123456")))
|
|
|
|
|
return EXIT_FAILURE;
|
2011-04-25 06:25:10 +08:00
|
|
|
if (virAsprintf(&map, "%s/src/cpu/cpu_map.xml", abs_top_srcdir) < 0 ||
|
|
|
|
|
cpuMapOverride(map) < 0) {
|
2012-02-03 07:16:43 +08:00
|
|
|
VIR_FREE(map);
|
2010-04-16 14:21:23 +08:00
|
|
|
return EXIT_FAILURE;
|
2011-04-25 06:25:10 +08:00
|
|
|
}
|
2010-04-16 14:21:23 +08:00
|
|
|
|
2011-12-21 21:27:16 +08:00
|
|
|
# define DO_TEST_FULL(name, migrateFrom, migrateFd, \
|
|
|
|
|
expectError, expectFailure, ...) \
|
2008-05-10 00:41:19 +08:00
|
|
|
do { \
|
2011-02-08 22:22:39 +08:00
|
|
|
struct testInfo info = { \
|
2011-12-21 21:27:16 +08:00
|
|
|
name, NULL, migrateFrom, migrateFd, \
|
|
|
|
|
expectError, expectFailure \
|
2010-10-23 00:50:34 +08:00
|
|
|
}; \
|
2011-02-08 22:22:39 +08:00
|
|
|
if (!(info.extraFlags = qemuCapsNew())) \
|
|
|
|
|
return EXIT_FAILURE; \
|
|
|
|
|
qemuCapsSetList(info.extraFlags, __VA_ARGS__, QEMU_CAPS_LAST); \
|
2008-05-10 00:41:19 +08:00
|
|
|
if (virtTestRun("QEMU XML-2-ARGV " name, \
|
|
|
|
|
1, testCompareXMLToArgvHelper, &info) < 0) \
|
|
|
|
|
ret = -1; \
|
2011-02-08 22:22:39 +08:00
|
|
|
qemuCapsFree(info.extraFlags); \
|
2008-05-10 00:41:19 +08:00
|
|
|
} while (0)
|
|
|
|
|
|
2011-02-08 22:22:39 +08:00
|
|
|
# define DO_TEST(name, expectError, ...) \
|
2011-12-21 21:27:16 +08:00
|
|
|
DO_TEST_FULL(name, NULL, -1, expectError, false, __VA_ARGS__)
|
|
|
|
|
|
|
|
|
|
# define DO_TEST_FAILURE(name, ...) \
|
|
|
|
|
DO_TEST_FULL(name, NULL, -1, false, true, __VA_ARGS__)
|
2011-02-08 22:22:39 +08:00
|
|
|
|
|
|
|
|
# define NONE QEMU_CAPS_LAST
|
2009-01-30 01:27:54 +08:00
|
|
|
|
2009-12-28 23:21:15 +08:00
|
|
|
/* Unset or set all envvars here that are copied in qemudBuildCommandLine
|
|
|
|
|
* using ADD_ENV_COPY, otherwise these tests may fail due to unexpected
|
|
|
|
|
* values for these envvars */
|
2008-10-11 00:52:20 +08:00
|
|
|
setenv("PATH", "/bin", 1);
|
|
|
|
|
setenv("USER", "test", 1);
|
|
|
|
|
setenv("LOGNAME", "test", 1);
|
|
|
|
|
setenv("HOME", "/home/test", 1);
|
|
|
|
|
unsetenv("TMPDIR");
|
|
|
|
|
unsetenv("LD_PRELOAD");
|
|
|
|
|
unsetenv("LD_LIBRARY_PATH");
|
2009-12-28 23:21:15 +08:00
|
|
|
unsetenv("QEMU_AUDIO_DRV");
|
|
|
|
|
unsetenv("SDL_AUDIODRIVER");
|
2008-10-11 00:52:20 +08:00
|
|
|
|
2011-02-08 22:22:39 +08:00
|
|
|
DO_TEST("minimal", false, QEMU_CAPS_NAME);
|
|
|
|
|
DO_TEST("machine-aliases1", false, NONE);
|
|
|
|
|
DO_TEST("machine-aliases2", true, NONE);
|
|
|
|
|
DO_TEST("boot-cdrom", false, NONE);
|
|
|
|
|
DO_TEST("boot-network", false, NONE);
|
|
|
|
|
DO_TEST("boot-floppy", false, NONE);
|
|
|
|
|
DO_TEST("boot-multi", false, QEMU_CAPS_BOOT_MENU);
|
2011-05-26 22:15:01 +08:00
|
|
|
DO_TEST("boot-menu-enable", false,
|
|
|
|
|
QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE);
|
|
|
|
|
DO_TEST("boot-menu-enable", false,
|
|
|
|
|
QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_BOOTINDEX);
|
2011-02-08 22:22:39 +08:00
|
|
|
DO_TEST("boot-menu-disable", false, QEMU_CAPS_BOOT_MENU);
|
2011-05-26 22:15:01 +08:00
|
|
|
DO_TEST("boot-menu-disable-drive", false,
|
|
|
|
|
QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE);
|
|
|
|
|
DO_TEST("boot-menu-disable-drive-bootindex", false,
|
|
|
|
|
QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_BOOTINDEX);
|
2011-02-08 22:22:39 +08:00
|
|
|
DO_TEST("boot-order", false,
|
qemu: add new disk device='lun' for bus='virtio' & type='block'
In the past, generic SCSI commands issued from a guest to a virtio
disk were always passed through to the underlying disk by qemu, and
the kernel would also pass them on.
As a result of CVE-2011-4127 (see:
http://seclists.org/oss-sec/2011/q4/536), qemu now honors its
scsi=on|off device option for virtio-blk-pci (which enables/disables
passthrough of generic SCSI commands), and the kernel will only allow
the commands for physical devices (not for partitions or logical
volumes). The default behavior of qemu is still to allow sending
generic SCSI commands to physical disks that are presented to a guest
as virtio-blk-pci devices, but libvirt prefers to disable those
commands in the standard virtio block devices, enabling it only when
specifically requested (hopefully indicating that the requester
understands what they're asking for). For this purpose, a new libvirt
disk device type (device='lun') has been created.
device='lun' is identical to the default device='disk', except that:
1) It is only allowed if bus='virtio', type='block', and the qemu
version is "new enough" to support it ("new enough" == qemu 0.11 or
better), otherwise the domain will fail to start and a
CONFIG_UNSUPPORTED error will be logged).
2) The option "scsi=on" will be added to the -device arg to allow
SG_IO commands (if device !='lun', "scsi=off" will be added to the
-device arg so that SG_IO commands are specifically forbidden).
Guests which continue to use disk device='disk' (the default) will no
longer be able to use SG_IO commands on the disk; those that have
their disk device changed to device='lun' will still be able to use SG_IO
commands.
*docs/formatdomain.html.in - document the new device attribute value.
*docs/schemas/domaincommon.rng - allow it in the RNG
*tests/* - update the args of several existing tests to add scsi=off, and
add one new test that will test scsi=on.
*src/conf/domain_conf.c - update domain XML parser and formatter
*src/qemu/qemu_(command|driver|hotplug).c - treat
VIR_DOMAIN_DISK_DEVICE_LUN *almost* identically to
VIR_DOMAIN_DISK_DEVICE_DISK, except as indicated above.
Note that no support for this new device value was added to any
hypervisor drivers other than qemu, because it's unclear what it might
mean (if anything) to those drivers.
2012-01-05 11:48:38 +08:00
|
|
|
QEMU_CAPS_BOOTINDEX, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
|
2011-05-26 22:15:01 +08:00
|
|
|
DO_TEST("boot-complex", false,
|
qemu: add new disk device='lun' for bus='virtio' & type='block'
In the past, generic SCSI commands issued from a guest to a virtio
disk were always passed through to the underlying disk by qemu, and
the kernel would also pass them on.
As a result of CVE-2011-4127 (see:
http://seclists.org/oss-sec/2011/q4/536), qemu now honors its
scsi=on|off device option for virtio-blk-pci (which enables/disables
passthrough of generic SCSI commands), and the kernel will only allow
the commands for physical devices (not for partitions or logical
volumes). The default behavior of qemu is still to allow sending
generic SCSI commands to physical disks that are presented to a guest
as virtio-blk-pci devices, but libvirt prefers to disable those
commands in the standard virtio block devices, enabling it only when
specifically requested (hopefully indicating that the requester
understands what they're asking for). For this purpose, a new libvirt
disk device type (device='lun') has been created.
device='lun' is identical to the default device='disk', except that:
1) It is only allowed if bus='virtio', type='block', and the qemu
version is "new enough" to support it ("new enough" == qemu 0.11 or
better), otherwise the domain will fail to start and a
CONFIG_UNSUPPORTED error will be logged).
2) The option "scsi=on" will be added to the -device arg to allow
SG_IO commands (if device !='lun', "scsi=off" will be added to the
-device arg so that SG_IO commands are specifically forbidden).
Guests which continue to use disk device='disk' (the default) will no
longer be able to use SG_IO commands on the disk; those that have
their disk device changed to device='lun' will still be able to use SG_IO
commands.
*docs/formatdomain.html.in - document the new device attribute value.
*docs/schemas/domaincommon.rng - allow it in the RNG
*tests/* - update the args of several existing tests to add scsi=off, and
add one new test that will test scsi=on.
*src/conf/domain_conf.c - update domain XML parser and formatter
*src/qemu/qemu_(command|driver|hotplug).c - treat
VIR_DOMAIN_DISK_DEVICE_LUN *almost* identically to
VIR_DOMAIN_DISK_DEVICE_DISK, except as indicated above.
Note that no support for this new device value was added to any
hypervisor drivers other than qemu, because it's unclear what it might
mean (if anything) to those drivers.
2012-01-05 11:48:38 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT,
|
|
|
|
|
QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
|
2011-05-26 22:15:01 +08:00
|
|
|
DO_TEST("boot-complex-bootindex", false,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT,
|
qemu: add new disk device='lun' for bus='virtio' & type='block'
In the past, generic SCSI commands issued from a guest to a virtio
disk were always passed through to the underlying disk by qemu, and
the kernel would also pass them on.
As a result of CVE-2011-4127 (see:
http://seclists.org/oss-sec/2011/q4/536), qemu now honors its
scsi=on|off device option for virtio-blk-pci (which enables/disables
passthrough of generic SCSI commands), and the kernel will only allow
the commands for physical devices (not for partitions or logical
volumes). The default behavior of qemu is still to allow sending
generic SCSI commands to physical disks that are presented to a guest
as virtio-blk-pci devices, but libvirt prefers to disable those
commands in the standard virtio block devices, enabling it only when
specifically requested (hopefully indicating that the requester
understands what they're asking for). For this purpose, a new libvirt
disk device type (device='lun') has been created.
device='lun' is identical to the default device='disk', except that:
1) It is only allowed if bus='virtio', type='block', and the qemu
version is "new enough" to support it ("new enough" == qemu 0.11 or
better), otherwise the domain will fail to start and a
CONFIG_UNSUPPORTED error will be logged).
2) The option "scsi=on" will be added to the -device arg to allow
SG_IO commands (if device !='lun', "scsi=off" will be added to the
-device arg so that SG_IO commands are specifically forbidden).
Guests which continue to use disk device='disk' (the default) will no
longer be able to use SG_IO commands on the disk; those that have
their disk device changed to device='lun' will still be able to use SG_IO
commands.
*docs/formatdomain.html.in - document the new device attribute value.
*docs/schemas/domaincommon.rng - allow it in the RNG
*tests/* - update the args of several existing tests to add scsi=off, and
add one new test that will test scsi=on.
*src/conf/domain_conf.c - update domain XML parser and formatter
*src/qemu/qemu_(command|driver|hotplug).c - treat
VIR_DOMAIN_DISK_DEVICE_LUN *almost* identically to
VIR_DOMAIN_DISK_DEVICE_DISK, except as indicated above.
Note that no support for this new device value was added to any
hypervisor drivers other than qemu, because it's unclear what it might
mean (if anything) to those drivers.
2012-01-05 11:48:38 +08:00
|
|
|
QEMU_CAPS_BOOTINDEX,
|
|
|
|
|
QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
|
2011-02-08 22:22:39 +08:00
|
|
|
DO_TEST("bootloader", true, QEMU_CAPS_DOMID);
|
2011-07-08 15:56:17 +08:00
|
|
|
DO_TEST("bios", false, QEMU_CAPS_DEVICE, QEMU_CAPS_SGA);
|
2011-02-08 22:22:39 +08:00
|
|
|
DO_TEST("clock-utc", false, NONE);
|
|
|
|
|
DO_TEST("clock-localtime", false, NONE);
|
2010-02-03 02:07:12 +08:00
|
|
|
/*
|
|
|
|
|
* Can't be enabled since the absolute timestamp changes every time
|
2011-02-08 22:22:39 +08:00
|
|
|
DO_TEST("clock-variable", false, QEMU_CAPS_RTC);
|
2010-02-03 02:07:12 +08:00
|
|
|
*/
|
2011-02-08 22:22:39 +08:00
|
|
|
DO_TEST("clock-france", false, QEMU_CAPS_RTC);
|
2012-01-27 21:49:52 +08:00
|
|
|
DO_TEST("cpu-kvmclock", false, QEMU_CAPS_ENABLE_KVM);
|
|
|
|
|
DO_TEST("cpu-host-kvmclock", false, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_CPU_HOST);
|
|
|
|
|
DO_TEST("kvmclock", false, QEMU_CAPS_KVM);
|
2011-02-08 22:22:39 +08:00
|
|
|
|
|
|
|
|
DO_TEST("hugepages", false, QEMU_CAPS_MEM_PATH);
|
|
|
|
|
DO_TEST("disk-cdrom", false, NONE);
|
|
|
|
|
DO_TEST("disk-cdrom-empty", false, QEMU_CAPS_DRIVE);
|
|
|
|
|
DO_TEST("disk-floppy", false, NONE);
|
|
|
|
|
DO_TEST("disk-many", false, NONE);
|
|
|
|
|
DO_TEST("disk-virtio", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT);
|
2011-05-25 00:01:11 +08:00
|
|
|
DO_TEST("disk-order", false,
|
qemu: add new disk device='lun' for bus='virtio' & type='block'
In the past, generic SCSI commands issued from a guest to a virtio
disk were always passed through to the underlying disk by qemu, and
the kernel would also pass them on.
As a result of CVE-2011-4127 (see:
http://seclists.org/oss-sec/2011/q4/536), qemu now honors its
scsi=on|off device option for virtio-blk-pci (which enables/disables
passthrough of generic SCSI commands), and the kernel will only allow
the commands for physical devices (not for partitions or logical
volumes). The default behavior of qemu is still to allow sending
generic SCSI commands to physical disks that are presented to a guest
as virtio-blk-pci devices, but libvirt prefers to disable those
commands in the standard virtio block devices, enabling it only when
specifically requested (hopefully indicating that the requester
understands what they're asking for). For this purpose, a new libvirt
disk device type (device='lun') has been created.
device='lun' is identical to the default device='disk', except that:
1) It is only allowed if bus='virtio', type='block', and the qemu
version is "new enough" to support it ("new enough" == qemu 0.11 or
better), otherwise the domain will fail to start and a
CONFIG_UNSUPPORTED error will be logged).
2) The option "scsi=on" will be added to the -device arg to allow
SG_IO commands (if device !='lun', "scsi=off" will be added to the
-device arg so that SG_IO commands are specifically forbidden).
Guests which continue to use disk device='disk' (the default) will no
longer be able to use SG_IO commands on the disk; those that have
their disk device changed to device='lun' will still be able to use SG_IO
commands.
*docs/formatdomain.html.in - document the new device attribute value.
*docs/schemas/domaincommon.rng - allow it in the RNG
*tests/* - update the args of several existing tests to add scsi=off, and
add one new test that will test scsi=on.
*src/conf/domain_conf.c - update domain XML parser and formatter
*src/qemu/qemu_(command|driver|hotplug).c - treat
VIR_DOMAIN_DISK_DEVICE_LUN *almost* identically to
VIR_DOMAIN_DISK_DEVICE_DISK, except as indicated above.
Note that no support for this new device value was added to any
hypervisor drivers other than qemu, because it's unclear what it might
mean (if anything) to those drivers.
2012-01-05 11:48:38 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE_BOOT,
|
|
|
|
|
QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
|
2011-02-08 22:22:39 +08:00
|
|
|
DO_TEST("disk-xenvbd", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT);
|
|
|
|
|
DO_TEST("disk-drive-boot-disk", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT);
|
|
|
|
|
DO_TEST("disk-drive-boot-cdrom", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT);
|
|
|
|
|
DO_TEST("floppy-drive-fat", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_DRIVE_FORMAT);
|
|
|
|
|
DO_TEST("disk-drive-fat", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_DRIVE_FORMAT);
|
|
|
|
|
DO_TEST("disk-drive-readonly-disk", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_READONLY,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("disk-drive-readonly-no-device", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("disk-drive-fmt-qcow", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_DRIVE_FORMAT);
|
|
|
|
|
DO_TEST("disk-drive-shared", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL);
|
|
|
|
|
DO_TEST("disk-drive-cache-v1-wt", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
|
|
|
|
DO_TEST("disk-drive-cache-v1-wb", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
|
|
|
|
DO_TEST("disk-drive-cache-v1-none", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
|
|
|
|
DO_TEST("disk-drive-error-policy-stop", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_DRIVE_FORMAT);
|
qemu: leave rerror policy at default when enospace is requested
commit 12062ab set rerror=ignore when error_policy="enospace" was
selected (since the rerror option in qemu doesn't accept "enospc", as
the werror option does).
After that patch was already pushed, Paolo Bonzini noticed it and
commented that leaving rerror at the default ("report") would be a
better choice. This patch corrects the problem - if error_policy =
"enospace" is given, rerror is left off the qemu commandline,
effectively setting it to "report". For other values, rerror is still
set to match werror.
Additionally, the parsing of error_policy was changed to no longer
erroneously allow "default" as a choice - as with most other
attributes, if you want the default setting, just don't specify an
error_policy.
Finally, two ommissions in the first patch were corrected - a
long-dormant qemuxml2argv test for enospace was enabled, and fixed to
pass, and the argv2xml parser in qemu_command.c was updated to
recognize the different spelling on the qemu commandline.
2011-10-05 23:19:28 +08:00
|
|
|
DO_TEST("disk-drive-error-policy-enospace", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_DRIVE_FORMAT);
|
2011-10-05 02:17:06 +08:00
|
|
|
DO_TEST("disk-drive-error-policy-wreport-rignore", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_DRIVE_FORMAT);
|
2011-02-08 22:22:39 +08:00
|
|
|
DO_TEST("disk-drive-cache-v2-wt", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT);
|
|
|
|
|
DO_TEST("disk-drive-cache-v2-wb", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT);
|
|
|
|
|
DO_TEST("disk-drive-cache-v2-none", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT);
|
2011-09-02 21:36:58 +08:00
|
|
|
DO_TEST("disk-drive-cache-directsync", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2,
|
|
|
|
|
QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC, QEMU_CAPS_DRIVE_FORMAT);
|
2011-09-23 03:33:47 +08:00
|
|
|
DO_TEST("disk-drive-cache-unsafe", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2,
|
|
|
|
|
QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_DRIVE_FORMAT);
|
2011-02-08 22:22:39 +08:00
|
|
|
DO_TEST("disk-drive-network-nbd", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
|
|
|
|
DO_TEST("disk-drive-network-rbd", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
|
|
|
|
DO_TEST("disk-drive-network-sheepdog", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
2011-11-01 09:29:07 +08:00
|
|
|
DO_TEST("disk-drive-network-rbd-auth", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
2011-05-26 22:15:01 +08:00
|
|
|
DO_TEST("disk-drive-no-boot", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_BOOTINDEX);
|
2011-02-08 22:22:39 +08:00
|
|
|
DO_TEST("disk-usb", false, NONE);
|
|
|
|
|
DO_TEST("disk-usb-device", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("disk-scsi-device", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("disk-scsi-device-auto", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-02-28 14:01:31 +08:00
|
|
|
DO_TEST("disk-scsi-vscsi", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("disk-scsi-virtio-scsi", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2011-09-28 11:46:08 +08:00
|
|
|
DO_TEST("disk-sata-device", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_ICH9_AHCI);
|
2011-02-08 22:22:39 +08:00
|
|
|
DO_TEST("disk-aio", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_AIO,
|
|
|
|
|
QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT);
|
2011-06-20 16:26:47 +08:00
|
|
|
DO_TEST("disk-ioeventfd", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_IOEVENTFD,
|
qemu: add new disk device='lun' for bus='virtio' & type='block'
In the past, generic SCSI commands issued from a guest to a virtio
disk were always passed through to the underlying disk by qemu, and
the kernel would also pass them on.
As a result of CVE-2011-4127 (see:
http://seclists.org/oss-sec/2011/q4/536), qemu now honors its
scsi=on|off device option for virtio-blk-pci (which enables/disables
passthrough of generic SCSI commands), and the kernel will only allow
the commands for physical devices (not for partitions or logical
volumes). The default behavior of qemu is still to allow sending
generic SCSI commands to physical disks that are presented to a guest
as virtio-blk-pci devices, but libvirt prefers to disable those
commands in the standard virtio block devices, enabling it only when
specifically requested (hopefully indicating that the requester
understands what they're asking for). For this purpose, a new libvirt
disk device type (device='lun') has been created.
device='lun' is identical to the default device='disk', except that:
1) It is only allowed if bus='virtio', type='block', and the qemu
version is "new enough" to support it ("new enough" == qemu 0.11 or
better), otherwise the domain will fail to start and a
CONFIG_UNSUPPORTED error will be logged).
2) The option "scsi=on" will be added to the -device arg to allow
SG_IO commands (if device !='lun', "scsi=off" will be added to the
-device arg so that SG_IO commands are specifically forbidden).
Guests which continue to use disk device='disk' (the default) will no
longer be able to use SG_IO commands on the disk; those that have
their disk device changed to device='lun' will still be able to use SG_IO
commands.
*docs/formatdomain.html.in - document the new device attribute value.
*docs/schemas/domaincommon.rng - allow it in the RNG
*tests/* - update the args of several existing tests to add scsi=off, and
add one new test that will test scsi=on.
*src/conf/domain_conf.c - update domain XML parser and formatter
*src/qemu/qemu_(command|driver|hotplug).c - treat
VIR_DOMAIN_DISK_DEVICE_LUN *almost* identically to
VIR_DOMAIN_DISK_DEVICE_DISK, except as indicated above.
Note that no support for this new device value was added to any
hypervisor drivers other than qemu, because it's unclear what it might
mean (if anything) to those drivers.
2012-01-05 11:48:38 +08:00
|
|
|
QEMU_CAPS_VIRTIO_TX_ALG, QEMU_CAPS_DEVICE,
|
2012-01-12 17:31:14 +08:00
|
|
|
QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
|
|
|
|
|
DO_TEST("disk-copy_on_read", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_COPY_ON_READ,
|
|
|
|
|
QEMU_CAPS_VIRTIO_TX_ALG, QEMU_CAPS_DEVICE,
|
qemu: add new disk device='lun' for bus='virtio' & type='block'
In the past, generic SCSI commands issued from a guest to a virtio
disk were always passed through to the underlying disk by qemu, and
the kernel would also pass them on.
As a result of CVE-2011-4127 (see:
http://seclists.org/oss-sec/2011/q4/536), qemu now honors its
scsi=on|off device option for virtio-blk-pci (which enables/disables
passthrough of generic SCSI commands), and the kernel will only allow
the commands for physical devices (not for partitions or logical
volumes). The default behavior of qemu is still to allow sending
generic SCSI commands to physical disks that are presented to a guest
as virtio-blk-pci devices, but libvirt prefers to disable those
commands in the standard virtio block devices, enabling it only when
specifically requested (hopefully indicating that the requester
understands what they're asking for). For this purpose, a new libvirt
disk device type (device='lun') has been created.
device='lun' is identical to the default device='disk', except that:
1) It is only allowed if bus='virtio', type='block', and the qemu
version is "new enough" to support it ("new enough" == qemu 0.11 or
better), otherwise the domain will fail to start and a
CONFIG_UNSUPPORTED error will be logged).
2) The option "scsi=on" will be added to the -device arg to allow
SG_IO commands (if device !='lun', "scsi=off" will be added to the
-device arg so that SG_IO commands are specifically forbidden).
Guests which continue to use disk device='disk' (the default) will no
longer be able to use SG_IO commands on the disk; those that have
their disk device changed to device='lun' will still be able to use SG_IO
commands.
*docs/formatdomain.html.in - document the new device attribute value.
*docs/schemas/domaincommon.rng - allow it in the RNG
*tests/* - update the args of several existing tests to add scsi=off, and
add one new test that will test scsi=on.
*src/conf/domain_conf.c - update domain XML parser and formatter
*src/qemu/qemu_(command|driver|hotplug).c - treat
VIR_DOMAIN_DISK_DEVICE_LUN *almost* identically to
VIR_DOMAIN_DISK_DEVICE_DISK, except as indicated above.
Note that no support for this new device value was added to any
hypervisor drivers other than qemu, because it's unclear what it might
mean (if anything) to those drivers.
2012-01-05 11:48:38 +08:00
|
|
|
QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
|
2011-08-14 03:20:21 +08:00
|
|
|
DO_TEST("disk-snapshot", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT);
|
2011-08-13 14:32:45 +08:00
|
|
|
DO_TEST("event_idx", false,
|
|
|
|
|
QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_VIRTIO_BLK_EVENT_IDX,
|
|
|
|
|
QEMU_CAPS_VIRTIO_NET_EVENT_IDX,
|
qemu: add new disk device='lun' for bus='virtio' & type='block'
In the past, generic SCSI commands issued from a guest to a virtio
disk were always passed through to the underlying disk by qemu, and
the kernel would also pass them on.
As a result of CVE-2011-4127 (see:
http://seclists.org/oss-sec/2011/q4/536), qemu now honors its
scsi=on|off device option for virtio-blk-pci (which enables/disables
passthrough of generic SCSI commands), and the kernel will only allow
the commands for physical devices (not for partitions or logical
volumes). The default behavior of qemu is still to allow sending
generic SCSI commands to physical disks that are presented to a guest
as virtio-blk-pci devices, but libvirt prefers to disable those
commands in the standard virtio block devices, enabling it only when
specifically requested (hopefully indicating that the requester
understands what they're asking for). For this purpose, a new libvirt
disk device type (device='lun') has been created.
device='lun' is identical to the default device='disk', except that:
1) It is only allowed if bus='virtio', type='block', and the qemu
version is "new enough" to support it ("new enough" == qemu 0.11 or
better), otherwise the domain will fail to start and a
CONFIG_UNSUPPORTED error will be logged).
2) The option "scsi=on" will be added to the -device arg to allow
SG_IO commands (if device !='lun', "scsi=off" will be added to the
-device arg so that SG_IO commands are specifically forbidden).
Guests which continue to use disk device='disk' (the default) will no
longer be able to use SG_IO commands on the disk; those that have
their disk device changed to device='lun' will still be able to use SG_IO
commands.
*docs/formatdomain.html.in - document the new device attribute value.
*docs/schemas/domaincommon.rng - allow it in the RNG
*tests/* - update the args of several existing tests to add scsi=off, and
add one new test that will test scsi=on.
*src/conf/domain_conf.c - update domain XML parser and formatter
*src/qemu/qemu_(command|driver|hotplug).c - treat
VIR_DOMAIN_DISK_DEVICE_LUN *almost* identically to
VIR_DOMAIN_DISK_DEVICE_DISK, except as indicated above.
Note that no support for this new device value was added to any
hypervisor drivers other than qemu, because it's unclear what it might
mean (if anything) to those drivers.
2012-01-05 11:48:38 +08:00
|
|
|
QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
|
|
|
|
|
DO_TEST("virtio-lun", false,
|
|
|
|
|
QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
|
2011-06-20 16:26:47 +08:00
|
|
|
|
2011-02-08 22:22:39 +08:00
|
|
|
DO_TEST("graphics-vnc", false, NONE);
|
|
|
|
|
DO_TEST("graphics-vnc-socket", false, NONE);
|
2009-03-16 21:54:26 +08:00
|
|
|
|
|
|
|
|
driver.vncSASL = 1;
|
|
|
|
|
driver.vncSASLdir = strdup("/root/.sasl2");
|
2011-02-08 22:22:39 +08:00
|
|
|
DO_TEST("graphics-vnc-sasl", false, QEMU_CAPS_VGA);
|
2009-03-16 21:54:26 +08:00
|
|
|
driver.vncTLS = 1;
|
|
|
|
|
driver.vncTLSx509verify = 1;
|
|
|
|
|
driver.vncTLSx509certdir = strdup("/etc/pki/tls/qemu");
|
2011-02-08 22:22:39 +08:00
|
|
|
DO_TEST("graphics-vnc-tls", false, NONE);
|
2009-03-16 21:54:26 +08:00
|
|
|
driver.vncSASL = driver.vncTLSx509verify = driver.vncTLS = 0;
|
2012-02-03 07:16:43 +08:00
|
|
|
VIR_FREE(driver.vncSASLdir);
|
|
|
|
|
VIR_FREE(driver.vncTLSx509certdir);
|
2009-03-16 21:54:26 +08:00
|
|
|
driver.vncSASLdir = driver.vncTLSx509certdir = NULL;
|
|
|
|
|
|
2011-02-08 22:22:39 +08:00
|
|
|
DO_TEST("graphics-sdl", false, NONE);
|
|
|
|
|
DO_TEST("graphics-sdl-fullscreen", false, NONE);
|
|
|
|
|
DO_TEST("nographics", false, QEMU_CAPS_VGA);
|
|
|
|
|
DO_TEST("nographics-vga", false,
|
|
|
|
|
QEMU_CAPS_VGA, QEMU_CAPS_VGA_NONE);
|
|
|
|
|
DO_TEST("graphics-spice", false,
|
|
|
|
|
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE);
|
2011-05-31 21:52:05 +08:00
|
|
|
DO_TEST("graphics-spice-compression", false,
|
|
|
|
|
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE);
|
2011-05-26 19:52:08 +08:00
|
|
|
DO_TEST("graphics-spice-timeout", false,
|
|
|
|
|
QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE,
|
|
|
|
|
QEMU_CAPS_DEVICE_QXL_VGA);
|
qemu: Support vram for video of qxl type
For qemu names the primary vga as "qxl-vga":
1) if vram is specified for 2nd qxl device:
-vga qxl -global qxl-vga.vram_size=$SIZE \
-device qxl,id=video1,vram_size=$SIZE,...
2) if vram is not specified for 2nd qxl device, (use the default
set by global):
-vga qxl -global qxl-vga.vram_size=$SIZE \
-device qxl,id=video1,...
For qemu names all qxl devices as "qxl":
1) if vram is specified for 2nd qxl device:
-vga qxl -global qxl.vram_size=$SIZE \
-device qxl,id=video1,vram_size=$SIZE ...
2) if vram is not specified for 2nd qxl device:
-vga qxl -global qxl-vga.vram_size=$SIZE \
-device qxl,id=video1,...
"-global" is the only way to define vram_size for the primary qxl
device, regardless of how qemu names it, (It's not good a good
way, as original idea of "-global" is to set a global default for
a driver property, but to specify vram for first qxl device, we
have to use it).
For other qxl devices, as they are represented by "-device", could
specify it directly and seperately for each, and it overrides the
default set by "-global" if specified.
v1 - v2:
* modify "virDomainVideoDefaultRAM" so that it returns 16M as the
default vram_size for qxl device.
* vram_size * 1024 (qemu accepts bytes for vram_size).
* apply default vram_size for qxl device for which vram_size is
not specified.
* modify "graphics-spice" tests (more sensiable vram_size)
* Add an argument of virDomainDefPtr type for qemuBuildVideoDevStr,
to use virDomainVideoDefaultRAM in qemuBuildVideoDevStr).
v2 - v3:
* Modify default video memory size for qxl device from 16M to 24M
* Update codes to be consistent with changes on qemu_capabilities.*
2011-03-06 22:00:27 +08:00
|
|
|
DO_TEST("graphics-spice-qxl-vga", false,
|
|
|
|
|
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE,
|
|
|
|
|
QEMU_CAPS_DEVICE_QXL_VGA);
|
2011-02-08 22:22:39 +08:00
|
|
|
|
|
|
|
|
DO_TEST("input-usbmouse", false, NONE);
|
|
|
|
|
DO_TEST("input-usbtablet", false, NONE);
|
|
|
|
|
DO_TEST("input-xen", true, QEMU_CAPS_DOMID);
|
|
|
|
|
DO_TEST("misc-acpi", false, NONE);
|
|
|
|
|
DO_TEST("misc-no-reboot", false, NONE);
|
|
|
|
|
DO_TEST("misc-uuid", false, QEMU_CAPS_NAME, QEMU_CAPS_UUID);
|
|
|
|
|
DO_TEST("net-user", false, NONE);
|
|
|
|
|
DO_TEST("net-virtio", false, NONE);
|
|
|
|
|
DO_TEST("net-virtio-device", false,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_TX_ALG);
|
|
|
|
|
DO_TEST("net-virtio-netdev", false,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NETDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("net-eth", false, NONE);
|
|
|
|
|
DO_TEST("net-eth-ifname", false, NONE);
|
|
|
|
|
DO_TEST("net-eth-names", false, QEMU_CAPS_NET_NAME);
|
2012-01-16 22:08:07 +08:00
|
|
|
DO_TEST("net-client", false, NONE);
|
|
|
|
|
DO_TEST("net-server", false, NONE);
|
|
|
|
|
DO_TEST("net-mcast", false, NONE);
|
2011-02-08 22:22:39 +08:00
|
|
|
|
|
|
|
|
DO_TEST("serial-vc", false, NONE);
|
|
|
|
|
DO_TEST("serial-pty", false, NONE);
|
|
|
|
|
DO_TEST("serial-dev", false, NONE);
|
|
|
|
|
DO_TEST("serial-file", false, NONE);
|
|
|
|
|
DO_TEST("serial-unix", false, NONE);
|
|
|
|
|
DO_TEST("serial-tcp", false, NONE);
|
|
|
|
|
DO_TEST("serial-udp", false, NONE);
|
|
|
|
|
DO_TEST("serial-tcp-telnet", false, NONE);
|
|
|
|
|
DO_TEST("serial-many", false, NONE);
|
|
|
|
|
DO_TEST("parallel-tcp", false, NONE);
|
|
|
|
|
DO_TEST("console-compat", false, NONE);
|
|
|
|
|
DO_TEST("console-compat-auto", false, NONE);
|
|
|
|
|
|
|
|
|
|
DO_TEST("serial-vc-chardev", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("serial-pty-chardev", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("serial-dev-chardev", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("serial-file-chardev", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("serial-unix-chardev", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("serial-tcp-chardev", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("serial-udp-chardev", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("serial-tcp-telnet-chardev", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("serial-many-chardev", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("parallel-tcp-chardev", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("console-compat-chardev", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
|
|
|
|
|
DO_TEST("channel-guestfwd", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("channel-virtio", false,
|
Allow multiple consoles per virtual guest
While Xen only has a single paravirt console, UML, and
QEMU both support multiple paravirt consoles. The LXC
driver can also be trivially made to support multiple
consoles. This patch extends the XML to allow multiple
<console> elements in the XML. It also makes the UML
and QEMU drivers support this config.
* src/conf/domain_conf.c, src/conf/domain_conf.h: Allow
multiple <console> devices
* src/lxc/lxc_driver.c, src/xen/xen_driver.c,
src/xenxs/xen_sxpr.c, src/xenxs/xen_xm.c: Update for
internal API changes
* src/security/security_selinux.c, src/security/virt-aa-helper.c:
Only label consoles that aren't a copy of the serial device
* src/qemu/qemu_command.c, src/qemu/qemu_driver.c,
src/qemu/qemu_process.c, src/uml/uml_conf.c,
src/uml/uml_driver.c: Support multiple console devices
* tests/qemuxml2xmltest.c, tests/qemuxml2argvtest.c: Extra
tests for multiple virtio consoles. Set QEMU_CAPS_CHARDEV
for all console /channel tests
* tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args,
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args
tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args: Update
for correct chardev syntax
* tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args,
tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml: New
test file
2011-02-24 02:27:23 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
2011-02-08 22:22:39 +08:00
|
|
|
DO_TEST("channel-virtio-auto", false,
|
Allow multiple consoles per virtual guest
While Xen only has a single paravirt console, UML, and
QEMU both support multiple paravirt consoles. The LXC
driver can also be trivially made to support multiple
consoles. This patch extends the XML to allow multiple
<console> elements in the XML. It also makes the UML
and QEMU drivers support this config.
* src/conf/domain_conf.c, src/conf/domain_conf.h: Allow
multiple <console> devices
* src/lxc/lxc_driver.c, src/xen/xen_driver.c,
src/xenxs/xen_sxpr.c, src/xenxs/xen_xm.c: Update for
internal API changes
* src/security/security_selinux.c, src/security/virt-aa-helper.c:
Only label consoles that aren't a copy of the serial device
* src/qemu/qemu_command.c, src/qemu/qemu_driver.c,
src/qemu/qemu_process.c, src/uml/uml_conf.c,
src/uml/uml_driver.c: Support multiple console devices
* tests/qemuxml2xmltest.c, tests/qemuxml2argvtest.c: Extra
tests for multiple virtio consoles. Set QEMU_CAPS_CHARDEV
for all console /channel tests
* tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args,
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args
tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args: Update
for correct chardev syntax
* tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args,
tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml: New
test file
2011-02-24 02:27:23 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
2011-02-08 22:22:39 +08:00
|
|
|
DO_TEST("console-virtio", false,
|
Allow multiple consoles per virtual guest
While Xen only has a single paravirt console, UML, and
QEMU both support multiple paravirt consoles. The LXC
driver can also be trivially made to support multiple
consoles. This patch extends the XML to allow multiple
<console> elements in the XML. It also makes the UML
and QEMU drivers support this config.
* src/conf/domain_conf.c, src/conf/domain_conf.h: Allow
multiple <console> devices
* src/lxc/lxc_driver.c, src/xen/xen_driver.c,
src/xenxs/xen_sxpr.c, src/xenxs/xen_xm.c: Update for
internal API changes
* src/security/security_selinux.c, src/security/virt-aa-helper.c:
Only label consoles that aren't a copy of the serial device
* src/qemu/qemu_command.c, src/qemu/qemu_driver.c,
src/qemu/qemu_process.c, src/uml/uml_conf.c,
src/uml/uml_driver.c: Support multiple console devices
* tests/qemuxml2xmltest.c, tests/qemuxml2argvtest.c: Extra
tests for multiple virtio consoles. Set QEMU_CAPS_CHARDEV
for all console /channel tests
* tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args,
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args
tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args: Update
for correct chardev syntax
* tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args,
tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml: New
test file
2011-02-24 02:27:23 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("console-virtio-many", false,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
2011-02-08 22:22:39 +08:00
|
|
|
DO_TEST("channel-spicevmc", false,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC);
|
|
|
|
|
DO_TEST("channel-spicevmc-old", false,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_SPICEVMC);
|
|
|
|
|
|
|
|
|
|
DO_TEST("smartcard-host", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_EMULATED);
|
|
|
|
|
DO_TEST("smartcard-host-certificates", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_EMULATED);
|
|
|
|
|
DO_TEST("smartcard-passthrough-tcp", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_PASSTHRU);
|
|
|
|
|
DO_TEST("smartcard-passthrough-spicevmc", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_CCID_PASSTHRU, QEMU_CAPS_CHARDEV_SPICEVMC);
|
|
|
|
|
DO_TEST("smartcard-controller", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_EMULATED);
|
|
|
|
|
|
2011-09-02 21:21:23 +08:00
|
|
|
DO_TEST("usb-controller", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("usb-piix3-controller", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_PIIX3_USB_UHCI,
|
2011-09-02 22:49:42 +08:00
|
|
|
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_NODEFCONFIG);
|
2011-09-02 21:26:55 +08:00
|
|
|
DO_TEST("usb-ich9-ehci-addr", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1);
|
2011-09-02 21:28:27 +08:00
|
|
|
DO_TEST("input-usbmouse-addr", false,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2011-09-02 22:03:51 +08:00
|
|
|
DO_TEST("usb-ich9-companion", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1);
|
2011-09-02 22:20:40 +08:00
|
|
|
DO_TEST("usb-hub", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_USB_HUB,
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG);
|
2011-09-02 22:31:26 +08:00
|
|
|
DO_TEST("usb-ports", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_USB_HUB,
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG);
|
2011-09-02 23:09:14 +08:00
|
|
|
DO_TEST("usb-redir", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_USB_HUB,
|
2011-09-02 23:19:11 +08:00
|
|
|
QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR,
|
|
|
|
|
QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC);
|
2011-09-05 15:07:01 +08:00
|
|
|
DO_TEST("usb1-usb2", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
|
|
QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1);
|
2011-09-02 21:21:23 +08:00
|
|
|
|
2011-02-08 22:22:39 +08:00
|
|
|
DO_TEST("smbios", false, QEMU_CAPS_SMBIOS_TYPE);
|
|
|
|
|
|
|
|
|
|
DO_TEST("watchdog", false, NONE);
|
|
|
|
|
DO_TEST("watchdog-device", false, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("watchdog-dump", false, NONE);
|
|
|
|
|
DO_TEST("balloon-device", false, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("balloon-device-auto", false,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("sound", false, NONE);
|
|
|
|
|
DO_TEST("sound-device", false,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_HDA_DUPLEX);
|
|
|
|
|
DO_TEST("fs9p", false,
|
2012-01-17 20:44:18 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_FSDEV,
|
|
|
|
|
QEMU_CAPS_FSDEV_WRITEOUT);
|
2011-02-08 22:22:39 +08:00
|
|
|
|
|
|
|
|
DO_TEST("hostdev-usb-address", false, NONE);
|
|
|
|
|
DO_TEST("hostdev-usb-address-device", false,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("hostdev-pci-address", false, QEMU_CAPS_PCIDEVICE);
|
|
|
|
|
DO_TEST("hostdev-pci-address-device", false,
|
|
|
|
|
QEMU_CAPS_PCIDEVICE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-01-25 08:54:12 +08:00
|
|
|
DO_TEST("pci-rom", false,
|
|
|
|
|
QEMU_CAPS_PCIDEVICE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_PCI_ROMBAR);
|
2011-02-08 22:22:39 +08:00
|
|
|
|
2011-12-21 21:27:16 +08:00
|
|
|
DO_TEST_FULL("restore-v1", "stdio", 7, false, false,
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_MIGRATE_KVM_STDIO);
|
2011-12-21 21:27:16 +08:00
|
|
|
DO_TEST_FULL("restore-v2", "stdio", 7, false, false,
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_MIGRATE_QEMU_EXEC);
|
2011-12-21 21:27:16 +08:00
|
|
|
DO_TEST_FULL("restore-v2", "exec:cat", 7, false, false,
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_MIGRATE_QEMU_EXEC);
|
2011-12-21 21:27:16 +08:00
|
|
|
DO_TEST_FULL("restore-v2-fd", "stdio", 7, false, false,
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_MIGRATE_QEMU_FD);
|
2011-12-21 21:27:16 +08:00
|
|
|
DO_TEST_FULL("restore-v2-fd", "fd:7", 7, false, false,
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_MIGRATE_QEMU_FD);
|
2011-12-21 21:27:16 +08:00
|
|
|
DO_TEST_FULL("migrate", "tcp:10.0.0.1:5000", -1, false, false,
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_MIGRATE_QEMU_TCP);
|
|
|
|
|
|
|
|
|
|
DO_TEST("qemu-ns", false, NONE);
|
|
|
|
|
|
|
|
|
|
DO_TEST("smp", false, QEMU_CAPS_SMP_TOPOLOGY);
|
|
|
|
|
|
|
|
|
|
DO_TEST("cpu-topology1", false, QEMU_CAPS_SMP_TOPOLOGY);
|
|
|
|
|
DO_TEST("cpu-topology2", false, QEMU_CAPS_SMP_TOPOLOGY);
|
|
|
|
|
DO_TEST("cpu-topology3", false, NONE);
|
|
|
|
|
DO_TEST("cpu-minimum1", false, NONE);
|
|
|
|
|
DO_TEST("cpu-minimum2", false, NONE);
|
|
|
|
|
DO_TEST("cpu-exact1", false, NONE);
|
|
|
|
|
DO_TEST("cpu-exact2", false, NONE);
|
2011-12-21 21:27:16 +08:00
|
|
|
DO_TEST("cpu-exact2-nofallback", false, NONE);
|
|
|
|
|
DO_TEST("cpu-fallback", false, NONE);
|
|
|
|
|
DO_TEST_FAILURE("cpu-nofallback", NONE);
|
2011-02-08 22:22:39 +08:00
|
|
|
DO_TEST("cpu-strict1", false, NONE);
|
2011-11-11 20:53:04 +08:00
|
|
|
DO_TEST("cpu-numa1", false, NONE);
|
|
|
|
|
DO_TEST("cpu-numa2", false, QEMU_CAPS_SMP_TOPOLOGY);
|
2011-12-21 20:47:17 +08:00
|
|
|
DO_TEST("cpu-host-model", false, NONE);
|
|
|
|
|
DO_TEST("cpu-host-model-fallback", false, NONE);
|
|
|
|
|
DO_TEST_FAILURE("cpu-host-model-nofallback", NONE);
|
|
|
|
|
DO_TEST("cpu-host-passthrough", false, QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST);
|
|
|
|
|
DO_TEST_FAILURE("cpu-host-passthrough", NONE);
|
|
|
|
|
DO_TEST_FAILURE("cpu-qemu-host-passthrough",
|
|
|
|
|
QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST);
|
2011-02-08 22:22:39 +08:00
|
|
|
|
|
|
|
|
DO_TEST("memtune", false, QEMU_CAPS_NAME);
|
|
|
|
|
DO_TEST("blkiotune", false, QEMU_CAPS_NAME);
|
2011-11-08 19:00:34 +08:00
|
|
|
DO_TEST("blkiotune-device", false, QEMU_CAPS_NAME);
|
2011-03-29 21:44:14 +08:00
|
|
|
DO_TEST("cputune", false, QEMU_CAPS_NAME);
|
2011-06-20 15:17:43 +08:00
|
|
|
DO_TEST("numatune-memory", false, NONE);
|
2011-11-15 17:02:50 +08:00
|
|
|
DO_TEST("blkdeviotune", false, QEMU_CAPS_NAME, QEMU_CAPS_DEVICE,
|
2012-01-19 00:42:33 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_IOTUNE);
|
2011-02-08 14:59:38 +08:00
|
|
|
|
2011-06-08 12:34:04 +08:00
|
|
|
DO_TEST("multifunction-pci-device", false,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_PCI_MULTIFUNCTION);
|
|
|
|
|
|
2011-06-16 00:49:58 +08:00
|
|
|
DO_TEST("monitor-json", false, QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_NODEFCONFIG);
|
2011-09-21 16:25:29 +08:00
|
|
|
DO_TEST("no-shutdown", false, QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_NO_SHUTDOWN);
|
2011-06-16 00:49:58 +08:00
|
|
|
|
2011-12-23 08:47:46 +08:00
|
|
|
DO_TEST("seclabel-dynamic", false, QEMU_CAPS_NAME);
|
|
|
|
|
DO_TEST("seclabel-dynamic-baselabel", false, QEMU_CAPS_NAME);
|
2011-12-23 08:47:50 +08:00
|
|
|
DO_TEST("seclabel-dynamic-override", false, QEMU_CAPS_NAME);
|
2011-12-23 08:47:46 +08:00
|
|
|
DO_TEST("seclabel-static", false, QEMU_CAPS_NAME);
|
|
|
|
|
DO_TEST("seclabel-static-relabel", false, QEMU_CAPS_NAME);
|
2012-02-04 22:01:56 +08:00
|
|
|
DO_TEST("seclabel-none", false, QEMU_CAPS_NAME);
|
2011-12-23 08:47:46 +08:00
|
|
|
|
2012-01-13 11:39:25 +08:00
|
|
|
DO_TEST("pseries-basic", false,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("pseries-vio", false, QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("pseries-vio-user-assigned", false, QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("pseries-vio-address-clash", true, QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
|
2012-02-03 07:16:43 +08:00
|
|
|
VIR_FREE(driver.stateDir);
|
2008-02-27 12:35:08 +08:00
|
|
|
virCapabilitiesFree(driver.caps);
|
2012-02-03 07:16:43 +08:00
|
|
|
VIR_FREE(map);
|
2008-02-27 12:35:08 +08:00
|
|
|
|
2008-05-29 23:31:49 +08:00
|
|
|
return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
|
2007-07-19 05:34:22 +08:00
|
|
|
}
|
|
|
|
|
|
2008-05-29 23:31:49 +08:00
|
|
|
VIRT_TEST_MAIN(mymain)
|
|
|
|
|
|
2007-11-26 20:03:34 +08:00
|
|
|
#else
|
2011-12-02 04:47:34 +08:00
|
|
|
# include "testutils.h"
|
2007-11-26 20:03:34 +08:00
|
|
|
|
2011-07-09 07:24:44 +08:00
|
|
|
int main(void)
|
|
|
|
|
{
|
|
|
|
|
return EXIT_AM_SKIP;
|
|
|
|
|
}
|
2007-11-26 20:03:34 +08:00
|
|
|
|
|
|
|
|
#endif /* WITH_QEMU */
|