← Back to branch summary

~ubuntu-branches/ubuntu/precise/libvirt/precise-proposed

« back to all changes in this revision

Viewing changes to src/qemu/qemu_driver.c

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn, Serge Hallyn, Stefan Bader
  • Date: 2012-04-05 11:43:15 UTC
  • Revision ID: package-import@ubuntu.com-20120405114315-vihb4dj9r32pji9p
Tags: 0.9.8-2ubuntu16
https://launchpad.net/bugs/973529
[ Serge Hallyn ]
* Apply patches from Josh Durgin <josh.durgin@dreamhost.com> to make
  attaching rbd volumes and taking snapshots of them work.
  - ubuntu/9022-qemu-unescape-HMP-commands-before-converting-them-to.patch
  - ubuntu/9023-qemu-change-rbd-auth_supported-separation-character-.patch
  - ubuntu/9024-qemu-allow-snapshotting-of-sheepdog-and-rbd-disks.patch
  - ubuntu/9025-qemu-change-rbd-auth_supported-separation-character-.patch

[ Stefan Bader ]
* Do not use vfb sections in HVM graphics definitions (side-
  effect will create a vkbd device as well which causes error
  messages in the HVM guest). (LP: #973529)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/qemu/qemu_driver.c
9161
9161
     * that succeed as well
9162
9162
     */
9163
9163
    for (i = 0; i < vm->def->ndisks; i++) {
9164
 
        if (vm->def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK &&
9165
 
            (!vm->def->disks[i]->driverType ||
9166
 
             STRNEQ(vm->def->disks[i]->driverType, "qcow2"))) {
 
9164
        virDomainDiskDefPtr disk = vm->def->disks[i];
 
9165
        if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK &&
 
9166
            (disk->protocol == VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG ||
 
9167
             disk->protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD))
 
9168
            continue;
 
9169
 
 
9170
        if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK &&
 
9171
            (!disk->driverType ||
 
9172
             STRNEQ(disk->driverType, "qcow2"))) {
9167
9173
            qemuReportError(VIR_ERR_OPERATION_INVALID,
9168
9174
                            _("Disk '%s' does not support snapshotting"),
9169
 
                            vm->def->disks[i]->src);
 
9175
                            disk->src);
9170
9176
            return 0;
9171
9177
        }
9172
9178
    }