External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-11-03 20:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
730af8f2cd
libvirt/tests/qemuargv2xmltest.c

280 lines
7.5 KiB
C
Raw Normal View History

Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <sys/types.h>
#include <fcntl.h>
cleanup: Only include testutils.h once No reason to include it in both "if" and "else" branches.
2013-04-16 13:41:44 +00:00
#include "testutils.h"
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
#ifdef WITH_QEMU
build: consistently indent preprocessor directives * global: patch created by running: for f in $(git ls-files '*.[ch]') ; do cppi $f > $f.t && mv $f.t $f done
2010-03-09 18:22:22 +00:00
# include "internal.h"
Update QEMU test cases for new file locations & API renames * qemuargv2xmltest.c, qemuhelptest.c, qemuxml2argvtest.c, testutilsqemu.c: Update includes and cope with API renames
2010-12-17 16:41:51 +00:00
# include "qemu/qemu_command.h"
build: consistently indent preprocessor directives * global: patch created by running: for f in $(git ls-files '*.[ch]') ; do cppi $f > $f.t && mv $f.t $f done
2010-03-09 18:22:22 +00:00
# include "testutilsqemu.h"
virutil: Move string related functions to virstring.c The source code base needs to be adapted as well. Some files include virutil.h just for the string related functions (here, the include is substituted to match the new file), some include virutil.h without any need (here, the include is removed), and some require both.
2013-04-03 10:36:23 +00:00
# include "virstring.h"
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
Introduce OOM reporting to virAsprintf Actually, I'm turning this function into a macro as filename, function name and line number needs to be passed. The new function virAsprintfInternal is introduced with the extended set of arguments.
2013-06-07 15:10:28 +00:00
# define VIR_FROM_THIS VIR_FROM_NONE
Replace 'struct qemud_driver *' with virQEMUDriverPtr Remove the obsolete 'qemud' naming prefix and underscore based type name. Introduce virQEMUDriverPtr as the replacement, in common with LXC driver naming style
2012-11-28 16:43:10 +00:00
static virQEMUDriver driver;
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
static int blankProblemElements(char *data)
{
if (virtTestClearLineRegex("<name>[[:alnum:]]+</name>", data) < 0 ||
virtTestClearLineRegex("<uuid>([[:alnum:]]|-)+</uuid>", data) < 0 ||
xml: output memory unit for clarity Make it obvious to 'dumpxml' readers what unit we are using, since our default of KiB for memory (1024) differs from qemu's default of MiB; and differs from our use of bytes for storage. Tests were updated via: $ find tests/*data tests/*out -name '*.xml' | \ xargs sed -i 's/<\(memory\|currentMemory\|hard_limit\|soft_limit\|min_guarantee\|swap_hard_limit\)>/<\1 unit='"'KiB'>/" $ find tests/*data tests/*out -name '*.xml' | \ xargs sed -i 's/<\(capacity\|allocation\|available\)>/<\1 unit='"'bytes'>/" followed by a few fixes for the stragglers. Note that with this patch, the RNG for <memory> still forbids validation of anything except unit='KiB', since the code silently ignores the attribute; a later patch will expand <memory> to allow scaled input in the code and update the RNG to match. * docs/schemas/basictypes.rng (unit): Add 'bytes'. (scaledInteger): New define. * docs/schemas/storagevol.rng (sizing): Use it. * docs/schemas/storagepool.rng (sizing): Likewise. * docs/schemas/domaincommon.rng (memoryKBElement): New define; use for memory elements. * src/conf/storage_conf.c (virStoragePoolDefFormat) (virStorageVolDefFormat): Likewise. * src/conf/domain_conf.h (_virDomainDef): Document unit used internally. * src/conf/storage_conf.h (_virStoragePoolDef, _virStorageVolDef): Likewise. * tests/*data/*.xml: Update all tests. * tests/*out/*.xml: Likewise. * tests/define-dev-segfault: Likewise. * tests/openvzutilstest.c (testReadNetworkConf): Likewise. * tests/qemuargv2xmltest.c (blankProblemElements): Likewise.
2012-02-23 00:48:38 +00:00
virtTestClearLineRegex("<memory.*>[[:digit:]]+</memory>", data) < 0 ||
virtTestClearLineRegex("<currentMemory.*>[[:digit:]]+</currentMemory>",
data) < 0 ||
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
virtTestClearLineRegex("<readonly/>", data) < 0 ||
virtTestClearLineRegex("<sharable/>", data) < 0)
return -1;
return 0;
}
static int testCompareXMLToArgvFiles(const char *xml,
tests: silence qemuargv2xmltest noise Before this patch, the testsuite was noisy: TEST: qemuargv2xmltest ........................................ 40 ................20:41:28.046: warning : qemuParseCommandLine:6565 : unknown QEMU argument '-unknown', adding to the qemu namespace 20:41:28.046: warning : qemuParseCommandLine:6565 : unknown QEMU argument 'parameter', adding to the qemu namespace . 57 OK PASS: qemuargv2xmltest It's not a real failure (which is why the test was completing successfully), so much as an intentional warning to the user that use of the qemu namespace has the potential for undefined effects that leaked through the default logging behavior. After this patch series, all tests can access any logged data, and this particular test can explicitly check for the presence or absence of the warning, such that the test output becomes: TEST: qemuargv2xmltest ........................................ 40 ................. 57 OK PASS: qemuargv2xmltest * tests/testutils.h (virtTestLogContentAndReset): New prototype. * tests/testutils.c (struct virtTestLogData): New struct. (virtTestLogOutput, virtTestLogClose, virtTestLogContentAndReset): New functions. (virtTestMain): Always capture log data emitted during tests. * tests/qemuargv2xmltest.c (testCompareXMLToArgvHelper, mymain): Use flag to mark which tests expect noisy stderr. (testCompareXMLToArgvFiles): Add parameter to test whether stderr was appropriately silent.
2010-09-10 16:25:49 +00:00
const char *cmdfile,
bool expect_warning) {
tests: Lower stack usage below 4096 bytes Make virtTestLoadFile allocate the buffer to read the file into. Fix logic error in virtTestLoadFile, stop reading on the first empty line. Use virFileReadLimFD in virtTestCaptureProgramOutput to avoid manual buffer handling.
2011-04-24 22:25:10 +00:00
char *expectxml = NULL;
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
char *actualxml = NULL;
tests: Lower stack usage below 4096 bytes Make virtTestLoadFile allocate the buffer to read the file into. Fix logic error in virtTestLoadFile, stop reading on the first empty line. Use virFileReadLimFD in virtTestCaptureProgramOutput to avoid manual buffer handling.
2011-04-24 22:25:10 +00:00
char *cmd = NULL;
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
int ret = -1;
virDomainDefPtr vmdef = NULL;
tests: silence qemuargv2xmltest noise Before this patch, the testsuite was noisy: TEST: qemuargv2xmltest ........................................ 40 ................20:41:28.046: warning : qemuParseCommandLine:6565 : unknown QEMU argument '-unknown', adding to the qemu namespace 20:41:28.046: warning : qemuParseCommandLine:6565 : unknown QEMU argument 'parameter', adding to the qemu namespace . 57 OK PASS: qemuargv2xmltest It's not a real failure (which is why the test was completing successfully), so much as an intentional warning to the user that use of the qemu namespace has the potential for undefined effects that leaked through the default logging behavior. After this patch series, all tests can access any logged data, and this particular test can explicitly check for the presence or absence of the warning, such that the test output becomes: TEST: qemuargv2xmltest ........................................ 40 ................. 57 OK PASS: qemuargv2xmltest * tests/testutils.h (virtTestLogContentAndReset): New prototype. * tests/testutils.c (struct virtTestLogData): New struct. (virtTestLogOutput, virtTestLogClose, virtTestLogContentAndReset): New functions. (virtTestMain): Always capture log data emitted during tests. * tests/qemuargv2xmltest.c (testCompareXMLToArgvHelper, mymain): Use flag to mark which tests expect noisy stderr. (testCompareXMLToArgvFiles): Add parameter to test whether stderr was appropriately silent.
2010-09-10 16:25:49 +00:00
char *log;
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
tests: Lower stack usage below 4096 bytes Make virtTestLoadFile allocate the buffer to read the file into. Fix logic error in virtTestLoadFile, stop reading on the first empty line. Use virFileReadLimFD in virtTestCaptureProgramOutput to avoid manual buffer handling.
2011-04-24 22:25:10 +00:00
if (virtTestLoadFile(cmdfile, &cmd) < 0)
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
goto fail;
tests: Lower stack usage below 4096 bytes Make virtTestLoadFile allocate the buffer to read the file into. Fix logic error in virtTestLoadFile, stop reading on the first empty line. Use virFileReadLimFD in virtTestCaptureProgramOutput to avoid manual buffer handling.
2011-04-24 22:25:10 +00:00
if (virtTestLoadFile(xml, &expectxml) < 0)
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
goto fail;
maint: Rename xmlconf to xmlopt and virDomainXMLConfig to virDomainXMLOption This patch is the result of running: for i in $(git ls-files | grep -v html | grep -v \.po$ ); do sed -i -e "s/virDomainXMLConf/virDomainXMLOption/g" -e "s/xmlconf/xmlopt/g" $i done and a few manual tweaks.
2013-03-31 18:03:42 +00:00
if (!(vmdef = qemuParseCommandLineString(driver.caps, driver.xmlopt,
virCaps: conf: start splitting out irrelevat data The virCaps structure gathered a ton of irrelevant data over time that. The original reason is that it was propagated to the XML parser functions. This patch aims to create a new data structure virDomainXMLConf that will contain immutable data that are used by the XML parser. This will allow two things we need: 1) Get rid of the stuff from virCaps 2) Allow us to add callbacks to check and add driver specific stuff after domain XML is parsed. This first attempt removes pointers to private data allocation functions to this new structure and update all callers and function that require them.
2013-03-05 15:17:24 +00:00
cmd, NULL, NULL, NULL)))
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
goto fail;
tests: silence qemuargv2xmltest noise Before this patch, the testsuite was noisy: TEST: qemuargv2xmltest ........................................ 40 ................20:41:28.046: warning : qemuParseCommandLine:6565 : unknown QEMU argument '-unknown', adding to the qemu namespace 20:41:28.046: warning : qemuParseCommandLine:6565 : unknown QEMU argument 'parameter', adding to the qemu namespace . 57 OK PASS: qemuargv2xmltest It's not a real failure (which is why the test was completing successfully), so much as an intentional warning to the user that use of the qemu namespace has the potential for undefined effects that leaked through the default logging behavior. After this patch series, all tests can access any logged data, and this particular test can explicitly check for the presence or absence of the warning, such that the test output becomes: TEST: qemuargv2xmltest ........................................ 40 ................. 57 OK PASS: qemuargv2xmltest * tests/testutils.h (virtTestLogContentAndReset): New prototype. * tests/testutils.c (struct virtTestLogData): New struct. (virtTestLogOutput, virtTestLogClose, virtTestLogContentAndReset): New functions. (virtTestMain): Always capture log data emitted during tests. * tests/qemuargv2xmltest.c (testCompareXMLToArgvHelper, mymain): Use flag to mark which tests expect noisy stderr. (testCompareXMLToArgvFiles): Add parameter to test whether stderr was appropriately silent.
2010-09-10 16:25:49 +00:00
if ((log = virtTestLogContentAndReset()) == NULL)
goto fail;
if ((*log != '\0') != expect_warning) {
build: expand rule to cover testsuite The bulk of this patch was done with: sed -i 's/\(\bfree *(/VIR_FREE(/g' tests/*.c followed by fixing the few compile errors that resulted. * cfg.mk (exclude_file_name_regexp--sc_prohibit_raw_allocation): Remove tests from exemption. * tests/testutils.h: Add common header. * tests/commandhelper.c: Fix offenders. * tests/cputest.c: Likewise. * tests/domainsnapshotxml2xmltest.c: Likewise. * tests/interfacexml2xmltest.c: Likewise. * tests/networkxml2argvtest.c: Likewise. * tests/networkxml2xmltest.c: Likewise. * tests/nodedevxml2xmltest.c: Likewise. * tests/nodeinfotest.c: Likewise. * tests/nwfilterxml2xmltest.c: Likewise. * tests/qemuargv2xmltest.c: Likewise. * tests/qemuxml2argvtest.c: Likewise. * tests/qemuxml2xmltest.c: Likewise. * tests/qemuxmlnstest.c: Likewise. * tests/qparamtest.c: Likewise. * tests/sexpr2xmltest.c: Likewise. * tests/storagepoolxml2xmltest.c: Likewise. * tests/storagevolxml2xmltest.c: Likewise. * tests/testutils.c: Likewise. * tests/virshtest.c: Likewise. * tests/xencapstest.c: Likewise. * tests/xmconfigtest.c: Likewise. * tests/xml2sexprtest.c: Likewise.
2012-02-02 23:16:43 +00:00
VIR_FREE(log);
tests: silence qemuargv2xmltest noise Before this patch, the testsuite was noisy: TEST: qemuargv2xmltest ........................................ 40 ................20:41:28.046: warning : qemuParseCommandLine:6565 : unknown QEMU argument '-unknown', adding to the qemu namespace 20:41:28.046: warning : qemuParseCommandLine:6565 : unknown QEMU argument 'parameter', adding to the qemu namespace . 57 OK PASS: qemuargv2xmltest It's not a real failure (which is why the test was completing successfully), so much as an intentional warning to the user that use of the qemu namespace has the potential for undefined effects that leaked through the default logging behavior. After this patch series, all tests can access any logged data, and this particular test can explicitly check for the presence or absence of the warning, such that the test output becomes: TEST: qemuargv2xmltest ........................................ 40 ................. 57 OK PASS: qemuargv2xmltest * tests/testutils.h (virtTestLogContentAndReset): New prototype. * tests/testutils.c (struct virtTestLogData): New struct. (virtTestLogOutput, virtTestLogClose, virtTestLogContentAndReset): New functions. (virtTestMain): Always capture log data emitted during tests. * tests/qemuargv2xmltest.c (testCompareXMLToArgvHelper, mymain): Use flag to mark which tests expect noisy stderr. (testCompareXMLToArgvFiles): Add parameter to test whether stderr was appropriately silent.
2010-09-10 16:25:49 +00:00
goto fail;
}
build: expand rule to cover testsuite The bulk of this patch was done with: sed -i 's/\(\bfree *(/VIR_FREE(/g' tests/*.c followed by fixing the few compile errors that resulted. * cfg.mk (exclude_file_name_regexp--sc_prohibit_raw_allocation): Remove tests from exemption. * tests/testutils.h: Add common header. * tests/commandhelper.c: Fix offenders. * tests/cputest.c: Likewise. * tests/domainsnapshotxml2xmltest.c: Likewise. * tests/interfacexml2xmltest.c: Likewise. * tests/networkxml2argvtest.c: Likewise. * tests/networkxml2xmltest.c: Likewise. * tests/nodedevxml2xmltest.c: Likewise. * tests/nodeinfotest.c: Likewise. * tests/nwfilterxml2xmltest.c: Likewise. * tests/qemuargv2xmltest.c: Likewise. * tests/qemuxml2argvtest.c: Likewise. * tests/qemuxml2xmltest.c: Likewise. * tests/qemuxmlnstest.c: Likewise. * tests/qparamtest.c: Likewise. * tests/sexpr2xmltest.c: Likewise. * tests/storagepoolxml2xmltest.c: Likewise. * tests/storagevolxml2xmltest.c: Likewise. * tests/testutils.c: Likewise. * tests/virshtest.c: Likewise. * tests/xencapstest.c: Likewise. * tests/xmconfigtest.c: Likewise. * tests/xml2sexprtest.c: Likewise.
2012-02-02 23:16:43 +00:00
VIR_FREE(log);
tests: silence qemuargv2xmltest noise Before this patch, the testsuite was noisy: TEST: qemuargv2xmltest ........................................ 40 ................20:41:28.046: warning : qemuParseCommandLine:6565 : unknown QEMU argument '-unknown', adding to the qemu namespace 20:41:28.046: warning : qemuParseCommandLine:6565 : unknown QEMU argument 'parameter', adding to the qemu namespace . 57 OK PASS: qemuargv2xmltest It's not a real failure (which is why the test was completing successfully), so much as an intentional warning to the user that use of the qemu namespace has the potential for undefined effects that leaked through the default logging behavior. After this patch series, all tests can access any logged data, and this particular test can explicitly check for the presence or absence of the warning, such that the test output becomes: TEST: qemuargv2xmltest ........................................ 40 ................. 57 OK PASS: qemuargv2xmltest * tests/testutils.h (virtTestLogContentAndReset): New prototype. * tests/testutils.c (struct virtTestLogData): New struct. (virtTestLogOutput, virtTestLogClose, virtTestLogContentAndReset): New functions. (virtTestMain): Always capture log data emitted during tests. * tests/qemuargv2xmltest.c (testCompareXMLToArgvHelper, mymain): Use flag to mark which tests expect noisy stderr. (testCompareXMLToArgvFiles): Add parameter to test whether stderr was appropriately silent.
2010-09-10 16:25:49 +00:00
Remove virConnectPtr from all domain XML parsing/formatting APIs
2010-02-09 18:58:01 +00:00
if (!(actualxml = virDomainDefFormat(vmdef, 0)))
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
goto fail;
if (blankProblemElements(expectxml) < 0 ||
blankProblemElements(actualxml) < 0)
goto fail;
if (STRNEQ(expectxml, actualxml)) {
virtTestDifference(stderr, expectxml, actualxml);
goto fail;
}
ret = 0;
fail:
build: expand rule to cover testsuite The bulk of this patch was done with: sed -i 's/\(\bfree *(/VIR_FREE(/g' tests/*.c followed by fixing the few compile errors that resulted. * cfg.mk (exclude_file_name_regexp--sc_prohibit_raw_allocation): Remove tests from exemption. * tests/testutils.h: Add common header. * tests/commandhelper.c: Fix offenders. * tests/cputest.c: Likewise. * tests/domainsnapshotxml2xmltest.c: Likewise. * tests/interfacexml2xmltest.c: Likewise. * tests/networkxml2argvtest.c: Likewise. * tests/networkxml2xmltest.c: Likewise. * tests/nodedevxml2xmltest.c: Likewise. * tests/nodeinfotest.c: Likewise. * tests/nwfilterxml2xmltest.c: Likewise. * tests/qemuargv2xmltest.c: Likewise. * tests/qemuxml2argvtest.c: Likewise. * tests/qemuxml2xmltest.c: Likewise. * tests/qemuxmlnstest.c: Likewise. * tests/qparamtest.c: Likewise. * tests/sexpr2xmltest.c: Likewise. * tests/storagepoolxml2xmltest.c: Likewise. * tests/storagevolxml2xmltest.c: Likewise. * tests/testutils.c: Likewise. * tests/virshtest.c: Likewise. * tests/xencapstest.c: Likewise. * tests/xmconfigtest.c: Likewise. * tests/xml2sexprtest.c: Likewise.
2012-02-02 23:16:43 +00:00
VIR_FREE(expectxml);
VIR_FREE(actualxml);
VIR_FREE(cmd);
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
virDomainDefFree(vmdef);
return ret;
}
struct testInfo {
const char *name;
Convert qemu command line flags to 64-bit int The QEMU flags are commonly stored as a signed or unsigned int, allowing only 31 flags. This limit is rather close, so to aid future patches, change it to a 64-bit int * src/qemu/qemu_conf.c, src/qemu/qemu_conf.h, src/qemu/qemu_driver.c, tests/qemuargv2xmltest.c, tests/qemuhelptest.c, tests/qemuxml2argvtest.c: Use 'unsigned long long' for QEMU flags
2010-02-09 13:06:56 +00:00
unsigned long long extraFlags;
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
const char *migrateFrom;
};
tests: Lower stack usage below 4096 bytes Make virtTestLoadFile allocate the buffer to read the file into. Fix logic error in virtTestLoadFile, stop reading on the first empty line. Use virFileReadLimFD in virtTestCaptureProgramOutput to avoid manual buffer handling.
2011-04-24 22:25:10 +00:00
static int
testCompareXMLToArgvHelper(const void *data)
{
int result = -1;
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
const struct testInfo *info = data;
tests: Lower stack usage below 4096 bytes Make virtTestLoadFile allocate the buffer to read the file into. Fix logic error in virtTestLoadFile, stop reading on the first empty line. Use virFileReadLimFD in virtTestCaptureProgramOutput to avoid manual buffer handling.
2011-04-24 22:25:10 +00:00
char *xml = NULL;
char *args = NULL;
if (virAsprintf(&xml, "%s/qemuxml2argvdata/qemuxml2argv-%s.xml",
abs_srcdir, info->name) < 0 ||
virAsprintf(&args, "%s/qemuxml2argvdata/qemuxml2argv-%s.args",
abs_srcdir, info->name) < 0)
goto cleanup;
result = testCompareXMLToArgvFiles(xml, args, !!info->extraFlags);
cleanup:
build: expand rule to cover testsuite The bulk of this patch was done with: sed -i 's/\(\bfree *(/VIR_FREE(/g' tests/*.c followed by fixing the few compile errors that resulted. * cfg.mk (exclude_file_name_regexp--sc_prohibit_raw_allocation): Remove tests from exemption. * tests/testutils.h: Add common header. * tests/commandhelper.c: Fix offenders. * tests/cputest.c: Likewise. * tests/domainsnapshotxml2xmltest.c: Likewise. * tests/interfacexml2xmltest.c: Likewise. * tests/networkxml2argvtest.c: Likewise. * tests/networkxml2xmltest.c: Likewise. * tests/nodedevxml2xmltest.c: Likewise. * tests/nodeinfotest.c: Likewise. * tests/nwfilterxml2xmltest.c: Likewise. * tests/qemuargv2xmltest.c: Likewise. * tests/qemuxml2argvtest.c: Likewise. * tests/qemuxml2xmltest.c: Likewise. * tests/qemuxmlnstest.c: Likewise. * tests/qparamtest.c: Likewise. * tests/sexpr2xmltest.c: Likewise. * tests/storagepoolxml2xmltest.c: Likewise. * tests/storagevolxml2xmltest.c: Likewise. * tests/testutils.c: Likewise. * tests/virshtest.c: Likewise. * tests/xencapstest.c: Likewise. * tests/xmconfigtest.c: Likewise. * tests/xml2sexprtest.c: Likewise.
2012-02-02 23:16:43 +00:00
VIR_FREE(xml);
VIR_FREE(args);
tests: Lower stack usage below 4096 bytes Make virtTestLoadFile allocate the buffer to read the file into. Fix logic error in virtTestLoadFile, stop reading on the first empty line. Use virFileReadLimFD in virtTestCaptureProgramOutput to avoid manual buffer handling.
2011-04-24 22:25:10 +00:00
return result;
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
}
static int
tests: simplify common setup A few of the tests were missing basic sanity checks, while most of them were doing copy-and-paste initialization (in fact, some of them pasted the argc > 1 check more than once!). It's much nicer to do things in one common place, and minimizes the size of the next patch that fixes getcwd usage. * tests/testutils.h (EXIT_AM_HARDFAIL): New define. (progname, abs_srcdir): Define for all tests. (VIRT_TEST_MAIN): Change callback signature. * tests/testutils.c (virtTestMain): Do more common init. * tests/commandtest.c (mymain): Simplify. * tests/cputest.c (mymain): Likewise. * tests/esxutilstest.c (mymain): Likewise. * tests/eventtest.c (mymain): Likewise. * tests/hashtest.c (mymain): Likewise. * tests/networkxml2xmltest.c (mymain): Likewise. * tests/nodedevxml2xmltest.c (myname): Likewise. * tests/nodeinfotest.c (mymain): Likewise. * tests/nwfilterxml2xmltest.c (mymain): Likewise. * tests/qemuargv2xmltest.c (mymain): Likewise. * tests/qemuhelptest.c (mymain): Likewise. * tests/qemuxml2argvtest.c (mymain): Likewise. * tests/qemuxml2xmltest.c (mymain): Likewise. * tests/qparamtest.c (mymain): Likewise. * tests/sexpr2xmltest.c (mymain): Likewise. * tests/sockettest.c (mymain): Likewise. * tests/statstest.c (mymain): Likewise. * tests/storagepoolxml2xmltest.c (mymain): Likewise. * tests/storagevolxml2xmltest.c (mymain): Likewise. * tests/virbuftest.c (mymain): Likewise. * tests/virshtest.c (mymain): Likewise. * tests/vmx2xmltest.c (mymain): Likewise. * tests/xencapstest.c (mymain): Likewise. * tests/xmconfigtest.c (mymain): Likewise. * tests/xml2sexprtest.c (mymain): Likewise. * tests/xml2vmxtest.c (mymain): Likewise.
2011-04-29 16:21:20 +00:00
mymain(void)
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
{
int ret = 0;
Introduce a virQEMUDriverConfigPtr object Currently the virQEMUDriverPtr struct contains an wide variety of data with varying access needs. Move all the static config data into a dedicated virQEMUDriverConfigPtr object. The only locking requirement is to hold the driver lock, while obtaining an instance of virQEMUDriverConfigPtr. Once a reference is held on the config object, it can be used completely lockless since it is immutable. NB, not all APIs correctly hold the driver lock while getting a reference to the config object in this patch. This is safe for now since the config is never updated on the fly. Later patches will address this fully. Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-01-10 21:03:14 +00:00
driver.config = virQEMUDriverConfigNew(false);
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
if ((driver.caps = testQemuCapsInit()) == NULL)
return EXIT_FAILURE;
virCaps: get rid of defaultDiskDriverName This patch removes the defaultDiskDriverName from the virCaps structure. This particular default value is used only in the qemu driver so this patch uses the recently added callback to fill the driver name if it's needed instead of propagating it through virCaps.
2013-03-11 09:24:29 +00:00
if (!(driver.xmlopt = virQEMUDriverCreateXMLConf(&driver)))
virCaps: conf: start splitting out irrelevat data The virCaps structure gathered a ton of irrelevant data over time that. The original reason is that it was propagated to the XML parser functions. This patch aims to create a new data structure virDomainXMLConf that will contain immutable data that are used by the XML parser. This will allow two things we need: 1) Get rid of the stuff from virCaps 2) Allow us to add callbacks to check and add driver specific stuff after domain XML is parsed. This first attempt removes pointers to private data allocation functions to this new structure and update all callers and function that require them.
2013-03-05 15:17:24 +00:00
return EXIT_FAILURE;
Remove test case average timing The test case average timing code has not been used by any test case ever. Delete it to remove complexity. Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-09-20 18:13:35 +00:00
# define DO_TEST_FULL(name, extraFlags, migrateFrom) \
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
do { \
const struct testInfo info = { name, extraFlags, migrateFrom }; \
if (virtTestRun("QEMU ARGV-2-XML " name, \
Remove test case average timing The test case average timing code has not been used by any test case ever. Delete it to remove complexity. Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-09-20 18:13:35 +00:00
testCompareXMLToArgvHelper, &info) < 0) \
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
ret = -1; \
} while (0)
tests: clean up qemuargv2xmltest Since commit 107a7bd06bc, the extraFlags argument was unused. * tests/qemuargv2xmltest.c (DO_TEST): Drop extraFlags argument. Adjust all callers.
2010-09-10 02:32:50 +00:00
# define DO_TEST(name) \
DO_TEST_FULL(name, 0, NULL)
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00: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");
/* Can't roundtrip vcpu cpuset attribute */
qemu: Rename QEMUD_CMD_FLAG_* to QEMU_CAPS_* The new names comply more with the fact that they are all members of enum qemuCapsFlags.
2011-02-07 14:54:08 +00:00
/*DO_TEST("minimal", QEMU_CAPS_NAME);*/
tests: Add tests for dump-core option
2012-08-15 08:16:36 +00:00
DO_TEST("machine-core-on");
DO_TEST("machine-core-off");
tests: clean up qemuargv2xmltest Since commit 107a7bd06bc, the extraFlags argument was unused. * tests/qemuargv2xmltest.c (DO_TEST): Drop extraFlags argument. Adjust all callers.
2010-09-10 02:32:50 +00:00
DO_TEST("boot-cdrom");
DO_TEST("boot-network");
DO_TEST("boot-floppy");
qemu: parse and create -cpu ...,-kvmclock QEMU supports a bunch of CPUID features that are tied to the kvm CPUID nodes rather than the processor's. They are "kvmclock", "kvm_nopiodelay", "kvm_mmu", "kvm_asyncpf". These are not known to libvirt and their CPUID leaf might move if (for example) the Hyper-V extensions are enabled. Hence their handling would anyway require some special-casing. However, among these the most useful is kvmclock; an additional "property" of this feature is that a <timer> element is a better model than a CPUID feature. Although, creating part of the -cpu command-line from something other than the <cpu> XML element introduces some ugliness. Reviewed-by: Jiri Denemark <jdenemar@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2012-01-27 13:49:52 +00:00
DO_TEST("kvmclock");
/* This needs <emulator>./qemu.sh</emulator> which doesn't work here. */
/*DO_TEST("cpu-kvmclock");*/
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
/* Can't roundtrip xenner arch */
tests: clean up qemuargv2xmltest Since commit 107a7bd06bc, the extraFlags argument was unused. * tests/qemuargv2xmltest.c (DO_TEST): Drop extraFlags argument. Adjust all callers.
2010-09-10 02:32:50 +00:00
/*DO_TEST("bootloader");*/
QEMU Tests for reboot-timeout
2012-09-18 10:32:07 +00:00
DO_TEST("reboot-timeout-enabled");
DO_TEST("reboot-timeout-disabled");
tests: clean up qemuargv2xmltest Since commit 107a7bd06bc, the extraFlags argument was unused. * tests/qemuargv2xmltest.c (DO_TEST): Drop extraFlags argument. Adjust all callers.
2010-09-10 02:32:50 +00:00
DO_TEST("clock-utc");
DO_TEST("clock-localtime");
DO_TEST("disk-cdrom");
DO_TEST("disk-cdrom-empty");
DO_TEST("disk-floppy");
DO_TEST("disk-many");
DO_TEST("disk-virtio");
DO_TEST("disk-xenvbd");
DO_TEST("disk-drive-boot-disk");
DO_TEST("disk-drive-boot-cdrom");
DO_TEST("disk-drive-fmt-qcow");
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
/* Can't roundtrip shareable+cache mode option */
tests: clean up qemuargv2xmltest Since commit 107a7bd06bc, the extraFlags argument was unused. * tests/qemuargv2xmltest.c (DO_TEST): Drop extraFlags argument. Adjust all callers.
2010-09-10 02:32:50 +00:00
/*DO_TEST("disk-drive-shared");*/
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
/* Can't roundtrip v1 writethrough option */
tests: clean up qemuargv2xmltest Since commit 107a7bd06bc, the extraFlags argument was unused. * tests/qemuargv2xmltest.c (DO_TEST): Drop extraFlags argument. Adjust all callers.
2010-09-10 02:32:50 +00:00
/*DO_TEST("disk-drive-cache-v1-wt");*/
DO_TEST("disk-drive-cache-v1-wb");
DO_TEST("disk-drive-cache-v1-none");
DO_TEST("disk-drive-error-policy-stop");
DO_TEST("disk-drive-error-policy-enospace");
qemu: add separate rerror_policy for disk errors Previously libvirt's disk device XML only had a single attribute, error_policy, to control both read and write error policy, but qemu has separate options for controlling read and write. In one case (enospc) a policy is allowed for write errors but not read errors. This patch adds a separate attribute that sets only the read error policy. If just error_policy is set, it will apply to both read and write error policy (previous behavior), but if the new rerror_policy attribute is set, it will override error_policy for read errors only. Possible values for rerror_policy are "stop", "report", and "ignore" ("report" is the qemu-controlled default for rerror_policy when error_policy isn't specified). For consistency, the value "report" has been added to the possible values for error_policy as well.
2011-10-04 18:17:06 +00:00
DO_TEST("disk-drive-error-policy-wreport-rignore");
tests: clean up qemuargv2xmltest Since commit 107a7bd06bc, the extraFlags argument was unused. * tests/qemuargv2xmltest.c (DO_TEST): Drop extraFlags argument. Adjust all callers.
2010-09-10 02:32:50 +00:00
DO_TEST("disk-drive-cache-v2-wt");
DO_TEST("disk-drive-cache-v2-wb");
DO_TEST("disk-drive-cache-v2-none");
Add directsync cache mode support for disk driver Newer QEMU introduced cache=directsync for -drive, this patchset is to expose it in libvirt layer. * Introduced a new QEMU capability flag ($prefix_CACHE_DIRECTSYNC), As even $prefix_CACHE_V2 is set, we can't known if directsync is supported.
2011-09-02 13:36:58 +00:00
DO_TEST("disk-drive-cache-directsync");
Add unsafe cache mode support for disk driver QEMU 0.13 introduced cache=unsafe for -drive, this patch exposes it in the libvirt layer. * Introduced a new QEMU capability flag ($prefix_CACHE_UNSAFE), as even if $prefix_CACHE_V2 is set, we can't know if unsafe is supported. * Improved the reliability of qemu cache type detection.
2011-09-22 19:33:47 +00:00
DO_TEST("disk-drive-cache-unsafe");
tests: Add tests for network disks Signed-off-by: Josh Durgin <joshd@hq.newdream.net>
2010-12-07 19:57:33 +00:00
DO_TEST("disk-drive-network-nbd");
qemu: support named nbd exports These are supported by nbd-server and by the NBD server that QEMU embeds for live image access. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Eric Blake <eblake@redhat.com>
2013-02-25 17:44:23 +00:00
DO_TEST("disk-drive-network-nbd-export");
qemu: support URI syntax for NBD QEMU 1.3 and newer support an alternative URI-based syntax to specify the location of an NBD server. Libvirt can keep on using the old syntax in general, but only the URI syntax supports IPv6 addresses. The URI syntax also supports relative paths to Unix sockets. These should never be used but aren't explicitly blocked either by the parser, so support it just in case. The URI syntax is intentionally compatible with Gluster's, and the code can be reused. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Eric Blake <eblake@redhat.com>
2013-02-25 17:44:25 +00:00
DO_TEST("disk-drive-network-nbd-ipv6");
DO_TEST("disk-drive-network-nbd-ipv6-export");
qemu: support NBD with Unix sockets This reuses the XML format that was introduced for Gluster. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Eric Blake <eblake@redhat.com>
2013-02-25 17:44:24 +00:00
DO_TEST("disk-drive-network-nbd-unix");
qemu: add support for libiscsi libiscsi provides a userspace iSCSI initiator. The main advantage over the kernel initiator is that it is very easy to provide different initiator names for VMs on the same host. Thus libiscsi supports usage of persistent reservations in the VM, which otherwise would only be possible with NPIV. libiscsi uses "iscsi" as the scheme, not "iscsi+tcp". We can change this in the tests (while remaining backwards-compatible manner, because QEMU uses TCP as the default transport for both Gluster and NBD). Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2013-03-21 11:53:49 +00:00
DO_TEST("disk-drive-network-iscsi");
tests: Add tests for gluster protocol based network disks support Signed-off-by: Harsh Prateek Bora <harsh@linux.vnet.ibm.com>
2012-11-22 18:10:41 +00:00
DO_TEST("disk-drive-network-gluster");
tests: Add tests for network disks Signed-off-by: Josh Durgin <joshd@hq.newdream.net>
2010-12-07 19:57:33 +00:00
DO_TEST("disk-drive-network-rbd");
qemu: escape ipv6 for rbd network disk hosts Hosts for rbd are ceph monitor daemons. These have fixed IP addresses, so they are often referenced by IP rather than hostname for convenience, or to avoid relying on DNS. Using IPv4 addresses as the host name works already, but IPv6 addresses require rbd-specific escaping because the colon is used as an option separator in the string passed to qemu. Escape these colons, and enclose the IPv6 address in square brackets so it is distinguished from the port, which is currently mandatory. Acked-by: Osier Yang <jyang@redhat.com> Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-01-25 02:45:31 +00:00
DO_TEST("disk-drive-network-rbd-ipv6");
qemu/rbd: improve rbd device specification This improves the support for qemu rbd devices by adding support for a few key features (e.g., authentication) and cleaning up the way in which rbd configuration options are passed to qemu. An <auth> member of the disk source xml specifies how librbd should authenticate. The username attribute is the Ceph/RBD user to authenticate as. The usage or uuid attributes specify which secret to use. Usage is an arbitrary identifier local to libvirt. The old RBD support relied on setting an environment variable to communicate information to qemu/librbd. Instead, pass those options explicitly to qemu. Update the qemu argument parsing and tests accordingly. Signed-off-by: Sage Weil <sage@newdream.net> Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
2011-11-01 01:29:07 +00:00
/* older format using CEPH_ARGS env var */
DO_TEST("disk-drive-network-rbd-ceph-env");
tests: Add tests for network disks Signed-off-by: Josh Durgin <joshd@hq.newdream.net>
2010-12-07 19:57:33 +00:00
DO_TEST("disk-drive-network-sheepdog");
tests: clean up qemuargv2xmltest Since commit 107a7bd06bc, the extraFlags argument was unused. * tests/qemuargv2xmltest.c (DO_TEST): Drop extraFlags argument. Adjust all callers.
2010-09-10 02:32:50 +00:00
DO_TEST("disk-usb");
DO_TEST("graphics-vnc");
qemu: Allow serving VNC over a unix domain socket QEMU supports serving VNC over a unix domain socket rather than traditional TCP host/port. This is specified with: <graphics type='vnc' socket='/foo/bar/baz'/> This provides better security access control than VNC listening on 127.0.0.1, but will cause issues with tools that rely on the lax security (virt-manager in fedora runs as regular user by default, and wouldn't be able to access a socket owned by 'qemu' or 'root'). Also not currently supported by any clients, though I have patches for virt-manager, and virt-viewer should be simple to update. v2: schema: Make listen vs. socket a <choice>
2011-01-07 21:03:07 +00:00
DO_TEST("graphics-vnc-socket");
qemu: Add VNC WebSocket support Adding a VNC WebSocket support for QEMU driver. This functionality is in upstream qemu from commit described as v1.3.0-982-g7536ee4, so the capability is being recognized based on QEMU version for now.
2013-04-30 14:26:43 +00:00
DO_TEST("graphics-vnc-websocket");
qemu: add ', share=<policy>' to qemu commandline example: qemu ${otherargs} \ -vnc 127.0.0.1:0,share=allow-exclusive
2013-05-21 14:31:49 +00:00
DO_TEST("graphics-vnc-policy");
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
tests: clean up qemuargv2xmltest Since commit 107a7bd06bc, the extraFlags argument was unused. * tests/qemuargv2xmltest.c (DO_TEST): Drop extraFlags argument. Adjust all callers.
2010-09-10 02:32:50 +00:00
DO_TEST("graphics-vnc-sasl");
DO_TEST("graphics-vnc-tls");
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
tests: clean up qemuargv2xmltest Since commit 107a7bd06bc, the extraFlags argument was unused. * tests/qemuargv2xmltest.c (DO_TEST): Drop extraFlags argument. Adjust all callers.
2010-09-10 02:32:50 +00:00
DO_TEST("graphics-sdl");
DO_TEST("graphics-sdl-fullscreen");
DO_TEST("nographics-vga");
DO_TEST("input-usbmouse");
DO_TEST("input-usbtablet");
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
/* Can't rountrip xenner arch */
tests: clean up qemuargv2xmltest Since commit 107a7bd06bc, the extraFlags argument was unused. * tests/qemuargv2xmltest.c (DO_TEST): Drop extraFlags argument. Adjust all callers.
2010-09-10 02:32:50 +00:00
/*DO_TEST("input-xen");*/
DO_TEST("misc-acpi");
tests: Add tests for qemu S3/S4 state configuration Few tests were added which are checking whether the parsing of the xml and command-line arguments is working and compatible with each other.
2012-08-02 10:18:16 +00:00
DO_TEST("misc-disable-s3");
DO_TEST("misc-disable-suspends");
DO_TEST("misc-enable-s4");
tests: clean up qemuargv2xmltest Since commit 107a7bd06bc, the extraFlags argument was unused. * tests/qemuargv2xmltest.c (DO_TEST): Drop extraFlags argument. Adjust all callers.
2010-09-10 02:32:50 +00:00
DO_TEST("misc-no-reboot");
DO_TEST("misc-uuid");
DO_TEST("net-user");
DO_TEST("net-virtio");
DO_TEST("net-eth");
DO_TEST("net-eth-ifname");
DO_TEST("serial-vc");
DO_TEST("serial-pty");
DO_TEST("serial-dev");
DO_TEST("serial-file");
DO_TEST("serial-unix");
DO_TEST("serial-tcp");
DO_TEST("serial-udp");
DO_TEST("serial-tcp-telnet");
DO_TEST("serial-many");
DO_TEST("parallel-tcp");
DO_TEST("console-compat");
DO_TEST("sound");
DO_TEST("watchdog");
DO_TEST("hostdev-usb-address");
DO_TEST("hostdev-pci-address");
vcpu: improve vcpu support in qemu command line * src/qemu/qemu_conf.c (qemuParseCommandLineSmp): Distinguish between vcpus and maxvcpus, for new enough qemu. * tests/qemuargv2xmltest.c (mymain): Add new test. * tests/qemuxml2argvtest.c (mymain): Likewise. * tests/qemuxml2xmltest.c (mymain): Likewise. * tests/qemuxml2argvdata/qemuxml2argv-smp.args: New file.
2010-09-29 21:58:47 +00:00
DO_TEST("smp");
qemu: Add support for HyperV Enlightenment feature "relaxed" This patch adds QEMU support for the "relaxed" feature implemented by previous patch.
2012-10-17 12:55:18 +00:00
DO_TEST("hyperv");
qemu: Add command line builder and parser for NVRAM. This patch is to add command line builder and parser for NVRAM device, and add test cases. Signed-off-by: Li Zhang <zhlcindy@linux.vnet.ibm.com>
2013-04-25 08:46:04 +00:00
DO_TEST("pseries-nvram");
qemu: New XML to disable memory merge at guest startup QEMU introduced command line "-mem-merge=on|off" (defaults to on) to enable/disable the memory merge (KSM) at guest startup. This exposes it by new XML: <memoryBacking> <nosharepages/> </memoryBacking> The XML tag is same with what we used internally for old RHEL.
2013-05-14 05:25:50 +00:00
DO_TEST("nosharepages");
tests: clean up qemuargv2xmltest Since commit 107a7bd06bc, the extraFlags argument was unused. * tests/qemuargv2xmltest.c (DO_TEST): Drop extraFlags argument. Adjust all callers.
2010-09-10 02:32:50 +00:00
DO_TEST_FULL("restore-v1", 0, "stdio");
DO_TEST_FULL("restore-v2", 0, "stdio");
DO_TEST_FULL("restore-v2", 0, "exec:cat");
DO_TEST_FULL("migrate", 0, "tcp:10.0.0.1:5000");
tests: silence qemuargv2xmltest noise Before this patch, the testsuite was noisy: TEST: qemuargv2xmltest ........................................ 40 ................20:41:28.046: warning : qemuParseCommandLine:6565 : unknown QEMU argument '-unknown', adding to the qemu namespace 20:41:28.046: warning : qemuParseCommandLine:6565 : unknown QEMU argument 'parameter', adding to the qemu namespace . 57 OK PASS: qemuargv2xmltest It's not a real failure (which is why the test was completing successfully), so much as an intentional warning to the user that use of the qemu namespace has the potential for undefined effects that leaked through the default logging behavior. After this patch series, all tests can access any logged data, and this particular test can explicitly check for the presence or absence of the warning, such that the test output becomes: TEST: qemuargv2xmltest ........................................ 40 ................. 57 OK PASS: qemuargv2xmltest * tests/testutils.h (virtTestLogContentAndReset): New prototype. * tests/testutils.c (struct virtTestLogData): New struct. (virtTestLogOutput, virtTestLogClose, virtTestLogContentAndReset): New functions. (virtTestMain): Always capture log data emitted during tests. * tests/qemuargv2xmltest.c (testCompareXMLToArgvHelper, mymain): Use flag to mark which tests expect noisy stderr. (testCompareXMLToArgvFiles): Add parameter to test whether stderr was appropriately silent.
2010-09-10 16:25:49 +00:00
DO_TEST_FULL("qemu-ns-no-env", 1, NULL);
Add tests for the new Qemu namespace XML. Thanks to DV for knocking together the Relax-NG changes quickly for me. Changes since v1: - Change the domain.rng to correspond to the new schema - Don't allocate caps->ns in testQemuCapsInit since it is a static table Changes since v2: - Change domain.rng to add restrictions on allowed environment names Changes since v3: - Remove a bogus comment in the tests Signed-off-by: Chris Lalancette <clalance@redhat.com>
2010-04-20 21:22:49 +00:00
Introduce a virQEMUDriverConfigPtr object Currently the virQEMUDriverPtr struct contains an wide variety of data with varying access needs. Move all the static config data into a dedicated virQEMUDriverConfigPtr object. The only locking requirement is to hold the driver lock, while obtaining an instance of virQEMUDriverConfigPtr. Once a reference is held on the config object, it can be used completely lockless since it is immutable. NB, not all APIs correctly hold the driver lock while getting a reference to the config object in this patch. This is safe for now since the config is never updated on the fly. Later patches will address this fully. Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-01-10 21:03:14 +00:00
virObjectUnref(driver.config);
Turn virCapabilities into a virObject To enable virCapabilities instances to be reference counted, turn it into a virObject. All cases of virCapabilitiesFree turn into virObjectUnref Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
2013-02-01 12:26:18 +00:00
virObjectUnref(driver.caps);
maint: Rename xmlconf to xmlopt and virDomainXMLConfig to virDomainXMLOption This patch is the result of running: for i in $(git ls-files | grep -v html | grep -v \.po$ ); do sed -i -e "s/virDomainXMLConf/virDomainXMLOption/g" -e "s/xmlconf/xmlopt/g" $i done and a few manual tweaks.
2013-03-31 18:03:42 +00:00
virObjectUnref(driver.xmlopt);
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
Cleanup for a return statement in source files Return statements with parameter enclosed in parentheses were modified and parentheses were removed. The whole change was scripted, here is how: List of files was obtained using this command: git grep -l -e '\<return\s*([^()]*\(([^()]*)[^()]*\)*)\s*;' | \ grep -e '\.[ch]$' -e '\.py$' Found files were modified with this command: sed -i -e \ 's_^\(.*\<return\)\s*(\(\([^()]*([^()]*)[^()]*\)*\))\s*\(;.*$\)_\1 \2\4_' \ -e 's_^\(.*\<return\)\s*(\([^()]*\))\s*\(;.*$\)_\1 \2\3_' Then checked for nonsense. The whole command looks like this: git grep -l -e '\<return\s*([^()]*\(([^()]*)[^()]*\)*)\s*;' | \ grep -e '\.[ch]$' -e '\.py$' | xargs sed -i -e \ 's_^\(.*\<return\)\s*(\(\([^()]*([^()]*)[^()]*\)*\))\s*\(;.*$\)_\1 \2\4_' \ -e 's_^\(.*\<return\)\s*(\([^()]*\))\s*\(;.*$\)_\1 \2\3_'
2012-03-22 11:33:35 +00:00
return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE;
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
}
VIRT_TEST_MAIN(mymain)
#else
tests: Unify style of test skipping code Prefer 'return EXIT_AM_SKIP' over 'exit(EXIT_AM_SKIP)'. Prefer 'int main(void)' over 'int main(int argc, char **argv)'. Fix mymain signature in commandtest and nodeinfotest.
2011-07-28 15:48:12 +00:00
int
main(void)
{
return EXIT_AM_SKIP;
}
Test case for QEMU driver ARGV -> XML conversion
2009-05-21 14:22:51 +00:00
#endif /* WITH_QEMU */
Reference in New Issue Copy Permalink