qed: remove incoming live migration blocker
Signed-off-by: Benoit Canet <benoit.canet@gmail.com> Reviewed-by: Stefan Hajnoczi <stefanha@gmail.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
		
							parent
							
								
									2d1f3c2360
								
							
						
					
					
						commit
						50d30c2675
					
				| 
						 | 
				
			
			@ -498,12 +498,6 @@ static int bdrv_qed_open(BlockDriverState *bs, int flags)
 | 
			
		|||
    s->need_check_timer = qemu_new_timer_ns(vm_clock,
 | 
			
		||||
                                            qed_need_check_timer_cb, s);
 | 
			
		||||
 | 
			
		||||
    error_set(&s->migration_blocker,
 | 
			
		||||
              QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED,
 | 
			
		||||
              "qed", bs->device_name, "live migration");
 | 
			
		||||
    migrate_add_blocker(s->migration_blocker);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
out:
 | 
			
		||||
    if (ret) {
 | 
			
		||||
        qed_free_l2_cache(&s->l2_cache);
 | 
			
		||||
| 
						 | 
				
			
			@ -516,9 +510,6 @@ static void bdrv_qed_close(BlockDriverState *bs)
 | 
			
		|||
{
 | 
			
		||||
    BDRVQEDState *s = bs->opaque;
 | 
			
		||||
 | 
			
		||||
    migrate_del_blocker(s->migration_blocker);
 | 
			
		||||
    error_free(s->migration_blocker);
 | 
			
		||||
 | 
			
		||||
    qed_cancel_need_check_timer(s);
 | 
			
		||||
    qemu_free_timer(s->need_check_timer);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -169,8 +169,6 @@ typedef struct {
 | 
			
		|||
 | 
			
		||||
    /* Periodic flush and clear need check flag */
 | 
			
		||||
    QEMUTimer *need_check_timer;
 | 
			
		||||
 | 
			
		||||
    Error *migration_blocker;
 | 
			
		||||
} BDRVQEDState;
 | 
			
		||||
 | 
			
		||||
enum {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue