These:
+/* Defines poached from apicdef.h kernel header. */ +static u_int32_t APIC_MODE_NMI = 0x4; +static u_int32_t APIC_MODE_EXTINT = 0x7;
are available in other QEMU headers (search for APIC_DM_NMI, APIC_DM_EXTINT).
Also they should have been #defines rather than statics; and also these nearby ones from patch 21 should be #defines in cpu.h instead of being here:
+/* IA32_MTRR_DEF_TYPE MSR: E (MTRRs enabled) flag, bit 11 */ +static u_int64_t MTRR_ENABLE = 0x800; +static u_int64_t MTRR_MEM_TYPE_WB = 0x6; +
Thanks, Paolo