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"
|
2015-10-20 21:48:33 +08:00
|
|
|
# include "qemu/qemu_migration.h"
|
2010-03-10 02:22:22 +08:00
|
|
|
# include "datatypes.h"
|
2013-11-20 23:04:10 +08:00
|
|
|
# include "conf/storage_conf.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"
|
2014-08-15 00:05:48 +08:00
|
|
|
# include "storage/storage_driver.h"
|
2015-02-02 18:26:49 +08:00
|
|
|
# include "virmock.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
|
|
|
|
2014-06-11 17:40:44 +08:00
|
|
|
if (virUUIDGenerate(uuid) < 0)
|
|
|
|
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
|
|
|
return virGetSecret(conn, uuid, usageType, usageID);
|
2011-11-01 09:29:07 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static virSecretDriver fakeSecretDriver = {
|
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
|
|
|
};
|
|
|
|
|
2013-11-20 23:04:10 +08:00
|
|
|
|
|
|
|
# define STORAGE_POOL_XML_PATH "storagepoolxml2xmlout/"
|
|
|
|
static const unsigned char fakeUUID[VIR_UUID_BUFLEN] = "fakeuuid";
|
|
|
|
|
|
|
|
static virStoragePoolPtr
|
|
|
|
fakeStoragePoolLookupByName(virConnectPtr conn,
|
|
|
|
const char *name)
|
|
|
|
{
|
|
|
|
char *xmlpath = NULL;
|
|
|
|
virStoragePoolPtr ret = NULL;
|
|
|
|
|
|
|
|
if (STRNEQ(name, "inactive")) {
|
|
|
|
if (virAsprintf(&xmlpath, "%s/%s%s.xml",
|
|
|
|
abs_srcdir,
|
|
|
|
STORAGE_POOL_XML_PATH,
|
|
|
|
name) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (!virFileExists(xmlpath)) {
|
|
|
|
virReportError(VIR_ERR_NO_STORAGE_POOL,
|
|
|
|
"File '%s' not found", xmlpath);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = virGetStoragePool(conn, name, fakeUUID, NULL, NULL);
|
|
|
|
|
2014-03-25 14:53:44 +08:00
|
|
|
cleanup:
|
2013-11-20 23:04:10 +08:00
|
|
|
VIR_FREE(xmlpath);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static virStorageVolPtr
|
|
|
|
fakeStorageVolLookupByName(virStoragePoolPtr pool,
|
|
|
|
const char *name)
|
|
|
|
{
|
|
|
|
char **volinfo = NULL;
|
|
|
|
virStorageVolPtr ret = NULL;
|
|
|
|
|
|
|
|
if (STREQ(pool->name, "inactive")) {
|
|
|
|
virReportError(VIR_ERR_OPERATION_INVALID,
|
|
|
|
"storage pool '%s' is not active", pool->name);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (STREQ(name, "nonexistent")) {
|
|
|
|
virReportError(VIR_ERR_NO_STORAGE_VOL,
|
|
|
|
"no storage vol with matching name '%s'", name);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strchr(name, '+'))
|
|
|
|
goto fallback;
|
|
|
|
|
|
|
|
if (!(volinfo = virStringSplit(name, "+", 2)))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (!volinfo[1])
|
|
|
|
goto fallback;
|
|
|
|
|
|
|
|
ret = virGetStorageVol(pool->conn, pool->name, volinfo[1], volinfo[0],
|
|
|
|
NULL, NULL);
|
|
|
|
|
2014-03-25 14:53:44 +08:00
|
|
|
cleanup:
|
2013-11-20 23:04:10 +08:00
|
|
|
virStringFreeList(volinfo);
|
|
|
|
return ret;
|
|
|
|
|
2014-03-25 14:53:44 +08:00
|
|
|
fallback:
|
2013-11-20 23:04:10 +08:00
|
|
|
ret = virGetStorageVol(pool->conn, pool->name, name, "block", NULL, NULL);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
fakeStorageVolGetInfo(virStorageVolPtr vol,
|
|
|
|
virStorageVolInfoPtr info)
|
|
|
|
{
|
|
|
|
memset(info, 0, sizeof(*info));
|
|
|
|
|
|
|
|
info->type = virStorageVolTypeFromString(vol->key);
|
|
|
|
|
|
|
|
if (info->type < 0) {
|
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
"Invalid volume type '%s'", vol->key);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
fakeStorageVolGetPath(virStorageVolPtr vol)
|
|
|
|
{
|
|
|
|
char *ret = NULL;
|
|
|
|
|
|
|
|
ignore_value(virAsprintf(&ret, "/some/%s/device/%s", vol->key, vol->name));
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
fakeStoragePoolGetXMLDesc(virStoragePoolPtr pool,
|
|
|
|
unsigned int flags_unused ATTRIBUTE_UNUSED)
|
|
|
|
{
|
|
|
|
char *xmlpath = NULL;
|
|
|
|
char *xmlbuf = NULL;
|
|
|
|
|
|
|
|
if (STREQ(pool->name, "inactive")) {
|
|
|
|
virReportError(VIR_ERR_NO_STORAGE_POOL, NULL);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (virAsprintf(&xmlpath, "%s/%s%s.xml",
|
|
|
|
abs_srcdir,
|
|
|
|
STORAGE_POOL_XML_PATH,
|
|
|
|
pool->name) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (virtTestLoadFile(xmlpath, &xmlbuf) < 0) {
|
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
"failed to load XML file '%s'",
|
|
|
|
xmlpath);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2014-03-25 14:53:44 +08:00
|
|
|
cleanup:
|
2013-11-20 23:04:10 +08:00
|
|
|
VIR_FREE(xmlpath);
|
|
|
|
|
|
|
|
return xmlbuf;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
fakeStoragePoolIsActive(virStoragePoolPtr pool)
|
|
|
|
{
|
|
|
|
if (STREQ(pool->name, "inactive"))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Test storage pool implementation
|
|
|
|
*
|
|
|
|
* These functions aid testing of storage pool related stuff when creating a
|
2013-12-02 20:25:01 +08:00
|
|
|
* qemu command line.
|
2013-11-20 23:04:10 +08:00
|
|
|
*
|
|
|
|
* There are a few "magic" values to pass to these functions:
|
|
|
|
*
|
2013-12-02 20:25:01 +08:00
|
|
|
* 1) "inactive" as a pool name to create an inactive pool. All other names are
|
|
|
|
* interpreted as file names in storagepoolxml2xmlout/ and are used as the
|
2013-11-20 23:04:10 +08:00
|
|
|
* definition for the pool. If the file doesn't exist the pool doesn't exist.
|
|
|
|
*
|
|
|
|
* 2) "nonexistent" returns an error while looking up a volume. Otherwise
|
2013-12-02 20:25:01 +08:00
|
|
|
* pattern VOLUME_TYPE+VOLUME_PATH can be used to simulate a volume in a pool.
|
2013-11-20 23:04:10 +08:00
|
|
|
* This creates a fake path for this volume. If the '+' sign is omitted, block
|
|
|
|
* type is assumed.
|
|
|
|
*/
|
|
|
|
static virStorageDriver fakeStorageDriver = {
|
|
|
|
.storagePoolLookupByName = fakeStoragePoolLookupByName,
|
|
|
|
.storageVolLookupByName = fakeStorageVolLookupByName,
|
|
|
|
.storagePoolGetXMLDesc = fakeStoragePoolGetXMLDesc,
|
|
|
|
.storageVolGetPath = fakeStorageVolGetPath,
|
|
|
|
.storageVolGetInfo = fakeStorageVolGetInfo,
|
|
|
|
.storagePoolIsActive = fakeStoragePoolIsActive,
|
|
|
|
};
|
|
|
|
|
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,
|
2014-09-18 23:38:32 +08:00
|
|
|
FLAG_FIPS = 1 << 4,
|
2012-07-10 00:29:55 +08:00
|
|
|
} 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,
|
2015-10-20 19:51:01 +08:00
|
|
|
const char *migrateURI,
|
2012-07-10 00:29:55 +08:00
|
|
|
virQemuXML2ArgvTestFlags flags)
|
2011-04-25 06:25:10 +08:00
|
|
|
{
|
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;
|
2013-09-20 16:39:51 +08:00
|
|
|
size_t i;
|
2015-02-13 00:39:34 +08:00
|
|
|
virBitmapPtr nodeset = 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;
|
2013-11-20 23:04:10 +08:00
|
|
|
conn->storageDriver = &fakeStorageDriver;
|
2007-07-19 05:34:22 +08:00
|
|
|
|
2015-02-13 00:39:34 +08:00
|
|
|
if (virBitmapParse("0-3", '\0', &nodeset, 4) < 0)
|
|
|
|
goto out;
|
|
|
|
|
2013-03-28 21:55:55 +08:00
|
|
|
if (!(vmdef = virDomainDefParseFile(xml, driver.caps, driver.xmlopt,
|
2014-11-19 00:44:00 +08:00
|
|
|
VIR_DOMAIN_DEF_PARSE_INACTIVE))) {
|
Introduce new OOM testing support
The previous OOM testing support would re-run the entire "main"
method each iteration, failing a different malloc each time.
When a test suite has 'n' allocations, the number of repeats
requires is (n * (n + 1) ) / 2. This gets very large, very
quickly.
This new OOM testing support instead integrates at the
virtTestRun level, so each individual test case gets repeated,
instead of the entire test suite. This means the values of
'n' are orders of magnitude smaller.
The simple usage is
$ VIR_TEST_OOM=1 ./qemuxml2argvtest
...
29) QEMU XML-2-ARGV clock-utc ... OK
Test OOM for nalloc=36 .................................... OK
30) QEMU XML-2-ARGV clock-localtime ... OK
Test OOM for nalloc=36 .................................... OK
31) QEMU XML-2-ARGV clock-france ... OK
Test OOM for nalloc=38 ...................................... OK
...
the second lines reports how many mallocs have to be failed, and thus
how many repeats of the test will be run.
If it crashes, then running under valgrind will often show the problem
$ VIR_TEST_OOM=1 ../run valgrind ./qemuxml2argvtest
When debugging problems it is also helpful to select an individual
test case
$ VIR_TEST_RANGE=30 VIR_TEST_OOM=1 ../run valgrind ./qemuxml2argvtest
When things get really tricky, it is possible to request that just
specific allocs are failed. eg to fail allocs 5 -> 12, use
$ VIR_TEST_RANGE=30 VIR_TEST_OOM=1:5-12 ../run valgrind ./qemuxml2argvtest
In the worse case, you might want to know the stack trace of the
alloc which was failed then VIR_TEST_OOM_TRACE can be set. If it
is set to 1 then it will only print if it thinks a mistake happened.
This is often not reliable, so setting it to 2 will make it print
the stack trace for every alloc that is failed.
$ VIR_TEST_OOM_TRACE=2 VIR_TEST_RANGE=30 VIR_TEST_OOM=1:5-5 ../run valgrind ./qemuxml2argvtest
30) QEMU XML-2-ARGV clock-localtime ... OK
Test OOM for nalloc=36 !virAllocN
/home/berrange/src/virt/libvirt/src/util/viralloc.c:180
virHashCreateFull
/home/berrange/src/virt/libvirt/src/util/virhash.c:144
virDomainDefParseXML
/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:11745
virDomainDefParseNode
/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:12646
virDomainDefParse
/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:12590
testCompareXMLToArgvFiles
/home/berrange/src/virt/libvirt/tests/qemuxml2argvtest.c:106
virtTestRun
/home/berrange/src/virt/libvirt/tests/testutils.c:250
mymain
/home/berrange/src/virt/libvirt/tests/qemuxml2argvtest.c:418 (discriminator 2)
virtTestMain
/home/berrange/src/virt/libvirt/tests/testutils.c:750
??
??:0
_start
??:?
FAILED
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-09-23 21:21:52 +08:00
|
|
|
if (!virtTestOOMActive() &&
|
|
|
|
(flags & FLAG_EXPECT_PARSE_ERROR))
|
2012-07-10 00:29:55 +08:00
|
|
|
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
|
|
|
|
2014-01-11 01:18:03 +08:00
|
|
|
if (!virDomainDefCheckABIStability(vmdef, vmdef)) {
|
2015-04-24 01:38:00 +08:00
|
|
|
VIR_TEST_DEBUG("ABI stability check failed on %s", xml);
|
2014-01-11 01:18:03 +08:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2015-02-18 23:33:50 +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_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
|
|
|
|
2015-02-12 21:50:31 +08:00
|
|
|
virQEMUCapsFilterByMachineType(extraFlags, vmdef->os.machine);
|
|
|
|
|
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
|
|
|
|
2013-09-20 16:39:51 +08:00
|
|
|
for (i = 0; i < vmdef->nhostdevs; i++) {
|
|
|
|
virDomainHostdevDefPtr hostdev = vmdef->hostdevs[i];
|
|
|
|
|
|
|
|
if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
|
|
|
|
hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
|
|
|
|
hostdev->source.subsys.u.pci.backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT) {
|
|
|
|
hostdev->source.subsys.u.pci.backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-20 23:04:10 +08:00
|
|
|
for (i = 0; i < vmdef->ndisks; i++) {
|
2014-08-15 00:05:48 +08:00
|
|
|
if (virStorageTranslateDiskSourcePool(conn, vmdef->disks[i]) < 0)
|
2013-11-20 23:04:10 +08:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
if (!(cmd = qemuBuildCommandLine(conn, &driver, vmdef, &monitor_chr,
|
|
|
|
(flags & FLAG_JSON), extraFlags,
|
2015-10-20 19:51:01 +08:00
|
|
|
migrateURI, NULL,
|
2013-05-17 18:34:24 +08:00
|
|
|
VIR_NETDEV_VPORT_PROFILE_OP_NO_OP,
|
2014-09-18 23:38:32 +08:00
|
|
|
&testCallbacks, false,
|
2014-10-30 14:34:30 +08:00
|
|
|
(flags & FLAG_FIPS),
|
2015-02-21 03:52:37 +08:00
|
|
|
nodeset, NULL, NULL))) {
|
Introduce new OOM testing support
The previous OOM testing support would re-run the entire "main"
method each iteration, failing a different malloc each time.
When a test suite has 'n' allocations, the number of repeats
requires is (n * (n + 1) ) / 2. This gets very large, very
quickly.
This new OOM testing support instead integrates at the
virtTestRun level, so each individual test case gets repeated,
instead of the entire test suite. This means the values of
'n' are orders of magnitude smaller.
The simple usage is
$ VIR_TEST_OOM=1 ./qemuxml2argvtest
...
29) QEMU XML-2-ARGV clock-utc ... OK
Test OOM for nalloc=36 .................................... OK
30) QEMU XML-2-ARGV clock-localtime ... OK
Test OOM for nalloc=36 .................................... OK
31) QEMU XML-2-ARGV clock-france ... OK
Test OOM for nalloc=38 ...................................... OK
...
the second lines reports how many mallocs have to be failed, and thus
how many repeats of the test will be run.
If it crashes, then running under valgrind will often show the problem
$ VIR_TEST_OOM=1 ../run valgrind ./qemuxml2argvtest
When debugging problems it is also helpful to select an individual
test case
$ VIR_TEST_RANGE=30 VIR_TEST_OOM=1 ../run valgrind ./qemuxml2argvtest
When things get really tricky, it is possible to request that just
specific allocs are failed. eg to fail allocs 5 -> 12, use
$ VIR_TEST_RANGE=30 VIR_TEST_OOM=1:5-12 ../run valgrind ./qemuxml2argvtest
In the worse case, you might want to know the stack trace of the
alloc which was failed then VIR_TEST_OOM_TRACE can be set. If it
is set to 1 then it will only print if it thinks a mistake happened.
This is often not reliable, so setting it to 2 will make it print
the stack trace for every alloc that is failed.
$ VIR_TEST_OOM_TRACE=2 VIR_TEST_RANGE=30 VIR_TEST_OOM=1:5-5 ../run valgrind ./qemuxml2argvtest
30) QEMU XML-2-ARGV clock-localtime ... OK
Test OOM for nalloc=36 !virAllocN
/home/berrange/src/virt/libvirt/src/util/viralloc.c:180
virHashCreateFull
/home/berrange/src/virt/libvirt/src/util/virhash.c:144
virDomainDefParseXML
/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:11745
virDomainDefParseNode
/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:12646
virDomainDefParse
/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:12590
testCompareXMLToArgvFiles
/home/berrange/src/virt/libvirt/tests/qemuxml2argvtest.c:106
virtTestRun
/home/berrange/src/virt/libvirt/tests/testutils.c:250
mymain
/home/berrange/src/virt/libvirt/tests/qemuxml2argvtest.c:418 (discriminator 2)
virtTestMain
/home/berrange/src/virt/libvirt/tests/testutils.c:750
??
??:0
_start
??:?
FAILED
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-09-23 21:21:52 +08:00
|
|
|
if (!virtTestOOMActive() &&
|
|
|
|
(flags & FLAG_EXPECT_FAILURE)) {
|
2011-12-21 21:27:16 +08:00
|
|
|
ret = 0;
|
2015-04-24 01:38:00 +08:00
|
|
|
VIR_TEST_DEBUG("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) {
|
2015-04-24 01:38:00 +08:00
|
|
|
VIR_TEST_DEBUG("qemuBuildCommandLine should have failed\n");
|
2011-12-21 21:27:16 +08:00
|
|
|
goto out;
|
|
|
|
}
|
2007-07-19 05:34:22 +08:00
|
|
|
|
Introduce new OOM testing support
The previous OOM testing support would re-run the entire "main"
method each iteration, failing a different malloc each time.
When a test suite has 'n' allocations, the number of repeats
requires is (n * (n + 1) ) / 2. This gets very large, very
quickly.
This new OOM testing support instead integrates at the
virtTestRun level, so each individual test case gets repeated,
instead of the entire test suite. This means the values of
'n' are orders of magnitude smaller.
The simple usage is
$ VIR_TEST_OOM=1 ./qemuxml2argvtest
...
29) QEMU XML-2-ARGV clock-utc ... OK
Test OOM for nalloc=36 .................................... OK
30) QEMU XML-2-ARGV clock-localtime ... OK
Test OOM for nalloc=36 .................................... OK
31) QEMU XML-2-ARGV clock-france ... OK
Test OOM for nalloc=38 ...................................... OK
...
the second lines reports how many mallocs have to be failed, and thus
how many repeats of the test will be run.
If it crashes, then running under valgrind will often show the problem
$ VIR_TEST_OOM=1 ../run valgrind ./qemuxml2argvtest
When debugging problems it is also helpful to select an individual
test case
$ VIR_TEST_RANGE=30 VIR_TEST_OOM=1 ../run valgrind ./qemuxml2argvtest
When things get really tricky, it is possible to request that just
specific allocs are failed. eg to fail allocs 5 -> 12, use
$ VIR_TEST_RANGE=30 VIR_TEST_OOM=1:5-12 ../run valgrind ./qemuxml2argvtest
In the worse case, you might want to know the stack trace of the
alloc which was failed then VIR_TEST_OOM_TRACE can be set. If it
is set to 1 then it will only print if it thinks a mistake happened.
This is often not reliable, so setting it to 2 will make it print
the stack trace for every alloc that is failed.
$ VIR_TEST_OOM_TRACE=2 VIR_TEST_RANGE=30 VIR_TEST_OOM=1:5-5 ../run valgrind ./qemuxml2argvtest
30) QEMU XML-2-ARGV clock-localtime ... OK
Test OOM for nalloc=36 !virAllocN
/home/berrange/src/virt/libvirt/src/util/viralloc.c:180
virHashCreateFull
/home/berrange/src/virt/libvirt/src/util/virhash.c:144
virDomainDefParseXML
/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:11745
virDomainDefParseNode
/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:12646
virDomainDefParse
/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:12590
testCompareXMLToArgvFiles
/home/berrange/src/virt/libvirt/tests/qemuxml2argvtest.c:106
virtTestRun
/home/berrange/src/virt/libvirt/tests/testutils.c:250
mymain
/home/berrange/src/virt/libvirt/tests/qemuxml2argvtest.c:418 (discriminator 2)
virtTestMain
/home/berrange/src/virt/libvirt/tests/testutils.c:750
??
??:0
_start
??:?
FAILED
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-09-23 21:21:52 +08:00
|
|
|
if (!virtTestOOMActive() &&
|
|
|
|
(!!virGetLastError() != !!(flags & FLAG_EXPECT_ERROR))) {
|
2015-04-24 01:38:00 +08:00
|
|
|
if ((log = virtTestLogContentAndReset()))
|
|
|
|
VIR_TEST_DEBUG("\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
|
|
|
|
2015-04-23 23:14:26 +08:00
|
|
|
if (virtTestCompareToFile(actualargv, cmdline) < 0)
|
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:
|
Introduce new OOM testing support
The previous OOM testing support would re-run the entire "main"
method each iteration, failing a different malloc each time.
When a test suite has 'n' allocations, the number of repeats
requires is (n * (n + 1) ) / 2. This gets very large, very
quickly.
This new OOM testing support instead integrates at the
virtTestRun level, so each individual test case gets repeated,
instead of the entire test suite. This means the values of
'n' are orders of magnitude smaller.
The simple usage is
$ VIR_TEST_OOM=1 ./qemuxml2argvtest
...
29) QEMU XML-2-ARGV clock-utc ... OK
Test OOM for nalloc=36 .................................... OK
30) QEMU XML-2-ARGV clock-localtime ... OK
Test OOM for nalloc=36 .................................... OK
31) QEMU XML-2-ARGV clock-france ... OK
Test OOM for nalloc=38 ...................................... OK
...
the second lines reports how many mallocs have to be failed, and thus
how many repeats of the test will be run.
If it crashes, then running under valgrind will often show the problem
$ VIR_TEST_OOM=1 ../run valgrind ./qemuxml2argvtest
When debugging problems it is also helpful to select an individual
test case
$ VIR_TEST_RANGE=30 VIR_TEST_OOM=1 ../run valgrind ./qemuxml2argvtest
When things get really tricky, it is possible to request that just
specific allocs are failed. eg to fail allocs 5 -> 12, use
$ VIR_TEST_RANGE=30 VIR_TEST_OOM=1:5-12 ../run valgrind ./qemuxml2argvtest
In the worse case, you might want to know the stack trace of the
alloc which was failed then VIR_TEST_OOM_TRACE can be set. If it
is set to 1 then it will only print if it thinks a mistake happened.
This is often not reliable, so setting it to 2 will make it print
the stack trace for every alloc that is failed.
$ VIR_TEST_OOM_TRACE=2 VIR_TEST_RANGE=30 VIR_TEST_OOM=1:5-5 ../run valgrind ./qemuxml2argvtest
30) QEMU XML-2-ARGV clock-localtime ... OK
Test OOM for nalloc=36 !virAllocN
/home/berrange/src/virt/libvirt/src/util/viralloc.c:180
virHashCreateFull
/home/berrange/src/virt/libvirt/src/util/virhash.c:144
virDomainDefParseXML
/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:11745
virDomainDefParseNode
/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:12646
virDomainDefParse
/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:12590
testCompareXMLToArgvFiles
/home/berrange/src/virt/libvirt/tests/qemuxml2argvtest.c:106
virtTestRun
/home/berrange/src/virt/libvirt/tests/testutils.c:250
mymain
/home/berrange/src/virt/libvirt/tests/qemuxml2argvtest.c:418 (discriminator 2)
virtTestMain
/home/berrange/src/virt/libvirt/tests/testutils.c:750
??
??:0
_start
??:?
FAILED
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-09-23 21:21:52 +08:00
|
|
|
if (!virtTestOOMActive() &&
|
|
|
|
(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;
|
|
|
|
|
2014-03-25 14:53:44 +08:00
|
|
|
out:
|
2012-02-03 07:16:43 +08:00
|
|
|
VIR_FREE(log);
|
|
|
|
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);
|
2015-02-13 00:39:34 +08:00
|
|
|
virBitmapFree(nodeset);
|
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;
|
2015-10-20 19:51:01 +08:00
|
|
|
char *migrateURI = NULL;
|
|
|
|
|
|
|
|
if (info->migrateFrom &&
|
2015-10-20 21:48:33 +08:00
|
|
|
!(migrateURI = qemuMigrationIncomingURI(info->migrateFrom,
|
|
|
|
info->migrateFd)))
|
2015-10-20 19:51:01 +08:00
|
|
|
goto cleanup;
|
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;
|
|
|
|
|
2014-09-18 23:38:32 +08:00
|
|
|
if (virQEMUCapsGet(info->extraFlags, QEMU_CAPS_ENABLE_FIPS))
|
|
|
|
flags |= FLAG_FIPS;
|
|
|
|
|
2015-09-09 22:03:15 +08:00
|
|
|
result = qemuTestCapsCacheInsert(driver.qemuCapsCache, info->name,
|
|
|
|
info->extraFlags);
|
|
|
|
if (result < 0)
|
|
|
|
goto cleanup;
|
|
|
|
|
2011-04-25 06:25:10 +08:00
|
|
|
result = testCompareXMLToArgvFiles(xml, args, info->extraFlags,
|
2015-10-20 19:51:01 +08:00
|
|
|
migrateURI, flags);
|
2011-04-25 06:25:10 +08:00
|
|
|
|
2014-03-25 14:53:44 +08:00
|
|
|
cleanup:
|
2015-10-20 19:51:01 +08:00
|
|
|
VIR_FREE(migrateURI);
|
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",
|
2015-03-24 00:19:28 +08:00
|
|
|
"Haswell-noTSX", "Haswell",
|
2012-08-22 23:28:55 +08:00
|
|
|
};
|
|
|
|
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;
|
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)
|
2013-11-28 05:31:53 +08:00
|
|
|
abs_top_srcdir = abs_srcdir "/..";
|
2010-04-16 14:21:23 +08:00
|
|
|
|
2014-02-06 21:24:02 +08:00
|
|
|
/* Set the timezone because we are mocking the time() function.
|
|
|
|
* If we don't do that, then localtime() may return unpredictable
|
|
|
|
* results. In order to detect things that just work by a blind
|
|
|
|
* chance, we need to set an virtual timezone that no libvirt
|
|
|
|
* developer resides in. */
|
|
|
|
if (setenv("TZ", "VIR00:30", 1) < 0) {
|
|
|
|
perror("setenv");
|
|
|
|
return EXIT_FAILURE;
|
|
|
|
}
|
|
|
|
|
2015-09-15 14:16:02 +08:00
|
|
|
if (qemuTestDriverInit(&driver) < 0)
|
2014-04-07 14:53:26 +08:00
|
|
|
return EXIT_FAILURE;
|
2015-06-16 02:59:58 +08:00
|
|
|
|
|
|
|
driver.privileged = true;
|
2014-04-07 14:53:26 +08:00
|
|
|
|
2013-01-11 05:03:14 +08:00
|
|
|
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;
|
|
|
|
|
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;
|
2014-07-23 23:37:18 +08:00
|
|
|
VIR_FREE(driver.config->hugetlbfs);
|
2014-07-23 23:37:21 +08:00
|
|
|
if (VIR_ALLOC_N(driver.config->hugetlbfs, 2) < 0)
|
2008-12-18 23:22:49 +08:00
|
|
|
return EXIT_FAILURE;
|
2014-07-23 23:37:21 +08:00
|
|
|
driver.config->nhugetlbfs = 2;
|
|
|
|
if (VIR_STRDUP(driver.config->hugetlbfs[0].mnt_dir, "/dev/hugepages2M") < 0 ||
|
|
|
|
VIR_STRDUP(driver.config->hugetlbfs[1].mnt_dir, "/dev/hugepages1G") < 0)
|
2010-03-06 04:31:50 +08:00
|
|
|
return EXIT_FAILURE;
|
2014-07-23 23:37:18 +08:00
|
|
|
driver.config->hugetlbfs[0].size = 2048;
|
|
|
|
driver.config->hugetlbfs[0].deflt = true;
|
2014-07-23 23:37:21 +08:00
|
|
|
driver.config->hugetlbfs[1].size = 1048576;
|
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;
|
2015-06-30 19:34:20 +08:00
|
|
|
VIR_FREE(driver.config->channelTargetDir);
|
|
|
|
if (VIR_STRDUP_QUIET(driver.config->channelTargetDir, "/tmp") < 0)
|
|
|
|
return EXIT_FAILURE;
|
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, \
|
2013-09-21 02:13:35 +08:00
|
|
|
testCompareXMLToArgvHelper, &info) < 0) \
|
2008-05-10 00:41:19 +08:00
|
|
|
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
|
|
|
|
2015-09-22 01:10:12 +08:00
|
|
|
# define DO_TEST_LINUX(name, ...) \
|
|
|
|
DO_TEST_LINUX_FULL(name, NULL, -1, 0, __VA_ARGS__)
|
|
|
|
|
2014-11-12 17:26:43 +08:00
|
|
|
# ifdef __linux__
|
|
|
|
/* This is a macro that invokes test only on Linux. It's
|
|
|
|
* meant to be called in those cases where qemuxml2argvmock
|
|
|
|
* cooperation is expected (e.g. we need a fixed time,
|
|
|
|
* predictable NUMA topology and so on). On non-Linux
|
|
|
|
* platforms the macro just consume its argument. */
|
2015-09-22 01:10:12 +08:00
|
|
|
# define DO_TEST_LINUX_FULL(name, ...) \
|
|
|
|
DO_TEST_FULL(name, __VA_ARGS__)
|
2014-11-12 17:26:43 +08:00
|
|
|
# else /* __linux__ */
|
2015-09-22 01:10:12 +08:00
|
|
|
# define DO_TEST_LINUX_FULL(name, ...) \
|
2014-11-12 17:26:43 +08:00
|
|
|
do { \
|
|
|
|
const char *tmp ATTRIBUTE_UNUSED = name; \
|
|
|
|
} while (0)
|
|
|
|
# endif /* __linux__ */
|
|
|
|
|
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
|
|
|
|
2015-11-06 22:29:41 +08:00
|
|
|
DO_TEST("minimal", NONE);
|
2015-03-04 18:04:27 +08:00
|
|
|
DO_TEST_PARSE_ERROR("minimal-no-memory", NONE);
|
2015-11-06 22:29:41 +08:00
|
|
|
DO_TEST("minimal-msg-timestamp", QEMU_CAPS_MSG_TIMESTAMP);
|
|
|
|
DO_TEST("minimal-s390", NONE);
|
2012-07-10 00:29:55 +08:00
|
|
|
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);
|
2015-04-03 00:44:44 +08:00
|
|
|
DO_TEST("machine-vmport-opt", QEMU_CAPS_MACHINE_OPT,
|
|
|
|
QEMU_CAPS_MACHINE_VMPORT_OPT);
|
2013-04-23 22:17:08 +08:00
|
|
|
DO_TEST("kvm", QEMU_CAPS_MACHINE_OPT);
|
2015-05-07 06:32:05 +08:00
|
|
|
DO_TEST("default-kvm-host-arch", QEMU_CAPS_MACHINE_OPT);
|
|
|
|
DO_TEST("default-qemu-host-arch", 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);
|
2015-06-22 21:20:55 +08:00
|
|
|
DO_TEST("boot-floppy-q35",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
|
|
|
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_ICH9_AHCI);
|
2015-06-22 21:20:55 +08:00
|
|
|
DO_TEST("bootindex-floppy-q35",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
|
|
|
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_BOOT_MENU,
|
2015-06-22 21:20:55 +08:00
|
|
|
QEMU_CAPS_BOOTINDEX);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("boot-multi", QEMU_CAPS_BOOT_MENU);
|
|
|
|
DO_TEST("boot-menu-enable",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("boot-menu-enable",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE,
|
2011-05-26 22:15:01 +08:00
|
|
|
QEMU_CAPS_BOOTINDEX);
|
2014-08-22 20:13:37 +08:00
|
|
|
DO_TEST("boot-menu-enable-with-timeout",
|
|
|
|
QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_SPLASH_TIMEOUT);
|
2014-08-22 20:13:37 +08:00
|
|
|
DO_TEST_FAILURE("boot-menu-enable-with-timeout", QEMU_CAPS_BOOT_MENU);
|
2014-08-22 19:39:26 +08:00
|
|
|
DO_TEST_PARSE_ERROR("boot-menu-enable-with-timeout-invalid", NONE);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("boot-menu-disable", QEMU_CAPS_BOOT_MENU);
|
|
|
|
DO_TEST("boot-menu-disable-drive",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("boot-menu-disable-drive-bootindex",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE,
|
2011-05-26 22:15:01 +08:00
|
|
|
QEMU_CAPS_BOOTINDEX);
|
2012-10-16 18:25:32 +08:00
|
|
|
DO_TEST_PARSE_ERROR("boot-dev+order",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_BOOTINDEX, QEMU_CAPS_DEVICE,
|
2012-10-16 18:25:32 +08:00
|
|
|
QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("boot-order",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_BOOTINDEX, 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);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("boot-complex",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, 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_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("boot-complex-bootindex",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, 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);
|
qemu: add "-boot strict" to commandline whenever possible
This resolves:
https://bugzilla.redhat.com/show_bug.cgi?id=888635
(which was already closed as CANTFIX because the qemu "-boot strict"
commandline option wasn't available at the time).
Problem: you couldn't have a domain that used PXE to boot, but also
had an un-bootable disk device *even if that disk wasn't listed in the
boot order*, because if PXE timed out (e.g. due to the bridge
forwarding delay), the BIOS would move on to the next target, which
would be the unbootable disk device (again - even though it wasn't
given a boot order), and get stuck at a "BOOT DISK FAILURE, PRESS ANY
KEY" message until a user intervened.
The solution available since sometime around QEMU 1.5, is to add
"-boot strict=on" to *every* qemu command. When this is done, if any
devices have a boot order specified, then QEMU will *only* attempt to
boot from those devices that have an explicit boot order, ignoring the
rest.
2013-12-02 20:07:12 +08:00
|
|
|
DO_TEST("boot-strict",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE_BOOT,
|
qemu: add "-boot strict" to commandline whenever possible
This resolves:
https://bugzilla.redhat.com/show_bug.cgi?id=888635
(which was already closed as CANTFIX because the qemu "-boot strict"
commandline option wasn't available at the time).
Problem: you couldn't have a domain that used PXE to boot, but also
had an un-bootable disk device *even if that disk wasn't listed in the
boot order*, because if PXE timed out (e.g. due to the bridge
forwarding delay), the BIOS would move on to the next target, which
would be the unbootable disk device (again - even though it wasn't
given a boot order), and get stuck at a "BOOT DISK FAILURE, PRESS ANY
KEY" message until a user intervened.
The solution available since sometime around QEMU 1.5, is to add
"-boot strict=on" to *every* qemu command. When this is done, if any
devices have a boot order specified, then QEMU will *only* attempt to
boot from those devices that have an explicit boot order, ignoring the
rest.
2013-12-02 20:07:12 +08:00
|
|
|
QEMU_CAPS_BOOTINDEX, QEMU_CAPS_BOOT_STRICT,
|
|
|
|
QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
|
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);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("bios-nvram", QEMU_CAPS_DEVICE,
|
2015-11-07 02:20:20 +08:00
|
|
|
QEMU_CAPS_DRIVE_READONLY);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("clock-utc", QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("clock-localtime", NONE);
|
2014-02-05 22:18:46 +08:00
|
|
|
DO_TEST("clock-localtime-basis-localtime", QEMU_CAPS_RTC);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("clock-variable", QEMU_CAPS_RTC);
|
|
|
|
DO_TEST("clock-france", QEMU_CAPS_RTC);
|
2013-10-09 05:41:16 +08:00
|
|
|
DO_TEST("clock-hpet-off", QEMU_CAPS_RTC, QEMU_CAPS_NO_HPET,
|
|
|
|
QEMU_CAPS_NO_KVM_PIT);
|
2014-02-05 02:02:04 +08:00
|
|
|
DO_TEST("clock-catchup", QEMU_CAPS_RTC, QEMU_CAPS_NO_KVM_PIT);
|
2012-07-10 00:29:55 +08:00
|
|
|
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);
|
2014-01-22 01:50:12 +08:00
|
|
|
DO_TEST("clock-timer-hyperv-rtc", QEMU_CAPS_KVM);
|
2012-07-10 00:29:55 +08:00
|
|
|
|
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);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("controller-order", QEMU_CAPS_PCIDEVICE,
|
2012-11-05 19:12:04 +08:00
|
|
|
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);
|
2013-09-24 00:32:11 +08:00
|
|
|
DO_TEST("pv-spinlock-disabled", NONE);
|
|
|
|
DO_TEST("pv-spinlock-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);
|
2015-11-24 20:26:33 +08:00
|
|
|
DO_TEST("hyperv-panic", NONE);
|
2012-10-17 20:55:18 +08:00
|
|
|
|
2014-08-22 01:04:45 +08:00
|
|
|
DO_TEST("kvm-features", NONE);
|
|
|
|
DO_TEST("kvm-features-off", NONE);
|
|
|
|
|
2015-01-05 23:52:18 +08:00
|
|
|
DO_TEST("pmu-feature", NONE);
|
|
|
|
DO_TEST("pmu-feature-off", NONE);
|
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("hugepages", QEMU_CAPS_MEM_PATH);
|
2015-06-25 00:09:57 +08:00
|
|
|
DO_TEST("hugepages-numa", QEMU_CAPS_RTC, QEMU_CAPS_NO_KVM_PIT,
|
|
|
|
QEMU_CAPS_DISABLE_S3, QEMU_CAPS_DISABLE_S4,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_SCSI,
|
2015-06-25 00:09:57 +08:00
|
|
|
QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_PCI_MULTIFUNCTION,
|
|
|
|
QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC,
|
2015-11-09 23:39:54 +08:00
|
|
|
QEMU_CAPS_VGA_QXL,
|
2015-06-25 00:09:57 +08:00
|
|
|
QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_USB_REDIR,
|
qemuBuildMemoryBackendStr: Honour passed @pagesize
So far the argument has not much meaning and was practically ignored.
This is not good since when doing memory hotplug, the size of desired
hugepage backing is passed in that argument. Taking closer look at the
tests I'm fixing reveals the bug. For instance, while the following is
in the test:
<memory model='dimm'>
<source>
<nodemask>1-3</nodemask>
<pagesize unit='KiB'>4096</pagesize>
</source>
<target>
<size unit='KiB'>524287</size>
<node>0</node>
</target>
<address type='dimm' slot='0' base='0x100000000'/>
</memory>
the generated commandline corresponding to this XML was:
-object memory-backend-ram,id=memdimm0,size=536870912,\
host-nodes=1-3,policy=bind
Have you noticed? Yes, memory-backend-ram! Nothing can be further away
from the right answer. The hugepage backing is requested in the XML
and we happily ignore it. This is just not right. It's
memory-backend-file which should have been used:
-object memory-backend-file,id=memdimm0,prealloc=yes,\
mem-path=/dev/hugepages4M/libvirt/qemu,size=536870912,\
host-nodes=1-3,policy=bind
The problem is, that @pagesize passed to qemuBuildMemoryBackendStr
(where this part of commandline is built) was ignored. The hugepage to
back memory was searched only and only by NUMA nodes pinning. This
works only for regular guest NUMA nodes.
Then, I'm changing the hugepages size in the test XMLs too. This is
simply because in the test suite we create dummy mount points just for
2M and 1G hugepages. And in the test 4M was requested. I'm sticking to
2M, but 1G should just work too.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2015-06-25 23:27:29 +08:00
|
|
|
QEMU_CAPS_DEVICE_PC_DIMM,
|
2015-06-25 00:09:57 +08:00
|
|
|
QEMU_CAPS_MEM_PATH, QEMU_CAPS_OBJECT_MEMORY_FILE);
|
2014-11-12 17:26:43 +08:00
|
|
|
DO_TEST_LINUX("hugepages-pages", QEMU_CAPS_MEM_PATH,
|
|
|
|
QEMU_CAPS_OBJECT_MEMORY_RAM,
|
|
|
|
QEMU_CAPS_OBJECT_MEMORY_FILE);
|
2014-07-23 23:37:21 +08:00
|
|
|
DO_TEST("hugepages-pages2", QEMU_CAPS_MEM_PATH, QEMU_CAPS_OBJECT_MEMORY_RAM,
|
|
|
|
QEMU_CAPS_OBJECT_MEMORY_FILE);
|
|
|
|
DO_TEST("hugepages-pages3", QEMU_CAPS_MEM_PATH, QEMU_CAPS_OBJECT_MEMORY_RAM,
|
|
|
|
QEMU_CAPS_OBJECT_MEMORY_FILE);
|
2014-11-12 17:26:43 +08:00
|
|
|
DO_TEST_LINUX("hugepages-shared", QEMU_CAPS_MEM_PATH,
|
|
|
|
QEMU_CAPS_OBJECT_MEMORY_RAM,
|
|
|
|
QEMU_CAPS_OBJECT_MEMORY_FILE);
|
2014-09-25 19:28:33 +08:00
|
|
|
DO_TEST_PARSE_ERROR("hugepages-memaccess-invalid", NONE);
|
2014-09-15 17:59:09 +08:00
|
|
|
DO_TEST_FAILURE("hugepages-pages4", QEMU_CAPS_MEM_PATH,
|
|
|
|
QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE);
|
2014-09-02 22:53:10 +08:00
|
|
|
DO_TEST("hugepages-pages5", QEMU_CAPS_MEM_PATH);
|
2014-12-12 17:37:35 +08:00
|
|
|
DO_TEST("hugepages-pages6", NONE);
|
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);
|
2015-03-27 06:48:07 +08:00
|
|
|
DO_TEST("disk-iscsi", NONE);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("disk-cdrom-network-http", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE);
|
|
|
|
DO_TEST("disk-cdrom-network-https", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE);
|
|
|
|
DO_TEST("disk-cdrom-network-ftp", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE);
|
|
|
|
DO_TEST("disk-cdrom-network-ftps", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE);
|
|
|
|
DO_TEST("disk-cdrom-network-tftp", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE);
|
|
|
|
DO_TEST("disk-cdrom-empty", NONE);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-cdrom-tray",
|
2015-11-06 22:28:57 +08:00
|
|
|
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);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST_FAILURE("disk-floppy-pseries", NONE);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-floppy-tray-no-device-cap", NONE);
|
|
|
|
DO_TEST("disk-floppy-tray",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE);
|
|
|
|
DO_TEST("disk-virtio-s390",
|
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);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("disk-virtio", QEMU_CAPS_DRIVE_BOOT);
|
|
|
|
DO_TEST("disk-virtio-ccw",
|
2013-03-05 23:44:23 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("disk-virtio-ccw-many",
|
2013-03-05 23:44:23 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("disk-virtio-scsi-ccw", QEMU_CAPS_VIRTIO_SCSI,
|
2013-03-15 02:32:26 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-order",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, 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_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("disk-xenvbd", QEMU_CAPS_DRIVE_BOOT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-boot-disk",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DRIVE_BOOT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-boot-cdrom",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DRIVE_BOOT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("floppy-drive-fat",
|
2015-11-07 02:20:20 +08:00
|
|
|
QEMU_CAPS_DRIVE_BOOT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-fat",
|
2015-11-07 02:20:20 +08:00
|
|
|
QEMU_CAPS_DRIVE_BOOT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-readonly-disk",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DRIVE_READONLY,
|
2011-02-08 22:22:39 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-readonly-no-device",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-fmt-qcow",
|
2015-11-07 02:20:20 +08:00
|
|
|
QEMU_CAPS_DRIVE_BOOT);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-shared",
|
2015-11-07 02:20:20 +08:00
|
|
|
QEMU_CAPS_DRIVE_SERIAL);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-error-policy-stop",
|
2015-11-07 02:20:20 +08:00
|
|
|
QEMU_CAPS_MONITOR_JSON);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-error-policy-enospace",
|
2015-11-07 02:20:20 +08:00
|
|
|
QEMU_CAPS_MONITOR_JSON);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-error-policy-wreport-rignore",
|
2015-11-07 02:20:20 +08:00
|
|
|
QEMU_CAPS_MONITOR_JSON);
|
|
|
|
DO_TEST("disk-drive-cache-v2-wt", NONE);
|
|
|
|
DO_TEST("disk-drive-cache-v2-wb", NONE);
|
|
|
|
DO_TEST("disk-drive-cache-v2-none", NONE);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-cache-directsync",
|
2015-11-07 02:20:20 +08:00
|
|
|
QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-cache-unsafe",
|
2015-11-07 02:20:20 +08:00
|
|
|
QEMU_CAPS_DRIVE_CACHE_UNSAFE);
|
2014-04-15 06:54:19 +08:00
|
|
|
DO_TEST("disk-drive-copy-on-read",
|
2015-11-07 02:20:20 +08:00
|
|
|
QEMU_CAPS_DRIVE_COPY_ON_READ);
|
|
|
|
DO_TEST("disk-drive-network-nbd", NONE);
|
|
|
|
DO_TEST("disk-drive-network-nbd-export", NONE);
|
|
|
|
DO_TEST("disk-drive-network-nbd-ipv6", NONE);
|
|
|
|
DO_TEST("disk-drive-network-nbd-ipv6-export", NONE);
|
|
|
|
DO_TEST("disk-drive-network-nbd-unix", NONE);
|
|
|
|
DO_TEST("disk-drive-network-iscsi", NONE);
|
|
|
|
DO_TEST("disk-drive-network-iscsi-auth", NONE);
|
2013-03-21 19:53:50 +08:00
|
|
|
DO_TEST("disk-drive-network-iscsi-lun",
|
2015-11-07 02:20:20 +08:00
|
|
|
QEMU_CAPS_DEVICE,
|
2013-03-21 19:53:50 +08:00
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI,
|
|
|
|
QEMU_CAPS_VIRTIO_BLK_SG_IO, QEMU_CAPS_SCSI_BLOCK);
|
2015-11-07 02:20:20 +08:00
|
|
|
DO_TEST("disk-drive-network-gluster", NONE);
|
|
|
|
DO_TEST("disk-drive-network-rbd", NONE);
|
|
|
|
DO_TEST("disk-drive-network-sheepdog", NONE);
|
|
|
|
DO_TEST("disk-drive-network-rbd-auth", NONE);
|
|
|
|
DO_TEST("disk-drive-network-rbd-ipv6", NONE);
|
|
|
|
DO_TEST_FAILURE("disk-drive-network-rbd-no-colon", NONE);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-drive-no-boot",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_BOOTINDEX);
|
2015-06-27 01:48:06 +08:00
|
|
|
DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_SCSI);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-usb", NONE);
|
|
|
|
DO_TEST("disk-usb-device",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_USB_STORAGE,
|
2013-08-23 18:38:10 +08:00
|
|
|
QEMU_CAPS_NODEFCONFIG);
|
2013-08-23 18:38:11 +08:00
|
|
|
DO_TEST("disk-usb-device-removable",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_USB_STORAGE,
|
2013-08-23 18:38:11 +08:00
|
|
|
QEMU_CAPS_USB_STORAGE_REMOVABLE, QEMU_CAPS_NODEFCONFIG);
|
2015-04-30 20:16:40 +08:00
|
|
|
DO_TEST_FAILURE("disk-usb-pci",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE,
|
2015-04-30 20:16:40 +08:00
|
|
|
QEMU_CAPS_DEVICE_USB_STORAGE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-scsi-device",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
2012-08-08 15:06:33 +08:00
|
|
|
QEMU_CAPS_SCSI_LSI);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-scsi-device-auto",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
2012-08-08 15:06:33 +08:00
|
|
|
QEMU_CAPS_SCSI_LSI);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-scsi-disk-split",
|
2015-11-06 22:28:57 +08:00
|
|
|
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",
|
2015-11-06 22:28:57 +08:00
|
|
|
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",
|
2015-11-06 22:28:57 +08:00
|
|
|
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",
|
2015-11-06 22:28:57 +08:00
|
|
|
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",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-scsi-virtio-scsi",
|
2015-11-06 22:28:57 +08:00
|
|
|
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",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
2013-04-06 00:21:23 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI);
|
2014-05-23 02:22:52 +08:00
|
|
|
DO_TEST("disk-virtio-scsi-cmd_per_lun",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
2014-05-23 02:22:52 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI);
|
|
|
|
DO_TEST("disk-virtio-scsi-max_sectors",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
2014-05-23 02:22:52 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI);
|
2015-07-27 02:41:34 +08:00
|
|
|
DO_TEST("disk-virtio-scsi-ioeventfd",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
2015-07-27 02:41:34 +08:00
|
|
|
QEMU_CAPS_VIRTIO_IOEVENTFD, QEMU_CAPS_VIRTIO_SCSI);
|
2013-03-21 22:11:39 +08:00
|
|
|
DO_TEST("disk-scsi-megasas",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
2013-03-21 22:11:39 +08:00
|
|
|
QEMU_CAPS_SCSI_MEGASAS);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-sata-device",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE,
|
2011-09-28 11:46:08 +08:00
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_ICH9_AHCI);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-aio",
|
2015-11-07 02:20:20 +08:00
|
|
|
QEMU_CAPS_DRIVE_AIO);
|
2013-11-21 16:12:07 +08:00
|
|
|
DO_TEST("disk-source-pool",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2013-11-21 18:04:50 +08:00
|
|
|
DO_TEST("disk-source-pool-mode",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-ioeventfd",
|
2015-11-06 22:28:57 +08:00
|
|
|
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",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DRIVE_COPY_ON_READ,
|
2012-01-12 17:31:14 +08:00
|
|
|
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",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DRIVE_DISCARD,
|
2013-05-14 20:44:54 +08:00
|
|
|
QEMU_CAPS_DEVICE);
|
2015-11-07 02:20:20 +08:00
|
|
|
DO_TEST("disk-snapshot", NONE);
|
2015-06-19 04:00:53 +08:00
|
|
|
DO_TEST_FAILURE("disk-same-targets",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_SCSI_LSI,
|
2015-06-19 04:00:53 +08:00
|
|
|
QEMU_CAPS_DEVICE_USB_STORAGE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("event_idx",
|
2011-08-13 14:32:45 +08:00
|
|
|
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_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_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);
|
2015-02-23 19:34:23 +08:00
|
|
|
DO_TEST("disk-serial",
|
|
|
|
QEMU_CAPS_KVM,
|
|
|
|
QEMU_CAPS_DEVICE,
|
|
|
|
QEMU_CAPS_DRIVE_SERIAL);
|
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"));
|
2015-11-09 23:39:54 +08:00
|
|
|
DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC);
|
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
|
|
|
|
2015-11-10 00:20:08 +08:00
|
|
|
DO_TEST("graphics-sdl", QEMU_CAPS_SDL);
|
|
|
|
DO_TEST("graphics-sdl-fullscreen", QEMU_CAPS_SDL);
|
2015-11-09 23:39:54 +08:00
|
|
|
DO_TEST("nographics", NONE);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("nographics-vga",
|
2015-11-09 23:39:54 +08:00
|
|
|
QEMU_CAPS_VGA_NONE);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("graphics-spice",
|
2015-11-09 23:39:54 +08:00
|
|
|
QEMU_CAPS_VGA_QXL,
|
2012-12-14 15:08:01 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE,
|
2014-01-17 00:11:15 +08:00
|
|
|
QEMU_CAPS_DEVICE_QXL,
|
|
|
|
QEMU_CAPS_SPICE_FILE_XFER_DISABLE);
|
2012-02-24 22:13:06 +08:00
|
|
|
driver.config->spiceSASL = 1;
|
|
|
|
ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl2"));
|
|
|
|
DO_TEST("graphics-spice-sasl",
|
2015-11-09 23:39:54 +08:00
|
|
|
QEMU_CAPS_VGA_QXL,
|
2012-02-24 22:13:06 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE,
|
|
|
|
QEMU_CAPS_DEVICE_QXL);
|
|
|
|
VIR_FREE(driver.config->spiceSASLdir);
|
|
|
|
driver.config->spiceSASL = 0;
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("graphics-spice-agentmouse",
|
2015-11-09 23:39:54 +08:00
|
|
|
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",
|
2015-11-09 23:39:54 +08:00
|
|
|
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",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_KVM,
|
2015-11-09 23:39:54 +08:00
|
|
|
QEMU_CAPS_VGA_QXL,
|
2011-05-26 19:52:08 +08:00
|
|
|
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",
|
2015-11-09 23:39:54 +08:00
|
|
|
QEMU_CAPS_VGA_QXL,
|
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_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",
|
2015-11-09 23:39:54 +08:00
|
|
|
QEMU_CAPS_SPICE,
|
2012-05-08 21:00:28 +08:00
|
|
|
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);
|
2014-01-17 00:11:15 +08:00
|
|
|
DO_TEST("graphics-spice-agent-file-xfer",
|
2015-11-09 23:39:54 +08:00
|
|
|
QEMU_CAPS_VGA_QXL,
|
2014-01-17 00:11:15 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE,
|
|
|
|
QEMU_CAPS_DEVICE_QXL_VGA,
|
|
|
|
QEMU_CAPS_DEVICE_QXL,
|
|
|
|
QEMU_CAPS_SPICE_FILE_XFER_DISABLE);
|
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);
|
|
|
|
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);
|
2015-11-06 22:29:52 +08:00
|
|
|
DO_TEST("misc-uuid", NONE);
|
2014-09-16 16:06:50 +08:00
|
|
|
DO_TEST_PARSE_ERROR("vhost_queues-invalid", NONE);
|
2014-07-12 01:47:31 +08:00
|
|
|
DO_TEST("net-vhostuser", QEMU_CAPS_DEVICE, QEMU_CAPS_NETDEV);
|
2015-02-26 19:45:57 +08:00
|
|
|
DO_TEST("net-vhostuser-multiq",
|
2015-06-15 16:38:21 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NETDEV, QEMU_CAPS_VHOSTUSER_MULTIQUEUE);
|
2015-02-26 19:45:57 +08:00
|
|
|
DO_TEST_FAILURE("net-vhostuser-multiq", QEMU_CAPS_DEVICE, QEMU_CAPS_NETDEV);
|
2012-07-10 00:29:55 +08:00
|
|
|
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);
|
2014-09-11 18:58:04 +08:00
|
|
|
DO_TEST("net-virtio-disable-offloads",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
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);
|
2015-11-10 00:20:08 +08:00
|
|
|
DO_TEST("net-eth-names", NONE);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("net-client", NONE);
|
|
|
|
DO_TEST("net-server", NONE);
|
|
|
|
DO_TEST("net-mcast", NONE);
|
2015-08-30 04:19:10 +08:00
|
|
|
DO_TEST("net-udp", NONE);
|
2012-07-10 00:29:55 +08:00
|
|
|
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);
|
2014-04-30 19:32:19 +08:00
|
|
|
DO_TEST("net-hostdev-multidomain",
|
|
|
|
QEMU_CAPS_PCIDEVICE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
QEMU_CAPS_HOST_PCI_MULTIDOMAIN);
|
|
|
|
DO_TEST_FAILURE("net-hostdev-multidomain",
|
|
|
|
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);
|
2014-04-30 19:32:19 +08:00
|
|
|
DO_TEST("net-hostdev-vfio-multidomain",
|
|
|
|
QEMU_CAPS_PCIDEVICE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_HOST_PCI_MULTIDOMAIN);
|
|
|
|
DO_TEST_FAILURE("net-hostdev-vfio-multidomain",
|
|
|
|
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);
|
2014-01-30 19:19:12 +08:00
|
|
|
DO_TEST("serial-spiceport",
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
|
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
|
|
|
|
QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_QXL_VGA,
|
|
|
|
QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEPORT);
|
2015-11-06 22:29:41 +08:00
|
|
|
DO_TEST("serial-spiceport-nospice", NONE);
|
2014-01-30 19:19:12 +08:00
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
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);
|
2015-06-16 21:07:59 +08:00
|
|
|
DO_TEST("serial-dev-chardev-iobase",
|
|
|
|
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);
|
2015-05-06 23:50:03 +08:00
|
|
|
DO_TEST("pci-serial-dev-chardev",
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
QEMU_CAPS_DEVICE_PCI_SERIAL);
|
2011-02-08 22:22:39 +08:00
|
|
|
|
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);
|
2014-10-29 23:03:53 +08:00
|
|
|
DO_TEST("channel-virtio-state",
|
|
|
|
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);
|
2014-05-29 21:16:47 +08:00
|
|
|
DO_TEST("channel-virtio-autoassign",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
2015-03-24 22:23:46 +08:00
|
|
|
DO_TEST("channel-virtio-autoadd",
|
|
|
|
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,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390);
|
2013-03-05 23:44:23 +08:00
|
|
|
DO_TEST("console-virtio-ccw",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_CCW,
|
2013-03-05 23:44:23 +08:00
|
|
|
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,
|
2015-11-06 22:28:57 +08:00
|
|
|
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);
|
2015-06-30 16:21:21 +08:00
|
|
|
DO_TEST("channel-virtio-default",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC);
|
2015-06-30 19:34:20 +08:00
|
|
|
DO_TEST("channel-virtio-unix",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
|
2011-02-08 22:22:39 +08:00
|
|
|
|
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);
|
2015-04-10 21:49:42 +08:00
|
|
|
DO_TEST("usb-redir-filter-version",
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
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);
|
2015-06-24 17:28:42 +08:00
|
|
|
DO_TEST("watchdog-injectnmi", NONE);
|
2015-06-24 17:28:44 +08:00
|
|
|
DO_TEST("watchdog-diag288",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390);
|
2012-07-10 00:29:55 +08:00
|
|
|
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);
|
2013-06-26 19:00:00 +08:00
|
|
|
DO_TEST("balloon-device-period", 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,
|
2013-09-24 22:17:38 +08:00
|
|
|
QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_HDA_MICRO,
|
2014-07-24 23:32:31 +08:00
|
|
|
QEMU_CAPS_DEVICE_ICH9_INTEL_HDA,
|
|
|
|
QEMU_CAPS_OBJECT_USB_AUDIO);
|
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);
|
2015-07-07 23:30:43 +08:00
|
|
|
DO_TEST("fs9p-ccw",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_FSDEV,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_FSDEV_WRITEOUT,
|
2015-07-07 23:30:43 +08:00
|
|
|
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
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);
|
2014-04-30 19:32:19 +08:00
|
|
|
DO_TEST("hostdev-vfio-multidomain",
|
|
|
|
QEMU_CAPS_PCIDEVICE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_HOST_PCI_MULTIDOMAIN);
|
|
|
|
DO_TEST_FAILURE("hostdev-vfio-multidomain",
|
|
|
|
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
|
|
|
|
2015-11-07 00:50:26 +08:00
|
|
|
DO_TEST_FULL("restore-v2", "exec:cat", 7, 0, NONE);
|
|
|
|
DO_TEST_FULL("restore-v2-fd", "stdio", 7, 0, NONE);
|
|
|
|
DO_TEST_FULL("restore-v2-fd", "fd:7", 7, 0, NONE);
|
|
|
|
DO_TEST_FULL("migrate", "tcp:10.0.0.1:5000", -1, 0, NONE);
|
2011-02-08 22:22:39 +08:00
|
|
|
|
2015-09-22 01:10:12 +08:00
|
|
|
DO_TEST_LINUX_FULL("migrate-numa-unaligned", "stdio", 7, 0,
|
2015-11-07 00:50:26 +08:00
|
|
|
QEMU_CAPS_NUMA,
|
2015-09-22 01:10:12 +08:00
|
|
|
QEMU_CAPS_OBJECT_MEMORY_RAM);
|
|
|
|
|
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
|
|
|
|
2014-08-23 06:15:30 +08:00
|
|
|
DO_TEST("iothreads", QEMU_CAPS_OBJECT_IOTHREAD);
|
2015-04-10 21:21:23 +08:00
|
|
|
DO_TEST("iothreads-ids", QEMU_CAPS_OBJECT_IOTHREAD);
|
|
|
|
DO_TEST("iothreads-ids-partial", QEMU_CAPS_OBJECT_IOTHREAD);
|
qemu: Fix qemu startup check for QEMU_CAPS_OBJECT_IOTHREAD
https://bugzilla.redhat.com/show_bug.cgi?id=1249981
When qemuDomainPinIOThread was added in commit id 'fb562614', a check
for the IOThread capability was not needed since a check for iothreadpids
covered the condition where the support for IOThreads was not present.
The iothreadpids array was only created if qemuProcessDetectIOThreadPIDs
was able to query the monitor for IOThreads. It would only do that if
the QEMU_CAPS_OBJECT_IOTHREAD capability was set.
However, when iothreadids were added in commit id '8d4614a5' and the
check for iothreadpids was replaced by a search through the iothreadids[]
array for the matching iothread_id that left open the possibility that
an iothreadids[] array was defined, but the entries essentially pointed
to elements with only the 'iothread_id' defined leaving the 'thread_id'
value of 0 and eventually the cpumap entry of NULL.
This was because, the original IOThreads commit id '72edaae7' only
checked if IOThreads were defined and if the emulator had the IOThreads
capability, then IOThread objects were added at startup. The "capability
failure" check was only done when a disk was assigned to an IOThread in
qemuCheckIOThreads. This was because the initial implementation had no way
to dynamically add IOThreads, but it was possible to dynamically add a
disk to the domain. So the decision was if the domain supported it, then
add the IOThread objects. Then if a disk with an IOThread defined was
added, it could check the capability and fail to add if not there. This
just meant the 'iothreads' value was essentially ignored.
Eventually commit id 'a27ed6e7' allowed for the dynamic addition and
deletion of IOThread objects. So it was no longer necessary to generate
IOThread objects to dynamically attach a disk to. However, the startup
and disk check code was not modified to reflect this.
This patch will move the capability failure check to when IOThread
objects are being added to the command line. Thus a domain that has
IOThreads defined will not be started if the emulator doesn't support
the capability. This means when qemuCheckIOThreads is called to add
a disk, it's no longer necessary to check the capability. Instead the
code can use the IOThreadFind call to indicate that the IOThread
doesn't exist.
Finally because it could be possible to have a domain running with the
iothreadids[] defined prior to this change if libvirtd is restarted each
having mostly empty elements, qemuProcessDetectIOThreadPIDs will check
if there are niothreadids when the QEMU_CAPS_OBJECT_IOTHREAD capability
check fails and remove the elements and array if it exists.
With these changes in place, it turns out the cputune-numatune test
was failing because the right bit wasn't set in the test. So used the
opportunity to fix that and create a test that would expect to fail
with some sort of iothreads defined and used, but not having the
correct capability.
2015-10-16 00:30:40 +08:00
|
|
|
DO_TEST_FAILURE("iothreads-nocap", NONE);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("iothreads-disk", QEMU_CAPS_OBJECT_IOTHREAD, QEMU_CAPS_DEVICE);
|
2014-11-06 22:04:05 +08:00
|
|
|
DO_TEST("iothreads-disk-virtio-ccw", QEMU_CAPS_OBJECT_IOTHREAD, QEMU_CAPS_DEVICE,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
2014-08-23 06:15:30 +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);
|
2014-09-24 01:07:09 +08:00
|
|
|
DO_TEST("cpu-minimum1", QEMU_CAPS_KVM);
|
|
|
|
DO_TEST("cpu-minimum2", QEMU_CAPS_KVM);
|
|
|
|
DO_TEST("cpu-exact1", QEMU_CAPS_KVM);
|
|
|
|
DO_TEST("cpu-exact2", QEMU_CAPS_KVM);
|
|
|
|
DO_TEST("cpu-exact2-nofallback", QEMU_CAPS_KVM);
|
|
|
|
DO_TEST("cpu-fallback", QEMU_CAPS_KVM);
|
|
|
|
DO_TEST_FAILURE("cpu-nofallback", QEMU_CAPS_KVM);
|
|
|
|
DO_TEST("cpu-strict1", QEMU_CAPS_KVM);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("cpu-numa1", NONE);
|
|
|
|
DO_TEST("cpu-numa2", QEMU_CAPS_SMP_TOPOLOGY);
|
2015-03-04 18:04:27 +08:00
|
|
|
DO_TEST("cpu-numa-no-memory-element", QEMU_CAPS_SMP_TOPOLOGY);
|
2014-05-22 15:13:05 +08:00
|
|
|
DO_TEST_PARSE_ERROR("cpu-numa3", NONE);
|
2014-06-17 20:16:59 +08:00
|
|
|
DO_TEST_FAILURE("cpu-numa-disjoint", NONE);
|
|
|
|
DO_TEST("cpu-numa-disjoint", QEMU_CAPS_NUMA);
|
2014-09-08 17:36:09 +08:00
|
|
|
DO_TEST_FAILURE("cpu-numa-memshared", QEMU_CAPS_SMP_TOPOLOGY,
|
|
|
|
QEMU_CAPS_OBJECT_MEMORY_RAM);
|
|
|
|
DO_TEST_FAILURE("cpu-numa-memshared", QEMU_CAPS_SMP_TOPOLOGY);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("cpu-host-model", NONE);
|
2015-04-30 17:10:16 +08:00
|
|
|
DO_TEST("cpu-host-model-vendor", 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
|
|
|
|
2015-03-24 00:19:28 +08:00
|
|
|
driver.caps->host.cpu = cpuHaswell;
|
|
|
|
DO_TEST("cpu-Haswell", QEMU_CAPS_KVM);
|
|
|
|
DO_TEST("cpu-Haswell2", QEMU_CAPS_KVM);
|
|
|
|
DO_TEST("cpu-Haswell3", QEMU_CAPS_KVM);
|
|
|
|
DO_TEST("cpu-Haswell-noTSX", QEMU_CAPS_KVM);
|
|
|
|
driver.caps->host.cpu = cpuDefault;
|
|
|
|
|
2015-11-06 22:29:41 +08:00
|
|
|
DO_TEST("memtune", NONE);
|
|
|
|
DO_TEST("memtune-unlimited", NONE);
|
|
|
|
DO_TEST("blkiotune", NONE);
|
|
|
|
DO_TEST("blkiotune-device", NONE);
|
|
|
|
DO_TEST("cputune", NONE);
|
|
|
|
DO_TEST("cputune-zero-shares", NONE);
|
|
|
|
DO_TEST_PARSE_ERROR("cputune-iothreadsched-toomuch", NONE);
|
|
|
|
DO_TEST_PARSE_ERROR("cputune-vcpusched-overlap", NONE);
|
qemuBuildMemoryBackendStr: Report backend requirement more appropriately
So, when building the '-numa' command line, the
qemuBuildMemoryBackendStr() function does quite a lot of checks to
chose the best backend, or to check if one is in fact needed. However,
it returned that backend is needed even for this little fella:
<numatune>
<memory mode="strict" nodeset="0,2"/>
</numatune>
This can be guaranteed via CGroups entirely, there's no need to use
memory-backend-ram to let qemu know where to get memory from. Well, as
long as there's no <memnode/> element, which explicitly requires the
backend. Long story short, we wouldn't have to care, as qemu works
either way. However, the problem is migration (as always). Previously,
libvirt would have started qemu with:
-numa node,memory=X
in this case and restricted memory placement in CGroups. Today, libvirt
creates more complicated command line:
-object memory-backend-ram,id=ram-node0,size=X
-numa node,memdev=ram-node0
Again, one wouldn't find anything wrong with these two approaches.
Both work just fine. Unless you try to migrated from the older libvirt
into the newer one. These two approaches are, unfortunately, not
compatible. My suggestion is, in order to allow users to migrate, lets
use the older approach for as long as the newer one is not needed.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2015-02-13 00:43:27 +08:00
|
|
|
DO_TEST("cputune-numatune", QEMU_CAPS_SMP_TOPOLOGY,
|
|
|
|
QEMU_CAPS_KVM,
|
qemu: Fix qemu startup check for QEMU_CAPS_OBJECT_IOTHREAD
https://bugzilla.redhat.com/show_bug.cgi?id=1249981
When qemuDomainPinIOThread was added in commit id 'fb562614', a check
for the IOThread capability was not needed since a check for iothreadpids
covered the condition where the support for IOThreads was not present.
The iothreadpids array was only created if qemuProcessDetectIOThreadPIDs
was able to query the monitor for IOThreads. It would only do that if
the QEMU_CAPS_OBJECT_IOTHREAD capability was set.
However, when iothreadids were added in commit id '8d4614a5' and the
check for iothreadpids was replaced by a search through the iothreadids[]
array for the matching iothread_id that left open the possibility that
an iothreadids[] array was defined, but the entries essentially pointed
to elements with only the 'iothread_id' defined leaving the 'thread_id'
value of 0 and eventually the cpumap entry of NULL.
This was because, the original IOThreads commit id '72edaae7' only
checked if IOThreads were defined and if the emulator had the IOThreads
capability, then IOThread objects were added at startup. The "capability
failure" check was only done when a disk was assigned to an IOThread in
qemuCheckIOThreads. This was because the initial implementation had no way
to dynamically add IOThreads, but it was possible to dynamically add a
disk to the domain. So the decision was if the domain supported it, then
add the IOThread objects. Then if a disk with an IOThread defined was
added, it could check the capability and fail to add if not there. This
just meant the 'iothreads' value was essentially ignored.
Eventually commit id 'a27ed6e7' allowed for the dynamic addition and
deletion of IOThread objects. So it was no longer necessary to generate
IOThread objects to dynamically attach a disk to. However, the startup
and disk check code was not modified to reflect this.
This patch will move the capability failure check to when IOThread
objects are being added to the command line. Thus a domain that has
IOThreads defined will not be started if the emulator doesn't support
the capability. This means when qemuCheckIOThreads is called to add
a disk, it's no longer necessary to check the capability. Instead the
code can use the IOThreadFind call to indicate that the IOThread
doesn't exist.
Finally because it could be possible to have a domain running with the
iothreadids[] defined prior to this change if libvirtd is restarted each
having mostly empty elements, qemuProcessDetectIOThreadPIDs will check
if there are niothreadids when the QEMU_CAPS_OBJECT_IOTHREAD capability
check fails and remove the elements and array if it exists.
With these changes in place, it turns out the cputune-numatune test
was failing because the right bit wasn't set in the test. So used the
opportunity to fix that and create a test that would expect to fail
with some sort of iothreads defined and used, but not having the
correct capability.
2015-10-16 00:30:40 +08:00
|
|
|
QEMU_CAPS_OBJECT_IOTHREAD,
|
qemuBuildMemoryBackendStr: Report backend requirement more appropriately
So, when building the '-numa' command line, the
qemuBuildMemoryBackendStr() function does quite a lot of checks to
chose the best backend, or to check if one is in fact needed. However,
it returned that backend is needed even for this little fella:
<numatune>
<memory mode="strict" nodeset="0,2"/>
</numatune>
This can be guaranteed via CGroups entirely, there's no need to use
memory-backend-ram to let qemu know where to get memory from. Well, as
long as there's no <memnode/> element, which explicitly requires the
backend. Long story short, we wouldn't have to care, as qemu works
either way. However, the problem is migration (as always). Previously,
libvirt would have started qemu with:
-numa node,memory=X
in this case and restricted memory placement in CGroups. Today, libvirt
creates more complicated command line:
-object memory-backend-ram,id=ram-node0,size=X
-numa node,memdev=ram-node0
Again, one wouldn't find anything wrong with these two approaches.
Both work just fine. Unless you try to migrated from the older libvirt
into the newer one. These two approaches are, unfortunately, not
compatible. My suggestion is, in order to allow users to migrate, lets
use the older approach for as long as the newer one is not needed.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2015-02-13 00:43:27 +08:00
|
|
|
QEMU_CAPS_OBJECT_MEMORY_RAM,
|
|
|
|
QEMU_CAPS_OBJECT_MEMORY_FILE);
|
2014-07-02 17:15:45 +08:00
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("numatune-memory", NONE);
|
2014-08-11 22:06:23 +08:00
|
|
|
DO_TEST_PARSE_ERROR("numatune-memory-invalid-nodeset", NONE);
|
2014-11-12 17:26:43 +08:00
|
|
|
DO_TEST_LINUX("numatune-memnode", QEMU_CAPS_NUMA,
|
|
|
|
QEMU_CAPS_OBJECT_MEMORY_RAM);
|
2014-07-02 17:15:45 +08:00
|
|
|
DO_TEST_FAILURE("numatune-memnode", NONE);
|
|
|
|
|
2014-11-12 17:26:43 +08:00
|
|
|
DO_TEST_LINUX("numatune-memnode-no-memory", QEMU_CAPS_NUMA,
|
|
|
|
QEMU_CAPS_OBJECT_MEMORY_RAM);
|
2014-07-02 17:15:45 +08:00
|
|
|
DO_TEST_FAILURE("numatune-memnode-no-memory", NONE);
|
|
|
|
|
2013-09-11 16:49:39 +08:00
|
|
|
DO_TEST("numatune-auto-nodeset-invalid", NONE);
|
qemuBuildMemoryBackendStr: Report backend requirement more appropriately
So, when building the '-numa' command line, the
qemuBuildMemoryBackendStr() function does quite a lot of checks to
chose the best backend, or to check if one is in fact needed. However,
it returned that backend is needed even for this little fella:
<numatune>
<memory mode="strict" nodeset="0,2"/>
</numatune>
This can be guaranteed via CGroups entirely, there's no need to use
memory-backend-ram to let qemu know where to get memory from. Well, as
long as there's no <memnode/> element, which explicitly requires the
backend. Long story short, we wouldn't have to care, as qemu works
either way. However, the problem is migration (as always). Previously,
libvirt would have started qemu with:
-numa node,memory=X
in this case and restricted memory placement in CGroups. Today, libvirt
creates more complicated command line:
-object memory-backend-ram,id=ram-node0,size=X
-numa node,memdev=ram-node0
Again, one wouldn't find anything wrong with these two approaches.
Both work just fine. Unless you try to migrated from the older libvirt
into the newer one. These two approaches are, unfortunately, not
compatible. My suggestion is, in order to allow users to migrate, lets
use the older approach for as long as the newer one is not needed.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2015-02-13 00:43:27 +08:00
|
|
|
DO_TEST("numatune-auto-prefer", QEMU_CAPS_OBJECT_MEMORY_RAM,
|
|
|
|
QEMU_CAPS_OBJECT_MEMORY_FILE);
|
2014-11-04 10:44:40 +08:00
|
|
|
DO_TEST_FAILURE("numatune-static-nodeset-exceed-hostnode",
|
|
|
|
QEMU_CAPS_OBJECT_MEMORY_RAM);
|
2014-07-15 17:39:44 +08:00
|
|
|
DO_TEST_PARSE_ERROR("numatune-memnode-nocpu", NONE);
|
|
|
|
DO_TEST_PARSE_ERROR("numatune-memnodes-problematic", NONE);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("numad", NONE);
|
|
|
|
DO_TEST("numad-auto-vcpu-static-numatune", NONE);
|
2014-08-22 22:05:37 +08:00
|
|
|
DO_TEST_PARSE_ERROR("numad-auto-vcpu-static-numatune-no-nodeset", NONE);
|
2012-07-10 00:29:55 +08:00
|
|
|
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);
|
2015-11-06 22:29:41 +08:00
|
|
|
DO_TEST("blkdeviotune", QEMU_CAPS_DEVICE,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DRIVE_IOTUNE);
|
2015-11-06 22:29:41 +08:00
|
|
|
DO_TEST("blkdeviotune-max", QEMU_CAPS_DEVICE,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DRIVE_IOTUNE,
|
2014-11-12 23:16:52 +08:00
|
|
|
QEMU_CAPS_DRIVE_IOTUNE_MAX);
|
2011-02-08 14:59:38 +08:00
|
|
|
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("multifunction-pci-device",
|
2015-11-06 22:28:57 +08:00
|
|
|
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
|
|
|
|
2015-11-06 22:29:41 +08:00
|
|
|
DO_TEST("seclabel-dynamic", NONE);
|
|
|
|
DO_TEST("seclabel-dynamic-baselabel", NONE);
|
|
|
|
DO_TEST("seclabel-dynamic-override", NONE);
|
|
|
|
DO_TEST("seclabel-dynamic-labelskip", NONE);
|
|
|
|
DO_TEST("seclabel-dynamic-relabel", NONE);
|
|
|
|
DO_TEST("seclabel-static", NONE);
|
|
|
|
DO_TEST("seclabel-static-relabel", NONE);
|
|
|
|
DO_TEST("seclabel-static-labelskip", NONE);
|
|
|
|
DO_TEST("seclabel-none", NONE);
|
|
|
|
DO_TEST("seclabel-dac-none", NONE);
|
|
|
|
DO_TEST_PARSE_ERROR("seclabel-multiple", NONE);
|
|
|
|
DO_TEST_PARSE_ERROR("seclabel-device-duplicates", NONE);
|
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);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("pseries-vio",
|
2012-01-13 11:39:25 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("pseries-usb-default",
|
2013-04-19 18:26:36 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
|
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
|
QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PCI_MULTIFUNCTION);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("pseries-usb-multi",
|
2013-04-19 18:26:36 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
|
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI,
|
|
|
|
QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PCI_MULTIFUNCTION);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("pseries-vio-user-assigned",
|
2012-01-13 11:39:25 +08:00
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST_ERROR("pseries-vio-address-clash",
|
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);
|
2014-02-17 18:17:56 +08:00
|
|
|
DO_TEST("pseries-usb-kbd", QEMU_CAPS_PCI_OHCI,
|
|
|
|
QEMU_CAPS_DEVICE_USB_KBD, QEMU_CAPS_CHARDEV,
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2014-09-24 01:07:09 +08:00
|
|
|
DO_TEST("pseries-cpu-exact", QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
|
|
|
|
QEMU_CAPS_NODEFCONFIG);
|
2014-11-05 01:32:15 +08:00
|
|
|
DO_TEST("pseries-cpu-compat", QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST,
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2015-02-27 01:15:54 +08:00
|
|
|
DO_TEST("pseries-cpu-le", QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST,
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2015-05-28 22:39:13 +08:00
|
|
|
DO_TEST("pseries-panic-missing",
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2015-05-28 22:39:12 +08:00
|
|
|
DO_TEST("pseries-panic-no-address",
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
DO_TEST_FAILURE("pseries-panic-address",
|
|
|
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2012-07-10 00:29:55 +08:00
|
|
|
DO_TEST("disk-ide-drive-split",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
2012-04-17 17:16:52 +08:00
|
|
|
QEMU_CAPS_IDE_CD);
|
2012-09-11 16:57:04 +08:00
|
|
|
DO_TEST("disk-ide-wwn",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_IDE_CD,
|
2012-09-11 16:57:04 +08:00
|
|
|
QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_IDE_DRIVE_WWN);
|
2012-01-13 11:39:25 +08:00
|
|
|
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("disk-geometry", NONE);
|
2012-09-04 22:30:55 +08:00
|
|
|
DO_TEST("disk-blockio",
|
2015-11-06 22:28:57 +08:00
|
|
|
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,
|
2013-12-19 22:00:43 +08:00
|
|
|
QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_QXL_VGA,
|
|
|
|
QEMU_CAPS_DEVICE_PCI_BRIDGE);
|
2015-11-09 23:39:54 +08:00
|
|
|
DO_TEST("video-vga-nodevice", NONE);
|
2014-11-21 02:51:12 +08:00
|
|
|
DO_TEST("video-vga-device", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VGA,
|
|
|
|
QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
|
|
|
|
DO_TEST("video-vga-device-vgamem", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VGA,
|
|
|
|
QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_VGA_VGAMEM);
|
2015-11-09 23:39:54 +08:00
|
|
|
DO_TEST("video-qxl-nodevice", QEMU_CAPS_VGA_QXL);
|
2014-11-21 02:51:12 +08:00
|
|
|
DO_TEST("video-qxl-device", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_QXL_VGA,
|
|
|
|
QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
|
|
|
|
DO_TEST("video-qxl-device-vgamem", QEMU_CAPS_DEVICE,
|
2014-11-21 02:52:00 +08:00
|
|
|
QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
|
|
|
|
QEMU_CAPS_QXL_VGA_VGAMEM);
|
2015-11-09 23:39:54 +08:00
|
|
|
DO_TEST_FAILURE("video-qxl-sec-nodevice", QEMU_CAPS_VGA_QXL);
|
2014-11-21 02:51:12 +08:00
|
|
|
DO_TEST("video-qxl-sec-device", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_QXL_VGA,
|
|
|
|
QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
|
|
|
|
DO_TEST("video-qxl-sec-device-vgamem", QEMU_CAPS_DEVICE,
|
|
|
|
QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL,
|
2014-11-21 02:52:00 +08:00
|
|
|
QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_QXL_VGA_VGAMEM,
|
|
|
|
QEMU_CAPS_QXL_VGAMEM);
|
2015-02-10 15:55:06 +08:00
|
|
|
DO_TEST_PARSE_ERROR("video-invalid", NONE);
|
2012-12-14 15:09:17 +08:00
|
|
|
|
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);
|
2014-07-24 21:15:20 +08:00
|
|
|
DO_TEST("virtio-rng-multiple", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VIRTIO_RNG,
|
|
|
|
QEMU_CAPS_OBJECT_RNG_EGD, QEMU_CAPS_OBJECT_RNG_RANDOM);
|
2013-09-26 14:12:39 +08:00
|
|
|
DO_TEST_PARSE_ERROR("virtio-rng-egd-crash", 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,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_CCW,
|
2013-03-15 02:32:26 +08:00
|
|
|
QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_VIRTIO_RNG,
|
|
|
|
QEMU_CAPS_OBJECT_RNG_RANDOM);
|
2013-02-13 00:56:00 +08:00
|
|
|
|
qemu: remove test for allowing ide controller in s390, rename usb tests
Back in 2013, commit 877bc089 added in some tests that made sure no
error was generated on a domain definition that had an automatically
added usb controller if that domain didn't have a PCI bus to attach
the usb controller to. This was done because, at that time, libvirt
was automatically adding a usb controller to *any* domain definition
that didn't have one. Along with permitting the controller, two
s390-specific tests were added to ensure this behavior was maintained
- one with <controller type='usb' model='none'/> and another (called
"s390-piix-controllers") that had both usb and ide controllers, but
nothing attached to them.
Then in February of this year, commit 09ab9dcc eliminated the annoying
auto-adding of a usb device for s390 and s390x machines, stating:
"Since s390 does not support usb the default creation of a usb
controller for a domain should not occur."
Although, as verified here, the s390 doesn't support usb, and usb
controllers aren't currently added to s390 domain definitions
automatically, there are likely still some domain definitions in the
wild that have a usb controller (which was added *by libvirt*, not by
the user), so we will keep the tests verifying that behavior for
now. But this patch changes the names of the tests to reflect that
they don't actually contain a valid s390 config; this way future
developers won't propagate the incorrect idea that an s390 virtual
machine can have a USB (or IDE) bus.
In the case of the IDE controller, though, libvirt has never
automatically added an IDE controller unless a user added an IDE disk
(which itself would have caused an error), and we specifically *do*
want to begin generating an error when someone tries to add an IDE
controller to a domain that can't support one. For that reason, while
renaming the sz390-piix-controllers patch, this patch removes the
<controller type='ide'...> from it (otherwise the upcoming patch would
break make check)
2015-05-06 01:09:42 +08:00
|
|
|
DO_TEST("s390-allow-bogus-usb-none",
|
2013-04-27 01:52:43 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390,
|
2013-04-27 01:52:43 +08:00
|
|
|
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
|
|
|
|
|
qemu: remove test for allowing ide controller in s390, rename usb tests
Back in 2013, commit 877bc089 added in some tests that made sure no
error was generated on a domain definition that had an automatically
added usb controller if that domain didn't have a PCI bus to attach
the usb controller to. This was done because, at that time, libvirt
was automatically adding a usb controller to *any* domain definition
that didn't have one. Along with permitting the controller, two
s390-specific tests were added to ensure this behavior was maintained
- one with <controller type='usb' model='none'/> and another (called
"s390-piix-controllers") that had both usb and ide controllers, but
nothing attached to them.
Then in February of this year, commit 09ab9dcc eliminated the annoying
auto-adding of a usb device for s390 and s390x machines, stating:
"Since s390 does not support usb the default creation of a usb
controller for a domain should not occur."
Although, as verified here, the s390 doesn't support usb, and usb
controllers aren't currently added to s390 domain definitions
automatically, there are likely still some domain definitions in the
wild that have a usb controller (which was added *by libvirt*, not by
the user), so we will keep the tests verifying that behavior for
now. But this patch changes the names of the tests to reflect that
they don't actually contain a valid s390 config; this way future
developers won't propagate the incorrect idea that an s390 virtual
machine can have a USB (or IDE) bus.
In the case of the IDE controller, though, libvirt has never
automatically added an IDE controller unless a user added an IDE disk
(which itself would have caused an error), and we specifically *do*
want to begin generating an error when someone tries to add an IDE
controller to a domain that can't support one. For that reason, while
renaming the sz390-piix-controllers patch, this patch removes the
<controller type='ide'...> from it (otherwise the upcoming patch would
break make check)
2015-05-06 01:09:42 +08:00
|
|
|
DO_TEST("s390-allow-bogus-usb-controller",
|
2013-04-26 23:50:36 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390,
|
2013-04-26 23:50:36 +08:00
|
|
|
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);
|
2014-05-27 13:44:14 +08:00
|
|
|
DO_TEST("ppce500-serial", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV);
|
2013-03-14 12:49:43 +08:00
|
|
|
|
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
|
|
|
|
conf: more useful error message when pci function is out of range
If a pci address had a function number out of range, the error message
would be:
Insufficient specification for PCI address
which is logged by virDevicePCIAddressParseXML() after
virDevicePCIAddressIsValid returns a failure.
This patch enhances virDevicePCIAddressIsValid() to optionally report
the error itself (since it is the place that decides which part of the
address is "invalid"), and uses that feature when calling from
virDevicePCIAddressParseXML(), so that the error will be more useful,
e.g.:
Invalid PCI address function=0x8, must be <= 7
Previously, virDevicePCIAddressIsValid didn't check for the
theoretical limits of domain or bus, only for slot or function. While
adding log messages, we also correct that ommission. (The RNG for PCI
addresses already enforces this limit, which by the way means that we
can't add any negative tests for this - as far as I know our
domainschematest has no provisions for passing XML that is supposed to
fail).
Note that virDevicePCIAddressIsValid() can only check against the
absolute maximum attribute values for *any* possible PCI controller,
not for the actual maximums of the specific controller that this
device is attaching to; fortunately there is later more specific
validation for guest-side PCI addresses when building the set of
assigned PCI addresses. For host-side PCI addresses (e.g. for
<hostdev> and for network device pools), we rely on the error that
will be logged when it is found that the device doesn't actually
exist.
This resolves:
https://bugzilla.redhat.com/show_bug.cgi?id=1004596
2015-07-22 23:59:00 +08:00
|
|
|
|
|
|
|
DO_TEST_PARSE_ERROR("pci-domain-invalid", QEMU_CAPS_DEVICE);
|
|
|
|
DO_TEST_PARSE_ERROR("pci-bus-invalid", QEMU_CAPS_DEVICE);
|
|
|
|
DO_TEST_PARSE_ERROR("pci-slot-invalid", QEMU_CAPS_DEVICE);
|
|
|
|
DO_TEST_PARSE_ERROR("pci-function-invalid", QEMU_CAPS_DEVICE);
|
|
|
|
|
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);
|
2015-01-15 21:14:19 +08:00
|
|
|
DO_TEST("pci-many",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE);
|
qemu: set/validate slot/connection type when assigning slots for PCI devices
Since PCI bridges, PCIe bridges, PCIe switches, and PCIe root ports
all share the same namespace, they are all defined as controllers of
type='pci' in libvirt (but with a differing model attribute). Each of
these controllers has a certain connection type upstream, allows
certain connection types downstream, and each can either allow a
single downstream connection at slot 0, or connections from slot 1 -
31.
Right now, we only support the pci-root and pci-bridge devices, both
of which only allow PCI devices to connect, and both which have usable
slots 1 - 31. In preparation for adding other types of controllers
that have different capabilities, this patch 1) adds info to the
qemuDomainPCIAddressBus object to indicate the capabilities, 2) sets
those capabilities appropriately for pci-root and pci-bridge devices,
and 3) validates that the controller being connected to is the proper
type when allocating slots or validating that a user-selected slot is
appropriate for a device..
Having this infrastructure in place will make it much easier to add
support for the other PCI controller types.
While it would be possible to do all the necessary checking by just
storing the controller model in the qemyuDomainPCIAddressBus, it
greatly simplifies all the validation code to also keep a "flags",
"minSlot" and "maxSlot" for each - that way we can just check those
attributes rather than requiring a nearly identical switch statement
everywhere we need to validate compatibility.
You may notice many places where the flags are seemingly hard-coded to
QEMU_PCI_CONNECT_HOTPLUGGABLE | QEMU_PCI_CONNECT_TYPE_PCI
This is currently the correct value for all PCI devices, and in the
future will be the default, with small bits of code added to change to
the flags for the few devices which are the exceptions to this rule.
Finally, there are a few places with "FIXME" comments. Note that these
aren't indicating places that are broken according to the currently
supported devices, they are places that will need fixing when support
for new PCI controller models is added.
To assure that there was no regression in the auto-allocation of PCI
addresses or auto-creation of integrated pci-root, ide, and usb
controllers, a new test case (pci-bridge-many-disks) has been added to
both the qemuxml2argv and qemuxml2xml tests. This new test defines a
domain with several dozen virtio disks but no pci-root or
pci-bridges. The .args file of the new test case was created using
libvirt sources from before this patch, and the test still passes
after this patch has been applied.
2013-07-15 08:09:44 +08:00
|
|
|
DO_TEST("pci-bridge-many-disks",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE);
|
2013-07-11 03:19:32 +08:00
|
|
|
DO_TEST("pcie-root",
|
qemu: fix handling of default/implicit devices for q35
This patch adds in special handling for a few devices that need to be
treated differently for q35 domains:
usb - there is no implicit/default usb controller for the q35
machinetype. This is done because normally the default usb controller
is added to a domain by just adding "-usb" to the qemu commandline,
and it's assumed that this will add a single piix3 usb1 controller at
slot 1 function 2. That's not what happens when the machinetype is
q35, though. Instead, adding -usb to the commandline adds 3 usb
(version 2) controllers to the domain at slot 0x1D.{1,2,7}. Rather
than having
<controller type='usb' index='0'/>
translate into 3 separate devices on the PCI bus, it's cleaner to not
automatically add a default usb device; one can always be added
explicitly if desired. Or we may decide that on q35 machines, 3 usb
controllers will be automatically added when none is given. But for
this initial commit, at least we aren't locking ourselves into
something we later won't want.
video - qemu always initializes the primary video device immediately
after any integrated devices for the machinetype. Unless instructed
otherwise (by using "-device vga..." instead of "-vga" which libvirt
uses in many cases to work around deficiencies and bugs in various
qemu versions) qemu will always pick the first unused slot. In the
case of the "pc" machinetype and its derivatives, this is always slot
2, but on q35 machinetypes, the first free slot is slot 1 (since the
q35's integrated peripheral devices are placed in other slots,
e.g. slot 0x1f). In order to make the PCI address of the video device
predictable, that slot (1 or 2, depending on machinetype) is reserved
even when no video device has been specified.
sata - a q35 machine always has a sata controller implicitly added at
slot 0x1F, function 2. There is no way to avoid this controller, so we
always add it. Note that the xml2xml tests for the pcie-root and q35
cases were changed to use DO_TEST_DIFFERENT() so that we can check for
the sata controller being automatically added. This is especially
important because we can't check for it in the xml2argv output (it has
no effect on that output since it's an implicit device).
ide - q35 has no ide controllers.
isa and smbus controllers - these two are always present in a q35 (at
slot 0x1F functions 0 and 3) but we have no way of modelling them in
our config. We do need to reserve those functions so that the user
doesn't attempt to put anything else there though. (note that the "pc"
machine type also has an ISA controller, which we also ignore).
2013-08-02 16:55:55 +08:00
|
|
|
QEMU_CAPS_ICH9_AHCI,
|
qemu: add dmi-to-pci-bridge controller
This PCI controller, named "dmi-to-pci-bridge" in the libvirt config,
and implemented with qemu's "i82801b11-bridge" device, connects to a
PCI Express slot (e.g. one of the slots provided by the pcie-root
controller, aka "pcie.0" on the qemu commandline), and provides 31
*non-hot-pluggable* PCI (*not* PCIe) slots, numbered 1-31.
Any time a machine is defined which has a pcie-root controller
(i.e. any q35-based machinetype), libvirt will automatically add a
dmi-to-pci-bridge controller if one doesn't exist, and also add a
pci-bridge controller. The reasoning here is that any useful domain
will have either an immediate (startup time) or eventual (subsequent
hot-plug) need for a standard PCI slot; since the pcie-root controller
only provides PCIe slots, we need to connect a dmi-to-pci-bridge
controller to it in order to get a non-hot-plug PCI slot that we can
then use to connect a pci-bridge - the slots provided by the
pci-bridge will be both standard PCI and hot-pluggable.
Since pci-bridge devices themselves can not be hot-plugged into a
running system (although you can hot-plug other devices into a
pci-bridge's slots), any new pci-bridge controller that is added can
(and will) be plugged into the dmi-to-pci-bridge as long as it has
empty slots available.
This patch is also changing the qemuxml2xml-pcie test from a "DO_TEST"
to a "DO_DIFFERENT_TEST". This is so that the "before" xml can omit
the automatically added dmi-to-pci-bridge and pci-bridge devices, and
the "after" xml can include it - this way we are testing if libvirt is
properly adding these devices.
2013-07-31 09:37:32 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
|
|
|
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE);
|
|
|
|
DO_TEST("q35",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
|
|
|
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_ICH9_AHCI,
|
2015-11-09 23:39:54 +08:00
|
|
|
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
|
|
|
|
QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL);
|
2015-06-18 01:27:57 +08:00
|
|
|
DO_TEST("pcie-root-port",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
|
|
|
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
|
|
|
|
QEMU_CAPS_DEVICE_IOH3420,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_ICH9_AHCI,
|
2015-11-09 23:39:54 +08:00
|
|
|
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
|
|
|
|
QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL);
|
2015-06-18 01:27:57 +08:00
|
|
|
|
|
|
|
DO_TEST_ERROR("pcie-root-port-too-many",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
|
|
|
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
|
|
|
|
QEMU_CAPS_DEVICE_IOH3420,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_ICH9_AHCI,
|
2015-11-09 23:39:54 +08:00
|
|
|
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
|
|
|
|
QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL);
|
2013-04-19 18:38:53 +08:00
|
|
|
|
2015-06-17 03:09:07 +08:00
|
|
|
DO_TEST("pcie-switch-upstream-port",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
|
|
|
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
|
|
|
|
QEMU_CAPS_DEVICE_IOH3420,
|
|
|
|
QEMU_CAPS_DEVICE_X3130_UPSTREAM,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_ICH9_AHCI,
|
2015-11-09 23:39:54 +08:00
|
|
|
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
|
|
|
|
QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL);
|
2015-06-18 05:48:28 +08:00
|
|
|
DO_TEST("pcie-switch-downstream-port",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
|
|
|
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
|
|
|
|
QEMU_CAPS_DEVICE_IOH3420,
|
|
|
|
QEMU_CAPS_DEVICE_X3130_UPSTREAM,
|
|
|
|
QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_ICH9_AHCI,
|
2015-11-09 23:39:54 +08:00
|
|
|
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
|
|
|
|
QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL);
|
2015-06-17 03:09:07 +08:00
|
|
|
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("hostdev-scsi-lsi", QEMU_CAPS_DEVICE,
|
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
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
|
|
|
|
QEMU_CAPS_DEVICE_SCSI_GENERIC);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("hostdev-scsi-virtio-scsi", QEMU_CAPS_DEVICE,
|
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
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI,
|
|
|
|
QEMU_CAPS_DEVICE_SCSI_GENERIC);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("hostdev-scsi-readonly", QEMU_CAPS_DEVICE,
|
2013-05-04 02:07:25 +08:00
|
|
|
QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_VIRTIO_SCSI,
|
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_SCSI_GENERIC);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("hostdev-scsi-virtio-scsi", QEMU_CAPS_DEVICE,
|
2013-05-04 02:07:26 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI,
|
|
|
|
QEMU_CAPS_DEVICE_SCSI_GENERIC,
|
|
|
|
QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("hostdev-scsi-lsi-iscsi", QEMU_CAPS_DEVICE,
|
2014-07-09 22:08:34 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
|
|
|
|
QEMU_CAPS_DEVICE_SCSI_GENERIC);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("hostdev-scsi-lsi-iscsi-auth", QEMU_CAPS_DEVICE,
|
2014-07-09 22:08:34 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
|
|
|
|
QEMU_CAPS_DEVICE_SCSI_GENERIC);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("hostdev-scsi-virtio-iscsi", QEMU_CAPS_DEVICE,
|
2014-07-09 22:08:34 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI,
|
|
|
|
QEMU_CAPS_DEVICE_SCSI_GENERIC);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("hostdev-scsi-virtio-iscsi-auth", QEMU_CAPS_DEVICE,
|
2014-07-09 22:08:34 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI,
|
|
|
|
QEMU_CAPS_DEVICE_SCSI_GENERIC);
|
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-07-12 20:17:23 +08:00
|
|
|
DO_TEST_PARSE_ERROR("pci-bridge-negative-index-invalid",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE);
|
2013-07-22 14:51:55 +08:00
|
|
|
DO_TEST_PARSE_ERROR("pci-bridge-duplicate-index",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE);
|
|
|
|
DO_TEST_PARSE_ERROR("pci-root-nonzero-index",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE);
|
|
|
|
DO_TEST_PARSE_ERROR("pci-root-address",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE);
|
2013-07-12 20:17:23 +08:00
|
|
|
|
2013-07-18 17:19:23 +08:00
|
|
|
DO_TEST("hotplug-base",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_KVM, QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_SCSI);
|
2013-07-18 17:19:23 +08:00
|
|
|
|
2013-08-12 19:48:34 +08:00
|
|
|
DO_TEST("pcihole64", QEMU_CAPS_DEVICE, QEMU_CAPS_I440FX_PCI_HOLE64_SIZE);
|
|
|
|
DO_TEST_FAILURE("pcihole64-none", QEMU_CAPS_DEVICE);
|
|
|
|
DO_TEST("pcihole64-q35",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
|
|
|
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_ICH9_AHCI,
|
2015-11-09 23:39:54 +08:00
|
|
|
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
|
2013-08-12 19:48:34 +08:00
|
|
|
QEMU_CAPS_VGA_QXL, QEMU_CAPS_DEVICE_QXL,
|
|
|
|
QEMU_CAPS_Q35_PCI_HOLE64_SIZE);
|
|
|
|
|
2013-07-31 03:41:14 +08:00
|
|
|
DO_TEST("arm-vexpressa9-nodevs",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB);
|
2013-07-31 06:51:30 +08:00
|
|
|
DO_TEST("arm-vexpressa9-basic",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB);
|
2013-08-01 09:40:35 +08:00
|
|
|
DO_TEST("arm-vexpressa9-virtio",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
2013-08-01 09:40:35 +08:00
|
|
|
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
|
2013-11-20 05:49:40 +08:00
|
|
|
DO_TEST("arm-virt-virtio",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
2013-11-20 05:49:40 +08:00
|
|
|
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
|
2013-07-31 03:41:14 +08:00
|
|
|
|
2014-01-02 18:42:56 +08:00
|
|
|
DO_TEST("aarch64-virt-virtio",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
2014-01-02 18:42:56 +08:00
|
|
|
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
|
2015-09-30 08:10:07 +08:00
|
|
|
DO_TEST("aarch64-mmio-default-pci",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
2015-09-30 08:10:07 +08:00
|
|
|
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
|
|
|
|
QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
|
|
|
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE);
|
|
|
|
DO_TEST("aarch64-virtio-pci",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
2015-09-30 08:10:07 +08:00
|
|
|
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
|
|
|
|
QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
|
|
|
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_VIRTIO_SCSI);
|
2015-02-25 22:12:31 +08:00
|
|
|
DO_TEST("aarch64-aavmf-virtio-mmio",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
2015-02-25 22:12:31 +08:00
|
|
|
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
|
2014-02-14 22:09:00 +08:00
|
|
|
DO_TEST("aarch64-virt-default-nic",
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
|
|
|
|
QEMU_CAPS_DEVICE_VIRTIO_MMIO);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("aarch64-cpu-passthrough", QEMU_CAPS_DEVICE,
|
2015-04-24 01:47:06 +08:00
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
|
|
|
QEMU_CAPS_CPU_HOST, QEMU_CAPS_KVM);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("aarch64-gic", QEMU_CAPS_DEVICE,
|
2015-04-27 20:54:19 +08:00
|
|
|
QEMU_CAPS_KVM);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("aarch64-gicv3", QEMU_CAPS_DEVICE,
|
2015-09-30 19:04:11 +08:00
|
|
|
QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT,
|
|
|
|
QEMU_CAPS_MACH_VIRT_GIC_VERSION);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST_FAILURE("aarch64-gicv3", QEMU_CAPS_DEVICE,
|
2015-09-30 19:04:11 +08:00
|
|
|
QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT);
|
2014-01-02 18:42:56 +08:00
|
|
|
|
2015-05-22 06:18:20 +08:00
|
|
|
driver.caps->host.cpu->arch = VIR_ARCH_AARCH64;
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST("aarch64-kvm-32-on-64", QEMU_CAPS_DEVICE,
|
2015-05-22 06:18:20 +08:00
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
|
|
|
QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST, QEMU_CAPS_CPU_AARCH64_OFF);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST_FAILURE("aarch64-kvm-32-on-64", QEMU_CAPS_DEVICE,
|
2015-05-22 06:18:20 +08:00
|
|
|
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
|
|
|
QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST);
|
|
|
|
driver.caps->host.cpu->arch = cpuDefault->arch;
|
|
|
|
|
2013-07-02 00:28:50 +08:00
|
|
|
DO_TEST("kvm-pit-device", QEMU_CAPS_KVM_PIT_TICK_POLICY);
|
|
|
|
DO_TEST("kvm-pit-delay", QEMU_CAPS_NO_KVM_PIT);
|
|
|
|
DO_TEST("kvm-pit-device", QEMU_CAPS_NO_KVM_PIT,
|
|
|
|
QEMU_CAPS_KVM_PIT_TICK_POLICY);
|
|
|
|
|
2013-12-09 17:11:15 +08:00
|
|
|
DO_TEST("panic", QEMU_CAPS_DEVICE_PANIC,
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2015-11-24 20:26:36 +08:00
|
|
|
DO_TEST("panic-double", QEMU_CAPS_DEVICE_PANIC,
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
2013-12-09 17:11:15 +08:00
|
|
|
|
2015-02-26 22:28:07 +08:00
|
|
|
DO_TEST("panic-no-address", QEMU_CAPS_DEVICE_PANIC,
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
|
|
|
|
2014-09-18 23:38:32 +08:00
|
|
|
DO_TEST("fips-enabled", QEMU_CAPS_ENABLE_FIPS);
|
|
|
|
|
2014-09-25 15:00:47 +08:00
|
|
|
DO_TEST("shmem", QEMU_CAPS_PCIDEVICE,
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_IVSHMEM);
|
|
|
|
DO_TEST_FAILURE("shmem", NONE);
|
2014-10-18 00:05:38 +08:00
|
|
|
DO_TEST_FAILURE("shmem-invalid-size", QEMU_CAPS_PCIDEVICE,
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_IVSHMEM);
|
2015-06-17 11:56:21 +08:00
|
|
|
DO_TEST_FAILURE("shmem-invalid-address", QEMU_CAPS_PCIDEVICE,
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_IVSHMEM);
|
2014-10-18 00:05:38 +08:00
|
|
|
DO_TEST_FAILURE("shmem-small-size", QEMU_CAPS_PCIDEVICE,
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_IVSHMEM);
|
2014-09-22 16:49:39 +08:00
|
|
|
DO_TEST_PARSE_ERROR("shmem-msi-only", NONE);
|
2015-01-06 00:03:58 +08:00
|
|
|
DO_TEST("cpu-host-passthrough-features", QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST);
|
2014-09-22 16:49:39 +08:00
|
|
|
|
2014-10-06 20:18:37 +08:00
|
|
|
DO_TEST_FAILURE("memory-hotplug-nonuma", QEMU_CAPS_DEVICE_PC_DIMM);
|
|
|
|
DO_TEST_FAILURE("memory-hotplug", NONE);
|
|
|
|
DO_TEST("memory-hotplug", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA);
|
2015-01-09 17:40:37 +08:00
|
|
|
DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA,
|
qemuBuildMemoryBackendStr: Honour passed @pagesize
So far the argument has not much meaning and was practically ignored.
This is not good since when doing memory hotplug, the size of desired
hugepage backing is passed in that argument. Taking closer look at the
tests I'm fixing reveals the bug. For instance, while the following is
in the test:
<memory model='dimm'>
<source>
<nodemask>1-3</nodemask>
<pagesize unit='KiB'>4096</pagesize>
</source>
<target>
<size unit='KiB'>524287</size>
<node>0</node>
</target>
<address type='dimm' slot='0' base='0x100000000'/>
</memory>
the generated commandline corresponding to this XML was:
-object memory-backend-ram,id=memdimm0,size=536870912,\
host-nodes=1-3,policy=bind
Have you noticed? Yes, memory-backend-ram! Nothing can be further away
from the right answer. The hugepage backing is requested in the XML
and we happily ignore it. This is just not right. It's
memory-backend-file which should have been used:
-object memory-backend-file,id=memdimm0,prealloc=yes,\
mem-path=/dev/hugepages4M/libvirt/qemu,size=536870912,\
host-nodes=1-3,policy=bind
The problem is, that @pagesize passed to qemuBuildMemoryBackendStr
(where this part of commandline is built) was ignored. The hugepage to
back memory was searched only and only by NUMA nodes pinning. This
works only for regular guest NUMA nodes.
Then, I'm changing the hugepages size in the test XMLs too. This is
simply because in the test suite we create dummy mount points just for
2M and 1G hugepages. And in the test 4M was requested. I'm sticking to
2M, but 1G should just work too.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2015-06-25 23:27:29 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE);
|
2015-03-26 14:30:56 +08:00
|
|
|
DO_TEST("memory-hotplug-dimm-addr", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA,
|
qemuBuildMemoryBackendStr: Honour passed @pagesize
So far the argument has not much meaning and was practically ignored.
This is not good since when doing memory hotplug, the size of desired
hugepage backing is passed in that argument. Taking closer look at the
tests I'm fixing reveals the bug. For instance, while the following is
in the test:
<memory model='dimm'>
<source>
<nodemask>1-3</nodemask>
<pagesize unit='KiB'>4096</pagesize>
</source>
<target>
<size unit='KiB'>524287</size>
<node>0</node>
</target>
<address type='dimm' slot='0' base='0x100000000'/>
</memory>
the generated commandline corresponding to this XML was:
-object memory-backend-ram,id=memdimm0,size=536870912,\
host-nodes=1-3,policy=bind
Have you noticed? Yes, memory-backend-ram! Nothing can be further away
from the right answer. The hugepage backing is requested in the XML
and we happily ignore it. This is just not right. It's
memory-backend-file which should have been used:
-object memory-backend-file,id=memdimm0,prealloc=yes,\
mem-path=/dev/hugepages4M/libvirt/qemu,size=536870912,\
host-nodes=1-3,policy=bind
The problem is, that @pagesize passed to qemuBuildMemoryBackendStr
(where this part of commandline is built) was ignored. The hugepage to
back memory was searched only and only by NUMA nodes pinning. This
works only for regular guest NUMA nodes.
Then, I'm changing the hugepages size in the test XMLs too. This is
simply because in the test suite we create dummy mount points just for
2M and 1G hugepages. And in the test 4M was requested. I'm sticking to
2M, but 1G should just work too.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2015-06-25 23:27:29 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_OBJECT_MEMORY_FILE);
|
2015-10-14 01:12:23 +08:00
|
|
|
DO_TEST("memory-hotplug-ppc64-nonuma", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA,
|
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE);
|
2014-10-06 20:18:37 +08:00
|
|
|
|
2015-04-28 05:57:30 +08:00
|
|
|
DO_TEST("machine-aeskeywrap-on-caps",
|
|
|
|
QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_AES_KEY_WRAP,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_DEA_KEY_WRAP,
|
2015-04-28 05:57:30 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
|
|
|
|
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
|
DO_TEST_FAILURE("machine-aeskeywrap-on-caps", QEMU_CAPS_MACHINE_OPT,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
|
2015-04-28 05:57:30 +08:00
|
|
|
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
|
DO_TEST_FAILURE("machine-aeskeywrap-on-caps", NONE);
|
|
|
|
|
|
|
|
DO_TEST("machine-aeskeywrap-on-cap",
|
|
|
|
QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_AES_KEY_WRAP,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
|
2015-04-28 05:57:30 +08:00
|
|
|
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
|
DO_TEST_FAILURE("machine-aeskeywrap-on-cap", QEMU_CAPS_MACHINE_OPT,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
|
2015-04-28 05:57:30 +08:00
|
|
|
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
|
DO_TEST_FAILURE("machine-aeskeywrap-on-cap", NONE);
|
|
|
|
|
|
|
|
DO_TEST("machine-aeskeywrap-off-caps",
|
|
|
|
QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
|
2015-04-28 05:57:30 +08:00
|
|
|
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
|
DO_TEST_FAILURE("machine-aeskeywrap-off-caps", QEMU_CAPS_MACHINE_OPT,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
|
2015-04-28 05:57:30 +08:00
|
|
|
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
|
DO_TEST_FAILURE("machine-aeskeywrap-off-caps", NONE);
|
|
|
|
|
|
|
|
DO_TEST("machine-aeskeywrap-off-cap",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_AES_KEY_WRAP,
|
2015-04-28 05:57:30 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
|
|
|
|
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
|
DO_TEST_FAILURE("machine-aeskeywrap-off-cap", QEMU_CAPS_MACHINE_OPT,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
|
2015-04-28 05:57:30 +08:00
|
|
|
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
|
DO_TEST_FAILURE("machine-aeskeywrap-off-cap", NONE);
|
|
|
|
|
|
|
|
DO_TEST("machine-deakeywrap-on-caps",
|
|
|
|
QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
|
2015-04-28 05:57:30 +08:00
|
|
|
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
2015-11-06 22:28:57 +08:00
|
|
|
DO_TEST_FAILURE("machine-deakeywrap-on-caps", QEMU_CAPS_MACHINE_OPT,
|
2015-04-28 05:57:30 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
|
|
|
|
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
|
DO_TEST_FAILURE("machine-deakeywrap-on-caps", NONE);
|
|
|
|
|
|
|
|
DO_TEST("machine-deakeywrap-on-cap",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_DEA_KEY_WRAP,
|
2015-04-28 05:57:30 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
|
|
|
|
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
|
DO_TEST_FAILURE("machine-deakeywrap-on-cap", QEMU_CAPS_MACHINE_OPT,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
|
2015-04-28 05:57:30 +08:00
|
|
|
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
|
DO_TEST_FAILURE("machine-deakeywrap-on-cap", NONE);
|
|
|
|
|
|
|
|
DO_TEST("machine-deakeywrap-off-caps",
|
|
|
|
QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
|
2015-04-28 05:57:30 +08:00
|
|
|
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
|
DO_TEST_FAILURE("machine-deakeywrap-off-caps", QEMU_CAPS_MACHINE_OPT,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
|
2015-04-28 05:57:30 +08:00
|
|
|
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
|
DO_TEST_FAILURE("machine-deakeywrap-off-caps", NONE);
|
|
|
|
|
|
|
|
DO_TEST("machine-deakeywrap-off-cap",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_DEA_KEY_WRAP,
|
2015-04-28 05:57:30 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
|
|
|
|
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
|
DO_TEST_FAILURE("machine-deakeywrap-off-cap", QEMU_CAPS_MACHINE_OPT,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
|
2015-04-28 05:57:30 +08:00
|
|
|
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
|
DO_TEST_FAILURE("machine-deakeywrap-off-cap", NONE);
|
|
|
|
|
|
|
|
DO_TEST("machine-keywrap-none-caps",
|
|
|
|
QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP,
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE,
|
2015-04-28 05:57:30 +08:00
|
|
|
QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
|
DO_TEST("machine-keywrap-none",
|
2015-11-06 22:28:57 +08:00
|
|
|
QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_VIRTIO_SCSI,
|
2015-04-28 05:57:30 +08:00
|
|
|
QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
|
|
|
|
|
2015-10-20 22:01:01 +08:00
|
|
|
DO_TEST("qemu-ns-domain-ns0", NONE);
|
|
|
|
DO_TEST("qemu-ns-domain-commandline", NONE);
|
|
|
|
DO_TEST("qemu-ns-domain-commandline-ns0", NONE);
|
|
|
|
DO_TEST("qemu-ns-commandline", NONE);
|
|
|
|
DO_TEST("qemu-ns-commandline-ns0", NONE);
|
|
|
|
DO_TEST("qemu-ns-commandline-ns1", NONE);
|
|
|
|
|
2015-09-15 14:16:02 +08:00
|
|
|
qemuTestDriverFree(&driver);
|
2008-02-27 12:35:08 +08:00
|
|
|
|
2014-03-17 17:38:38 +08:00
|
|
|
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
|
2007-07-19 05:34:22 +08:00
|
|
|
}
|
|
|
|
|
2014-02-05 22:18:46 +08:00
|
|
|
VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/qemuxml2argvmock.so")
|
2008-05-29 23:31:49 +08:00
|
|
|
|
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 */
|