Re: [libvirt] [PATCH] qemu: clear useless code

2015-05-13 Thread Michal Privoznik
On 13.05.2015 07:56, zhang bo wrote:
> The variable 'now' is useless in qemuMigrationPrepareAny(), so I clear it.
> 
> Signed-off-by: Wang Yufei 
> Signed-off-by: Zhang Bo 
> ---
>  src/qemu/qemu_migration.c | 4 
>  1 file changed, 4 deletions(-)
> 
> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> index c1af704..4dcba7a 100644
> --- a/src/qemu/qemu_migration.c
> +++ b/src/qemu/qemu_migration.c
> @@ -2913,7 +2913,6 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
>  int ret = -1;
>  int dataFD[2] = { -1, -1 };
>  qemuDomainObjPrivatePtr priv = NULL;
> -unsigned long long now;
>  qemuMigrationCookiePtr mig = NULL;
>  bool tunnel = !!st;
>  char *xmlout = NULL;
> @@ -2923,9 +2922,6 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
>  bool abort_on_error = !!(flags & VIR_MIGRATE_ABORT_ON_ERROR);
>  bool taint_hook = false;
>  
> -if (virTimeMillisNow(&now) < 0)
> -return -1;
> -
>  virNWFilterReadLockFilterUpdates();
>  
>  if (flags & VIR_MIGRATE_OFFLINE) {
> 

I've reworded the commit message a bit, ACKed and pushed.

Michal

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list


[libvirt] [PATCH] qemu: clear useless code

2015-05-12 Thread zhang bo
The variable 'now' is useless in qemuMigrationPrepareAny(), so I clear it.

Signed-off-by: Wang Yufei 
Signed-off-by: Zhang Bo 
---
 src/qemu/qemu_migration.c | 4 
 1 file changed, 4 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index c1af704..4dcba7a 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2913,7 +2913,6 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
 int ret = -1;
 int dataFD[2] = { -1, -1 };
 qemuDomainObjPrivatePtr priv = NULL;
-unsigned long long now;
 qemuMigrationCookiePtr mig = NULL;
 bool tunnel = !!st;
 char *xmlout = NULL;
@@ -2923,9 +2922,6 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
 bool abort_on_error = !!(flags & VIR_MIGRATE_ABORT_ON_ERROR);
 bool taint_hook = false;
 
-if (virTimeMillisNow(&now) < 0)
-return -1;
-
 virNWFilterReadLockFilterUpdates();
 
 if (flags & VIR_MIGRATE_OFFLINE) {
-- 
1.7.12.4


--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list