mirror of
				https://github.com/yuzu-emu/unicorn.git
				synced 2025-11-04 14:14:57 +00:00 
			
		
		
		
	target-i386: Rename cpu_x86_init() to cpu_x86_init_user()
The function is used only for CONFIG_USER, so make its purpose clear. Backports commit 644dba250a3ed04079792f0d6cc918fb1483e6a5 from qemu
This commit is contained in:
		
							parent
							
								
									bba9634578
								
							
						
					
					
						commit
						68fa057b7c
					
				| 
						 | 
					@ -1805,7 +1805,7 @@ out:
 | 
				
			||||||
    return cpu;
 | 
					    return cpu;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
X86CPU *cpu_x86_init(struct uc_struct *uc, const char *cpu_model)
 | 
					X86CPU *cpu_x86_init_user(struct uc_struct *uc, const char *cpu_model)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    Error *error = NULL;
 | 
					    Error *error = NULL;
 | 
				
			||||||
    X86CPU *cpu;
 | 
					    X86CPU *cpu;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -979,7 +979,7 @@ typedef struct CPUX86State {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "cpu-qom.h"
 | 
					#include "cpu-qom.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
X86CPU *cpu_x86_init(struct uc_struct *uc, const char *cpu_model);
 | 
					X86CPU *cpu_x86_init_user(struct uc_struct *uc, const char *cpu_model);
 | 
				
			||||||
X86CPU *cpu_x86_create(struct uc_struct *uc, const char *cpu_model, Error **errp);
 | 
					X86CPU *cpu_x86_create(struct uc_struct *uc, const char *cpu_model, Error **errp);
 | 
				
			||||||
int cpu_x86_exec(struct uc_struct *uc, CPUX86State *s);
 | 
					int cpu_x86_exec(struct uc_struct *uc, CPUX86State *s);
 | 
				
			||||||
void x86_cpudef_setup(void);
 | 
					void x86_cpudef_setup(void);
 | 
				
			||||||
| 
						 | 
					@ -1167,7 +1167,7 @@ uint64_t cpu_get_tsc(CPUX86State *env);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static inline CPUX86State *cpu_init(struct uc_struct *uc, const char *cpu_model)
 | 
					static inline CPUX86State *cpu_init(struct uc_struct *uc, const char *cpu_model)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    X86CPU *cpu = cpu_x86_init(uc, cpu_model);
 | 
					    X86CPU *cpu = cpu_x86_init_user(uc, cpu_model);
 | 
				
			||||||
    if (cpu == NULL) {
 | 
					    if (cpu == NULL) {
 | 
				
			||||||
        return NULL;
 | 
					        return NULL;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue