openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
libvirt/tests/qemuhelptest.c

497 lines
15 KiB
C
Raw Normal View History

Add qemu help string parsing tests Signed-off-by: Mark McLoughlin <markmc@redhat.com>
2009-06-11 22:17:42 +08:00
#include <config.h>
#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-10 02:22:22 +08:00
# include <stdio.h>
# include <stdlib.h>
Add qemu help string parsing tests Signed-off-by: Mark McLoughlin <markmc@redhat.com>
2009-06-11 22:17:42 +08:00
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-10 02:22:22 +08:00
# include "testutils.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-18 00:41:51 +08:00
# include "qemu/qemu_capabilities.h"
qemu: improve device flag parsing * src/qemu/qemu_capabilities.h (qemuCapsParseDeviceStr): New prototype. * src/qemu/qemu_capabilities.c (qemuCapsParsePCIDeviceStrs) Rename and split... (qemuCapsExtractDeviceStr, qemuCapsParseDeviceStr): ...to make it easier to add and test device-specific checks. (qemuCapsExtractVersionInfo): Update caller. * tests/qemuhelptest.c (testHelpStrParsing): Also test parsing of device-related flags. (mymain): Update expected flags. * tests/qemuhelpdata/qemu-0.12.1-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.3-device: New file. * tests/qemuhelpdata/qemu-kvm-0.13.0-device: New file.
2011-01-14 00:09:15 +08:00
# include "memory.h"
Add qemu help string parsing tests Signed-off-by: Mark McLoughlin <markmc@redhat.com>
2009-06-11 22:17:42 +08:00
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-10 02:22:22 +08:00
# define MAX_HELP_OUTPUT_SIZE 1024*64
Add qemu help string parsing tests Signed-off-by: Mark McLoughlin <markmc@redhat.com>
2009-06-11 22:17:42 +08:00
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 21:06:56 +08:00
unsigned long long flags;
unsigned int version;
unsigned int is_kvm;
unsigned int kvm_version;
Add qemu help string parsing tests Signed-off-by: Mark McLoughlin <markmc@redhat.com>
2009-06-11 22:17:42 +08:00
};
static char *progname;
static char *abs_srcdir;
qemu_conf: fix flag value (gdb) p/x QEMUD_CMD_FLAG_VNET_HOST $7 = 0xffffffff80000000 Oops - that meant we were incorrectly setting QEMU_CMD_FLAG_RTC_TD_HACK for qemu-kvm-0.12.3 (and probably botching a few other settings as well). Fixes Red Hat BZ#592070 * src/qemu/qemu_conf.h (QEMUD_CMD_FLAG_VNET_HOST): Avoid sign extension. * tests/qemuhelpdata/qemu-kvm-0.12.3: New file. * tests/qemuhelptest.c (mymain): Add another case.
2010-05-13 11:07:00 +08:00
static void printMismatchedFlags(unsigned long long got,
unsigned long long expect)
Probe for -device and use -nodefaults Probe for the new -device flag and if available set the -nodefaults flag, instead of using -net none, -serial none or -parallel none. Other device types will be converted to use -device in later patches. The -nodefaults flag will help avoid unwelcome surprises from future QEMU releases * src/qemu/qemu_conf.c: Probe for -device. Add -nodefaults flag. Remove -net none, -serial none or -parallel none * src/qemu/qemu_conf.h: Define QEMU_CMD_FLAG_DEVICE * tests/qemuhelpdata/qemu-0.12.1: New data file for 0.12.1 QEMU * tests/qemuhelptest.c: Test feature extraction from 0.12.1 QEMU
2009-12-22 04:36:32 +08:00
{
int i;
qemu_conf: fix flag value (gdb) p/x QEMUD_CMD_FLAG_VNET_HOST $7 = 0xffffffff80000000 Oops - that meant we were incorrectly setting QEMU_CMD_FLAG_RTC_TD_HACK for qemu-kvm-0.12.3 (and probably botching a few other settings as well). Fixes Red Hat BZ#592070 * src/qemu/qemu_conf.h (QEMUD_CMD_FLAG_VNET_HOST): Avoid sign extension. * tests/qemuhelpdata/qemu-kvm-0.12.3: New file. * tests/qemuhelptest.c (mymain): Add another case.
2010-05-13 11:07:00 +08:00
for (i = 0 ; i < (sizeof(got)*CHAR_BIT) ; i++) {
unsigned long long gotFlag = (got & (1LL << i));
unsigned long long expectFlag = (expect & (1LL << i));
Probe for -device and use -nodefaults Probe for the new -device flag and if available set the -nodefaults flag, instead of using -net none, -serial none or -parallel none. Other device types will be converted to use -device in later patches. The -nodefaults flag will help avoid unwelcome surprises from future QEMU releases * src/qemu/qemu_conf.c: Probe for -device. Add -nodefaults flag. Remove -net none, -serial none or -parallel none * src/qemu/qemu_conf.h: Define QEMU_CMD_FLAG_DEVICE * tests/qemuhelpdata/qemu-0.12.1: New data file for 0.12.1 QEMU * tests/qemuhelptest.c: Test feature extraction from 0.12.1 QEMU
2009-12-22 04:36:32 +08:00
if (gotFlag && !expectFlag)
fprintf(stderr, "Extra flag %i\n", i);
if (!gotFlag && expectFlag)
fprintf(stderr, "Missing flag %i\n", i);
}
}
Add qemu help string parsing tests Signed-off-by: Mark McLoughlin <markmc@redhat.com>
2009-06-11 22:17:42 +08:00
static int testHelpStrParsing(const void *data)
{
const struct testInfo *info = data;
qemu: improve device flag parsing * src/qemu/qemu_capabilities.h (qemuCapsParseDeviceStr): New prototype. * src/qemu/qemu_capabilities.c (qemuCapsParsePCIDeviceStrs) Rename and split... (qemuCapsExtractDeviceStr, qemuCapsParseDeviceStr): ...to make it easier to add and test device-specific checks. (qemuCapsExtractVersionInfo): Update caller. * tests/qemuhelptest.c (testHelpStrParsing): Also test parsing of device-related flags. (mymain): Update expected flags. * tests/qemuhelpdata/qemu-0.12.1-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.3-device: New file. * tests/qemuhelpdata/qemu-kvm-0.13.0-device: New file.
2011-01-14 00:09:15 +08:00
char *path = NULL;
Add qemu help string parsing tests Signed-off-by: Mark McLoughlin <markmc@redhat.com>
2009-06-11 22:17:42 +08:00
char helpStr[MAX_HELP_OUTPUT_SIZE];
char *help = &(helpStr[0]);
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 21:06:56 +08:00
unsigned int version, is_kvm, kvm_version;
unsigned long long flags;
qemu: improve device flag parsing * src/qemu/qemu_capabilities.h (qemuCapsParseDeviceStr): New prototype. * src/qemu/qemu_capabilities.c (qemuCapsParsePCIDeviceStrs) Rename and split... (qemuCapsExtractDeviceStr, qemuCapsParseDeviceStr): ...to make it easier to add and test device-specific checks. (qemuCapsExtractVersionInfo): Update caller. * tests/qemuhelptest.c (testHelpStrParsing): Also test parsing of device-related flags. (mymain): Update expected flags. * tests/qemuhelpdata/qemu-0.12.1-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.3-device: New file. * tests/qemuhelpdata/qemu-kvm-0.13.0-device: New file.
2011-01-14 00:09:15 +08:00
int ret = -1;
Add qemu help string parsing tests Signed-off-by: Mark McLoughlin <markmc@redhat.com>
2009-06-11 22:17:42 +08:00
qemu: improve device flag parsing * src/qemu/qemu_capabilities.h (qemuCapsParseDeviceStr): New prototype. * src/qemu/qemu_capabilities.c (qemuCapsParsePCIDeviceStrs) Rename and split... (qemuCapsExtractDeviceStr, qemuCapsParseDeviceStr): ...to make it easier to add and test device-specific checks. (qemuCapsExtractVersionInfo): Update caller. * tests/qemuhelptest.c (testHelpStrParsing): Also test parsing of device-related flags. (mymain): Update expected flags. * tests/qemuhelpdata/qemu-0.12.1-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.3-device: New file. * tests/qemuhelpdata/qemu-kvm-0.13.0-device: New file.
2011-01-14 00:09:15 +08:00
if (virAsprintf(&path, "%s/qemuhelpdata/%s", abs_srcdir, info->name) < 0)
return -1;
Add qemu help string parsing tests Signed-off-by: Mark McLoughlin <markmc@redhat.com>
2009-06-11 22:17:42 +08:00
if (virtTestLoadFile(path, &help, MAX_HELP_OUTPUT_SIZE) < 0)
qemu: improve device flag parsing * src/qemu/qemu_capabilities.h (qemuCapsParseDeviceStr): New prototype. * src/qemu/qemu_capabilities.c (qemuCapsParsePCIDeviceStrs) Rename and split... (qemuCapsExtractDeviceStr, qemuCapsParseDeviceStr): ...to make it easier to add and test device-specific checks. (qemuCapsExtractVersionInfo): Update caller. * tests/qemuhelptest.c (testHelpStrParsing): Also test parsing of device-related flags. (mymain): Update expected flags. * tests/qemuhelpdata/qemu-0.12.1-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.3-device: New file. * tests/qemuhelpdata/qemu-kvm-0.13.0-device: New file.
2011-01-14 00:09:15 +08:00
goto cleanup;
Add qemu help string parsing tests Signed-off-by: Mark McLoughlin <markmc@redhat.com>
2009-06-11 22:17:42 +08:00
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-18 00:41:51 +08:00
if (qemuCapsParseHelpStr("QEMU", help, &flags,
&version, &is_kvm, &kvm_version) == -1)
qemu: improve device flag parsing * src/qemu/qemu_capabilities.h (qemuCapsParseDeviceStr): New prototype. * src/qemu/qemu_capabilities.c (qemuCapsParsePCIDeviceStrs) Rename and split... (qemuCapsExtractDeviceStr, qemuCapsParseDeviceStr): ...to make it easier to add and test device-specific checks. (qemuCapsExtractVersionInfo): Update caller. * tests/qemuhelptest.c (testHelpStrParsing): Also test parsing of device-related flags. (mymain): Update expected flags. * tests/qemuhelpdata/qemu-0.12.1-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.3-device: New file. * tests/qemuhelpdata/qemu-kvm-0.13.0-device: New file.
2011-01-14 00:09:15 +08:00
goto cleanup;
qemu: Use helper functions for handling cmd line capabilities Three new functions (qemuCapsSet, qemuCapsClear, and qemuCapsGet) were introduced replacing direct bit operations.
2011-02-08 22:08:12 +08:00
if (qemuCapsGet(info->flags, QEMU_CAPS_DEVICE)) {
qemu: improve device flag parsing * src/qemu/qemu_capabilities.h (qemuCapsParseDeviceStr): New prototype. * src/qemu/qemu_capabilities.c (qemuCapsParsePCIDeviceStrs) Rename and split... (qemuCapsExtractDeviceStr, qemuCapsParseDeviceStr): ...to make it easier to add and test device-specific checks. (qemuCapsExtractVersionInfo): Update caller. * tests/qemuhelptest.c (testHelpStrParsing): Also test parsing of device-related flags. (mymain): Update expected flags. * tests/qemuhelpdata/qemu-0.12.1-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.3-device: New file. * tests/qemuhelpdata/qemu-kvm-0.13.0-device: New file.
2011-01-14 00:09:15 +08:00
VIR_FREE(path);
if (virAsprintf(&path, "%s/qemuhelpdata/%s-device", abs_srcdir,
info->name) < 0)
goto cleanup;
if (virtTestLoadFile(path, &help, MAX_HELP_OUTPUT_SIZE) < 0)
goto cleanup;
if (qemuCapsParseDeviceStr(help, &flags) < 0)
goto cleanup;
}
Add qemu help string parsing tests Signed-off-by: Mark McLoughlin <markmc@redhat.com>
2009-06-11 22:17:42 +08:00
if (flags != info->flags) {
qemu: improve device flag parsing * src/qemu/qemu_capabilities.h (qemuCapsParseDeviceStr): New prototype. * src/qemu/qemu_capabilities.c (qemuCapsParsePCIDeviceStrs) Rename and split... (qemuCapsExtractDeviceStr, qemuCapsParseDeviceStr): ...to make it easier to add and test device-specific checks. (qemuCapsExtractVersionInfo): Update caller. * tests/qemuhelptest.c (testHelpStrParsing): Also test parsing of device-related flags. (mymain): Update expected flags. * tests/qemuhelpdata/qemu-0.12.1-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.3-device: New file. * tests/qemuhelpdata/qemu-kvm-0.13.0-device: New file.
2011-01-14 00:09:15 +08:00
fprintf(stderr,
"Computed flags do not match: got 0x%llx, expected 0x%llx\n",
Add qemu help string parsing tests Signed-off-by: Mark McLoughlin <markmc@redhat.com>
2009-06-11 22:17:42 +08:00
flags, info->flags);
Probe for -device and use -nodefaults Probe for the new -device flag and if available set the -nodefaults flag, instead of using -net none, -serial none or -parallel none. Other device types will be converted to use -device in later patches. The -nodefaults flag will help avoid unwelcome surprises from future QEMU releases * src/qemu/qemu_conf.c: Probe for -device. Add -nodefaults flag. Remove -net none, -serial none or -parallel none * src/qemu/qemu_conf.h: Define QEMU_CMD_FLAG_DEVICE * tests/qemuhelpdata/qemu-0.12.1: New data file for 0.12.1 QEMU * tests/qemuhelptest.c: Test feature extraction from 0.12.1 QEMU
2009-12-22 04:36:32 +08:00
if (getenv("VIR_TEST_DEBUG"))
printMismatchedFlags(flags, info->flags);
qemu: improve device flag parsing * src/qemu/qemu_capabilities.h (qemuCapsParseDeviceStr): New prototype. * src/qemu/qemu_capabilities.c (qemuCapsParsePCIDeviceStrs) Rename and split... (qemuCapsExtractDeviceStr, qemuCapsParseDeviceStr): ...to make it easier to add and test device-specific checks. (qemuCapsExtractVersionInfo): Update caller. * tests/qemuhelptest.c (testHelpStrParsing): Also test parsing of device-related flags. (mymain): Update expected flags. * tests/qemuhelpdata/qemu-0.12.1-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.3-device: New file. * tests/qemuhelpdata/qemu-kvm-0.13.0-device: New file.
2011-01-14 00:09:15 +08:00
goto cleanup;
Add qemu help string parsing tests Signed-off-by: Mark McLoughlin <markmc@redhat.com>
2009-06-11 22:17:42 +08:00
}
if (version != info->version) {
fprintf(stderr, "Parsed versions do not match: got %u, expected %u\n",
version, info->version);
qemu: improve device flag parsing * src/qemu/qemu_capabilities.h (qemuCapsParseDeviceStr): New prototype. * src/qemu/qemu_capabilities.c (qemuCapsParsePCIDeviceStrs) Rename and split... (qemuCapsExtractDeviceStr, qemuCapsParseDeviceStr): ...to make it easier to add and test device-specific checks. (qemuCapsExtractVersionInfo): Update caller. * tests/qemuhelptest.c (testHelpStrParsing): Also test parsing of device-related flags. (mymain): Update expected flags. * tests/qemuhelpdata/qemu-0.12.1-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.3-device: New file. * tests/qemuhelpdata/qemu-kvm-0.13.0-device: New file.
2011-01-14 00:09:15 +08:00
goto cleanup;
Add qemu help string parsing tests Signed-off-by: Mark McLoughlin <markmc@redhat.com>
2009-06-11 22:17:42 +08:00
}
if (is_kvm != info->is_kvm) {
qemu: improve device flag parsing * src/qemu/qemu_capabilities.h (qemuCapsParseDeviceStr): New prototype. * src/qemu/qemu_capabilities.c (qemuCapsParsePCIDeviceStrs) Rename and split... (qemuCapsExtractDeviceStr, qemuCapsParseDeviceStr): ...to make it easier to add and test device-specific checks. (qemuCapsExtractVersionInfo): Update caller. * tests/qemuhelptest.c (testHelpStrParsing): Also test parsing of device-related flags. (mymain): Update expected flags. * tests/qemuhelpdata/qemu-0.12.1-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.3-device: New file. * tests/qemuhelpdata/qemu-kvm-0.13.0-device: New file.
2011-01-14 00:09:15 +08:00
fprintf(stderr,
"Parsed is_kvm flag does not match: got %u, expected %u\n",
Add qemu help string parsing tests Signed-off-by: Mark McLoughlin <markmc@redhat.com>
2009-06-11 22:17:42 +08:00
is_kvm, info->is_kvm);
qemu: improve device flag parsing * src/qemu/qemu_capabilities.h (qemuCapsParseDeviceStr): New prototype. * src/qemu/qemu_capabilities.c (qemuCapsParsePCIDeviceStrs) Rename and split... (qemuCapsExtractDeviceStr, qemuCapsParseDeviceStr): ...to make it easier to add and test device-specific checks. (qemuCapsExtractVersionInfo): Update caller. * tests/qemuhelptest.c (testHelpStrParsing): Also test parsing of device-related flags. (mymain): Update expected flags. * tests/qemuhelpdata/qemu-0.12.1-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.3-device: New file. * tests/qemuhelpdata/qemu-kvm-0.13.0-device: New file.
2011-01-14 00:09:15 +08:00
goto cleanup;
Add qemu help string parsing tests Signed-off-by: Mark McLoughlin <markmc@redhat.com>
2009-06-11 22:17:42 +08:00
}
Probe for -device and use -nodefaults Probe for the new -device flag and if available set the -nodefaults flag, instead of using -net none, -serial none or -parallel none. Other device types will be converted to use -device in later patches. The -nodefaults flag will help avoid unwelcome surprises from future QEMU releases * src/qemu/qemu_conf.c: Probe for -device. Add -nodefaults flag. Remove -net none, -serial none or -parallel none * src/qemu/qemu_conf.h: Define QEMU_CMD_FLAG_DEVICE * tests/qemuhelpdata/qemu-0.12.1: New data file for 0.12.1 QEMU * tests/qemuhelptest.c: Test feature extraction from 0.12.1 QEMU
2009-12-22 04:36:32 +08:00
if (kvm_version != info->kvm_version) {
qemu: improve device flag parsing * src/qemu/qemu_capabilities.h (qemuCapsParseDeviceStr): New prototype. * src/qemu/qemu_capabilities.c (qemuCapsParsePCIDeviceStrs) Rename and split... (qemuCapsExtractDeviceStr, qemuCapsParseDeviceStr): ...to make it easier to add and test device-specific checks. (qemuCapsExtractVersionInfo): Update caller. * tests/qemuhelptest.c (testHelpStrParsing): Also test parsing of device-related flags. (mymain): Update expected flags. * tests/qemuhelpdata/qemu-0.12.1-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.3-device: New file. * tests/qemuhelpdata/qemu-kvm-0.13.0-device: New file.
2011-01-14 00:09:15 +08:00
fprintf(stderr,
"Parsed KVM versions do not match: got %u, expected %u\n",
Probe for -device and use -nodefaults Probe for the new -device flag and if available set the -nodefaults flag, instead of using -net none, -serial none or -parallel none. Other device types will be converted to use -device in later patches. The -nodefaults flag will help avoid unwelcome surprises from future QEMU releases * src/qemu/qemu_conf.c: Probe for -device. Add -nodefaults flag. Remove -net none, -serial none or -parallel none * src/qemu/qemu_conf.h: Define QEMU_CMD_FLAG_DEVICE * tests/qemuhelpdata/qemu-0.12.1: New data file for 0.12.1 QEMU * tests/qemuhelptest.c: Test feature extraction from 0.12.1 QEMU
2009-12-22 04:36:32 +08:00
kvm_version, info->kvm_version);
qemu: improve device flag parsing * src/qemu/qemu_capabilities.h (qemuCapsParseDeviceStr): New prototype. * src/qemu/qemu_capabilities.c (qemuCapsParsePCIDeviceStrs) Rename and split... (qemuCapsExtractDeviceStr, qemuCapsParseDeviceStr): ...to make it easier to add and test device-specific checks. (qemuCapsExtractVersionInfo): Update caller. * tests/qemuhelptest.c (testHelpStrParsing): Also test parsing of device-related flags. (mymain): Update expected flags. * tests/qemuhelpdata/qemu-0.12.1-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.3-device: New file. * tests/qemuhelpdata/qemu-kvm-0.13.0-device: New file.
2011-01-14 00:09:15 +08:00
goto cleanup;
Add qemu help string parsing tests Signed-off-by: Mark McLoughlin <markmc@redhat.com>
2009-06-11 22:17:42 +08:00
}
qemu: improve device flag parsing * src/qemu/qemu_capabilities.h (qemuCapsParseDeviceStr): New prototype. * src/qemu/qemu_capabilities.c (qemuCapsParsePCIDeviceStrs) Rename and split... (qemuCapsExtractDeviceStr, qemuCapsParseDeviceStr): ...to make it easier to add and test device-specific checks. (qemuCapsExtractVersionInfo): Update caller. * tests/qemuhelptest.c (testHelpStrParsing): Also test parsing of device-related flags. (mymain): Update expected flags. * tests/qemuhelpdata/qemu-0.12.1-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device: New file. * tests/qemuhelpdata/qemu-kvm-0.12.3-device: New file. * tests/qemuhelpdata/qemu-kvm-0.13.0-device: New file.
2011-01-14 00:09:15 +08:00
ret = 0;
cleanup:
VIR_FREE(path);
return ret;
Add qemu help string parsing tests Signed-off-by: Mark McLoughlin <markmc@redhat.com>
2009-06-11 22:17:42 +08:00
}
static int
mymain(int argc, char **argv)
{
int ret = 0;
char cwd[PATH_MAX];
progname = argv[0];
if (argc > 1) {
fprintf(stderr, "Usage: %s\n", progname);
return (EXIT_FAILURE);
}
abs_srcdir = getenv("abs_srcdir");
if (!abs_srcdir)
abs_srcdir = getcwd(cwd, sizeof(cwd));
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-10 02:22:22 +08:00
# define DO_TEST(name, flags, version, is_kvm, kvm_version) \
Add qemu help string parsing tests Signed-off-by: Mark McLoughlin <markmc@redhat.com>
2009-06-11 22:17:42 +08:00
do { \
const struct testInfo info = { name, flags, version, is_kvm, kvm_version }; \
if (virtTestRun("QEMU Help String Parsing " name, \
1, testHelpStrParsing, &info) < 0) \
ret = -1; \
} while (0)
Support <video> element for QEMU guests * src/qemu_conf.c, src/qemu_conf.h: Use -vga or -std-vga when starting guests if video card is present * tests/qemuhelptest.c: Change to use constants instead of hardcoded hex numbers, and add VGA support * tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args, tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml, tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml: Add <video> element for testing graphics adapter * tests/qemuxml2argvtest.c: Add QEMUD_CMD_FLAG_VGA flag * tests/qemuxml2xmltest.c: Add missing graphics-vnc-sasl/tls tests
2009-07-06 21:59:19 +08:00
DO_TEST("qemu-0.9.1",
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 22:54:08 +08:00
QEMU_CAPS_KQEMU |
QEMU_CAPS_VNC_COLON |
QEMU_CAPS_NO_REBOOT |
QEMU_CAPS_DRIVE |
QEMU_CAPS_NAME,
Support <video> element for QEMU guests * src/qemu_conf.c, src/qemu_conf.h: Use -vga or -std-vga when starting guests if video card is present * tests/qemuhelptest.c: Change to use constants instead of hardcoded hex numbers, and add VGA support * tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args, tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml, tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml: Add <video> element for testing graphics adapter * tests/qemuxml2argvtest.c: Add QEMUD_CMD_FLAG_VGA flag * tests/qemuxml2xmltest.c: Add missing graphics-vnc-sasl/tls tests
2009-07-06 21:59:19 +08:00
9001, 0, 0);
DO_TEST("kvm-74",
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 22:54:08 +08:00
QEMU_CAPS_VNC_COLON |
QEMU_CAPS_NO_REBOOT |
QEMU_CAPS_DRIVE |
QEMU_CAPS_DRIVE_BOOT |
QEMU_CAPS_NAME |
QEMU_CAPS_VNET_HDR |
QEMU_CAPS_MIGRATE_KVM_STDIO |
QEMU_CAPS_KVM |
QEMU_CAPS_DRIVE_FORMAT |
QEMU_CAPS_MEM_PATH |
QEMU_CAPS_TDF,
Support <video> element for QEMU guests * src/qemu_conf.c, src/qemu_conf.h: Use -vga or -std-vga when starting guests if video card is present * tests/qemuhelptest.c: Change to use constants instead of hardcoded hex numbers, and add VGA support * tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args, tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml, tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml: Add <video> element for testing graphics adapter * tests/qemuxml2argvtest.c: Add QEMUD_CMD_FLAG_VGA flag * tests/qemuxml2xmltest.c: Add missing graphics-vnc-sasl/tls tests
2009-07-06 21:59:19 +08:00
9001, 1, 74);
qemu: Fix detection of drive readonly option So far, readonly=on option is used when qemu supports -device. However, there are qemu versions which support readonly option with -drive although they don't have support for -device.
2010-10-23 00:02:31 +08:00
DO_TEST("kvm-83-rhel56",
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 22:54:08 +08:00
QEMU_CAPS_VNC_COLON |
QEMU_CAPS_NO_REBOOT |
QEMU_CAPS_DRIVE |
QEMU_CAPS_DRIVE_BOOT |
QEMU_CAPS_NAME |
QEMU_CAPS_UUID |
QEMU_CAPS_VNET_HDR |
QEMU_CAPS_MIGRATE_QEMU_TCP |
QEMU_CAPS_MIGRATE_QEMU_EXEC |
QEMU_CAPS_DRIVE_CACHE_V2 |
QEMU_CAPS_KVM |
QEMU_CAPS_DRIVE_FORMAT |
QEMU_CAPS_DRIVE_SERIAL |
QEMU_CAPS_VGA |
QEMU_CAPS_PCIDEVICE |
QEMU_CAPS_MEM_PATH |
QEMU_CAPS_BALLOON |
QEMU_CAPS_RTC_TD_HACK |
QEMU_CAPS_NO_HPET |
QEMU_CAPS_NO_KVM_PIT |
QEMU_CAPS_TDF |
QEMU_CAPS_DRIVE_READONLY |
QEMU_CAPS_SMBIOS_TYPE |
QEMU_CAPS_SPICE,
qemu: Fix detection of drive readonly option So far, readonly=on option is used when qemu supports -device. However, there are qemu versions which support readonly option with -drive although they don't have support for -device.
2010-10-23 00:02:31 +08:00
9001, 1, 83);
Support <video> element for QEMU guests * src/qemu_conf.c, src/qemu_conf.h: Use -vga or -std-vga when starting guests if video card is present * tests/qemuhelptest.c: Change to use constants instead of hardcoded hex numbers, and add VGA support * tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args, tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml, tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml: Add <video> element for testing graphics adapter * tests/qemuxml2argvtest.c: Add QEMUD_CMD_FLAG_VGA flag * tests/qemuxml2xmltest.c: Add missing graphics-vnc-sasl/tls tests
2009-07-06 21:59:19 +08:00
DO_TEST("qemu-0.10.5",
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 22:54:08 +08:00
QEMU_CAPS_KQEMU |
QEMU_CAPS_VNC_COLON |
QEMU_CAPS_NO_REBOOT |
QEMU_CAPS_DRIVE |
QEMU_CAPS_NAME |
QEMU_CAPS_UUID |
QEMU_CAPS_MIGRATE_QEMU_TCP |
QEMU_CAPS_MIGRATE_QEMU_EXEC |
QEMU_CAPS_DRIVE_CACHE_V2 |
QEMU_CAPS_DRIVE_FORMAT |
QEMU_CAPS_DRIVE_SERIAL |
QEMU_CAPS_VGA |
QEMU_CAPS_0_10 |
QEMU_CAPS_ENABLE_KVM |
QEMU_CAPS_SDL |
QEMU_CAPS_RTC_TD_HACK |
QEMU_CAPS_NO_HPET |
QEMU_CAPS_VGA_NONE,
Support <video> element for QEMU guests * src/qemu_conf.c, src/qemu_conf.h: Use -vga or -std-vga when starting guests if video card is present * tests/qemuhelptest.c: Change to use constants instead of hardcoded hex numbers, and add VGA support * tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args, tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml, tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml: Add <video> element for testing graphics adapter * tests/qemuxml2argvtest.c: Add QEMUD_CMD_FLAG_VGA flag * tests/qemuxml2xmltest.c: Add missing graphics-vnc-sasl/tls tests
2009-07-06 21:59:19 +08:00
10005, 0, 0);
DO_TEST("qemu-kvm-0.10.5",
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 22:54:08 +08:00
QEMU_CAPS_VNC_COLON |
QEMU_CAPS_NO_REBOOT |
QEMU_CAPS_DRIVE |
QEMU_CAPS_DRIVE_BOOT |
QEMU_CAPS_NAME |
QEMU_CAPS_UUID |
QEMU_CAPS_VNET_HDR |
QEMU_CAPS_MIGRATE_QEMU_TCP |
QEMU_CAPS_MIGRATE_QEMU_EXEC |
QEMU_CAPS_DRIVE_CACHE_V2 |
QEMU_CAPS_KVM |
QEMU_CAPS_DRIVE_FORMAT |
QEMU_CAPS_DRIVE_SERIAL |
QEMU_CAPS_VGA |
QEMU_CAPS_0_10 |
QEMU_CAPS_PCIDEVICE |
QEMU_CAPS_MEM_PATH |
QEMU_CAPS_SDL |
QEMU_CAPS_RTC_TD_HACK |
QEMU_CAPS_NO_HPET |
QEMU_CAPS_NO_KVM_PIT |
QEMU_CAPS_TDF |
QEMU_CAPS_NESTING |
QEMU_CAPS_VGA_NONE,
Support <video> element for QEMU guests * src/qemu_conf.c, src/qemu_conf.h: Use -vga or -std-vga when starting guests if video card is present * tests/qemuhelptest.c: Change to use constants instead of hardcoded hex numbers, and add VGA support * tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args, tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml, tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml: Add <video> element for testing graphics adapter * tests/qemuxml2argvtest.c: Add QEMUD_CMD_FLAG_VGA flag * tests/qemuxml2xmltest.c: Add missing graphics-vnc-sasl/tls tests
2009-07-06 21:59:19 +08:00
10005, 1, 0);
DO_TEST("kvm-86",
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 22:54:08 +08:00
QEMU_CAPS_VNC_COLON |
QEMU_CAPS_NO_REBOOT |
QEMU_CAPS_DRIVE |
QEMU_CAPS_DRIVE_BOOT |
QEMU_CAPS_NAME |
QEMU_CAPS_UUID |
QEMU_CAPS_VNET_HDR |
QEMU_CAPS_MIGRATE_QEMU_TCP |
QEMU_CAPS_MIGRATE_QEMU_EXEC |
QEMU_CAPS_DRIVE_CACHE_V2 |
QEMU_CAPS_KVM |
QEMU_CAPS_DRIVE_FORMAT |
QEMU_CAPS_DRIVE_SERIAL |
QEMU_CAPS_VGA |
QEMU_CAPS_0_10 |
QEMU_CAPS_PCIDEVICE |
QEMU_CAPS_SDL |
QEMU_CAPS_RTC_TD_HACK |
QEMU_CAPS_NO_HPET |
QEMU_CAPS_NO_KVM_PIT |
QEMU_CAPS_TDF |
QEMU_CAPS_NESTING |
QEMU_CAPS_SMBIOS_TYPE |
QEMU_CAPS_VGA_NONE,
Support <video> element for QEMU guests * src/qemu_conf.c, src/qemu_conf.h: Use -vga or -std-vga when starting guests if video card is present * tests/qemuhelptest.c: Change to use constants instead of hardcoded hex numbers, and add VGA support * tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args, tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml, tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml, tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml: Add <video> element for testing graphics adapter * tests/qemuxml2argvtest.c: Add QEMUD_CMD_FLAG_VGA flag * tests/qemuxml2xmltest.c: Add missing graphics-vnc-sasl/tls tests
2009-07-06 21:59:19 +08:00
10050, 1, 0);
Add qemu -help test data for qemu-kvm-0.11.0-rc2 * tests/qemuhelpdata/qemu-kvm-0.11.0-rc2: add data * tests/qemuhelptest.c: add expected output
2009-09-10 16:36:13 +08:00
DO_TEST("qemu-kvm-0.11.0-rc2",
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 22:54:08 +08:00
QEMU_CAPS_VNC_COLON |
QEMU_CAPS_NO_REBOOT |
QEMU_CAPS_DRIVE |
QEMU_CAPS_DRIVE_BOOT |
QEMU_CAPS_NAME |
QEMU_CAPS_UUID |
QEMU_CAPS_VNET_HDR |
QEMU_CAPS_MIGRATE_QEMU_TCP |
QEMU_CAPS_MIGRATE_QEMU_EXEC |
QEMU_CAPS_DRIVE_CACHE_V2 |
QEMU_CAPS_KVM |
QEMU_CAPS_DRIVE_FORMAT |
QEMU_CAPS_DRIVE_SERIAL |
QEMU_CAPS_VGA |
QEMU_CAPS_0_10 |
QEMU_CAPS_PCIDEVICE |
QEMU_CAPS_MEM_PATH |
QEMU_CAPS_ENABLE_KVM |
QEMU_CAPS_BALLOON |
QEMU_CAPS_SDL |
QEMU_CAPS_RTC_TD_HACK |
QEMU_CAPS_NO_HPET |
QEMU_CAPS_NO_KVM_PIT |
QEMU_CAPS_TDF |
QEMU_CAPS_BOOT_MENU |
QEMU_CAPS_NESTING |
QEMU_CAPS_NAME_PROCESS |
QEMU_CAPS_SMBIOS_TYPE |
QEMU_CAPS_VGA_NONE,
Add qemu -help test data for qemu-kvm-0.11.0-rc2 * tests/qemuhelpdata/qemu-kvm-0.11.0-rc2: add data * tests/qemuhelptest.c: add expected output
2009-09-10 16:36:13 +08:00
10092, 1, 0);
Probe for -device and use -nodefaults Probe for the new -device flag and if available set the -nodefaults flag, instead of using -net none, -serial none or -parallel none. Other device types will be converted to use -device in later patches. The -nodefaults flag will help avoid unwelcome surprises from future QEMU releases * src/qemu/qemu_conf.c: Probe for -device. Add -nodefaults flag. Remove -net none, -serial none or -parallel none * src/qemu/qemu_conf.h: Define QEMU_CMD_FLAG_DEVICE * tests/qemuhelpdata/qemu-0.12.1: New data file for 0.12.1 QEMU * tests/qemuhelptest.c: Test feature extraction from 0.12.1 QEMU
2009-12-22 04:36:32 +08:00
DO_TEST("qemu-0.12.1",
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 22:54:08 +08:00
QEMU_CAPS_VNC_COLON |
QEMU_CAPS_NO_REBOOT |
QEMU_CAPS_DRIVE |
QEMU_CAPS_NAME |
QEMU_CAPS_UUID |
QEMU_CAPS_MIGRATE_QEMU_TCP |
QEMU_CAPS_MIGRATE_QEMU_EXEC |
QEMU_CAPS_DRIVE_CACHE_V2 |
QEMU_CAPS_DRIVE_FORMAT |
QEMU_CAPS_DRIVE_SERIAL |
QEMU_CAPS_DRIVE_READONLY |
QEMU_CAPS_VGA |
QEMU_CAPS_0_10 |
QEMU_CAPS_ENABLE_KVM |
QEMU_CAPS_SDL |
QEMU_CAPS_XEN_DOMID |
QEMU_CAPS_MIGRATE_QEMU_UNIX |
QEMU_CAPS_CHARDEV |
QEMU_CAPS_BALLOON |
QEMU_CAPS_DEVICE |
QEMU_CAPS_SMP_TOPOLOGY |
QEMU_CAPS_RTC |
QEMU_CAPS_NO_HPET |
QEMU_CAPS_BOOT_MENU |
QEMU_CAPS_NAME_PROCESS |
QEMU_CAPS_SMBIOS_TYPE |
QEMU_CAPS_VGA_NONE |
QEMU_CAPS_MIGRATE_QEMU_FD |
QEMU_CAPS_DRIVE_AIO,
Probe for -device and use -nodefaults Probe for the new -device flag and if available set the -nodefaults flag, instead of using -net none, -serial none or -parallel none. Other device types will be converted to use -device in later patches. The -nodefaults flag will help avoid unwelcome surprises from future QEMU releases * src/qemu/qemu_conf.c: Probe for -device. Add -nodefaults flag. Remove -net none, -serial none or -parallel none * src/qemu/qemu_conf.h: Define QEMU_CMD_FLAG_DEVICE * tests/qemuhelpdata/qemu-0.12.1: New data file for 0.12.1 QEMU * tests/qemuhelptest.c: Test feature extraction from 0.12.1 QEMU
2009-12-22 04:36:32 +08:00
12001, 0, 0);
tests: test RHEL 6.0 qemu-kvm -help parsing * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60: New file. * tests/qemuhelptest.c (mymain): New test from RHEL 6.0 qemu-kvm, which covers some options (like -vga=qxl) not tested elsewhere. * .x-sc_prohibit_empty_lines_at_EOF: Exempt qemu help output.
2010-12-09 00:29:54 +08:00
DO_TEST("qemu-kvm-0.12.1.2-rhel60",
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 22:54:08 +08:00
QEMU_CAPS_VNC_COLON |
QEMU_CAPS_NO_REBOOT |
QEMU_CAPS_DRIVE |
QEMU_CAPS_DRIVE_BOOT |
QEMU_CAPS_NAME |
QEMU_CAPS_UUID |
QEMU_CAPS_VNET_HDR |
QEMU_CAPS_MIGRATE_QEMU_TCP |
QEMU_CAPS_MIGRATE_QEMU_EXEC |
QEMU_CAPS_DRIVE_CACHE_V2 |
QEMU_CAPS_KVM |
QEMU_CAPS_DRIVE_FORMAT |
QEMU_CAPS_DRIVE_SERIAL |
QEMU_CAPS_DRIVE_READONLY |
QEMU_CAPS_VGA |
QEMU_CAPS_0_10 |
QEMU_CAPS_PCIDEVICE |
QEMU_CAPS_MEM_PATH |
QEMU_CAPS_MIGRATE_QEMU_UNIX |
QEMU_CAPS_CHARDEV |
QEMU_CAPS_ENABLE_KVM |
QEMU_CAPS_BALLOON |
QEMU_CAPS_DEVICE |
QEMU_CAPS_SMP_TOPOLOGY |
QEMU_CAPS_RTC |
QEMU_CAPS_VNET_HOST |
QEMU_CAPS_NO_KVM_PIT |
QEMU_CAPS_TDF |
QEMU_CAPS_PCI_CONFIGFD |
QEMU_CAPS_NODEFCONFIG |
QEMU_CAPS_BOOT_MENU |
QEMU_CAPS_NESTING |
QEMU_CAPS_NAME_PROCESS |
QEMU_CAPS_SMBIOS_TYPE |
QEMU_CAPS_VGA_QXL |
QEMU_CAPS_SPICE |
QEMU_CAPS_VGA_NONE |
QEMU_CAPS_MIGRATE_QEMU_FD |
QEMU_CAPS_DRIVE_AIO |
QEMU_CAPS_DEVICE_SPICEVMC,
tests: test RHEL 6.0 qemu-kvm -help parsing * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60: New file. * tests/qemuhelptest.c (mymain): New test from RHEL 6.0 qemu-kvm, which covers some options (like -vga=qxl) not tested elsewhere. * .x-sc_prohibit_empty_lines_at_EOF: Exempt qemu help output.
2010-12-09 00:29:54 +08:00
12001, 1, 0);
qemu_conf: fix flag value (gdb) p/x QEMUD_CMD_FLAG_VNET_HOST $7 = 0xffffffff80000000 Oops - that meant we were incorrectly setting QEMU_CMD_FLAG_RTC_TD_HACK for qemu-kvm-0.12.3 (and probably botching a few other settings as well). Fixes Red Hat BZ#592070 * src/qemu/qemu_conf.h (QEMUD_CMD_FLAG_VNET_HOST): Avoid sign extension. * tests/qemuhelpdata/qemu-kvm-0.12.3: New file. * tests/qemuhelptest.c (mymain): Add another case.
2010-05-13 11:07:00 +08:00
DO_TEST("qemu-kvm-0.12.3",
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 22:54:08 +08:00
QEMU_CAPS_VNC_COLON |
QEMU_CAPS_NO_REBOOT |
QEMU_CAPS_DRIVE |
QEMU_CAPS_DRIVE_BOOT |
QEMU_CAPS_NAME |
QEMU_CAPS_UUID |
QEMU_CAPS_VNET_HDR |
QEMU_CAPS_MIGRATE_QEMU_TCP |
QEMU_CAPS_MIGRATE_QEMU_EXEC |
QEMU_CAPS_DRIVE_CACHE_V2 |
QEMU_CAPS_KVM |
QEMU_CAPS_DRIVE_FORMAT |
QEMU_CAPS_DRIVE_SERIAL |
QEMU_CAPS_DRIVE_READONLY |
QEMU_CAPS_VGA |
QEMU_CAPS_0_10 |
QEMU_CAPS_PCIDEVICE |
QEMU_CAPS_MEM_PATH |
QEMU_CAPS_SDL |
QEMU_CAPS_MIGRATE_QEMU_UNIX |
QEMU_CAPS_CHARDEV |
QEMU_CAPS_BALLOON |
QEMU_CAPS_DEVICE |
QEMU_CAPS_SMP_TOPOLOGY |
QEMU_CAPS_RTC |
QEMU_CAPS_VNET_HOST |
QEMU_CAPS_NO_HPET |
QEMU_CAPS_NO_KVM_PIT |
QEMU_CAPS_TDF |
QEMU_CAPS_BOOT_MENU |
QEMU_CAPS_NESTING |
QEMU_CAPS_NAME_PROCESS |
QEMU_CAPS_SMBIOS_TYPE |
QEMU_CAPS_VGA_NONE |
QEMU_CAPS_MIGRATE_QEMU_FD |
QEMU_CAPS_DRIVE_AIO,
qemu_conf: fix flag value (gdb) p/x QEMUD_CMD_FLAG_VNET_HOST $7 = 0xffffffff80000000 Oops - that meant we were incorrectly setting QEMU_CMD_FLAG_RTC_TD_HACK for qemu-kvm-0.12.3 (and probably botching a few other settings as well). Fixes Red Hat BZ#592070 * src/qemu/qemu_conf.h (QEMUD_CMD_FLAG_VNET_HOST): Avoid sign extension. * tests/qemuhelpdata/qemu-kvm-0.12.3: New file. * tests/qemuhelptest.c (mymain): Add another case.
2010-05-13 11:07:00 +08:00
12003, 1, 0);
tests: test Fedora 14 qemu-kvm -help parsing * tests/qemuhelpdata/qemu-kvm-0.13.0: New file. * tests/qemuhelptest.c (mymain): New test from Fedora 14 qemu-kvm, which covers some options (like -fstype passthrough) not tested elsewhere.
2010-12-09 01:10:51 +08:00
DO_TEST("qemu-kvm-0.13.0",
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 22:54:08 +08:00
QEMU_CAPS_VNC_COLON |
QEMU_CAPS_NO_REBOOT |
QEMU_CAPS_DRIVE |
QEMU_CAPS_DRIVE_BOOT |
QEMU_CAPS_NAME |
QEMU_CAPS_UUID |
QEMU_CAPS_VNET_HDR |
QEMU_CAPS_MIGRATE_QEMU_TCP |
QEMU_CAPS_MIGRATE_QEMU_EXEC |
QEMU_CAPS_DRIVE_CACHE_V2 |
QEMU_CAPS_KVM |
QEMU_CAPS_DRIVE_FORMAT |
QEMU_CAPS_DRIVE_SERIAL |
QEMU_CAPS_XEN_DOMID |
QEMU_CAPS_DRIVE_READONLY |
QEMU_CAPS_VGA |
QEMU_CAPS_0_10 |
QEMU_CAPS_PCIDEVICE |
QEMU_CAPS_MEM_PATH |
QEMU_CAPS_SDL |
QEMU_CAPS_MIGRATE_QEMU_UNIX |
QEMU_CAPS_CHARDEV |
QEMU_CAPS_ENABLE_KVM |
QEMU_CAPS_MONITOR_JSON |
QEMU_CAPS_BALLOON |
QEMU_CAPS_DEVICE |
QEMU_CAPS_SMP_TOPOLOGY |
QEMU_CAPS_NETDEV |
QEMU_CAPS_RTC |
QEMU_CAPS_VNET_HOST |
QEMU_CAPS_NO_HPET |
QEMU_CAPS_NO_KVM_PIT |
QEMU_CAPS_TDF |
QEMU_CAPS_PCI_CONFIGFD |
QEMU_CAPS_NODEFCONFIG |
QEMU_CAPS_BOOT_MENU |
QEMU_CAPS_FSDEV |
QEMU_CAPS_NESTING |
QEMU_CAPS_NAME_PROCESS |
QEMU_CAPS_SMBIOS_TYPE |
QEMU_CAPS_SPICE |
QEMU_CAPS_VGA_NONE |
QEMU_CAPS_MIGRATE_QEMU_FD |
QEMU_CAPS_DRIVE_AIO |
QEMU_CAPS_DEVICE_SPICEVMC,
tests: test Fedora 14 qemu-kvm -help parsing * tests/qemuhelpdata/qemu-kvm-0.13.0: New file. * tests/qemuhelptest.c (mymain): New test from Fedora 14 qemu-kvm, which covers some options (like -fstype passthrough) not tested elsewhere.
2010-12-09 01:10:51 +08:00
13000, 1, 0);
smartcard: check for qemu capability Qemu smartcard/spicevmc support exists on branches (such as http://cgit.freedesktop.org/~alon/qemu/commit/?h=usb_ccid.v15&id=024a37b) but is not yet upstream. The added -help output matches a scratch build that will be close to the RHEL 6.1 qemu-kvm. * src/qemu/qemu_capabilities.h (QEMUD_CMD_FLAG_CCID_EMULATED) (QEMUD_CMD_FLAG_CCID_PASSTHRU, QEMUD_CMD_FLAG_CHARDEV_SPICEVMC): New flags. * src/qemu/qemu_capabilities.c (qemuCapsComputeCmdFlags) (qemuCapsParseDeviceStr): Check for smartcard capabilities. (qemuCapsExtractVersionInfo): Tweak comment. * tests/qemuhelptest.c (mymain): New test. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel61: New file. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel61-device: Likewise.
2011-01-13 23:54:33 +08:00
DO_TEST("qemu-kvm-0.12.1.2-rhel61",
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 22:54:08 +08:00
QEMU_CAPS_VNC_COLON |
QEMU_CAPS_NO_REBOOT |
QEMU_CAPS_DRIVE |
QEMU_CAPS_NAME |
QEMU_CAPS_UUID |
QEMU_CAPS_VNET_HDR |
QEMU_CAPS_MIGRATE_QEMU_TCP |
QEMU_CAPS_MIGRATE_QEMU_EXEC |
QEMU_CAPS_DRIVE_CACHE_V2 |
QEMU_CAPS_KVM |
QEMU_CAPS_DRIVE_FORMAT |
QEMU_CAPS_DRIVE_SERIAL |
QEMU_CAPS_DRIVE_READONLY |
QEMU_CAPS_VGA |
QEMU_CAPS_0_10 |
QEMU_CAPS_PCIDEVICE |
QEMU_CAPS_MEM_PATH |
QEMU_CAPS_MIGRATE_QEMU_UNIX |
QEMU_CAPS_CHARDEV |
QEMU_CAPS_ENABLE_KVM |
QEMU_CAPS_BALLOON |
QEMU_CAPS_DEVICE |
QEMU_CAPS_SMP_TOPOLOGY |
QEMU_CAPS_RTC |
QEMU_CAPS_VNET_HOST |
QEMU_CAPS_NO_KVM_PIT |
QEMU_CAPS_TDF |
QEMU_CAPS_PCI_CONFIGFD |
QEMU_CAPS_NODEFCONFIG |
QEMU_CAPS_BOOT_MENU |
QEMU_CAPS_NESTING |
QEMU_CAPS_NAME_PROCESS |
QEMU_CAPS_SMBIOS_TYPE |
QEMU_CAPS_VGA_QXL |
QEMU_CAPS_SPICE |
QEMU_CAPS_VGA_NONE |
QEMU_CAPS_MIGRATE_QEMU_FD |
QEMU_CAPS_HDA_DUPLEX |
QEMU_CAPS_DRIVE_AIO |
QEMU_CAPS_CCID_PASSTHRU |
QEMU_CAPS_CHARDEV_SPICEVMC |
QEMU_CAPS_VIRTIO_TX_ALG,
smartcard: check for qemu capability Qemu smartcard/spicevmc support exists on branches (such as http://cgit.freedesktop.org/~alon/qemu/commit/?h=usb_ccid.v15&id=024a37b) but is not yet upstream. The added -help output matches a scratch build that will be close to the RHEL 6.1 qemu-kvm. * src/qemu/qemu_capabilities.h (QEMUD_CMD_FLAG_CCID_EMULATED) (QEMUD_CMD_FLAG_CCID_PASSTHRU, QEMUD_CMD_FLAG_CHARDEV_SPICEVMC): New flags. * src/qemu/qemu_capabilities.c (qemuCapsComputeCmdFlags) (qemuCapsParseDeviceStr): Check for smartcard capabilities. (qemuCapsExtractVersionInfo): Tweak comment. * tests/qemuhelptest.c (mymain): New test. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel61: New file. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel61-device: Likewise.
2011-01-13 23:54:33 +08:00
12001, 1, 0);
Add qemu help string parsing tests Signed-off-by: Mark McLoughlin <markmc@redhat.com>
2009-06-11 22:17:42 +08:00
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}
VIRT_TEST_MAIN(mymain)
#else
int main (void) { return (77); /* means 'test skipped' for automake */ }
#endif /* WITH_QEMU */