Use global properties to emulate -no-kvm-pit-reinjection
Releases of qemu-kvm will be interrupted at qemu 1.3.0. Users should switch to plain qemu releases. To avoid breaking scenarios which are setup with command line options specific to qemu-kvm, port these switches from qemu-kvm to qemu.git. Port -no-kvm-pit-reinjection. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
		
							parent
							
								
									4086bde8c0
								
							
						
					
					
						commit
						c21fb4f8b8
					
				@ -2888,6 +2888,10 @@ STEXI
 | 
				
			|||||||
Enable FIPS 140-2 compliance mode.
 | 
					Enable FIPS 140-2 compliance mode.
 | 
				
			||||||
ETEXI
 | 
					ETEXI
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					HXCOMM Deprecated by kvm-pit driver properties
 | 
				
			||||||
 | 
					DEF("no-kvm-pit-reinjection", HAS_ARG, QEMU_OPTION_no_kvm_pit_reinjection,
 | 
				
			||||||
 | 
					    "", QEMU_ARCH_I386)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
HXCOMM Deprecated (ignored)
 | 
					HXCOMM Deprecated (ignored)
 | 
				
			||||||
DEF("no-kvm-pit", HAS_ARG, QEMU_OPTION_no_kvm_pit, "", QEMU_ARCH_I386)
 | 
					DEF("no-kvm-pit", HAS_ARG, QEMU_OPTION_no_kvm_pit, "", QEMU_ARCH_I386)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										15
									
								
								vl.c
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								vl.c
									
									
									
									
									
								
							@ -3176,6 +3176,21 @@ int main(int argc, char **argv, char **envp)
 | 
				
			|||||||
                                "separately.\n");
 | 
					                                "separately.\n");
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					            case QEMU_OPTION_no_kvm_pit_reinjection: {
 | 
				
			||||||
 | 
					                static GlobalProperty kvm_pit_lost_tick_policy[] = {
 | 
				
			||||||
 | 
					                    {
 | 
				
			||||||
 | 
					                        .driver   = "kvm-pit",
 | 
				
			||||||
 | 
					                        .property = "lost_tick_policy",
 | 
				
			||||||
 | 
					                        .value    = "discard",
 | 
				
			||||||
 | 
					                    },
 | 
				
			||||||
 | 
					                    { /* end of list */ }
 | 
				
			||||||
 | 
					                };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                fprintf(stderr, "Warning: option deprecated, use "
 | 
				
			||||||
 | 
					                        "lost_tick_policy property of kvm-pit instead.\n");
 | 
				
			||||||
 | 
					                qdev_prop_register_global_list(kvm_pit_lost_tick_policy);
 | 
				
			||||||
 | 
					                break;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
            case QEMU_OPTION_usb:
 | 
					            case QEMU_OPTION_usb:
 | 
				
			||||||
                machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0);
 | 
					                machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0);
 | 
				
			||||||
                if (machine_opts) {
 | 
					                if (machine_opts) {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user