← Back to branch summary

~serge-hallyn/ubuntu/raring/libvirt/libvirt-hugepages

« back to all changes in this revision

Viewing changes to tests/qemuxmlnstest.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-13 15:44:12 UTC
  • mfrom: (1.2.13)
  • Revision ID: package-import@ubuntu.com-20120513154412-fgmn5sxqdzgnzlx3
Tags: 0.9.12-0ubuntu1
* New upstream version:
  * Synchronize with debian packaging:
    - debian/control: Update build depends.
    - debian/libvirt-bin.postrm: Cleanup /var/log/libvirt
      on purge.
    - Bump standards verson (no changes).
    - debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch: Added
  * Dropped patches:
    - debian/patches/Debianize-libvirt-guests.patch
    - debian/patches/rewrite-lxc-controller-eof-handling-yet-again
    - debian/patches/ubuntu/libnl13.patch
    - debian/patches/ubuntu/fix-lxc-startup-error.patch
    - debian/patches/ubuntu/fix-bridge-fd.patch
    - debian/patches/ubuntu/skip-labelling-network-disks.patch
    - debian/patches/ubuntu/xen-xend-shutdown-detection.patch
    - debian/patches/ubuntu/xen-config-no-vfb-for-hvm.patch
    - debian/patches/debian/Disable-daemon-start-test.patch
    - debian/patches/debian/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
    - debian/patches/ubuntu/9006-default-config-test-case.patch
    - debian/patches/fix-block-migration.patch
    - debian/patches/ubuntu/9022-qemu-unescape-HMP-commands-before-converting-them-to.patch
    - debian/patches/ubuntu/9023-qemu-change-rbd-auth_supported-separation-character-.patch
    - debian/patches/ubuntu/9024-qemu-allow-snapshotting-of-sheepdog-and-rbd-disks.patch
    - debian/patches/9025-qemu-change-rbd-auth_supported-separation-character-.patch
    - debian/patches/ubuntu/arm-gcc-workaround.patch
  * Rediffed:
    - debian/patches/Allow-libvirt-group-to-access-the-socket.patch
    - debian/patches/Disable-failing-virnetsockettest.patch
    - debian/patches/dnsmasq-as-priv-user
    - debian/patches/9002-better_default_uri_virsh.patch
  * debian/control: Add libnl-route-3-dev ass a build depends.
  * debian/patches/libnl3-build-fix.patch: Fix build with libnl3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/qemuxmlnstest.c
69
69
    if (vmdef->emulator && STRPREFIX(vmdef->emulator, "/.")) {
70
70
        if (!(emulator = strdup(vmdef->emulator + 1)))
71
71
            goto fail;
72
 
        free(vmdef->emulator);
 
72
        VIR_FREE(vmdef->emulator);
73
73
        vmdef->emulator = NULL;
74
74
        if (virAsprintf(&vmdef->emulator, "%s/qemuxml2argvdata/%s",
75
75
                        abs_srcdir, emulator) < 0)
89
89
    qemuCapsSetList(extraFlags,
90
90
                    QEMU_CAPS_VNC_COLON,
91
91
                    QEMU_CAPS_NO_REBOOT,
 
92
                    QEMU_CAPS_NO_ACPI,
92
93
                    QEMU_CAPS_LAST);
93
94
 
94
95
    if (qemudCanonicalizeMachine(&driver, vmdef) < 0)
106
107
    }
107
108
 
108
109
 
109
 
    free(virtTestLogContentAndReset());
 
110
    log = virtTestLogContentAndReset();
 
111
    VIR_FREE(log);
110
112
    virResetLastError();
111
113
 
112
114
    /* We do not call qemuCapsExtractVersionInfo() before calling
158
160
    ret = 0;
159
161
 
160
162
 fail:
161
 
    free(log);
162
 
    free(emulator);
163
 
    free(expectargv);
164
 
    free(actualargv);
 
163
    VIR_FREE(log);
 
164
    VIR_FREE(emulator);
 
165
    VIR_FREE(expectargv);
 
166
    VIR_FREE(actualargv);
165
167
    virCommandFree(cmd);
166
168
    virDomainDefFree(vmdef);
167
169
    virUnrefConnect(conn);
197
199
                                       info->json, info->expectError);
198
200
 
199
201
cleanup:
200
 
    free(xml);
201
 
    free(args);
 
202
    VIR_FREE(xml);
 
203
    VIR_FREE(args);
202
204
    return result;
203
205
}
204
206
 
230
232
        return EXIT_FAILURE;
231
233
    if (virAsprintf(&map, "%s/src/cpu/cpu_map.xml", abs_top_srcdir) < 0 ||
232
234
        cpuMapOverride(map) < 0) {
233
 
        free(map);
 
235
        VIR_FREE(map);
234
236
        return EXIT_FAILURE;
235
237
    }
236
238
 
274
276
    DO_TEST("qemu-ns-commandline-ns0", false, NONE);
275
277
    DO_TEST("qemu-ns-commandline-ns1", false, NONE);
276
278
 
277
 
    free(driver.stateDir);
 
279
    VIR_FREE(driver.stateDir);
278
280
    virCapabilitiesFree(driver.caps);
279
 
    free(map);
 
281
    VIR_FREE(map);
280
282
 
281
 
    return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
 
283
    return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE;
282
284
}
283
285
 
284
286
VIRT_TEST_MAIN(mymain)