diff options
| author |   Jiri Denemark <jdenemar@redhat.com> | 2011-02-08 15:08:12 +0100 |
|---|---|---|
| committer | Jiri Denemark <jdenemar@redhat.com> | 2011-02-24 12:07:06 +0100 |
| commit | a96d08dc539644e40aa64d12d446d09b08e1fdb9 (patch) | |
| tree | 8b2b90c64851948ee5ca67046ac650cfd0e534c9 /tests | |
| parent | qemu: Rename QEMUD_CMD_FLAG_* to QEMU_CAPS_* (diff) | |
| download | libvirt-a96d08dc539644e40aa64d12d446d09b08e1fdb9.tar.gz libvirt-a96d08dc539644e40aa64d12d446d09b08e1fdb9.tar.bz2 libvirt-a96d08dc539644e40aa64d12d446d09b08e1fdb9.zip | |
qemu: Use helper functions for handling cmd line capabilities
Three new functions (qemuCapsSet, qemuCapsClear, and qemuCapsGet) were
introduced replacing direct bit operations.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qemuhelptest.c | 2 | ||||
| -rw-r--r-- | tests/qemuxml2argvtest.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 11f1a67ed..75ecf58de 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -57,7 +57,7 @@ static int testHelpStrParsing(const void *data) &version, &is_kvm, &kvm_version) == -1) goto cleanup; - if (info->flags & QEMU_CAPS_DEVICE) { + if (qemuCapsGet(info->flags, QEMU_CAPS_DEVICE)) { VIR_FREE(path); if (virAsprintf(&path, "%s/qemuhelpdata/%s-device", abs_srcdir, info->name) < 0) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 2f9e80ccb..5092e7012 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -79,7 +79,7 @@ static int testCompareXMLToArgvFiles(const char *xml, goto fail; } - if (extraFlags & QEMU_CAPS_DOMID) + if (qemuCapsGet(extraFlags, QEMU_CAPS_DOMID)) vmdef->id = 6; else vmdef->id = -1; @@ -96,7 +96,7 @@ static int testCompareXMLToArgvFiles(const char *xml, if (qemudCanonicalizeMachine(&driver, vmdef) < 0) goto fail; - if (flags & QEMU_CAPS_DEVICE) { + if (qemuCapsGet(flags, QEMU_CAPS_DEVICE)) { qemuDomainPCIAddressSetPtr pciaddrs; if (!(pciaddrs = qemuDomainPCIAddressSetCreate(vmdef))) goto fail; @@ -117,7 +117,7 @@ static int testCompareXMLToArgvFiles(const char *xml, */ if (STREQLEN(vmdef->os.arch, "x86_64", 6) || STREQLEN(vmdef->os.arch, "i686", 4)) { - flags |= QEMU_CAPS_PCI_MULTIBUS; + qemuCapsSet(&flags, QEMU_CAPS_PCI_MULTIBUS); } if (!(cmd = qemuBuildCommandLine(conn, &driver, |