← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tests/qemuhelptest.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/qemuhelptest.c
53
53
        goto cleanup;
54
54
 
55
55
    if (qemuCapsParseHelpStr("QEMU", help, flags,
56
 
                             &version, &is_kvm, &kvm_version) == -1)
 
56
                             &version, &is_kvm, &kvm_version, false) == -1)
57
57
        goto cleanup;
58
58
 
59
59
# ifndef HAVE_YAJL
81
81
        goto cleanup;
82
82
 
83
83
    if (STRNEQ(got, expected)) {
84
 
        fprintf(stderr,
85
 
                "%s: computed flags do not match: got %s, expected %s\n",
86
 
                info->name, got, expected);
 
84
        if (virTestGetVerbose() || virTestGetDebug())
 
85
            fprintf(stderr,
 
86
                    "%s: computed flags do not match: got %s, expected %s\n",
 
87
                    info->name, got, expected);
87
88
 
88
 
        if (getenv("VIR_TEST_DEBUG"))
 
89
        if (virTestGetDebug())
89
90
            printMismatchedFlags(flags, info->flags);
90
91
 
91
92
        goto cleanup;
145
146
            QEMU_CAPS_VNC_COLON,
146
147
            QEMU_CAPS_NO_REBOOT,
147
148
            QEMU_CAPS_DRIVE,
148
 
            QEMU_CAPS_NAME);
 
149
            QEMU_CAPS_NAME,
 
150
            QEMU_CAPS_NO_ACPI);
149
151
    DO_TEST("kvm-74", 9001, 1, 74,
150
152
            QEMU_CAPS_VNC_COLON,
151
153
            QEMU_CAPS_NO_REBOOT,
158
160
            QEMU_CAPS_DRIVE_FORMAT,
159
161
            QEMU_CAPS_MEM_PATH,
160
162
            QEMU_CAPS_TDF,
161
 
            QEMU_CAPS_NO_SHUTDOWN);
 
163
            QEMU_CAPS_NO_SHUTDOWN,
 
164
            QEMU_CAPS_NO_ACPI);
162
165
    DO_TEST("kvm-83-rhel56", 9001, 1, 83,
163
166
            QEMU_CAPS_VNC_COLON,
164
167
            QEMU_CAPS_NO_REBOOT,
185
188
            QEMU_CAPS_DRIVE_READONLY,
186
189
            QEMU_CAPS_SMBIOS_TYPE,
187
190
            QEMU_CAPS_SPICE,
188
 
            QEMU_CAPS_NO_SHUTDOWN);
 
191
            QEMU_CAPS_NO_SHUTDOWN,
 
192
            QEMU_CAPS_NO_ACPI);
189
193
    DO_TEST("qemu-0.10.5", 10005, 0, 0,
190
194
            QEMU_CAPS_KQEMU,
191
195
            QEMU_CAPS_VNC_COLON,
205
209
            QEMU_CAPS_RTC_TD_HACK,
206
210
            QEMU_CAPS_NO_HPET,
207
211
            QEMU_CAPS_VGA_NONE,
208
 
            QEMU_CAPS_NO_SHUTDOWN);
 
212
            QEMU_CAPS_NO_SHUTDOWN,
 
213
            QEMU_CAPS_NO_ACPI);
209
214
    DO_TEST("qemu-kvm-0.10.5", 10005, 1, 0,
210
215
            QEMU_CAPS_VNC_COLON,
211
216
            QEMU_CAPS_NO_REBOOT,
231
236
            QEMU_CAPS_TDF,
232
237
            QEMU_CAPS_NESTING,
233
238
            QEMU_CAPS_VGA_NONE,
234
 
            QEMU_CAPS_NO_SHUTDOWN);
 
239
            QEMU_CAPS_NO_SHUTDOWN,
 
240
            QEMU_CAPS_NO_ACPI);
235
241
    DO_TEST("kvm-86", 10050, 1, 0,
236
242
            QEMU_CAPS_VNC_COLON,
237
243
            QEMU_CAPS_NO_REBOOT,
257
263
            QEMU_CAPS_NESTING,
258
264
            QEMU_CAPS_SMBIOS_TYPE,
259
265
            QEMU_CAPS_VGA_NONE,
260
 
            QEMU_CAPS_NO_SHUTDOWN);
 
266
            QEMU_CAPS_NO_SHUTDOWN,
 
267
            QEMU_CAPS_NO_ACPI);
261
268
    DO_TEST("qemu-kvm-0.11.0-rc2", 10092, 1, 0,
262
269
            QEMU_CAPS_VNC_COLON,
263
270
            QEMU_CAPS_NO_REBOOT,
288
295
            QEMU_CAPS_NAME_PROCESS,
289
296
            QEMU_CAPS_SMBIOS_TYPE,
290
297
            QEMU_CAPS_VGA_NONE,
291
 
            QEMU_CAPS_NO_SHUTDOWN);
 
298
            QEMU_CAPS_NO_SHUTDOWN,
 
299
            QEMU_CAPS_NO_ACPI);
292
300
    DO_TEST("qemu-0.12.1", 12001, 0, 0,
293
301
            QEMU_CAPS_VNC_COLON,
294
302
            QEMU_CAPS_NO_REBOOT,
320
328
            QEMU_CAPS_MIGRATE_QEMU_FD,
321
329
            QEMU_CAPS_DRIVE_AIO,
322
330
            QEMU_CAPS_NO_SHUTDOWN,
323
 
            QEMU_CAPS_PCI_ROMBAR);
 
331
            QEMU_CAPS_PCI_ROMBAR,
 
332
            QEMU_CAPS_NO_ACPI,
 
333
            QEMU_CAPS_VIRTIO_BLK_SG_IO,
 
334
            QEMU_CAPS_CPU_HOST);
324
335
    DO_TEST("qemu-kvm-0.12.1.2-rhel60", 12001, 1, 0,
325
336
            QEMU_CAPS_VNC_COLON,
326
337
            QEMU_CAPS_NO_REBOOT,
343
354
            QEMU_CAPS_MIGRATE_QEMU_UNIX,
344
355
            QEMU_CAPS_CHARDEV,
345
356
            QEMU_CAPS_ENABLE_KVM,
 
357
            QEMU_CAPS_MONITOR_JSON,
346
358
            QEMU_CAPS_BALLOON,
347
359
            QEMU_CAPS_DEVICE,
348
360
            QEMU_CAPS_SMP_TOPOLOGY,
 
361
            QEMU_CAPS_NETDEV,
349
362
            QEMU_CAPS_RTC,
350
363
            QEMU_CAPS_VHOST_NET,
351
364
            QEMU_CAPS_NO_KVM_PIT,
366
379
            QEMU_CAPS_PIIX4_USB_UHCI,
367
380
            QEMU_CAPS_USB_HUB,
368
381
            QEMU_CAPS_NO_SHUTDOWN,
369
 
            QEMU_CAPS_PCI_ROMBAR);
 
382
            QEMU_CAPS_PCI_ROMBAR,
 
383
            QEMU_CAPS_NO_ACPI,
 
384
            QEMU_CAPS_VIRTIO_BLK_SG_IO,
 
385
            QEMU_CAPS_CPU_HOST);
370
386
    DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0,
371
387
            QEMU_CAPS_VNC_COLON,
372
388
            QEMU_CAPS_NO_REBOOT,
405
421
            QEMU_CAPS_MIGRATE_QEMU_FD,
406
422
            QEMU_CAPS_DRIVE_AIO,
407
423
            QEMU_CAPS_NO_SHUTDOWN,
408
 
            QEMU_CAPS_PCI_ROMBAR);
 
424
            QEMU_CAPS_PCI_ROMBAR,
 
425
            QEMU_CAPS_NO_ACPI,
 
426
            QEMU_CAPS_VIRTIO_BLK_SG_IO,
 
427
            QEMU_CAPS_CPU_HOST);
409
428
    DO_TEST("qemu-kvm-0.13.0", 13000, 1, 0,
410
429
            QEMU_CAPS_VNC_COLON,
411
430
            QEMU_CAPS_NO_REBOOT,
460
479
            QEMU_CAPS_PCI_OHCI,
461
480
            QEMU_CAPS_USB_HUB,
462
481
            QEMU_CAPS_NO_SHUTDOWN,
463
 
            QEMU_CAPS_PCI_ROMBAR);
 
482
            QEMU_CAPS_PCI_ROMBAR,
 
483
            QEMU_CAPS_NO_ACPI,
 
484
            QEMU_CAPS_VIRTIO_BLK_SG_IO,
 
485
            QEMU_CAPS_CPU_HOST);
464
486
    DO_TEST("qemu-kvm-0.12.1.2-rhel61", 12001, 1, 0,
465
487
            QEMU_CAPS_VNC_COLON,
466
488
            QEMU_CAPS_NO_REBOOT,
483
505
            QEMU_CAPS_MIGRATE_QEMU_UNIX,
484
506
            QEMU_CAPS_CHARDEV,
485
507
            QEMU_CAPS_ENABLE_KVM,
 
508
            QEMU_CAPS_MONITOR_JSON,
486
509
            QEMU_CAPS_BALLOON,
487
510
            QEMU_CAPS_DEVICE,
488
511
            QEMU_CAPS_SMP_TOPOLOGY,
 
512
            QEMU_CAPS_NETDEV,
489
513
            QEMU_CAPS_RTC,
490
514
            QEMU_CAPS_VHOST_NET,
491
515
            QEMU_CAPS_NO_KVM_PIT,
511
535
            QEMU_CAPS_PIIX4_USB_UHCI,
512
536
            QEMU_CAPS_USB_HUB,
513
537
            QEMU_CAPS_NO_SHUTDOWN,
514
 
            QEMU_CAPS_PCI_ROMBAR);
 
538
            QEMU_CAPS_PCI_ROMBAR,
 
539
            QEMU_CAPS_NO_ACPI,
 
540
            QEMU_CAPS_VIRTIO_BLK_SCSI,
 
541
            QEMU_CAPS_VIRTIO_BLK_SG_IO,
 
542
            QEMU_CAPS_CPU_HOST);
515
543
    DO_TEST("qemu-kvm-0.12.1.2-rhel62-beta", 12001, 1, 0,
516
544
            QEMU_CAPS_VNC_COLON,
517
545
            QEMU_CAPS_NO_REBOOT,
535
563
            QEMU_CAPS_CHARDEV,
536
564
            QEMU_CAPS_ENABLE_KVM,
537
565
            QEMU_CAPS_BALLOON,
 
566
            QEMU_CAPS_MONITOR_JSON,
538
567
            QEMU_CAPS_DEVICE,
539
568
            QEMU_CAPS_SMP_TOPOLOGY,
 
569
            QEMU_CAPS_NETDEV,
540
570
            QEMU_CAPS_RTC,
541
571
            QEMU_CAPS_VHOST_NET,
542
572
            QEMU_CAPS_NO_KVM_PIT,
570
600
            QEMU_CAPS_ICH9_USB_EHCI1,
571
601
            QEMU_CAPS_USB_HUB,
572
602
            QEMU_CAPS_NO_SHUTDOWN,
573
 
            QEMU_CAPS_PCI_ROMBAR);
 
603
            QEMU_CAPS_PCI_ROMBAR,
 
604
            QEMU_CAPS_NO_ACPI,
 
605
            QEMU_CAPS_VIRTIO_BLK_SCSI,
 
606
            QEMU_CAPS_VIRTIO_BLK_SG_IO,
 
607
            QEMU_CAPS_DRIVE_COPY_ON_READ,
 
608
            QEMU_CAPS_CPU_HOST,
 
609
            QEMU_CAPS_SCSI_CD);
574
610
    DO_TEST("qemu-1.0", 1000000, 0, 0,
575
611
            QEMU_CAPS_VNC_COLON,
576
612
            QEMU_CAPS_NO_REBOOT,
632
668
            QEMU_CAPS_USB_HUB,
633
669
            QEMU_CAPS_NO_SHUTDOWN,
634
670
            QEMU_CAPS_PCI_ROMBAR,
635
 
            QEMU_CAPS_ICH9_AHCI);
 
671
            QEMU_CAPS_ICH9_AHCI,
 
672
            QEMU_CAPS_NO_ACPI,
 
673
            QEMU_CAPS_FSDEV_READONLY,
 
674
            QEMU_CAPS_VIRTIO_BLK_SCSI,
 
675
            QEMU_CAPS_VIRTIO_BLK_SG_IO,
 
676
            QEMU_CAPS_CPU_HOST,
 
677
            QEMU_CAPS_FSDEV_WRITEOUT,
 
678
            QEMU_CAPS_SCSI_BLOCK,
 
679
            QEMU_CAPS_SCSI_CD,
 
680
            QEMU_CAPS_IDE_CD);
636
681
 
637
682
    return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
638
683
}