diff options
author | Daniel P. Berrange <berrange@redhat.com> | 2010-02-10 13:19:17 +0000 |
---|---|---|
committer | Daniel P. Berrange <berrange@redhat.com> | 2010-02-10 13:33:06 +0000 |
commit | 38536d6f7f2334f4e83e0c42c4a1b059b5cbbf9d (patch) | |
tree | 57c9593b14d5579ffa06fadb545d4e4257774a28 /tests | |
parent | Remove virConnectPtr from secret XML APIs (diff) | |
download | libvirt-38536d6f7f2334f4e83e0c42c4a1b059b5cbbf9d.tar.gz libvirt-38536d6f7f2334f4e83e0c42c4a1b059b5cbbf9d.tar.bz2 libvirt-38536d6f7f2334f4e83e0c42c4a1b059b5cbbf9d.zip |
Annotate some virConnectPtr as mandatory non-null
Use the ATTRIBUTE_NONNULL annotation to mark some virConnectPtr
args as mandatory non-null so the compiler can warn of mistakes
* src/conf/domain_event.h: All virConnectPtr args must be non-null
* src/qemu/qemu_conf.h: qemudBuildCommandLine and
qemudNetworkIfaceConnect() must be given non-null connection
* tests/qemuxml2argvtest.c: Provide a non-null (dummy) connection to
qemudBuildCommandLine()
Diffstat (limited to 'tests')
-rw-r--r-- | tests/qemuxml2argvtest.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8bdab4933..3ee71a3b1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -13,6 +13,7 @@ #include "internal.h" #include "testutils.h" #include "qemu/qemu_conf.h" +#include "datatypes.h" #include "testutilsqemu.h" @@ -36,6 +37,10 @@ static int testCompareXMLToArgvFiles(const char *xml, unsigned long long flags; virDomainDefPtr vmdef = NULL; virDomainChrDef monitor_chr; + virConnectPtr conn; + + if (!(conn = virGetConnect())) + goto fail; if (virtTestLoadFile(cmd, &expectargv, MAX_FILE) < 0) goto fail; @@ -75,7 +80,7 @@ static int testCompareXMLToArgvFiles(const char *xml, } - if (qemudBuildCommandLine(NULL, &driver, + if (qemudBuildCommandLine(conn, &driver, vmdef, &monitor_chr, 0, flags, &argv, &qenv, NULL, NULL, migrateFrom) < 0) @@ -137,6 +142,7 @@ static int testCompareXMLToArgvFiles(const char *xml, free(qenv); } virDomainDefFree(vmdef); + virUnrefConnect(conn); return ret; } |