← Back to branch summary

~ubuntu-branches/ubuntu/maverick/libvirt/maverick

« back to all changes in this revision

Viewing changes to tests/qemuxml2argvtest.c

Tags: upstream-0.6.4
Import upstream version 0.6.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/qemuxml2argvtest.c
34
34
    const char **tmp = NULL;
35
35
    int ret = -1, len, flags;
36
36
    virDomainDefPtr vmdef = NULL;
37
 
    virDomainObj vm;
38
37
 
39
38
    if (virtTestLoadFile(cmd, &expectargv, MAX_FILE) < 0)
40
39
        goto fail;
43
42
                                        VIR_DOMAIN_XML_INACTIVE)))
44
43
        goto fail;
45
44
 
46
 
    memset(&vm, 0, sizeof vm);
47
 
    vm.def = vmdef;
48
45
    if (extraFlags & QEMUD_CMD_FLAG_DOMID)
49
 
        vm.def->id = 6;
 
46
        vmdef->id = 6;
50
47
    else
51
 
        vm.def->id = -1;
52
 
    vm.pid = -1;
 
48
        vmdef->id = -1;
53
49
 
54
50
    flags = QEMUD_CMD_FLAG_VNC_COLON |
55
51
        QEMUD_CMD_FLAG_NO_REBOOT |
56
52
        extraFlags;
57
53
 
58
54
    if (qemudBuildCommandLine(NULL, &driver,
59
 
                              &vm, flags, &argv, &qenv,
 
55
                              vmdef, flags, &argv, &qenv,
60
56
                              NULL, NULL, migrateFrom) < 0)
61
57
        goto fail;
62
58