smbios: remove dependency on x86 e820 tables

[qemu.git] / hw / i386 / kvmvapic.c

diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
index 9850a8511a845a3d4a8f40405d62b6441b08e0ce..c6d34b2546a84f7fd96544e0505da1be15aafc3f 100644 (file)
--- a/hw/i386/kvmvapic.c
+++ b/hw/i386/kvmvapic.c
@@ -59,6 +59,7 @@ typedef struct VAPICROMState {
     GuestROMState rom_state;
     size_t rom_size;
     bool rom_mapped_writable;
     GuestROMState rom_state;
     size_t rom_size;
     bool rom_mapped_writable;

+    VMChangeStateEntry *vmsentry;

 } VAPICROMState;
 
 #define TYPE_VAPIC "kvmvapic"
 } VAPICROMState;
 
 #define TYPE_VAPIC "kvmvapic"


@@ -124,14 +125,14 @@ static const TPRInstruction tpr_instr[] = {
 
 static void read_guest_rom_state(VAPICROMState *s)
 {
 
 static void read_guest_rom_state(VAPICROMState *s)
 {

-    cpu_physical_memory_rw(s->rom_state_paddr, (void *)&s->rom_state,
-                           sizeof(GuestROMState), 0);
+    cpu_physical_memory_read(s->rom_state_paddr, &s->rom_state,
+                             sizeof(GuestROMState));

 }
 
 static void write_guest_rom_state(VAPICROMState *s)
 {
 }
 
 static void write_guest_rom_state(VAPICROMState *s)
 {

-    cpu_physical_memory_rw(s->rom_state_paddr, (void *)&s->rom_state,
-                           sizeof(GuestROMState), 1);
+    cpu_physical_memory_write(s->rom_state_paddr, &s->rom_state,
+                              sizeof(GuestROMState));

 }
 
 static void update_guest_rom_state(VAPICROMState *s)
 }
 
 static void update_guest_rom_state(VAPICROMState *s)


@@ -146,6 +147,7 @@ static void update_guest_rom_state(VAPICROMState *s)
 
 static int find_real_tpr_addr(VAPICROMState *s, CPUX86State *env)
 {
 
 static int find_real_tpr_addr(VAPICROMState *s, CPUX86State *env)
 {

+    CPUState *cs = CPU(x86_env_get_cpu(env));

     hwaddr paddr;
     target_ulong addr;
 
     hwaddr paddr;
     target_ulong addr;
 


@@ -158,7 +160,7 @@ static int find_real_tpr_addr(VAPICROMState *s, CPUX86State *env)
      * virtual address space for the APIC mapping.
      */
     for (addr = 0xfffff000; addr >= 0x80000000; addr -= TARGET_PAGE_SIZE) {
      * virtual address space for the APIC mapping.
      */
     for (addr = 0xfffff000; addr >= 0x80000000; addr -= TARGET_PAGE_SIZE) {

-        paddr = cpu_get_phys_page_debug(env, addr);
+        paddr = cpu_get_phys_page_debug(cs, addr);

         if (paddr != APIC_DEFAULT_ADDRESS) {
             continue;
         }
         if (paddr != APIC_DEFAULT_ADDRESS) {
             continue;
         }


@@ -187,9 +189,10 @@ static bool opcode_matches(uint8_t *opcode, const TPRInstruction *instr)
          modrm_reg(opcode[1]) == instr->modrm_reg);
 }
 
          modrm_reg(opcode[1]) == instr->modrm_reg);
 }
 

-static int evaluate_tpr_instruction(VAPICROMState *s, CPUX86State *env,
+static int evaluate_tpr_instruction(VAPICROMState *s, X86CPU *cpu,

                                     target_ulong *pip, TPRAccess access)
 {
                                     target_ulong *pip, TPRAccess access)
 {

+    CPUState *cs = CPU(cpu);

     const TPRInstruction *instr;
     target_ulong ip = *pip;
     uint8_t opcode[2];
     const TPRInstruction *instr;
     target_ulong ip = *pip;
     uint8_t opcode[2];


@@ -210,7 +213,7 @@ static int evaluate_tpr_instruction(VAPICROMState *s, CPUX86State *env,
      * RSP, used by the patched instruction, is zero, so the guest gets a
      * double fault and dies.
      */
      * RSP, used by the patched instruction, is zero, so the guest gets a
      * double fault and dies.
      */

-    if (env->regs[R_ESP] == 0) {
+    if (cpu->env.regs[R_ESP] == 0) {

         return -1;
     }
 
         return -1;
     }
 


@@ -225,7 +228,7 @@ static int evaluate_tpr_instruction(VAPICROMState *s, CPUX86State *env,
             if (instr->access != access) {
                 continue;
             }
             if (instr->access != access) {
                 continue;
             }

-            if (cpu_memory_rw_debug(env, ip - instr->length, opcode,
+            if (cpu_memory_rw_debug(cs, ip - instr->length, opcode,

                                     sizeof(opcode), 0) < 0) {
                 return -1;
             }
                                     sizeof(opcode), 0) < 0) {
                 return -1;
             }


@@ -236,7 +239,7 @@ static int evaluate_tpr_instruction(VAPICROMState *s, CPUX86State *env,
         }
         return -1;
     } else {
         }
         return -1;
     } else {

-        if (cpu_memory_rw_debug(env, ip, opcode, sizeof(opcode), 0) < 0) {
+        if (cpu_memory_rw_debug(cs, ip, opcode, sizeof(opcode), 0) < 0) {

             return -1;
         }
         for (i = 0; i < ARRAY_SIZE(tpr_instr); i++) {
             return -1;
         }
         for (i = 0; i < ARRAY_SIZE(tpr_instr); i++) {


@@ -253,7 +256,7 @@ instruction_ok:
      * Grab the virtual TPR address from the instruction
      * and update the cached values.
      */
      * Grab the virtual TPR address from the instruction
      * and update the cached values.
      */

-    if (cpu_memory_rw_debug(env, ip + instr->addr_offset,
+    if (cpu_memory_rw_debug(cs, ip + instr->addr_offset,

                             (void *)&real_tpr_addr,
                             sizeof(real_tpr_addr), 0) < 0) {
         return -1;
                             (void *)&real_tpr_addr,
                             sizeof(real_tpr_addr), 0) < 0) {
         return -1;


@@ -271,6 +274,7 @@ instruction_ok:
 
 static int update_rom_mapping(VAPICROMState *s, CPUX86State *env, target_ulong ip)
 {
 
 static int update_rom_mapping(VAPICROMState *s, CPUX86State *env, target_ulong ip)
 {

+    CPUState *cs = CPU(x86_env_get_cpu(env));

     hwaddr paddr;
     uint32_t rom_state_vaddr;
     uint32_t pos, patch, offset;
     hwaddr paddr;
     uint32_t rom_state_vaddr;
     uint32_t pos, patch, offset;


@@ -287,7 +291,7 @@ static int update_rom_mapping(VAPICROMState *s, CPUX86State *env, target_ulong i
 
     /* find out virtual address of the ROM */
     rom_state_vaddr = s->rom_state_paddr + (ip & 0xf0000000);
 
     /* find out virtual address of the ROM */
     rom_state_vaddr = s->rom_state_paddr + (ip & 0xf0000000);

-    paddr = cpu_get_phys_page_debug(env, rom_state_vaddr);
+    paddr = cpu_get_phys_page_debug(cs, rom_state_vaddr);

     if (paddr == -1) {
         return -1;
     }
     if (paddr == -1) {
         return -1;
     }


@@ -308,16 +312,14 @@ static int update_rom_mapping(VAPICROMState *s, CPUX86State *env, target_ulong i
     for (pos = le32_to_cpu(s->rom_state.fixup_start);
          pos < le32_to_cpu(s->rom_state.fixup_end);
          pos += 4) {
     for (pos = le32_to_cpu(s->rom_state.fixup_start);
          pos < le32_to_cpu(s->rom_state.fixup_end);
          pos += 4) {

-        cpu_physical_memory_rw(paddr + pos - s->rom_state.vaddr,
-                               (void *)&offset, sizeof(offset), 0);
+        cpu_physical_memory_read(paddr + pos - s->rom_state.vaddr,
+                                 &offset, sizeof(offset));

         offset = le32_to_cpu(offset);
         offset = le32_to_cpu(offset);

-        cpu_physical_memory_rw(paddr + offset, (void *)&patch,
-                               sizeof(patch), 0);
+        cpu_physical_memory_read(paddr + offset, &patch, sizeof(patch));

         patch = le32_to_cpu(patch);
         patch += rom_state_vaddr - le32_to_cpu(s->rom_state.vaddr);
         patch = cpu_to_le32(patch);
         patch = le32_to_cpu(patch);
         patch += rom_state_vaddr - le32_to_cpu(s->rom_state.vaddr);
         patch = cpu_to_le32(patch);

-        cpu_physical_memory_rw(paddr + offset, (void *)&patch,
-                               sizeof(patch), 1);
+        cpu_physical_memory_write(paddr + offset, &patch, sizeof(patch));

     }
     read_guest_rom_state(s);
     s->vapic_paddr = paddr + le32_to_cpu(s->rom_state.vapic_vaddr) -
     }
     read_guest_rom_state(s);
     s->vapic_paddr = paddr + le32_to_cpu(s->rom_state.vapic_vaddr) -


@@ -332,8 +334,9 @@ static int update_rom_mapping(VAPICROMState *s, CPUX86State *env, target_ulong i
  * cannot be accessed or is considered invalid. This also ensures that we are
  * not patching the wrong guest.
  */
  * cannot be accessed or is considered invalid. This also ensures that we are
  * not patching the wrong guest.
  */

-static int get_kpcr_number(CPUX86State *env)
+static int get_kpcr_number(X86CPU *cpu)

 {
 {

+    CPUX86State *env = &cpu->env;

     struct kpcr {
         uint8_t  fill1[0x1c];
         uint32_t self;
     struct kpcr {
         uint8_t  fill1[0x1c];
         uint32_t self;


@@ -341,7 +344,7 @@ static int get_kpcr_number(CPUX86State *env)
         uint8_t  number;
     } QEMU_PACKED kpcr;
 
         uint8_t  number;
     } QEMU_PACKED kpcr;
 

-    if (cpu_memory_rw_debug(env, env->segs[R_FS].base,
+    if (cpu_memory_rw_debug(CPU(cpu), env->segs[R_FS].base,

                             (void *)&kpcr, sizeof(kpcr), 0) < 0 ||
         kpcr.self != env->segs[R_FS].base) {
         return -1;
                             (void *)&kpcr, sizeof(kpcr), 0) < 0 ||
         kpcr.self != env->segs[R_FS].base) {
         return -1;


@@ -349,9 +352,9 @@ static int get_kpcr_number(CPUX86State *env)
     return kpcr.number;
 }
 
     return kpcr.number;
 }
 

-static int vapic_enable(VAPICROMState *s, CPUX86State *env)
+static int vapic_enable(VAPICROMState *s, X86CPU *cpu)

 {
 {

-    int cpu_number = get_kpcr_number(env);
+    int cpu_number = get_kpcr_number(cpu);

     hwaddr vapic_paddr;
     static const uint8_t enabled = 1;
 
     hwaddr vapic_paddr;
     static const uint8_t enabled = 1;
 


@@ -360,28 +363,28 @@ static int vapic_enable(VAPICROMState *s, CPUX86State *env)
     }
     vapic_paddr = s->vapic_paddr +
         (((hwaddr)cpu_number) << VAPIC_CPU_SHIFT);
     }
     vapic_paddr = s->vapic_paddr +
         (((hwaddr)cpu_number) << VAPIC_CPU_SHIFT);

-    cpu_physical_memory_rw(vapic_paddr + offsetof(VAPICState, enabled),
-                           (void *)&enabled, sizeof(enabled), 1);
-    apic_enable_vapic(env->apic_state, vapic_paddr);
+    cpu_physical_memory_write(vapic_paddr + offsetof(VAPICState, enabled),
+                              &enabled, sizeof(enabled));
+    apic_enable_vapic(cpu->apic_state, vapic_paddr);

 
     s->state = VAPIC_ACTIVE;
 
     return 0;
 }
 
 
     s->state = VAPIC_ACTIVE;
 
     return 0;
 }
 

-static void patch_byte(CPUX86State *env, target_ulong addr, uint8_t byte)
+static void patch_byte(X86CPU *cpu, target_ulong addr, uint8_t byte)

 {
 {

-    cpu_memory_rw_debug(env, addr, &byte, 1, 1);
+    cpu_memory_rw_debug(CPU(cpu), addr, &byte, 1, 1);

 }
 
 }
 

-static void patch_call(VAPICROMState *s, CPUX86State *env, target_ulong ip,
+static void patch_call(VAPICROMState *s, X86CPU *cpu, target_ulong ip,

                        uint32_t target)
 {
     uint32_t offset;
 
     offset = cpu_to_le32(target - ip - 5);
                        uint32_t target)
 {
     uint32_t offset;
 
     offset = cpu_to_le32(target - ip - 5);

-    patch_byte(env, ip, 0xe8); /* call near */
-    cpu_memory_rw_debug(env, ip + 1, (void *)&offset, sizeof(offset), 1);
+    patch_byte(cpu, ip, 0xe8); /* call near */
+    cpu_memory_rw_debug(CPU(cpu), ip + 1, (void *)&offset, sizeof(offset), 1);

 }
 
 static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip)
 }
 
 static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip)


@@ -402,39 +405,38 @@ static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip)
     }
 
     if (!kvm_enabled()) {
     }
 
     if (!kvm_enabled()) {

-        cpu_restore_state(env, env->mem_io_pc);

         cpu_get_tb_cpu_state(env, &current_pc, &current_cs_base,
                              &current_flags);
     }
 
     pause_all_vcpus();
 
         cpu_get_tb_cpu_state(env, &current_pc, &current_cs_base,
                              &current_flags);
     }
 
     pause_all_vcpus();
 

-    cpu_memory_rw_debug(env, ip, opcode, sizeof(opcode), 0);
+    cpu_memory_rw_debug(cs, ip, opcode, sizeof(opcode), 0);

 
     switch (opcode[0]) {
     case 0x89: /* mov r32 to r/m32 */
 
     switch (opcode[0]) {
     case 0x89: /* mov r32 to r/m32 */

-        patch_byte(env, ip, 0x50 + modrm_reg(opcode[1]));  /* push reg */
-        patch_call(s, env, ip + 1, handlers->set_tpr);
+        patch_byte(cpu, ip, 0x50 + modrm_reg(opcode[1]));  /* push reg */
+        patch_call(s, cpu, ip + 1, handlers->set_tpr);

         break;
     case 0x8b: /* mov r/m32 to r32 */
         break;
     case 0x8b: /* mov r/m32 to r32 */

-        patch_byte(env, ip, 0x90);
-        patch_call(s, env, ip + 1, handlers->get_tpr[modrm_reg(opcode[1])]);
+        patch_byte(cpu, ip, 0x90);
+        patch_call(s, cpu, ip + 1, handlers->get_tpr[modrm_reg(opcode[1])]);

         break;
     case 0xa1: /* mov abs to eax */
         break;
     case 0xa1: /* mov abs to eax */

-        patch_call(s, env, ip, handlers->get_tpr[0]);
+        patch_call(s, cpu, ip, handlers->get_tpr[0]);

         break;
     case 0xa3: /* mov eax to abs */
         break;
     case 0xa3: /* mov eax to abs */

-        patch_call(s, env, ip, handlers->set_tpr_eax);
+        patch_call(s, cpu, ip, handlers->set_tpr_eax);

         break;
     case 0xc7: /* mov imm32, r/m32 (c7/0) */
         break;
     case 0xc7: /* mov imm32, r/m32 (c7/0) */

-        patch_byte(env, ip, 0x68);  /* push imm32 */
-        cpu_memory_rw_debug(env, ip + 6, (void *)&imm32, sizeof(imm32), 0);
-        cpu_memory_rw_debug(env, ip + 1, (void *)&imm32, sizeof(imm32), 1);
-        patch_call(s, env, ip + 5, handlers->set_tpr);
+        patch_byte(cpu, ip, 0x68);  /* push imm32 */
+        cpu_memory_rw_debug(cs, ip + 6, (void *)&imm32, sizeof(imm32), 0);
+        cpu_memory_rw_debug(cs, ip + 1, (void *)&imm32, sizeof(imm32), 1);
+        patch_call(s, cpu, ip + 5, handlers->set_tpr);

         break;
     case 0xff: /* push r/m32 */
         break;
     case 0xff: /* push r/m32 */

-        patch_byte(env, ip, 0x50); /* push eax */
-        patch_call(s, env, ip + 1, handlers->get_tpr_stack);
+        patch_byte(cpu, ip, 0x50); /* push eax */
+        patch_call(s, cpu, ip + 1, handlers->get_tpr_stack);

         break;
     default:
         abort();
         break;
     default:
         abort();


@@ -444,30 +446,30 @@ static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip)
 
     if (!kvm_enabled()) {
         cs->current_tb = NULL;
 
     if (!kvm_enabled()) {
         cs->current_tb = NULL;

-        tb_gen_code(env, current_pc, current_cs_base, current_flags, 1);
-        cpu_resume_from_signal(env, NULL);
+        tb_gen_code(cs, current_pc, current_cs_base, current_flags, 1);
+        cpu_resume_from_signal(cs, NULL);

     }
 }
 
 void vapic_report_tpr_access(DeviceState *dev, CPUState *cs, target_ulong ip,
                              TPRAccess access)
 {
     }
 }
 
 void vapic_report_tpr_access(DeviceState *dev, CPUState *cs, target_ulong ip,
                              TPRAccess access)
 {

-    VAPICROMState *s = DO_UPCAST(VAPICROMState, busdev.qdev, dev);
+    VAPICROMState *s = VAPIC(dev);

     X86CPU *cpu = X86_CPU(cs);
     CPUX86State *env = &cpu->env;
 
     cpu_synchronize_state(cs);
 
     X86CPU *cpu = X86_CPU(cs);
     CPUX86State *env = &cpu->env;
 
     cpu_synchronize_state(cs);
 

-    if (evaluate_tpr_instruction(s, env, &ip, access) < 0) {
+    if (evaluate_tpr_instruction(s, cpu, &ip, access) < 0) {

         if (s->state == VAPIC_ACTIVE) {
         if (s->state == VAPIC_ACTIVE) {

-            vapic_enable(s, env);
+            vapic_enable(s, cpu);

         }
         return;
     }
     if (update_rom_mapping(s, env, ip) < 0) {
         return;
     }
         }
         return;
     }
     if (update_rom_mapping(s, env, ip) < 0) {
         return;
     }

-    if (vapic_enable(s, env) < 0) {
+    if (vapic_enable(s, cpu) < 0) {

         return;
     }
     patch_instruction(s, cpu, ip);
         return;
     }
     patch_instruction(s, cpu, ip);


@@ -490,23 +492,22 @@ static void vapic_enable_tpr_reporting(bool enable)
     VAPICEnableTPRReporting info = {
         .enable = enable,
     };
     VAPICEnableTPRReporting info = {
         .enable = enable,
     };

+    CPUState *cs;

     X86CPU *cpu;
     X86CPU *cpu;

-    CPUX86State *env;

 
 

-    for (env = first_cpu; env != NULL; env = env->next_cpu) {
-        cpu = x86_env_get_cpu(env);
-        info.apic = env->apic_state;
-        run_on_cpu(CPU(cpu), vapic_do_enable_tpr_reporting, &info);
+    CPU_FOREACH(cs) {
+        cpu = X86_CPU(cs);
+        info.apic = cpu->apic_state;
+        run_on_cpu(cs, vapic_do_enable_tpr_reporting, &info);

     }
 }
 
 static void vapic_reset(DeviceState *dev)
 {
     }
 }
 
 static void vapic_reset(DeviceState *dev)
 {

-    VAPICROMState *s = DO_UPCAST(VAPICROMState, busdev.qdev, dev);
+    VAPICROMState *s = VAPIC(dev);

 
 

-    if (s->state == VAPIC_ACTIVE) {
-        s->state = VAPIC_STANDBY;
-    }
+    s->state = VAPIC_INACTIVE;
+    s->rom_state_paddr = 0;

     vapic_enable_tpr_reporting(false);
 }
 
     vapic_enable_tpr_reporting(false);
 }
 


@@ -532,7 +533,7 @@ static int patch_hypercalls(VAPICROMState *s)
     uint8_t *rom;
 
     rom = g_malloc(s->rom_size);
     uint8_t *rom;
 
     rom = g_malloc(s->rom_size);

-    cpu_physical_memory_rw(rom_paddr, rom, s->rom_size, 0);
+    cpu_physical_memory_read(rom_paddr, rom, s->rom_size);

 
     for (pos = 0; pos < s->rom_size - sizeof(vmcall_pattern); pos++) {
         if (kvm_irqchip_in_kernel()) {
 
     for (pos = 0; pos < s->rom_size - sizeof(vmcall_pattern); pos++) {
         if (kvm_irqchip_in_kernel()) {


@@ -548,8 +549,7 @@ static int patch_hypercalls(VAPICROMState *s)
         }
         if (memcmp(rom + pos, pattern, 7) == 0 &&
             (rom[pos + 7] == alternates[0] || rom[pos + 7] == alternates[1])) {
         }
         if (memcmp(rom + pos, pattern, 7) == 0 &&
             (rom[pos + 7] == alternates[0] || rom[pos + 7] == alternates[1])) {

-            cpu_physical_memory_rw(rom_paddr + pos + 5, (uint8_t *)patch,
-                                   3, 1);
+            cpu_physical_memory_write(rom_paddr + pos + 5, patch, 3);

             /*
              * Don't flush the tb here. Under ordinary conditions, the patched
              * calls are miles away from the current IP. Under malicious
             /*
              * Don't flush the tb here. Under ordinary conditions, the patched
              * calls are miles away from the current IP. Under malicious


@@ -572,7 +572,7 @@ static int patch_hypercalls(VAPICROMState *s)
  * enable write access to the option ROM so that variables can be updated by
  * the guest.
  */
  * enable write access to the option ROM so that variables can be updated by
  * the guest.
  */

-static void vapic_map_rom_writable(VAPICROMState *s)
+static int vapic_map_rom_writable(VAPICROMState *s)

 {
     hwaddr rom_paddr = s->rom_state_paddr & ROM_BLOCK_MASK;
     MemoryRegionSection section;
 {
     hwaddr rom_paddr = s->rom_state_paddr & ROM_BLOCK_MASK;
     MemoryRegionSection section;


@@ -584,15 +584,21 @@ static void vapic_map_rom_writable(VAPICROMState *s)
 
     if (s->rom_mapped_writable) {
         memory_region_del_subregion(as, &s->rom);
 
     if (s->rom_mapped_writable) {
         memory_region_del_subregion(as, &s->rom);

-        memory_region_destroy(&s->rom);
+        object_unparent(OBJECT(&s->rom));

     }
 
     /* grab RAM memory region (region @rom_paddr may still be pc.rom) */
     section = memory_region_find(as, 0, 1);
 
     /* read ROM size from RAM region */
     }
 
     /* grab RAM memory region (region @rom_paddr may still be pc.rom) */
     section = memory_region_find(as, 0, 1);
 
     /* read ROM size from RAM region */

+    if (rom_paddr + 2 >= memory_region_size(section.mr)) {
+        return -1;
+    }

     ram = memory_region_get_ram_ptr(section.mr);
     rom_size = ram[rom_paddr + 2] * ROM_BLOCK_SIZE;
     ram = memory_region_get_ram_ptr(section.mr);
     rom_size = ram[rom_paddr + 2] * ROM_BLOCK_SIZE;

+    if (rom_size == 0) {
+        return -1;
+    }

     s->rom_size = rom_size;
 
     /* We need to round to avoid creating subpages
     s->rom_size = rom_size;
 
     /* We need to round to avoid creating subpages


@@ -606,11 +612,15 @@ static void vapic_map_rom_writable(VAPICROMState *s)
     memory_region_add_subregion_overlap(as, rom_paddr, &s->rom, 1000);
     s->rom_mapped_writable = true;
     memory_region_unref(section.mr);
     memory_region_add_subregion_overlap(as, rom_paddr, &s->rom, 1000);
     s->rom_mapped_writable = true;
     memory_region_unref(section.mr);

+
+    return 0;

 }
 
 static int vapic_prepare(VAPICROMState *s)
 {
 }
 
 static int vapic_prepare(VAPICROMState *s)
 {

-    vapic_map_rom_writable(s);
+    if (vapic_map_rom_writable(s) < 0) {
+        return -1;
+    }

 
     if (patch_hypercalls(s) < 0) {
         return -1;
 
     if (patch_hypercalls(s) < 0) {
         return -1;


@@ -624,11 +634,13 @@ static int vapic_prepare(VAPICROMState *s)
 static void vapic_write(void *opaque, hwaddr addr, uint64_t data,
                         unsigned int size)
 {
 static void vapic_write(void *opaque, hwaddr addr, uint64_t data,
                         unsigned int size)
 {

-    CPUX86State *env = cpu_single_env;
+    CPUState *cs = current_cpu;
+    X86CPU *cpu = X86_CPU(cs);
+    CPUX86State *env = &cpu->env;

     hwaddr rom_paddr;
     VAPICROMState *s = opaque;
 
     hwaddr rom_paddr;
     VAPICROMState *s = opaque;
 

-    cpu_synchronize_state(CPU(x86_env_get_cpu(env)));
+    cpu_synchronize_state(cs);

 
     /*
      * The VAPIC supports two PIO-based hypercalls, both via port 0x7E.
 
     /*
      * The VAPIC supports two PIO-based hypercalls, both via port 0x7E.


@@ -651,6 +663,7 @@ static void vapic_write(void *opaque, hwaddr addr, uint64_t data,
         }
         if (vapic_prepare(s) < 0) {
             s->state = VAPIC_INACTIVE;
         }
         if (vapic_prepare(s) < 0) {
             s->state = VAPIC_INACTIVE;

+            s->rom_state_paddr = 0;

             break;
         }
         break;
             break;
         }
         break;


@@ -663,8 +676,8 @@ static void vapic_write(void *opaque, hwaddr addr, uint64_t data,
              * accurate.
              */
             pause_all_vcpus();
              * accurate.
              */
             pause_all_vcpus();

-            patch_byte(env, env->eip - 2, 0x66);
-            patch_byte(env, env->eip - 1, 0x90);
+            patch_byte(cpu, env->eip - 2, 0x66);
+            patch_byte(cpu, env->eip - 1, 0x90);

             resume_all_vcpus();
         }
 
             resume_all_vcpus();
         }
 


@@ -677,12 +690,12 @@ static void vapic_write(void *opaque, hwaddr addr, uint64_t data,
         if (find_real_tpr_addr(s, env) < 0) {
             break;
         }
         if (find_real_tpr_addr(s, env) < 0) {
             break;
         }

-        vapic_enable(s, env);
+        vapic_enable(s, cpu);

         break;
     default:
     case 4:
         if (!kvm_irqchip_in_kernel()) {
         break;
     default:
     case 4:
         if (!kvm_irqchip_in_kernel()) {

-            apic_poll_irq(env->apic_state);
+            apic_poll_irq(cpu->apic_state);

         }
         break;
     }
         }
         break;
     }


@@ -699,33 +712,60 @@ static const MemoryRegionOps vapic_ops = {
     .endianness = DEVICE_NATIVE_ENDIAN,
 };
 
     .endianness = DEVICE_NATIVE_ENDIAN,
 };
 

-static int vapic_init(SysBusDevice *dev)
+static void vapic_realize(DeviceState *dev, Error **errp)

 {
 {

+    SysBusDevice *sbd = SYS_BUS_DEVICE(dev);

     VAPICROMState *s = VAPIC(dev);
 
     memory_region_init_io(&s->io, OBJECT(s), &vapic_ops, s, "kvmvapic", 2);
     VAPICROMState *s = VAPIC(dev);
 
     memory_region_init_io(&s->io, OBJECT(s), &vapic_ops, s, "kvmvapic", 2);

-    sysbus_add_io(dev, VAPIC_IO_PORT, &s->io);
-    sysbus_init_ioports(dev, VAPIC_IO_PORT, 2);
+    sysbus_add_io(sbd, VAPIC_IO_PORT, &s->io);
+    sysbus_init_ioports(sbd, VAPIC_IO_PORT, 2);

 
     option_rom[nb_option_roms].name = "kvmvapic.bin";
     option_rom[nb_option_roms].bootindex = -1;
     nb_option_roms++;
 
     option_rom[nb_option_roms].name = "kvmvapic.bin";
     option_rom[nb_option_roms].bootindex = -1;
     nb_option_roms++;

-
-    return 0;

 }
 
 static void do_vapic_enable(void *data)
 {
     VAPICROMState *s = data;
 }
 
 static void do_vapic_enable(void *data)
 {
     VAPICROMState *s = data;

+    X86CPU *cpu = X86_CPU(first_cpu);

 
 

-    vapic_enable(s, first_cpu);
+    static const uint8_t enabled = 1;
+    cpu_physical_memory_write(s->vapic_paddr + offsetof(VAPICState, enabled),
+                              &enabled, sizeof(enabled));
+    apic_enable_vapic(cpu->apic_state, s->vapic_paddr);
+    s->state = VAPIC_ACTIVE;

 }
 
 }
 

-static int vapic_post_load(void *opaque, int version_id)
+static void kvmvapic_vm_state_change(void *opaque, int running,
+                                     RunState state)

 {
     VAPICROMState *s = opaque;
     uint8_t *zero;
 
 {
     VAPICROMState *s = opaque;
     uint8_t *zero;
 

+    if (!running) {
+        return;
+    }
+
+    if (s->state == VAPIC_ACTIVE) {
+        if (smp_cpus == 1) {
+            run_on_cpu(first_cpu, do_vapic_enable, s);
+        } else {
+            zero = g_malloc0(s->rom_state.vapic_size);
+            cpu_physical_memory_write(s->vapic_paddr, zero,
+                                      s->rom_state.vapic_size);
+            g_free(zero);
+        }
+    }
+
+    qemu_del_vm_change_state_handler(s->vmsentry);
+}
+
+static int vapic_post_load(void *opaque, int version_id)
+{
+    VAPICROMState *s = opaque;
+

     /*
      * The old implementation of qemu-kvm did not provide the state
      * VAPIC_STANDBY. Reconstruct it.
     /*
      * The old implementation of qemu-kvm did not provide the state
      * VAPIC_STANDBY. Reconstruct it.


@@ -739,17 +779,11 @@ static int vapic_post_load(void *opaque, int version_id)
             return -1;
         }
     }
             return -1;
         }
     }

-    if (s->state == VAPIC_ACTIVE) {
-        if (smp_cpus == 1) {
-            run_on_cpu(ENV_GET_CPU(first_cpu), do_vapic_enable, s);
-        } else {
-            zero = g_malloc0(s->rom_state.vapic_size);
-            cpu_physical_memory_rw(s->vapic_paddr, zero,
-                                   s->rom_state.vapic_size, 1);
-            g_free(zero);
-        }
-    }

 
 

+    if (!s->vmsentry) {
+        s->vmsentry =
+            qemu_add_vm_change_state_handler(kvmvapic_vm_state_change, s);
+    }

     return 0;
 }
 
     return 0;
 }
 


@@ -757,7 +791,6 @@ static const VMStateDescription vmstate_handlers = {
     .name = "kvmvapic-handlers",
     .version_id = 1,
     .minimum_version_id = 1,
     .name = "kvmvapic-handlers",
     .version_id = 1,
     .minimum_version_id = 1,

-    .minimum_version_id_old = 1,

     .fields = (VMStateField[]) {
         VMSTATE_UINT32(set_tpr, VAPICHandlers),
         VMSTATE_UINT32(set_tpr_eax, VAPICHandlers),
     .fields = (VMStateField[]) {
         VMSTATE_UINT32(set_tpr, VAPICHandlers),
         VMSTATE_UINT32(set_tpr_eax, VAPICHandlers),


@@ -771,7 +804,6 @@ static const VMStateDescription vmstate_guest_rom = {
     .name = "kvmvapic-guest-rom",
     .version_id = 1,
     .minimum_version_id = 1,
     .name = "kvmvapic-guest-rom",
     .version_id = 1,
     .minimum_version_id = 1,

-    .minimum_version_id_old = 1,

     .fields = (VMStateField[]) {
         VMSTATE_UNUSED(8),     /* signature */
         VMSTATE_UINT32(vaddr, GuestROMState),
     .fields = (VMStateField[]) {
         VMSTATE_UNUSED(8),     /* signature */
         VMSTATE_UINT32(vaddr, GuestROMState),


@@ -791,7 +823,6 @@ static const VMStateDescription vmstate_vapic = {
     .name = "kvm-tpr-opt",      /* compatible with qemu-kvm VAPIC */
     .version_id = 1,
     .minimum_version_id = 1,
     .name = "kvm-tpr-opt",      /* compatible with qemu-kvm VAPIC */
     .version_id = 1,
     .minimum_version_id = 1,

-    .minimum_version_id_old = 1,

     .post_load = vapic_post_load,
     .fields = (VMStateField[]) {
         VMSTATE_STRUCT(rom_state, VAPICROMState, 0, vmstate_guest_rom,
     .post_load = vapic_post_load,
     .fields = (VMStateField[]) {
         VMSTATE_STRUCT(rom_state, VAPICROMState, 0, vmstate_guest_rom,


@@ -807,13 +838,11 @@ static const VMStateDescription vmstate_vapic = {
 
 static void vapic_class_init(ObjectClass *klass, void *data)
 {
 
 static void vapic_class_init(ObjectClass *klass, void *data)
 {

-    SysBusDeviceClass *sc = SYS_BUS_DEVICE_CLASS(klass);

     DeviceClass *dc = DEVICE_CLASS(klass);
 
     DeviceClass *dc = DEVICE_CLASS(klass);
 

-    dc->no_user = 1;

     dc->reset   = vapic_reset;
     dc->vmsd    = &vmstate_vapic;
     dc->reset   = vapic_reset;
     dc->vmsd    = &vmstate_vapic;

-    sc->init    = vapic_init;
+    dc->realize = vapic_realize;

 }
 
 static const TypeInfo vapic_type = {
 }
 
 static const TypeInfo vapic_type = {