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 /block/vvfat.c | |
| parent | 0f7fdd347514ea97b24f5f658f3ae31f9b078397 (diff) | |
| download | qemu-541dc0d47f10973c241e9955afc2aefc96adec51.tar.gz | |
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 'block/vvfat.c')
| -rw-r--r-- | block/vvfat.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/block/vvfat.c b/block/vvfat.c index d6a07efcc9..187ac96f25 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -200,7 +200,7 @@ static int array_index(array_t* array, void* pointer) } /* These structures are used to fake a disk and the VFAT filesystem. - * For this reason we need to use __attribute__((packed)). */ + * For this reason we need to use QEMU_PACKED. */ typedef struct bootsector_t { uint8_t jump[3]; @@ -224,7 +224,7 @@ typedef struct bootsector_t { uint8_t signature; uint32_t id; uint8_t volume_label[11]; - } __attribute__((packed)) fat16; + } QEMU_PACKED fat16; struct { uint32_t sectors_per_fat; uint16_t flags; @@ -233,12 +233,12 @@ typedef struct bootsector_t { uint16_t info_sector; uint16_t backup_boot_sector; uint16_t ignored; - } __attribute__((packed)) fat32; + } QEMU_PACKED fat32; } u; uint8_t fat_type[8]; uint8_t ignored[0x1c0]; uint8_t magic[2]; -} __attribute__((packed)) bootsector_t; +} QEMU_PACKED bootsector_t; typedef struct { uint8_t head; @@ -253,7 +253,7 @@ typedef struct partition_t { mbr_chs_t end_CHS; uint32_t start_sector_long; uint32_t length_sector_long; -} __attribute__((packed)) partition_t; +} QEMU_PACKED partition_t; typedef struct mbr_t { uint8_t ignored[0x1b8]; @@ -261,7 +261,7 @@ typedef struct mbr_t { uint8_t ignored2[2]; partition_t partition[4]; uint8_t magic[2]; -} __attribute__((packed)) mbr_t; +} QEMU_PACKED mbr_t; typedef struct direntry_t { uint8_t name[8]; @@ -276,7 +276,7 @@ typedef struct direntry_t { uint16_t mdate; uint16_t begin; uint32_t size; -} __attribute__((packed)) direntry_t; +} QEMU_PACKED direntry_t; /* this structure are used to transparently access the files */ |