ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix vmmouse with -smp 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4165 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aurel32 2008-04-07 19:47:25 +00:00
parent 4ce7ff6e68
commit 26fb5e48d9
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/pc.c
View File

@ -748,9 +748,10 @@ static void pc_init1(int ram_size, int vga_ram_size,
if (pci_enabled) { if (pci_enabled) {
apic_init(env); apic_init(env);
} }
vmport_init(env);
} }
vmport_init();
/* allocate RAM */ /* allocate RAM */
ram_addr = qemu_ram_alloc(ram_size); ram_addr = qemu_ram_alloc(ram_size);
cpu_register_physical_memory(0, ram_size, ram_addr); cpu_register_physical_memory(0, ram_size, ram_addr);

2
hw/pc.h
View File

@ -59,7 +59,7 @@ int pit_get_mode(PITState *pit, int channel);
int pit_get_out(PITState *pit, int channel, int64_t current_time); int pit_get_out(PITState *pit, int channel, int64_t current_time);
/* vmport.c */ /* vmport.c */
void vmport_init(CPUState *env); void vmport_init(void);
void vmport_register(unsigned char command, IOPortReadFunc *func, void *opaque); void vmport_register(unsigned char command, IOPortReadFunc *func, void *opaque);
/* vmmouse.c */ /* vmmouse.c */

18
hw/vmport.c
View File

@ -34,7 +34,6 @@
typedef struct _VMPortState typedef struct _VMPortState
{ {
CPUState *env;
IOPortReadFunc *func[VMPORT_ENTRIES]; IOPortReadFunc *func[VMPORT_ENTRIES];
void *opaque[VMPORT_ENTRIES]; void *opaque[VMPORT_ENTRIES];
} VMPortState; } VMPortState;
@ -53,14 +52,15 @@ void vmport_register(unsigned char command, IOPortReadFunc *func, void *opaque)
static uint32_t vmport_ioport_read(void *opaque, uint32_t addr) static uint32_t vmport_ioport_read(void *opaque, uint32_t addr)
{ {
VMPortState *s = opaque; VMPortState *s = opaque;
CPUState *env = cpu_single_env;
unsigned char command; unsigned char command;
uint32_t eax; uint32_t eax;
eax = s->env->regs[R_EAX]; eax = env->regs[R_EAX];
if (eax != VMPORT_MAGIC) if (eax != VMPORT_MAGIC)
return eax; return eax;
command = s->env->regs[R_ECX]; command = env->regs[R_ECX];
if (command >= VMPORT_ENTRIES) if (command >= VMPORT_ENTRIES)
return eax; return eax;
if (!s->func[command]) if (!s->func[command])
@ -74,25 +74,23 @@ static uint32_t vmport_ioport_read(void *opaque, uint32_t addr)
static uint32_t vmport_cmd_get_version(void *opaque, uint32_t addr) static uint32_t vmport_cmd_get_version(void *opaque, uint32_t addr)
{ {
CPUState *env = opaque; CPUState *env = cpu_single_env;
env->regs[R_EBX] = VMPORT_MAGIC; env->regs[R_EBX] = VMPORT_MAGIC;
return 6; return 6;
} }
static uint32_t vmport_cmd_ram_size(void *opaque, uint32_t addr) static uint32_t vmport_cmd_ram_size(void *opaque, uint32_t addr)
{ {
CPUState *env = opaque; CPUState *env = cpu_single_env;
env->regs[R_EBX] = 0x1177; env->regs[R_EBX] = 0x1177;
return ram_size; return ram_size;
} }
void vmport_init(CPUState *env) void vmport_init(void)
{ {
port_state.env = env;
register_ioport_read(0x5658, 1, 4, vmport_ioport_read, &port_state); register_ioport_read(0x5658, 1, 4, vmport_ioport_read, &port_state);
/* Register some generic port commands */ /* Register some generic port commands */
vmport_register(VMPORT_CMD_GETVERSION, vmport_cmd_get_version, env); vmport_register(VMPORT_CMD_GETVERSION, vmport_cmd_get_version, NULL);
vmport_register(VMPORT_CMD_GETRAMSIZE, vmport_cmd_ram_size, env); vmport_register(VMPORT_CMD_GETRAMSIZE, vmport_cmd_ram_size, NULL);
} }