Fix patch 4 in get migration speed series

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=152
This commit is contained in:
James Fehlig 2011-09-15 04:10:37 +00:00 committed by Git OBS Bridge
parent bec12474ff
commit e910448849

View File

@ -8,7 +8,7 @@ Index: libvirt-0.9.4/src/qemu/qemu_driver.c
=================================================================== ===================================================================
--- libvirt-0.9.4.orig/src/qemu/qemu_driver.c --- libvirt-0.9.4.orig/src/qemu/qemu_driver.c
+++ libvirt-0.9.4/src/qemu/qemu_driver.c +++ libvirt-0.9.4/src/qemu/qemu_driver.c
@@ -8329,6 +8329,38 @@ static int qemuDomainSnapshotSetCurrentI @@ -8329,6 +8329,40 @@ static int qemuDomainSnapshotSetCurrentI
} }
@ -19,6 +19,7 @@ Index: libvirt-0.9.4/src/qemu/qemu_driver.c
+{ +{
+ struct qemud_driver *driver = dom->conn->privateData; + struct qemud_driver *driver = dom->conn->privateData;
+ virDomainObjPtr vm; + virDomainObjPtr vm;
+ qemuDomainObjPrivatePtr priv;
+ int ret = -1; + int ret = -1;
+ +
+ virCheckFlags(0, -1); + virCheckFlags(0, -1);
@ -35,7 +36,8 @@ Index: libvirt-0.9.4/src/qemu/qemu_driver.c
+ goto cleanup; + goto cleanup;
+ } + }
+ +
+ *bandwidth = vm->privateData->migMaxBandwidth; + priv = vm->privateData;
+ *bandwidth = priv->migMaxBandwidth;
+ ret = 0; + ret = 0;
+ +
+cleanup: +cleanup:
@ -47,7 +49,7 @@ Index: libvirt-0.9.4/src/qemu/qemu_driver.c
static int qemuDomainSnapshotIsAllowed(virDomainObjPtr vm) static int qemuDomainSnapshotIsAllowed(virDomainObjPtr vm)
{ {
int i; int i;
@@ -9494,6 +9526,7 @@ static virDriver qemuDriver = { @@ -9494,6 +9528,7 @@ static virDriver qemuDriver = {
.domainAbortJob = qemuDomainAbortJob, /* 0.7.7 */ .domainAbortJob = qemuDomainAbortJob, /* 0.7.7 */
.domainMigrateSetMaxDowntime = qemuDomainMigrateSetMaxDowntime, /* 0.8.0 */ .domainMigrateSetMaxDowntime = qemuDomainMigrateSetMaxDowntime, /* 0.8.0 */
.domainMigrateSetMaxSpeed = qemuDomainMigrateSetMaxSpeed, /* 0.9.0 */ .domainMigrateSetMaxSpeed = qemuDomainMigrateSetMaxSpeed, /* 0.9.0 */