diff options
| author | Stefan Weil <weil@mail.berlios.de> | 2011-08-31 12:38:01 +0200 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-09-03 10:45:59 +0000 |
| commit | 541dc0d47f10973c241e9955afc2aefc96adec51 (patch) | |
| tree | 33d3224319ba8d33738cf5d2073f62687f1352c7 /target-i386 | |
| parent | 0f7fdd347514ea97b24f5f658f3ae31f9b078397 (diff) | |
Use new macro QEMU_PACKED for packed structures
Most changes were made using these commands:
git grep -la '__attribute__((packed))'|xargs perl -pi -e 's/__attribute__\(\(packed\)\)/QEMU_PACKED/'
git grep -la '__attribute__ ((packed))'|xargs perl -pi -e 's/__attribute__ \(\(packed\)\)/QEMU_PACKED/'
git grep -la '__attribute__((__packed__))'|xargs perl -pi -e 's/__attribute__\(\(__packed__\)\)/QEMU_PACKED/'
git grep -la '__attribute__ ((__packed__))'|xargs perl -pi -e 's/__attribute__ \(\(__packed__\)\)/QEMU_PACKED/'
git grep -la '__attribute((packed))'|xargs perl -pi -e 's/__attribute\(\(packed\)\)/QEMU_PACKED/'
Whitespace in linux-user/syscall_defs.h was fixed manually
to avoid warnings from scripts/checkpatch.pl.
Manual changes were also applied to hw/pc.c.
I did not fix indentation with tabs in block/vvfat.c.
The patch will show 4 errors with scripts/checkpatch.pl.
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/kvm.c | 2 | ||||
| -rw-r--r-- | target-i386/svm.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 1d9b20c706..70ef74b80a 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -348,7 +348,7 @@ int kvm_arch_init_vcpu(CPUState *env) struct { struct kvm_cpuid2 cpuid; struct kvm_cpuid_entry2 entries[100]; - } __attribute__((packed)) cpuid_data; + } QEMU_PACKED cpuid_data; KVMState *s = env->kvm_state; uint32_t limit, i, j, cpuid_i; uint32_t unused; diff --git a/target-i386/svm.h b/target-i386/svm.h index a224aead17..04193ed60f 100644 --- a/target-i386/svm.h +++ b/target-i386/svm.h @@ -130,7 +130,7 @@ #define SVM_CR0_SELECTIVE_MASK (1 << 3 | 1) /* TS and MP */ -struct __attribute__ ((__packed__)) vmcb_control_area { +struct QEMU_PACKED vmcb_control_area { uint16_t intercept_cr_read; uint16_t intercept_cr_write; uint16_t intercept_dr_read; @@ -162,14 +162,14 @@ struct __attribute__ ((__packed__)) vmcb_control_area { uint8_t reserved_5[832]; }; -struct __attribute__ ((__packed__)) vmcb_seg { +struct QEMU_PACKED vmcb_seg { uint16_t selector; uint16_t attrib; uint32_t limit; uint64_t base; }; -struct __attribute__ ((__packed__)) vmcb_save_area { +struct QEMU_PACKED vmcb_save_area { struct vmcb_seg es; struct vmcb_seg cs; struct vmcb_seg ss; @@ -214,7 +214,7 @@ struct __attribute__ ((__packed__)) vmcb_save_area { uint64_t last_excp_to; }; -struct __attribute__ ((__packed__)) vmcb { +struct QEMU_PACKED vmcb { struct vmcb_control_area control; struct vmcb_save_area save; }; |