From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KCKk0-0003As-48 for qemu-devel@nongnu.org; Fri, 27 Jun 2008 16:40:20 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KCKjy-00039J-Gp for qemu-devel@nongnu.org; Fri, 27 Jun 2008 16:40:19 -0400 Received: from [199.232.76.173] (port=51162 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KCKjx-00038p-K8 for qemu-devel@nongnu.org; Fri, 27 Jun 2008 16:40:17 -0400 Received: from mx1.redhat.com ([66.187.233.31]:55970) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KCKjx-00081a-TA for qemu-devel@nongnu.org; Fri, 27 Jun 2008 16:40:18 -0400 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id m5RKeGs3014627 for ; Fri, 27 Jun 2008 16:40:16 -0400 Received: from pobox-2.corp.redhat.com (pobox-2.corp.redhat.com [10.11.255.15]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m5RKeGRl006050 for ; Fri, 27 Jun 2008 16:40:16 -0400 Received: from localhost.localdomain (vpn-4-80.str.redhat.com [10.32.4.80]) by pobox-2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m5RKdado004563 for ; Fri, 27 Jun 2008 16:40:14 -0400 From: Glauber Costa Date: Fri, 27 Jun 2008 17:38:19 -0300 Message-Id: <1214599103-13846-17-git-send-email-gcosta@redhat.com> In-Reply-To: <1214599103-13846-16-git-send-email-gcosta@redhat.com> References: <1214599103-13846-1-git-send-email-gcosta@redhat.com> <1214599103-13846-2-git-send-email-gcosta@redhat.com> <1214599103-13846-3-git-send-email-gcosta@redhat.com> <1214599103-13846-4-git-send-email-gcosta@redhat.com> <1214599103-13846-5-git-send-email-gcosta@redhat.com> <1214599103-13846-6-git-send-email-gcosta@redhat.com> <1214599103-13846-7-git-send-email-gcosta@redhat.com> <1214599103-13846-8-git-send-email-gcosta@redhat.com> <1214599103-13846-9-git-send-email-gcosta@redhat.com> <1214599103-13846-10-git-send-email-gcosta@redhat.com> <1214599103-13846-11-git-send-email-gcosta@redhat.com> <1214599103-13846-12-git-send-email-gcosta@redhat.com> <1214599103-13846-13-git-send-email-gcosta@redhat.com> <1214599103-13846-14-git-send-email-gcosta@redhat.com> <1214599103-13846-15-git-send-email-gcosta@redhat.com> <1214599103-13846-16-git-send-email-gcosta@redhat.com> Subject: [Qemu-devel] [PATCH 16/20] small changes in headers needed to acomodate kvm files as is. Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org --- cpu-defs.h | 1 + target-i386/cpu.h | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/cpu-defs.h b/cpu-defs.h index e197686..899ac65 100644 --- a/cpu-defs.h +++ b/cpu-defs.h @@ -169,6 +169,7 @@ typedef struct CPUTLBEntry { void *next_cpu; /* next CPU sharing TB cache */ \ int cpu_index; /* CPU index (informative) */ \ int running; /* Nonzero if cpu is currently running(usermode). */ \ + int thread_id; \ /* user data */ \ void *opaque; \ \ diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 5798cf3..38aab1b 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -199,7 +199,8 @@ #define CR4_PAE_MASK (1 << 5) #define CR4_PGE_MASK (1 << 7) #define CR4_PCE_MASK (1 << 8) -#define CR4_OSFXSR_MASK (1 << 9) +#define CR4_OSFXSR_SHIFT 9 +#define CR4_OSFXSR_MASK (1 << CR4_OSFXSR_SHIFT) #define CR4_OSXMMEXCPT_MASK (1 << 10) #define PG_PRESENT_BIT 0 @@ -595,6 +596,7 @@ typedef struct CPUX86State { int kqemu_enabled; int last_io_time; #endif + /* in order to simplify APIC support, we leave this pointer to the user */ struct APICState *apic_state; -- 1.5.5.1