summaryrefslogtreecommitdiff
path: root/target-i386/cpu-qom.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-03-03 00:29:17 +0000
committerPeter Maydell <peter.maydell@linaro.org>2015-03-03 00:29:17 +0000
commit0856579cac2f1dacecd847cfcd89680d26ff78f5 (patch)
tree6ab14c4d57029b50bf6ec08b4b881bfad0625217 /target-i386/cpu-qom.h
parentb8a173b25c887a606681fc35a46702c164d5b2d0 (diff)
downloadqemu-0856579cac2f1dacecd847cfcd89680d26ff78f5.tar.gz
Revert "Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging"
This reverts commit b8a173b25c887a606681fc35a46702c164d5b2d0, reversing changes made to 5de090464f1ec5360c4f30faa01d8a9f8826cd58. (I applied this pull request when I should not have done so, and am now immediately reverting it.) Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-i386/cpu-qom.h')
-rw-r--r--target-i386/cpu-qom.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h
index 31a0c1e776..b557b619cf 100644
--- a/target-i386/cpu-qom.h
+++ b/target-i386/cpu-qom.h
@@ -93,7 +93,6 @@ typedef struct X86CPU {
bool expose_kvm;
bool migratable;
bool host_features;
- int64_t apic_id;
/* if true the CPUID code directly forward host cache leaves to the guest */
bool cache_info_passthrough;