diff options
author | Daniel P. Berrange <berrange@redhat.com> | 2010-02-09 13:06:56 +0000 |
---|---|---|
committer | Daniel P. Berrange <berrange@redhat.com> | 2010-02-10 12:09:41 +0000 |
commit | 910b019f9371ceaab504f4e3d7f7a125eba75535 (patch) | |
tree | 54865dbf257ad81f7652f376f621eaeb685dc8e4 /tests | |
parent | Remove use of virConnectPtr from security driver APIs (diff) | |
download | libvirt-910b019f9371ceaab504f4e3d7f7a125eba75535.tar.gz libvirt-910b019f9371ceaab504f4e3d7f7a125eba75535.tar.bz2 libvirt-910b019f9371ceaab504f4e3d7f7a125eba75535.zip |
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
Diffstat (limited to 'tests')
-rw-r--r-- | tests/qemuargv2xmltest.c | 2 | ||||
-rw-r--r-- | tests/qemuhelptest.c | 13 | ||||
-rw-r--r-- | tests/qemuxml2argvtest.c | 7 |
3 files changed, 12 insertions, 10 deletions
diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index f07311b1c..50c445359 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -75,7 +75,7 @@ static int testCompareXMLToArgvFiles(const char *xml, struct testInfo { const char *name; - int extraFlags; + unsigned long long extraFlags; const char *migrateFrom; }; diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 34a604860..0f2b509b4 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -12,10 +12,10 @@ struct testInfo { const char *name; - unsigned flags; - unsigned version; - unsigned is_kvm; - unsigned kvm_version; + unsigned long long flags; + unsigned int version; + unsigned int is_kvm; + unsigned int kvm_version; }; static char *progname; @@ -41,7 +41,8 @@ static int testHelpStrParsing(const void *data) char path[PATH_MAX]; char helpStr[MAX_HELP_OUTPUT_SIZE]; char *help = &(helpStr[0]); - unsigned flags, version, is_kvm, kvm_version; + unsigned int version, is_kvm, kvm_version; + unsigned long long flags; snprintf(path, PATH_MAX, "%s/qemuhelpdata/%s", abs_srcdir, info->name); @@ -52,7 +53,7 @@ static int testHelpStrParsing(const void *data) return -1; if (flags != info->flags) { - fprintf(stderr, "Computed flags do not match: got 0x%x, expected 0x%x\n", + fprintf(stderr, "Computed flags do not match: got 0x%llx, expected 0x%llx\n", flags, info->flags); if (getenv("VIR_TEST_DEBUG")) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 9af345fe6..8bdab4933 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -24,7 +24,7 @@ static struct qemud_driver driver; static int testCompareXMLToArgvFiles(const char *xml, const char *cmd, - int extraFlags, + unsigned long long extraFlags, const char *migrateFrom) { char argvData[MAX_FILE]; char *expectargv = &(argvData[0]); @@ -32,7 +32,8 @@ static int testCompareXMLToArgvFiles(const char *xml, const char **argv = NULL; const char **qenv = NULL; const char **tmp = NULL; - int ret = -1, len, flags; + int ret = -1, len; + unsigned long long flags; virDomainDefPtr vmdef = NULL; virDomainChrDef monitor_chr; @@ -142,7 +143,7 @@ static int testCompareXMLToArgvFiles(const char *xml, struct testInfo { const char *name; - int extraFlags; + unsigned long long extraFlags; const char *migrateFrom; }; |