Move network redirection code out of vl.c and into net.c
Mostly code motion. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5581 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
		
							parent
							
								
									6f97dba008
								
							
						
					
					
						commit
						63a01ef83a
					
				@ -580,6 +580,7 @@ ifndef CONFIG_USER_ONLY
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o net-checksum.o
 | 
					OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o net-checksum.o
 | 
				
			||||||
OBJS+=fw_cfg.o aio.o buffered_file.o migration.o migration-tcp.o qemu-char.o
 | 
					OBJS+=fw_cfg.o aio.o buffered_file.o migration.o migration-tcp.o qemu-char.o
 | 
				
			||||||
 | 
					OBJS+=net.o
 | 
				
			||||||
ifdef CONFIG_WIN32
 | 
					ifdef CONFIG_WIN32
 | 
				
			||||||
OBJS+=block-raw-win32.o
 | 
					OBJS+=block-raw-win32.o
 | 
				
			||||||
else
 | 
					else
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										9
									
								
								net.h
									
									
									
									
									
								
							
							
						
						
									
										9
									
								
								net.h
									
									
									
									
									
								
							@ -69,4 +69,13 @@ uint16_t net_checksum_tcpudp(uint16_t length, uint16_t proto,
 | 
				
			|||||||
                             uint8_t *addrs, uint8_t *buf);
 | 
					                             uint8_t *addrs, uint8_t *buf);
 | 
				
			||||||
void net_checksum_calculate(uint8_t *data, int length);
 | 
					void net_checksum_calculate(uint8_t *data, int length);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* from net.c */
 | 
				
			||||||
 | 
					int net_client_init(const char *device, const char *p);
 | 
				
			||||||
 | 
					int net_client_parse(const char *str);
 | 
				
			||||||
 | 
					void net_slirp_smb(const char *exported_dir);
 | 
				
			||||||
 | 
					void net_slirp_redir(const char *redir_str);
 | 
				
			||||||
 | 
					void net_cleanup(void);
 | 
				
			||||||
 | 
					int slirp_is_inited(void);
 | 
				
			||||||
 | 
					void net_client_check(void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										7
									
								
								sysemu.h
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								sysemu.h
									
									
									
									
									
								
							@ -193,4 +193,11 @@ void do_usb_add(const char *devname);
 | 
				
			|||||||
void do_usb_del(const char *devname);
 | 
					void do_usb_del(const char *devname);
 | 
				
			||||||
void usb_info(void);
 | 
					void usb_info(void);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					const char *get_opt_name(char *buf, int buf_size, const char *p);
 | 
				
			||||||
 | 
					const char *get_opt_value(char *buf, int buf_size, const char *p);
 | 
				
			||||||
 | 
					int get_param_value(char *buf, int buf_size,
 | 
				
			||||||
 | 
					                    const char *tag, const char *str);
 | 
				
			||||||
 | 
					int check_params(char *buf, int buf_size,
 | 
				
			||||||
 | 
					                 const char * const *params, const char *str);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user