diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-01-25 16:11:42 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-01-28 16:57:56 +0100 |
| commit | c03c520d508ba8b3a384f9849700987df8e4c328 (patch) | |
| tree | d03407b7d8e749143af57a6e4cdc1eb538f3c43c /include/qom/cpu.h | |
| parent | 2dddbc2123681f0cc37a891fa61d97a88d5e641c (diff) | |
| download | qemu-c03c520d508ba8b3a384f9849700987df8e4c328.zip | |
cpu: Unconditionalize CPUState fields
Commits fc8c5b8c41ee5ba69d7a2be63b02a08c7b0b155b (Makefile.user: Define
CONFIG_USER_ONLY for libuser/) and
dd83b06ae61cfa2dc4381ab49f365bd0995fc930 (qom: Introduce CPU class)
specifically prepared the qom/cpu.c file to be compiled differently for
softmmu and *-user. This broke as part of build system refactorings
while CPU patches were in flight, adding conditional fields
kvm_fd (8737c51c0444f832c4e97d7eb7540eae457e08e4) and
kvm_vcpu_dirty (20d695a9254c1b086a456d3b79a3c311236643ba) for softmmu.
linux-user and bsd-user would therefore get a CPUState type with
instance_size ~8 bytes longer than expected.
Fix this by unconditionally having the fields in CPUState.
In practice, target-specific CPU types' instance_size would compensate
this, and upstream qom/cpu.c does not yet touch any affected field.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include/qom/cpu.h')
| -rw-r--r-- | include/qom/cpu.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 8097692bde..46f2247274 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -93,10 +93,8 @@ struct CPUState { bool stop; bool stopped; -#if !defined(CONFIG_USER_ONLY) int kvm_fd; bool kvm_vcpu_dirty; -#endif struct KVMState *kvm_state; struct kvm_run *kvm_run; |