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>
|
|
|
|
|
|
2013-04-16 21:41:44 +08:00
|
|
|
#include "testutils.h"
|
|
|
|
|
|
2007-11-26 20:03:34 +08:00
|
|
|
#ifdef WITH_QEMU
|
|
|
|
|
|
2010-03-10 02:22:22 +08:00
|
|
|
# include "internal.h"
|
2012-12-13 02:06:53 +08:00
|
|
|
# include "viralloc.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"
|
2013-04-03 18:36:23 +08:00
|
|
|
# include "virstring.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
|
|
|
|
2013-05-03 20:52:21 +08:00
|
|
|
# define VIR_FROM_THIS VIR_FROM_QEMU
|
|
|
|
|
|
2010-04-16 14:21:23 +08:00
|
|
|
static const char *abs_top_srcdir;
|
2012-11-29 00:43:10 +08:00
|
|
|
static virQEMUDriver 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)
|
|
|
|
|
{
|
2013-05-03 20:52:21 +08:00
|
|
|
char *secret;
|
|
|
|
|
if (VIR_STRDUP(secret, "AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A") < 0)
|
2013-02-04 22:54:33 +08:00
|
|
|
return NULL;
|
2011-11-01 09:29:07 +08:00
|
|
|
*value_size = strlen(secret);
|
|
|
|
|
return (unsigned char *) secret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static virSecretPtr
|
|
|
|
|
fakeSecretLookupByUsage(virConnectPtr conn,
|
|
|
|
|
int usageType ATTRIBUTE_UNUSED,
|
|
|
|
|
const char *usageID)
|
|
|
|
|
{
|
Convert public datatypes to inherit from virObject
This converts the following public API datatypes to use the
virObject infrastructure:
virConnectPtr
virDomainPtr
virDomainSnapshotPtr
virInterfacePtr
virNetworkPtr
virNodeDevicePtr
virNWFilterPtr
virSecretPtr
virStreamPtr
virStorageVolPtr
virStoragePoolPtr
The code is significantly simplified, since the mutex in the
virConnectPtr object now only needs to be held when accessing
the per-connection virError object instance. All other operations
are completely lock free.
* src/datatypes.c, src/datatypes.h, src/libvirt.c: Convert
public datatypes to use virObject
* src/conf/domain_event.c, src/phyp/phyp_driver.c,
src/qemu/qemu_command.c, src/qemu/qemu_migration.c,
src/qemu/qemu_process.c, src/storage/storage_driver.c,
src/vbox/vbox_tmpl.c, src/xen/xend_internal.c,
tests/qemuxml2argvtest.c, tests/qemuxmlnstest.c,
tests/sexpr2xmltest.c, tests/xmconfigtest.c: Convert
to use virObjectUnref/virObjectRef
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-08-01 00:55:36 +08:00
|
|
|
unsigned char uuid[VIR_UUID_BUFLEN];
|
2011-11-01 09:29:07 +08:00
|
|
|
if (STRNEQ(usageID, "mycluster_myname"))
|
|
|
|
|
return NULL;
|
Convert public datatypes to inherit from virObject
This converts the following public API datatypes to use the
virObject infrastructure:
virConnectPtr
virDomainPtr
virDomainSnapshotPtr
virInterfacePtr
virNetworkPtr
virNodeDevicePtr
virNWFilterPtr
virSecretPtr
virStreamPtr
virStorageVolPtr
virStoragePoolPtr
The code is significantly simplified, since the mutex in the
virConnectPtr object now only needs to be held when accessing
the per-connection virError object instance. All other operations
are completely lock free.
* src/datatypes.c, src/datatypes.h, src/libvirt.c: Convert
public datatypes to use virObject
* src/conf/domain_event.c, src/phyp/phyp_driver.c,
src/qemu/qemu_command.c, src/qemu/qemu_migration.c,
src/qemu/qemu_process.c, src/storage/storage_driver.c,
src/vbox/vbox_tmpl.c, src/xen/xend_internal.c,
tests/qemuxml2argvtest.c, tests/qemuxmlnstest.c,
tests/sexpr2xmltest.c, tests/xmconfigtest.c: Convert
to use virObjectUnref/virObjectRef
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-08-01 00:55:36 +08:00
|
|
|
|
|
|
|
|
virUUIDGenerate(uuid);
|
|
|
|
|
return virGetSecret(conn, uuid, usageType, usageID);
|
2011-11-01 09:29:07 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
fakeSecretClose(virConnectPtr conn ATTRIBUTE_UNUSED)
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static virSecretDriver fakeSecretDriver = {
|
|
|
|
|
.name = "fake_secret",
|
2013-04-23 20:49:21 +08:00
|
|
|
.secretOpen = NULL,
|
|
|
|
|
.secretClose = fakeSecretClose,
|
2013-04-23 01:26:01 +08:00
|
|
|
.connectNumOfSecrets = NULL,
|
|
|
|
|
.connectListSecrets = NULL,
|
|
|
|
|
.secretLookupByUUID = NULL,
|
|
|
|
|
.secretLookupByUsage = fakeSecretLookupByUsage,
|
|
|
|
|
.secretDefineXML = NULL,
|
|
|
|
|
.secretGetXMLDesc = NULL,
|
|
|
|
|
.secretSetValue = NULL,
|
|
|
|
|
.secretGetValue = fakeSecretGetValue,
|
|
|
|
|
.secretUndefine = NULL,
|
2011-11-01 09:29:07 +08:00
|
|
|
};
|
|
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
typedef enum {
|
|
|
|
|
FLAG_EXPECT_ERROR = 1 << 0,
|
|
|
|
|
FLAG_EXPECT_FAILURE = 1 << 1,
|
|
|
|
|
FLAG_EXPECT_PARSE_ERROR = 1 << 2,
|
|
|
|
|
FLAG_JSON = 1 << 3,
|
|
|
|
|
} virQemuXML2ArgvTestFlags;
|
|
|
|
|
|
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,
|
2013-02-01 21:48:58 +08:00
|
|
|
virQEMUCapsPtr extraFlags,
|
2010-10-23 00:50:34 +08:00
|
|
|
const char *migrateFrom,
|
2010-12-23 06:13:29 +08:00
|
|
|
int migrateFd,
|
2012-07-10 00:29:55 +08:00
|
|
|
virQemuXML2ArgvTestFlags flags)
|
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-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
|
|
|
|
2013-03-28 21:55:55 +08:00
|
|
|
if (!(vmdef = virDomainDefParseFile(xml, driver.caps, driver.xmlopt,
|
2011-07-12 01:29:09 +08:00
|
|
|
QEMU_EXPECTED_VIRT_TYPES,
|
2012-07-10 00:29:55 +08:00
|
|
|
VIR_DOMAIN_XML_INACTIVE))) {
|
|
|
|
|
if (flags & FLAG_EXPECT_PARSE_ERROR)
|
|
|
|
|
goto ok;
|
2011-12-21 21:27:16 +08:00
|
|
|
goto out;
|
2012-07-10 00:29:55 +08:00
|
|
|
}
|
2007-07-19 05:34:22 +08:00
|
|
|
|
2013-02-01 21:48:58 +08:00
|
|
|
if (virQEMUCapsGet(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
|
|
|
|
2013-02-01 21:48:58 +08:00
|
|
|
virQEMUCapsSetList(extraFlags,
|
|
|
|
|
QEMU_CAPS_VNC_COLON,
|
|
|
|
|
QEMU_CAPS_NO_REBOOT,
|
|
|
|
|
QEMU_CAPS_NO_ACPI,
|
|
|
|
|
QEMU_CAPS_LAST);
|
2007-07-19 05:34:22 +08:00
|
|
|
|
2012-08-22 23:25:57 +08:00
|
|
|
if (STREQ(vmdef->os.machine, "pc") &&
|
|
|
|
|
STREQ(vmdef->emulator, "/usr/bin/qemu-system-x86_64")) {
|
|
|
|
|
VIR_FREE(vmdef->os.machine);
|
2013-05-03 20:52:21 +08:00
|
|
|
if (VIR_STRDUP(vmdef->os.machine, "pc-0.11") < 0)
|
2012-08-22 23:25:57 +08:00
|
|
|
goto out;
|
|
|
|
|
}
|
2009-09-10 18:09:06 +08:00
|
|
|
|
2013-02-01 21:48:58 +08:00
|
|
|
if (virQEMUCapsGet(extraFlags, QEMU_CAPS_DEVICE)) {
|
2012-06-29 23:02:04 +08:00
|
|
|
if (qemuDomainAssignAddresses(vmdef, extraFlags, NULL)) {
|
2012-07-10 00:29:55 +08:00
|
|
|
if (flags & FLAG_EXPECT_ERROR)
|
2012-01-13 11:39:24 +08:00
|
|
|
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
|
|
|
}
|
|
|
|
|
|
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
|
|
|
|
2012-12-19 03:32:23 +08:00
|
|
|
if (vmdef->os.arch == VIR_ARCH_X86_64 ||
|
|
|
|
|
vmdef->os.arch == VIR_ARCH_I686) {
|
2013-02-01 21:48:58 +08:00
|
|
|
virQEMUCapsSet(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
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
if (!(cmd = qemuBuildCommandLine(conn, &driver, vmdef, &monitor_chr,
|
|
|
|
|
(flags & FLAG_JSON), extraFlags,
|
2010-12-23 06:13:29 +08:00
|
|
|
migrateFrom, migrateFd, NULL,
|
2013-05-17 18:34:24 +08:00
|
|
|
VIR_NETDEV_VPORT_PROFILE_OP_NO_OP,
|
|
|
|
|
&testCallbacks))) {
|
2012-07-10 00:29:55 +08:00
|
|
|
if (flags & FLAG_EXPECT_FAILURE) {
|
2011-12-21 21:27:16 +08:00
|
|
|
ret = 0;
|
2013-05-13 20:58:22 +08:00
|
|
|
if (virTestGetDebug() > 1)
|
|
|
|
|
fprintf(stderr, "Got expected error: %s\n",
|
|
|
|
|
virGetLastErrorMessage());
|
2011-12-21 21:27:16 +08:00
|
|
|
virResetLastError();
|
|
|
|
|
}
|
|
|
|
|
goto out;
|
2012-07-10 00:29:55 +08:00
|
|
|
} else if (flags & FLAG_EXPECT_FAILURE) {
|
2011-12-21 21:27:16 +08:00
|
|
|
if (virTestGetDebug())
|
|
|
|
|
fprintf(stderr, "qemuBuildCommandLine should have failed\n");
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
2007-07-19 05:34:22 +08:00
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
if (!!virGetLastError() != !!(flags & FLAG_EXPECT_ERROR)) {
|
2010-11-29 21:11:53 +08:00
|
|
|
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
|
|
|
|
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:
|
2012-07-10 00:29:55 +08:00
|
|
|
if (flags & FLAG_EXPECT_ERROR) {
|
2012-01-13 11:39:24 +08:00
|
|
|
/* 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(expectargv);
|
|
|
|
|
VIR_FREE(actualargv);
|
2010-11-23 07:09:13 +08:00
|
|
|
virCommandFree(cmd);
|
2008-07-12 03:34:11 +08:00
|
|
|
virDomainDefFree(vmdef);
|
Convert public datatypes to inherit from virObject
This converts the following public API datatypes to use the
virObject infrastructure:
virConnectPtr
virDomainPtr
virDomainSnapshotPtr
virInterfacePtr
virNetworkPtr
virNodeDevicePtr
virNWFilterPtr
virSecretPtr
virStreamPtr
virStorageVolPtr
virStoragePoolPtr
The code is significantly simplified, since the mutex in the
virConnectPtr object now only needs to be held when accessing
the per-connection virError object instance. All other operations
are completely lock free.
* src/datatypes.c, src/datatypes.h, src/libvirt.c: Convert
public datatypes to use virObject
* src/conf/domain_event.c, src/phyp/phyp_driver.c,
src/qemu/qemu_command.c, src/qemu/qemu_migration.c,
src/qemu/qemu_process.c, src/storage/storage_driver.c,
src/vbox/vbox_tmpl.c, src/xen/xend_internal.c,
tests/qemuxml2argvtest.c, tests/qemuxmlnstest.c,
tests/sexpr2xmltest.c, tests/xmconfigtest.c: Convert
to use virObjectUnref/virObjectRef
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2012-08-01 00:55:36 +08:00
|
|
|
virObjectUnref(conn);
|
2007-07-19 05:34:22 +08:00
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-05-10 00:41:19 +08:00
|
|
|
struct testInfo {
|
|
|
|
|
const char *name;
|
2013-02-01 21:48:58 +08:00
|
|
|
virQEMUCapsPtr extraFlags;
|
2009-01-30 01:27:54 +08:00
|
|
|
const char *migrateFrom;
|
2010-12-23 06:13:29 +08:00
|
|
|
int migrateFd;
|
2012-07-10 00:29:55 +08:00
|
|
|
unsigned int flags;
|
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;
|
2012-07-10 00:29:55 +08:00
|
|
|
unsigned int flags = info->flags;
|
2011-04-25 06:25:10 +08:00
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
|
2013-02-01 21:48:58 +08:00
|
|
|
if (virQEMUCapsGet(info->extraFlags, QEMU_CAPS_MONITOR_JSON))
|
2012-07-10 00:29:55 +08:00
|
|
|
flags |= FLAG_JSON;
|
|
|
|
|
|
2011-04-25 06:25:10 +08:00
|
|
|
result = testCompareXMLToArgvFiles(xml, args, info->extraFlags,
|
2011-06-16 00:49:58 +08:00
|
|
|
info->migrateFrom, info->migrateFd,
|
2012-07-10 00:29:55 +08:00
|
|
|
flags);
|
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
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2012-08-22 23:28:55 +08:00
|
|
|
static int
|
2013-02-01 21:48:58 +08:00
|
|
|
testAddCPUModels(virQEMUCapsPtr caps, bool skipLegacy)
|
2012-08-22 23:28:55 +08:00
|
|
|
{
|
|
|
|
|
const char *newModels[] = {
|
|
|
|
|
"Opteron_G3", "Opteron_G2", "Opteron_G1",
|
|
|
|
|
"Nehalem", "Penryn", "Conroe",
|
|
|
|
|
};
|
|
|
|
|
const char *legacyModels[] = {
|
|
|
|
|
"n270", "athlon", "pentium3", "pentium2", "pentium",
|
|
|
|
|
"486", "coreduo", "kvm32", "qemu32", "kvm64",
|
|
|
|
|
"core2duo", "phenom", "qemu64",
|
|
|
|
|
};
|
|
|
|
|
size_t i;
|
|
|
|
|
|
2013-05-21 15:53:48 +08:00
|
|
|
for (i = 0; i < ARRAY_CARDINALITY(newModels); i++) {
|
2013-02-01 21:48:58 +08:00
|
|
|
if (virQEMUCapsAddCPUDefinition(caps, newModels[i]) < 0)
|
2012-08-22 23:28:55 +08:00
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
if (skipLegacy)
|
|
|
|
|
return 0;
|
2013-05-21 15:53:48 +08:00
|
|
|
for (i = 0; i < ARRAY_CARDINALITY(legacyModels); i++) {
|
2013-02-01 21:48:58 +08:00
|
|
|
if (virQEMUCapsAddCPUDefinition(caps, legacyModels[i]) < 0)
|
2012-08-22 23:28:55 +08:00
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
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;
|
2012-08-22 23:28:55 +08:00
|
|
|
bool skipLegacyCPUs = false;
|
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 = "..";
|
|
|
|
|
|
2013-01-11 05:03:14 +08:00
|
|
|
driver.config = virQEMUDriverConfigNew(false);
|
|
|
|
|
VIR_FREE(driver.config->spiceListen);
|
|
|
|
|
VIR_FREE(driver.config->vncListen);
|
|
|
|
|
|
2013-02-08 00:39:16 +08:00
|
|
|
VIR_FREE(driver.config->vncTLSx509certdir);
|
2013-05-03 20:52:21 +08:00
|
|
|
if (VIR_STRDUP_QUIET(driver.config->vncTLSx509certdir, "/etc/pki/libvirt-vnc") < 0)
|
2013-02-08 00:39:16 +08:00
|
|
|
return EXIT_FAILURE;
|
|
|
|
|
VIR_FREE(driver.config->spiceTLSx509certdir);
|
2013-05-03 20:52:21 +08:00
|
|
|
if (VIR_STRDUP_QUIET(driver.config->spiceTLSx509certdir, "/etc/pki/libvirt-spice") < 0)
|
2013-02-08 00:39:16 +08:00
|
|
|
return EXIT_FAILURE;
|
|
|
|
|
|
2008-05-29 23:31:49 +08:00
|
|
|
if ((driver.caps = testQemuCapsInit()) == NULL)
|
|
|
|
|
return EXIT_FAILURE;
|
2013-03-11 17:24:29 +08:00
|
|
|
if (!(driver.xmlopt = virQEMUDriverCreateXMLConf(&driver)))
|
2013-03-05 23:17:24 +08:00
|
|
|
return EXIT_FAILURE;
|
2013-01-11 05:03:14 +08:00
|
|
|
VIR_FREE(driver.config->stateDir);
|
2013-05-03 20:52:21 +08:00
|
|
|
if (VIR_STRDUP_QUIET(driver.config->stateDir, "/nowhere") < 0)
|
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
|
|
|
return EXIT_FAILURE;
|
2013-01-11 05:03:14 +08:00
|
|
|
VIR_FREE(driver.config->hugetlbfsMount);
|
2013-05-03 20:52:21 +08:00
|
|
|
if (VIR_STRDUP_QUIET(driver.config->hugetlbfsMount, "/dev/hugepages") < 0)
|
2008-12-18 23:22:49 +08:00
|
|
|
return EXIT_FAILURE;
|
2013-01-11 05:03:14 +08:00
|
|
|
VIR_FREE(driver.config->hugepagePath);
|
2013-05-03 20:52:21 +08:00
|
|
|
if (VIR_STRDUP_QUIET(driver.config->hugepagePath, "/dev/hugepages/libvirt/qemu") < 0)
|
2010-03-06 04:31:50 +08:00
|
|
|
return EXIT_FAILURE;
|
2013-01-11 05:03:14 +08:00
|
|
|
driver.config->spiceTLS = 1;
|
2013-05-03 20:52:21 +08:00
|
|
|
if (VIR_STRDUP_QUIET(driver.config->spicePassword, "123456") < 0)
|
2010-03-06 04:31:50 +08:00
|
|
|
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
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
# define DO_TEST_FULL(name, migrateFrom, migrateFd, flags, ...) \
|
2008-05-10 00:41:19 +08:00
|
|
|
do { \
|
test: fix build errors with gcc 4.7.0 and -O0
When building on Fedora 17 (which uses gcc 4.7.0) with -O0 in CFLAGS,
three of the tests failed to compile.
cputest.c and qemuxml2argvtest.c had non-static structs defined
inside the macro that was being repeatedly invoked. Due to some so-far
unidentified change in gcc, the stack space used by variables defined
inside { } is not recovered/re-used when the block ends, so all these
structs have become additive (this is the same problem worked around
in commit cf57d345b). Fortunately, these two files could be fixed with
a single line addition of "static" to the struct definition in the
macro.
virnettlscontexttest.c was a bit different, though. The problem structs
in the do/while loop of macros had non-constant initializers, so it
took a bit more work and piecemeal initialization instead of member
initialization to get things to be happy.
In an ideal world, none of these changes should be necessary, but not
knowing how long it will be until the gcc regressions are fixed, and
since the code is just as correct after this patch as before, it makes
sense to fix libvirt's build for -O0 while also reporting the gcc
problem.
2012-04-06 04:31:36 +08:00
|
|
|
static struct testInfo info = { \
|
2012-07-10 00:29:55 +08:00
|
|
|
name, NULL, migrateFrom, migrateFd, (flags) \
|
2010-10-23 00:50:34 +08:00
|
|
|
}; \
|
2013-02-01 21:48:58 +08:00
|
|
|
if (!(info.extraFlags = virQEMUCapsNew())) \
|
2011-02-08 22:22:39 +08:00
|
|
|
return EXIT_FAILURE; \
|
2012-08-22 23:28:55 +08:00
|
|
|
if (testAddCPUModels(info.extraFlags, skipLegacyCPUs) < 0) \
|
|
|
|
|
return EXIT_FAILURE; \
|
2013-02-01 21:48:58 +08:00
|
|
|
virQEMUCapsSetList(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; \
|
2012-08-21 00:44:14 +08:00
|
|
|
virObjectUnref(info.extraFlags); \
|
2008-05-10 00:41:19 +08:00
|
|
|
} while (0)
|
|
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
# define DO_TEST(name, ...) \
|
|
|
|
|
DO_TEST_FULL(name, NULL, -1, 0, __VA_ARGS__)
|
|
|
|
|
|
|
|
|
|
# define DO_TEST_ERROR(name, ...) \
|
|
|
|
|
DO_TEST_FULL(name, NULL, -1, FLAG_EXPECT_ERROR, __VA_ARGS__)
|
2011-12-21 21:27:16 +08:00
|
|
|
|
|
|
|
|
# define DO_TEST_FAILURE(name, ...) \
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST_FULL(name, NULL, -1, FLAG_EXPECT_FAILURE, __VA_ARGS__)
|
|
|
|
|
|
|
|
|
|
# define DO_TEST_PARSE_ERROR(name, ...) \
|
|
|
|
|
DO_TEST_FULL(name, NULL, -1, \
|
|
|
|
|
FLAG_EXPECT_PARSE_ERROR | FLAG_EXPECT_ERROR, \
|
|
|
|
|
__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
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("minimal", QEMU_CAPS_NAME);
|
|
|
|
|
DO_TEST("minimal-s390", QEMU_CAPS_NAME);
|
|
|
|
|
DO_TEST("machine-aliases1", NONE);
|
2012-09-14 22:34:33 +08:00
|
|
|
DO_TEST("machine-aliases2", QEMU_CAPS_KVM);
|
2013-03-29 13:22:46 +08:00
|
|
|
DO_TEST("machine-core-on", QEMU_CAPS_MACHINE_OPT,
|
|
|
|
|
QEMU_CAPS_DUMP_GUEST_CORE);
|
|
|
|
|
DO_TEST("machine-core-off", QEMU_CAPS_MACHINE_OPT,
|
|
|
|
|
QEMU_CAPS_DUMP_GUEST_CORE);
|
2012-08-15 16:16:36 +08:00
|
|
|
DO_TEST_FAILURE("machine-core-on", NONE);
|
2013-03-29 13:22:46 +08:00
|
|
|
DO_TEST_FAILURE("machine-core-on", QEMU_CAPS_MACHINE_OPT);
|
2013-04-07 16:31:57 +08:00
|
|
|
DO_TEST("machine-usb-opt", QEMU_CAPS_MACHINE_OPT,
|
|
|
|
|
QEMU_CAPS_MACHINE_USB_OPT);
|
2013-04-23 22:17:08 +08:00
|
|
|
DO_TEST("kvm", QEMU_CAPS_MACHINE_OPT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("boot-cdrom", NONE);
|
|
|
|
|
DO_TEST("boot-network", NONE);
|
|
|
|
|
DO_TEST("boot-floppy", NONE);
|
|
|
|
|
DO_TEST("boot-multi", QEMU_CAPS_BOOT_MENU);
|
|
|
|
|
DO_TEST("boot-menu-enable",
|
2011-05-26 22:15:01 +08:00
|
|
|
QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("boot-menu-enable",
|
2011-05-26 22:15:01 +08:00
|
|
|
QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_BOOTINDEX);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("boot-menu-disable", QEMU_CAPS_BOOT_MENU);
|
|
|
|
|
DO_TEST("boot-menu-disable-drive",
|
2011-05-26 22:15:01 +08:00
|
|
|
QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("boot-menu-disable-drive-bootindex",
|
2011-05-26 22:15:01 +08:00
|
|
|
QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_BOOTINDEX);
|
2012-10-16 18:25:32 +08:00
|
|
|
DO_TEST_PARSE_ERROR("boot-dev+order",
|
|
|
|
|
QEMU_CAPS_BOOTINDEX, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("boot-order",
|
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);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("boot-complex",
|
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);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("boot-complex-bootindex",
|
2011-05-26 22:15:01 +08:00
|
|
|
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);
|
2012-09-14 22:34:33 +08:00
|
|
|
DO_TEST("bootloader", QEMU_CAPS_DOMID, QEMU_CAPS_KVM);
|
2012-09-18 18:32:07 +08:00
|
|
|
|
|
|
|
|
DO_TEST("reboot-timeout-disabled", QEMU_CAPS_REBOOT_TIMEOUT);
|
|
|
|
|
DO_TEST("reboot-timeout-enabled", QEMU_CAPS_REBOOT_TIMEOUT);
|
|
|
|
|
DO_TEST_FAILURE("reboot-timeout-enabled", NONE);
|
|
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("bios", QEMU_CAPS_DEVICE, QEMU_CAPS_SGA);
|
|
|
|
|
DO_TEST("clock-utc", NONE);
|
|
|
|
|
DO_TEST("clock-localtime", NONE);
|
2010-02-03 02:07:12 +08:00
|
|
|
/*
|
|
|
|
|
* Can't be enabled since the absolute timestamp changes every time
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("clock-variable", QEMU_CAPS_RTC);
|
2010-02-03 02:07:12 +08:00
|
|
|
*/
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("clock-france", QEMU_CAPS_RTC);
|
|
|
|
|
DO_TEST("cpu-kvmclock", QEMU_CAPS_ENABLE_KVM);
|
|
|
|
|
DO_TEST("cpu-host-kvmclock", QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_CPU_HOST);
|
|
|
|
|
DO_TEST("kvmclock", QEMU_CAPS_KVM);
|
|
|
|
|
|
2012-09-13 21:27:07 +08:00
|
|
|
DO_TEST("cpu-eoi-disabled", QEMU_CAPS_ENABLE_KVM);
|
|
|
|
|
DO_TEST("cpu-eoi-enabled", QEMU_CAPS_ENABLE_KVM);
|
2012-11-05 19:12:04 +08:00
|
|
|
DO_TEST("controller-order", QEMU_CAPS_DRIVE, QEMU_CAPS_PCIDEVICE,
|
|
|
|
|
QEMU_CAPS_KVM, QEMU_CAPS_DEVICE, QEMU_CAPS_ENABLE_KVM,
|
|
|
|
|
QEMU_CAPS_BOOT_MENU, QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
|
|
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DRIVE_AIO,
|
|
|
|
|
QEMU_CAPS_CCID_PASSTHRU, QEMU_CAPS_CHARDEV,
|
|
|
|
|
QEMU_CAPS_CHARDEV_SPICEVMC, QEMU_CAPS_SPICE, QEMU_CAPS_HDA_DUPLEX);
|
2012-09-13 21:27:07 +08:00
|
|
|
DO_TEST("eoi-disabled", NONE);
|
|
|
|
|
DO_TEST("eoi-enabled", NONE);
|
2012-10-09 00:51:57 +08:00
|
|
|
DO_TEST("kvmclock+eoi-disabled", QEMU_CAPS_ENABLE_KVM);
|
2012-09-13 21:27:07 +08:00
|
|
|
|
2012-10-17 20:55:18 +08:00
|
|
|
DO_TEST("hyperv", NONE);
|
2013-07-04 18:12:57 +08:00
|
|
|
DO_TEST("hyperv-off", NONE);
|
2012-10-17 20:55:18 +08:00
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("hugepages", QEMU_CAPS_MEM_PATH);
|
2013-05-14 13:25:50 +08:00
|
|
|
DO_TEST("nosharepages", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MEM_MERGE);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-cdrom", NONE);
|
|
|
|
|
DO_TEST("disk-cdrom-empty", QEMU_CAPS_DRIVE);
|
|
|
|
|
DO_TEST("disk-cdrom-tray",
|
2012-03-14 23:26:48 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_TX_ALG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-cdrom-tray-no-device-cap", NONE);
|
|
|
|
|
DO_TEST("disk-floppy", NONE);
|
|
|
|
|
DO_TEST("disk-floppy-tray-no-device-cap", NONE);
|
|
|
|
|
DO_TEST("disk-floppy-tray",
|
2012-03-14 23:26:48 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-virtio-s390", QEMU_CAPS_DRIVE,
|
2012-06-29 23:02:07 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_S390);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-many", NONE);
|
|
|
|
|
DO_TEST("disk-virtio", QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT);
|
2013-03-05 23:44:23 +08:00
|
|
|
DO_TEST("disk-virtio-ccw", QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
|
|
DO_TEST("disk-virtio-ccw-many", QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
2013-03-15 02:32:26 +08:00
|
|
|
DO_TEST("disk-virtio-scsi-ccw", QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_SCSI,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-order",
|
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);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-xenvbd", QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT);
|
|
|
|
|
DO_TEST("disk-drive-boot-disk",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-boot-cdrom",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("floppy-drive-fat",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_DRIVE_FORMAT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-fat",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_DRIVE_FORMAT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-readonly-disk",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_READONLY,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-readonly-no-device",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-fmt-qcow",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_DRIVE_FORMAT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-shared",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-cache-v1-wt",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-cache-v1-wb",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-cache-v1-none",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-error-policy-stop",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_DRIVE_FORMAT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-error-policy-enospace",
|
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
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_DRIVE_FORMAT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-error-policy-wreport-rignore",
|
2011-10-05 02:17:06 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_DRIVE_FORMAT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-cache-v2-wt",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-cache-v2-wb",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-cache-v2-none",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-cache-directsync",
|
2011-09-02 21:36:58 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2,
|
|
|
|
|
QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC, QEMU_CAPS_DRIVE_FORMAT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-cache-unsafe",
|
2011-09-23 03:33:47 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2,
|
|
|
|
|
QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_DRIVE_FORMAT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-network-nbd",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
2013-02-26 01:44:23 +08:00
|
|
|
DO_TEST("disk-drive-network-nbd-export",
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
2013-02-26 01:44:25 +08:00
|
|
|
DO_TEST("disk-drive-network-nbd-ipv6",
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
|
|
|
|
DO_TEST("disk-drive-network-nbd-ipv6-export",
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
2013-02-26 01:44:24 +08:00
|
|
|
DO_TEST("disk-drive-network-nbd-unix",
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
2013-03-21 19:53:49 +08:00
|
|
|
DO_TEST("disk-drive-network-iscsi",
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
2013-03-21 19:53:54 +08:00
|
|
|
DO_TEST("disk-drive-network-iscsi-auth",
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
2013-03-21 19:53:50 +08:00
|
|
|
DO_TEST("disk-drive-network-iscsi-lun",
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE_FORMAT,
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI,
|
|
|
|
|
QEMU_CAPS_VIRTIO_BLK_SG_IO, QEMU_CAPS_SCSI_BLOCK);
|
2012-11-23 02:10:41 +08:00
|
|
|
DO_TEST("disk-drive-network-gluster",
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-network-rbd",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-network-sheepdog",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-network-rbd-auth",
|
2011-11-01 09:29:07 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
2013-01-25 10:45:31 +08:00
|
|
|
DO_TEST("disk-drive-network-rbd-ipv6",
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
2013-05-15 02:55:13 +08:00
|
|
|
DO_TEST_FAILURE("disk-drive-network-rbd-no-colon",
|
2013-05-13 20:58:22 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-no-boot",
|
2011-05-26 22:15:01 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_BOOTINDEX);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-usb", NONE);
|
|
|
|
|
DO_TEST("disk-usb-device",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-scsi-device",
|
2012-08-08 15:06:33 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_SCSI_LSI);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-scsi-device-auto",
|
2012-08-08 15:06:33 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_SCSI_LSI);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-scsi-disk-split",
|
2012-04-17 17:08:05 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
2013-03-15 02:32:24 +08:00
|
|
|
QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI);
|
2012-09-11 16:57:04 +08:00
|
|
|
DO_TEST("disk-scsi-disk-wwn",
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
2013-03-15 02:32:24 +08:00
|
|
|
QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI,
|
2012-12-06 18:23:02 +08:00
|
|
|
QEMU_CAPS_SCSI_DISK_WWN);
|
|
|
|
|
DO_TEST("disk-scsi-disk-vpd",
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
2013-03-15 02:32:24 +08:00
|
|
|
QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI,
|
2012-12-06 18:23:02 +08:00
|
|
|
QEMU_CAPS_SCSI_DISK_WWN);
|
|
|
|
|
DO_TEST_FAILURE("disk-scsi-disk-vpd-build-error",
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
2013-03-15 02:32:24 +08:00
|
|
|
QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI,
|
2012-09-11 16:57:04 +08:00
|
|
|
QEMU_CAPS_SCSI_DISK_WWN);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-scsi-vscsi",
|
2012-02-28 14:01:31 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-scsi-virtio-scsi",
|
2012-08-08 15:06:33 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
2013-03-15 02:32:24 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI);
|
2013-04-06 00:21:23 +08:00
|
|
|
DO_TEST("disk-virtio-scsi-num_queues",
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_VIRTIO_SCSI);
|
2013-03-21 22:11:39 +08:00
|
|
|
DO_TEST("disk-scsi-megasas",
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_SCSI_MEGASAS);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-sata-device",
|
2011-09-28 11:46:08 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_ICH9_AHCI);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-aio",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_AIO,
|
|
|
|
|
QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-ioeventfd",
|
2011-06-20 16:26:47 +08:00
|
|
|
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);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-copy_on_read",
|
2012-01-12 17:31:14 +08:00
|
|
|
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);
|
2013-05-14 20:44:54 +08:00
|
|
|
DO_TEST("disk-drive-discard",
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_DISCARD,
|
|
|
|
|
QEMU_CAPS_DEVICE);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-snapshot",
|
2011-08-14 03:20:21 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("event_idx",
|
2011-08-13 14:32:45 +08:00
|
|
|
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);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("virtio-lun",
|
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_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-scsi-lun-passthrough",
|
2012-03-12 22:19:56 +08:00
|
|
|
QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_DEVICE,
|
2012-08-08 15:06:33 +08:00
|
|
|
QEMU_CAPS_SCSI_BLOCK, QEMU_CAPS_VIRTIO_BLK_SG_IO,
|
2013-03-15 02:32:24 +08:00
|
|
|
QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI);
|
2011-06-20 16:26:47 +08:00
|
|
|
|
2012-10-20 03:40:52 +08:00
|
|
|
DO_TEST("graphics-vnc", QEMU_CAPS_VNC);
|
|
|
|
|
DO_TEST("graphics-vnc-socket", QEMU_CAPS_VNC);
|
2013-04-30 22:26:43 +08:00
|
|
|
DO_TEST("graphics-vnc-websocket", QEMU_CAPS_VNC, QEMU_CAPS_VNC_WEBSOCKET);
|
2013-05-21 22:31:49 +08:00
|
|
|
DO_TEST("graphics-vnc-policy", QEMU_CAPS_VNC, QEMU_CAPS_VNC_SHARE_POLICY);
|
2009-03-16 21:54:26 +08:00
|
|
|
|
2013-01-11 05:03:14 +08:00
|
|
|
driver.config->vncSASL = 1;
|
|
|
|
|
VIR_FREE(driver.config->vncSASLdir);
|
2013-05-03 20:52:21 +08:00
|
|
|
ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl2"));
|
2012-10-20 03:40:52 +08:00
|
|
|
DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_VGA);
|
2013-01-11 05:03:14 +08:00
|
|
|
driver.config->vncTLS = 1;
|
|
|
|
|
driver.config->vncTLSx509verify = 1;
|
2012-10-20 03:40:52 +08:00
|
|
|
DO_TEST("graphics-vnc-tls", QEMU_CAPS_VNC);
|
2013-01-11 05:03:14 +08:00
|
|
|
driver.config->vncSASL = driver.config->vncTLSx509verify = driver.config->vncTLS = 0;
|
2013-02-04 22:54:33 +08:00
|
|
|
VIR_FREE(driver.config->vncSASLdir);
|
|
|
|
|
VIR_FREE(driver.config->vncTLSx509certdir);
|
2009-03-16 21:54:26 +08:00
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("graphics-sdl", NONE);
|
|
|
|
|
DO_TEST("graphics-sdl-fullscreen", NONE);
|
|
|
|
|
DO_TEST("nographics", QEMU_CAPS_VGA);
|
|
|
|
|
DO_TEST("nographics-vga",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_VGA, QEMU_CAPS_VGA_NONE);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("graphics-spice",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
|
2012-12-14 15:08:01 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE,
|
|
|
|
|
QEMU_CAPS_DEVICE_QXL);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("graphics-spice-agentmouse",
|
2012-03-09 15:26:24 +08:00
|
|
|
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
|
2012-03-09 17:10:53 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE,
|
|
|
|
|
QEMU_CAPS_CHARDEV_SPICEVMC,
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("graphics-spice-compression",
|
2011-05-31 21:52:05 +08:00
|
|
|
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
|
2012-12-14 15:08:01 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE,
|
|
|
|
|
QEMU_CAPS_DEVICE_QXL);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("graphics-spice-timeout",
|
2011-05-26 19:52:08 +08:00
|
|
|
QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE,
|
|
|
|
|
QEMU_CAPS_DEVICE_QXL_VGA);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("graphics-spice-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
|
|
|
QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE,
|
2012-12-14 15:08:01 +08:00
|
|
|
QEMU_CAPS_DEVICE_QXL_VGA,
|
|
|
|
|
QEMU_CAPS_DEVICE_QXL);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("graphics-spice-usb-redir",
|
2012-05-08 21:00:28 +08:00
|
|
|
QEMU_CAPS_VGA, QEMU_CAPS_SPICE,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_USB_HUB,
|
|
|
|
|
QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR,
|
|
|
|
|
QEMU_CAPS_CHARDEV_SPICEVMC);
|
2011-02-08 22:22:39 +08:00
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("input-usbmouse", NONE);
|
|
|
|
|
DO_TEST("input-usbtablet", NONE);
|
2012-10-20 03:40:52 +08:00
|
|
|
DO_TEST("input-xen", QEMU_CAPS_DOMID, QEMU_CAPS_KVM, QEMU_CAPS_VNC);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("misc-acpi", NONE);
|
2012-08-02 18:18:16 +08:00
|
|
|
DO_TEST("misc-disable-s3", QEMU_CAPS_DISABLE_S3);
|
|
|
|
|
DO_TEST("misc-disable-suspends", QEMU_CAPS_DISABLE_S3, QEMU_CAPS_DISABLE_S4);
|
|
|
|
|
DO_TEST("misc-enable-s4", QEMU_CAPS_DISABLE_S4);
|
|
|
|
|
DO_TEST_FAILURE("misc-enable-s4", NONE);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("misc-no-reboot", NONE);
|
|
|
|
|
DO_TEST("misc-uuid", QEMU_CAPS_NAME, QEMU_CAPS_UUID);
|
|
|
|
|
DO_TEST("net-user", NONE);
|
|
|
|
|
DO_TEST("net-virtio", NONE);
|
|
|
|
|
DO_TEST("net-virtio-device",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_TX_ALG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("net-virtio-netdev",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NETDEV, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("net-virtio-s390",
|
2012-06-29 23:02:07 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_S390);
|
2013-03-05 23:44:23 +08:00
|
|
|
DO_TEST("net-virtio-ccw",
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("net-eth", NONE);
|
|
|
|
|
DO_TEST("net-eth-ifname", NONE);
|
|
|
|
|
DO_TEST("net-eth-names", QEMU_CAPS_NET_NAME);
|
|
|
|
|
DO_TEST("net-client", NONE);
|
|
|
|
|
DO_TEST("net-server", NONE);
|
|
|
|
|
DO_TEST("net-mcast", NONE);
|
|
|
|
|
DO_TEST("net-hostdev",
|
qemu: support type='hostdev' network devices at domain start
This patch makes sure that each network device ("interface") of
type='hostdev' appears on both the hostdevs list and the nets list of
the virDomainDef, and it modifies the qemu driver startup code so that
these devices will be presented to qemu on the commandline as hostdevs
rather than as network devices.
It does not add support for hotplug of these type of devices, or code
to honor the <mac address> or <virtualport> given in the config (both
of those will be done in separate patches).
Once each device is placed on both lists, much of what this patch does
is modify places in the code that traverse all the device lists so
that these hybrid devices are only acted on once - either along with
the other hostdevs, or along with the other network interfaces. (In
many cases, only one of the lists is traversed / a specific operation
is performed on only one type of device. In those instances, the code
can remain unchanged.)
There is one special case - when building the commandline, interfaces
are allowed to proceed all the way through
networkAllocateActualDevice() before deciding to skip the rest of
netdev-specific processing - this is so that (once we have support for
networks with pools of hostdev devices) we can get the actual device
allocated, then rely on the loop processing all hostdevs to generate
the correct commandline.
(NB: <interface type='hostdev'> is only supported for PCI network
devices that are SR-IOV Virtual Functions (VF). Standard PCI[e] and
USB devices, and even the Physical Functions (PF) of SR-IOV devices
can only be assigned to a guest using the more basic <hostdev> device
entry. This limitation is mostly due to the fact that non-SR-IOV
ethernet devices tend to lose mac address configuration whenever the
card is reset, which happens when a card is assigned to a guest;
SR-IOV VFs fortunately don't suffer the same problem.)
2012-02-23 23:45:35 +08:00
|
|
|
QEMU_CAPS_PCIDEVICE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2013-04-25 19:58:37 +08:00
|
|
|
DO_TEST("net-hostdev-vfio",
|
|
|
|
|
QEMU_CAPS_PCIDEVICE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_DEVICE_VFIO_PCI);
|
2011-02-08 22:22:39 +08:00
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("serial-vc", NONE);
|
|
|
|
|
DO_TEST("serial-pty", NONE);
|
|
|
|
|
DO_TEST("serial-dev", NONE);
|
|
|
|
|
DO_TEST("serial-file", NONE);
|
|
|
|
|
DO_TEST("serial-unix", NONE);
|
|
|
|
|
DO_TEST("serial-tcp", NONE);
|
|
|
|
|
DO_TEST("serial-udp", NONE);
|
|
|
|
|
DO_TEST("serial-tcp-telnet", NONE);
|
|
|
|
|
DO_TEST("serial-many", NONE);
|
|
|
|
|
DO_TEST("parallel-tcp", NONE);
|
|
|
|
|
DO_TEST("console-compat", NONE);
|
|
|
|
|
DO_TEST("console-compat-auto", NONE);
|
|
|
|
|
|
|
|
|
|
DO_TEST("serial-vc-chardev",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("serial-pty-chardev",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("serial-dev-chardev",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("serial-file-chardev",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("serial-unix-chardev",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("serial-tcp-chardev",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("serial-udp-chardev",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("serial-tcp-telnet-chardev",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("serial-many-chardev",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("parallel-tcp-chardev",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("parallel-parport-chardev",
|
2012-05-23 13:50:02 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("console-compat-chardev",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("channel-guestfwd",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("channel-virtio",
|
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);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("channel-virtio-auto",
|
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);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("console-virtio",
|
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);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("console-virtio-many",
|
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);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("console-virtio-s390",
|
2012-06-29 23:02:07 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
2013-03-05 23:44:23 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390);
|
|
|
|
|
DO_TEST("console-virtio-ccw",
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_CCW,
|
|
|
|
|
QEMU_CAPS_VIRTIO_S390);
|
2013-01-08 01:17:15 +08:00
|
|
|
DO_TEST("console-sclp",
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_SCLP_S390);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("channel-spicevmc",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("channel-spicevmc-old",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_SPICEVMC);
|
|
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("smartcard-host",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_EMULATED);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("smartcard-host-certificates",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_EMULATED);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("smartcard-passthrough-tcp",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_PASSTHRU);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("smartcard-passthrough-spicevmc",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_CCID_PASSTHRU, QEMU_CAPS_CHARDEV_SPICEVMC);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("smartcard-controller",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_EMULATED);
|
|
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("usb-controller",
|
2011-09-02 21:21:23 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("usb-piix3-controller",
|
2011-09-02 21:21:23 +08:00
|
|
|
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);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("usb-ich9-ehci-addr",
|
2011-09-02 21:26:55 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("input-usbmouse-addr",
|
2011-09-02 21:28:27 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("usb-ich9-companion",
|
2011-09-02 22:03:51 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1);
|
2013-04-23 22:23:51 +08:00
|
|
|
DO_TEST_PARSE_ERROR("usb-ich9-no-companion",
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("usb-hub",
|
2011-09-02 22:20:40 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_USB_HUB,
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("usb-ports",
|
2011-09-02 22:31:26 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_USB_HUB,
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("usb-redir",
|
2011-09-02 23:09:14 +08:00
|
|
|
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);
|
2012-11-21 02:47:09 +08:00
|
|
|
DO_TEST("usb-redir-boot",
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_USB_HUB,
|
|
|
|
|
QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR,
|
|
|
|
|
QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC, QEMU_CAPS_BOOTINDEX,
|
|
|
|
|
QEMU_CAPS_USB_REDIR_BOOTINDEX);
|
2012-09-13 15:25:47 +08:00
|
|
|
DO_TEST("usb-redir-filter",
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_USB_HUB,
|
|
|
|
|
QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR,
|
|
|
|
|
QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC,
|
|
|
|
|
QEMU_CAPS_USB_REDIR_FILTER);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("usb1-usb2",
|
2011-09-05 15:07:01 +08:00
|
|
|
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);
|
2012-07-03 21:43:13 +08:00
|
|
|
DO_TEST("usb-none",
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST_PARSE_ERROR("usb-none-other",
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST_PARSE_ERROR("usb-none-hub",
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_USB_HUB);
|
|
|
|
|
DO_TEST_PARSE_ERROR("usb-none-usbtablet",
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
|
2011-09-02 21:21:23 +08:00
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("smbios", QEMU_CAPS_SMBIOS_TYPE);
|
2013-04-26 20:33:26 +08:00
|
|
|
DO_TEST_PARSE_ERROR("smbios-date", QEMU_CAPS_SMBIOS_TYPE);
|
2013-04-27 02:29:37 +08:00
|
|
|
DO_TEST_PARSE_ERROR("smbios-uuid-match", QEMU_CAPS_SMBIOS_TYPE);
|
2011-02-08 22:22:39 +08:00
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("watchdog", NONE);
|
|
|
|
|
DO_TEST("watchdog-device", QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("watchdog-dump", NONE);
|
|
|
|
|
DO_TEST("balloon-device", QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
DO_TEST("balloon-device-auto",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("sound", NONE);
|
|
|
|
|
DO_TEST("sound-device",
|
2012-05-16 06:55:11 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_HDA_MICRO);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("fs9p",
|
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
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("hostdev-usb-address", NONE);
|
|
|
|
|
DO_TEST("hostdev-usb-address-device",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-11-21 02:47:09 +08:00
|
|
|
DO_TEST("hostdev-usb-address-device-boot", QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_BOOTINDEX,
|
|
|
|
|
QEMU_CAPS_USB_HOST_BOOTINDEX);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("hostdev-pci-address", QEMU_CAPS_PCIDEVICE);
|
|
|
|
|
DO_TEST("hostdev-pci-address-device",
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_PCIDEVICE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2013-04-25 19:58:37 +08:00
|
|
|
DO_TEST("hostdev-vfio",
|
|
|
|
|
QEMU_CAPS_PCIDEVICE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_DEVICE_VFIO_PCI);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("pci-rom",
|
2012-01-25 08:54:12 +08:00
|
|
|
QEMU_CAPS_PCIDEVICE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_PCI_ROMBAR);
|
2011-02-08 22:22:39 +08:00
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST_FULL("restore-v1", "stdio", 7, 0, QEMU_CAPS_MIGRATE_KVM_STDIO);
|
|
|
|
|
DO_TEST_FULL("restore-v2", "stdio", 7, 0, QEMU_CAPS_MIGRATE_QEMU_EXEC);
|
|
|
|
|
DO_TEST_FULL("restore-v2", "exec:cat", 7, 0, QEMU_CAPS_MIGRATE_QEMU_EXEC);
|
|
|
|
|
DO_TEST_FULL("restore-v2-fd", "stdio", 7, 0, QEMU_CAPS_MIGRATE_QEMU_FD);
|
|
|
|
|
DO_TEST_FULL("restore-v2-fd", "fd:7", 7, 0, QEMU_CAPS_MIGRATE_QEMU_FD);
|
|
|
|
|
DO_TEST_FULL("migrate", "tcp:10.0.0.1:5000", -1, 0,
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_MIGRATE_QEMU_TCP);
|
|
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("qemu-ns", NONE);
|
2011-02-08 22:22:39 +08:00
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("smp", QEMU_CAPS_SMP_TOPOLOGY);
|
2011-02-08 22:22:39 +08:00
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("cpu-topology1", QEMU_CAPS_SMP_TOPOLOGY);
|
|
|
|
|
DO_TEST("cpu-topology2", QEMU_CAPS_SMP_TOPOLOGY);
|
|
|
|
|
DO_TEST("cpu-topology3", NONE);
|
|
|
|
|
DO_TEST("cpu-minimum1", NONE);
|
|
|
|
|
DO_TEST("cpu-minimum2", NONE);
|
|
|
|
|
DO_TEST("cpu-exact1", NONE);
|
|
|
|
|
DO_TEST("cpu-exact2", NONE);
|
|
|
|
|
DO_TEST("cpu-exact2-nofallback", NONE);
|
|
|
|
|
DO_TEST("cpu-fallback", NONE);
|
2011-12-21 21:27:16 +08:00
|
|
|
DO_TEST_FAILURE("cpu-nofallback", NONE);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("cpu-strict1", NONE);
|
|
|
|
|
DO_TEST("cpu-numa1", NONE);
|
|
|
|
|
DO_TEST("cpu-numa2", QEMU_CAPS_SMP_TOPOLOGY);
|
|
|
|
|
DO_TEST("cpu-host-model", NONE);
|
2012-08-22 23:28:55 +08:00
|
|
|
skipLegacyCPUs = true;
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("cpu-host-model-fallback", NONE);
|
2011-12-21 20:47:17 +08:00
|
|
|
DO_TEST_FAILURE("cpu-host-model-nofallback", NONE);
|
2012-08-22 23:28:55 +08:00
|
|
|
skipLegacyCPUs = false;
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("cpu-host-passthrough", QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST);
|
2011-12-21 20:47:17 +08:00
|
|
|
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
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("memtune", QEMU_CAPS_NAME);
|
|
|
|
|
DO_TEST("blkiotune", QEMU_CAPS_NAME);
|
|
|
|
|
DO_TEST("blkiotune-device", QEMU_CAPS_NAME);
|
|
|
|
|
DO_TEST("cputune", QEMU_CAPS_NAME);
|
|
|
|
|
DO_TEST("numatune-memory", NONE);
|
|
|
|
|
DO_TEST("numad", NONE);
|
|
|
|
|
DO_TEST("numad-auto-vcpu-static-numatune", NONE);
|
|
|
|
|
DO_TEST("numad-auto-memory-vcpu-cpuset", NONE);
|
|
|
|
|
DO_TEST("numad-auto-memory-vcpu-no-cpuset-and-placement", NONE);
|
|
|
|
|
DO_TEST("numad-static-memory-auto-vcpu", NONE);
|
|
|
|
|
DO_TEST("blkdeviotune", 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
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("multifunction-pci-device",
|
2011-06-08 12:34:04 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
2012-08-08 15:06:33 +08:00
|
|
|
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_SCSI_LSI);
|
2011-06-08 12:34:04 +08:00
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("monitor-json", QEMU_CAPS_DEVICE,
|
2011-06-16 00:49:58 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("no-shutdown", QEMU_CAPS_DEVICE,
|
2011-09-21 16:25:29 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_NO_SHUTDOWN);
|
2011-06-16 00:49:58 +08:00
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("seclabel-dynamic", QEMU_CAPS_NAME);
|
|
|
|
|
DO_TEST("seclabel-dynamic-baselabel", QEMU_CAPS_NAME);
|
|
|
|
|
DO_TEST("seclabel-dynamic-override", QEMU_CAPS_NAME);
|
|
|
|
|
DO_TEST("seclabel-static", QEMU_CAPS_NAME);
|
|
|
|
|
DO_TEST("seclabel-static-relabel", QEMU_CAPS_NAME);
|
|
|
|
|
DO_TEST("seclabel-none", QEMU_CAPS_NAME);
|
2011-12-23 08:47:46 +08:00
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("pseries-basic",
|
2012-01-13 11:39:25 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("pseries-vio", QEMU_CAPS_DRIVE,
|
2012-01-13 11:39:25 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2013-04-19 18:26:36 +08:00
|
|
|
DO_TEST("pseries-usb-default", QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
|
|
QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PCI_MULTIFUNCTION);
|
|
|
|
|
DO_TEST("pseries-usb-multi", QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
|
|
QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PCI_MULTIFUNCTION);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("pseries-vio-user-assigned", QEMU_CAPS_DRIVE,
|
2012-01-13 11:39:25 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST_ERROR("pseries-vio-address-clash", QEMU_CAPS_DRIVE,
|
2012-01-13 11:39:25 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2013-04-25 16:46:04 +08:00
|
|
|
DO_TEST("pseries-nvram", QEMU_CAPS_DEVICE_NVRAM);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-ide-drive-split",
|
2012-04-17 17:16:52 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_IDE_CD);
|
2012-09-11 16:57:04 +08:00
|
|
|
DO_TEST("disk-ide-wwn",
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_IDE_CD,
|
|
|
|
|
QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_IDE_DRIVE_WWN);
|
2012-01-13 11:39:25 +08:00
|
|
|
|
2012-08-20 21:58:51 +08:00
|
|
|
DO_TEST("disk-geometry", QEMU_CAPS_DRIVE);
|
2012-09-04 22:30:55 +08:00
|
|
|
DO_TEST("disk-blockio",
|
2012-08-29 23:48:31 +08:00
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
2012-09-04 22:30:55 +08:00
|
|
|
QEMU_CAPS_IDE_CD, QEMU_CAPS_BLOCKIO);
|
2012-08-20 21:58:51 +08:00
|
|
|
|
2012-12-14 15:09:17 +08:00
|
|
|
DO_TEST("video-device-pciaddr-default",
|
|
|
|
|
QEMU_CAPS_KVM, QEMU_CAPS_VNC,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
|
|
|
|
|
QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_QXL_VGA);
|
|
|
|
|
|
2013-03-07 19:50:14 +08:00
|
|
|
DO_TEST("virtio-rng-default", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VIRTIO_RNG,
|
|
|
|
|
QEMU_CAPS_OBJECT_RNG_RANDOM);
|
2013-02-13 00:56:00 +08:00
|
|
|
DO_TEST("virtio-rng-random", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VIRTIO_RNG,
|
|
|
|
|
QEMU_CAPS_OBJECT_RNG_RANDOM);
|
|
|
|
|
DO_TEST("virtio-rng-egd", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VIRTIO_RNG,
|
|
|
|
|
QEMU_CAPS_OBJECT_RNG_EGD);
|
2013-03-15 02:32:26 +08:00
|
|
|
DO_TEST("virtio-rng-ccw",
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_CCW,
|
|
|
|
|
QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_VIRTIO_RNG,
|
|
|
|
|
QEMU_CAPS_OBJECT_RNG_RANDOM);
|
2013-02-13 00:56:00 +08:00
|
|
|
|
2013-04-27 01:52:43 +08:00
|
|
|
DO_TEST("s390-usb-none",
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390,
|
|
|
|
|
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
|
|
|
|
|
|
2013-04-26 23:50:36 +08:00
|
|
|
DO_TEST("s390-piix-controllers",
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
|
QEMU_CAPS_DRIVE, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390,
|
|
|
|
|
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
|
|
|
|
|
|
2013-03-14 12:49:43 +08:00
|
|
|
DO_TEST("ppc-dtb", QEMU_CAPS_KVM, QEMU_CAPS_DTB);
|
|
|
|
|
|
2013-04-13 04:55:46 +08:00
|
|
|
DO_TEST("tpm-passthrough", QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS);
|
2013-05-09 18:33:11 +08:00
|
|
|
DO_TEST_PARSE_ERROR("tpm-no-backend-invalid", QEMU_CAPS_DEVICE,
|
|
|
|
|
QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS);
|
2013-04-13 04:55:46 +08:00
|
|
|
|
2013-04-19 18:38:53 +08:00
|
|
|
DO_TEST("pci-autoadd-addr", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE);
|
|
|
|
|
DO_TEST("pci-autoadd-idx", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE);
|
|
|
|
|
|
qemu: Build qemu command line for scsi host device
Except the scsi host device's controller is "lsilogic", mapping
between the libvirt attributes and scsi-generic properties is:
libvirt qemu
-----------------------------------------
controller bus ($libvirt_controller.0)
bus channel
target scsi-id
unit lun
For scsi host device with "lsilogic" controller, the mapping is:
('target (libvirt)' must be 0, as it's not used; 'unit (libvirt)
must <= 7).
libvirt qemu
----------------------------------------------------------
controller && bus bus ($libvirt_controller.$libvirt_bus)
unit scsi-id
It's not good to hardcode/hard-check limits of these attributes,
and even worse, these limits are not documented, one has to find
out by either testing or reading the qemu code, I'm looking forward
to qemu expose limits like these one day). For example, exposing
"max_target", "max_lun" for megasas:
static const struct SCSIBusInfo megasas_scsi_info = {
.tcq = true,
.max_target = MFI_MAX_LD,
.max_lun = 255,
.transfer_data = megasas_xfer_complete,
.get_sg_list = megasas_get_sg_list,
.complete = megasas_command_complete,
.cancel = megasas_command_cancel,
};
Example of the qemu command line (lsilogic controller):
-drive file=/dev/sg2,if=none,id=drive-hostdev-scsi_host7-0-0-0 \
-device scsi-generic,bus=scsi0.0,scsi-id=8,\
drive=drive-hostdev-scsi_host7-0-0-0,id=hostdev-scsi_host7-0-0-0
Example of the qemu command line (virtio-scsi controller):
-drive file=/dev/sg2,if=none,id=drive-hostdev-scsi_host7-0-0-0 \
-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=128,lun=128,\
drive=drive-hostdev-scsi_host7-0-0-0,id=hostdev-scsi_host7-0-0-0
Signed-off-by: Han Cheng <hanc.fnst@cn.fujitsu.com>
Signed-off-by: Osier Yang <jyang@redhat.com>
2013-05-04 02:07:23 +08:00
|
|
|
DO_TEST("hostdev-scsi-lsi", QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
|
|
|
|
|
QEMU_CAPS_DEVICE_SCSI_GENERIC);
|
|
|
|
|
DO_TEST("hostdev-scsi-virtio-scsi", QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI,
|
|
|
|
|
QEMU_CAPS_DEVICE_SCSI_GENERIC);
|
2013-05-04 02:07:25 +08:00
|
|
|
DO_TEST("hostdev-scsi-readonly", QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_VIRTIO_SCSI,
|
|
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_SCSI_GENERIC);
|
2013-05-04 02:07:26 +08:00
|
|
|
DO_TEST("hostdev-scsi-virtio-scsi", QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE,
|
|
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI,
|
|
|
|
|
QEMU_CAPS_DEVICE_SCSI_GENERIC,
|
|
|
|
|
QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX);
|
qemu: Build qemu command line for scsi host device
Except the scsi host device's controller is "lsilogic", mapping
between the libvirt attributes and scsi-generic properties is:
libvirt qemu
-----------------------------------------
controller bus ($libvirt_controller.0)
bus channel
target scsi-id
unit lun
For scsi host device with "lsilogic" controller, the mapping is:
('target (libvirt)' must be 0, as it's not used; 'unit (libvirt)
must <= 7).
libvirt qemu
----------------------------------------------------------
controller && bus bus ($libvirt_controller.$libvirt_bus)
unit scsi-id
It's not good to hardcode/hard-check limits of these attributes,
and even worse, these limits are not documented, one has to find
out by either testing or reading the qemu code, I'm looking forward
to qemu expose limits like these one day). For example, exposing
"max_target", "max_lun" for megasas:
static const struct SCSIBusInfo megasas_scsi_info = {
.tcq = true,
.max_target = MFI_MAX_LD,
.max_lun = 255,
.transfer_data = megasas_xfer_complete,
.get_sg_list = megasas_get_sg_list,
.complete = megasas_command_complete,
.cancel = megasas_command_cancel,
};
Example of the qemu command line (lsilogic controller):
-drive file=/dev/sg2,if=none,id=drive-hostdev-scsi_host7-0-0-0 \
-device scsi-generic,bus=scsi0.0,scsi-id=8,\
drive=drive-hostdev-scsi_host7-0-0-0,id=hostdev-scsi_host7-0-0-0
Example of the qemu command line (virtio-scsi controller):
-drive file=/dev/sg2,if=none,id=drive-hostdev-scsi_host7-0-0-0 \
-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=128,lun=128,\
drive=drive-hostdev-scsi_host7-0-0-0,id=hostdev-scsi_host7-0-0-0
Signed-off-by: Han Cheng <hanc.fnst@cn.fujitsu.com>
Signed-off-by: Osier Yang <jyang@redhat.com>
2013-05-04 02:07:23 +08:00
|
|
|
|
2013-05-17 04:01:05 +08:00
|
|
|
DO_TEST("mlock-on", QEMU_CAPS_MLOCK);
|
|
|
|
|
DO_TEST_FAILURE("mlock-on", NONE);
|
|
|
|
|
DO_TEST("mlock-off", QEMU_CAPS_MLOCK);
|
|
|
|
|
DO_TEST("mlock-unsupported", NONE);
|
|
|
|
|
|
2013-01-11 05:03:14 +08:00
|
|
|
virObjectUnref(driver.config);
|
2013-02-01 20:26:18 +08:00
|
|
|
virObjectUnref(driver.caps);
|
2013-04-01 02:03:42 +08:00
|
|
|
virObjectUnref(driver.xmlopt);
|
2012-02-03 07:16:43 +08:00
|
|
|
VIR_FREE(map);
|
2008-02-27 12:35:08 +08:00
|
|
|
|
2012-03-22 19:33:35 +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-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 */
|