[PATCH v3] block: replace TABs with space
Bring the block files in line with the QEMU coding style, with spaces
for indentation. This patch partially resolves the issue 371.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/371
Signed-off-by: Yeqi Fu
---
block/bochs.c | 18 +++
block/file-posix.c | 126 ++--
block/file-win32.c | 66 +++
block/parallels.c | 34 ++--
block/qcow.c| 44
include/block/nbd.h | 2 +-
6 files changed, 145 insertions(+), 145 deletions(-)
diff --git a/block/bochs.c b/block/bochs.c
index 2f5ae52c90..18f48d2f89 100644
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -293,15 +293,15 @@ static void bochs_close(BlockDriverState *bs)
}
static BlockDriver bdrv_bochs = {
-.format_name = "bochs",
-.instance_size = sizeof(BDRVBochsState),
-.bdrv_probe= bochs_probe,
-.bdrv_open = bochs_open,
-.bdrv_child_perm = bdrv_default_perms,
-.bdrv_refresh_limits = bochs_refresh_limits,
-.bdrv_co_preadv = bochs_co_preadv,
-.bdrv_close= bochs_close,
-.is_format = true,
+.format_name= "bochs",
+.instance_size = sizeof(BDRVBochsState),
+.bdrv_probe = bochs_probe,
+.bdrv_open = bochs_open,
+.bdrv_child_perm= bdrv_default_perms,
+.bdrv_refresh_limits= bochs_refresh_limits,
+.bdrv_co_preadv = bochs_co_preadv,
+.bdrv_close = bochs_close,
+.is_format = true,
};
static void bdrv_bochs_init(void)
diff --git a/block/file-posix.c b/block/file-posix.c
index 5760cf22d1..bdebe0c9a6 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -124,7 +124,7 @@
#define FTYPE_FILE 0
#define FTYPE_CD 1
-#define MAX_BLOCKSIZE 4096
+#define MAX_BLOCKSIZE 4096
/* Posix file locking bytes. Libvirt takes byte 0, we start from higher bytes,
* leaving a few more bytes for its future use. */
@@ -3819,42 +3819,42 @@ static void coroutine_fn
cdrom_co_lock_medium(BlockDriverState *bs, bool locked)
}
static BlockDriver bdrv_host_cdrom = {
-.format_name= "host_cdrom",
-.protocol_name = "host_cdrom",
-.instance_size = sizeof(BDRVRawState),
-.bdrv_needs_filename = true,
-.bdrv_probe_device = cdrom_probe_device,
-.bdrv_parse_filename = cdrom_parse_filename,
-.bdrv_file_open = cdrom_open,
-.bdrv_close = raw_close,
-.bdrv_reopen_prepare = raw_reopen_prepare,
-.bdrv_reopen_commit = raw_reopen_commit,
-.bdrv_reopen_abort = raw_reopen_abort,
-.bdrv_co_create_opts = bdrv_co_create_opts_simple,
-.create_opts = &bdrv_create_opts_simple,
-.mutable_opts= mutable_opts,
-.bdrv_co_invalidate_cache = raw_co_invalidate_cache,
-
-.bdrv_co_preadv = raw_co_preadv,
-.bdrv_co_pwritev= raw_co_pwritev,
-.bdrv_co_flush_to_disk = raw_co_flush_to_disk,
-.bdrv_refresh_limits = raw_refresh_limits,
-.bdrv_co_io_plug= raw_co_io_plug,
-.bdrv_co_io_unplug = raw_co_io_unplug,
-.bdrv_attach_aio_context = raw_aio_attach_aio_context,
-
-.bdrv_co_truncate = raw_co_truncate,
-.bdrv_co_getlength = raw_co_getlength,
-.has_variable_length= true,
-.bdrv_co_get_allocated_file_size= raw_co_get_allocated_file_size,
+.format_name = "host_cdrom",
+.protocol_name = "host_cdrom",
+.instance_size = sizeof(BDRVRawState),
+.bdrv_needs_filename = true,
+.bdrv_probe_device = cdrom_probe_device,
+.bdrv_parse_filename = cdrom_parse_filename,
+.bdrv_file_open = cdrom_open,
+.bdrv_close = raw_close,
+.bdrv_reopen_prepare = raw_reopen_prepare,
+.bdrv_reopen_commit = raw_reopen_commit,
+.bdrv_reopen_abort = raw_reopen_abort,
+.bdrv_co_create_opts = bdrv_co_create_opts_simple,
+.create_opts = &bdrv_create_opts_simple,
+.mutable_opts= mutable_opts,
+.bdrv_co_invalidate_cache= raw_co_invalidate_cache,
+
+.bdrv_co_preadv = raw_co_preadv,
+.bdrv_co_pwritev = raw_co_pwritev,
+.bdrv_co_flush_to_disk = raw_co_flush_to_disk,
+.bdrv_refresh_limits = raw_refresh_limits,
+.bdrv_co_io_plug = raw_co_io_plug,
+.bdrv_co_io_unplug = raw_co_io_unplug,
+.bdrv_attach_aio_context = raw_aio_attach_aio_context,
+
+.bdrv_co_truncate= raw_co_truncate,
+.bdrv_co_getlength = raw_co_getlength,
+.has_variable_length = true,
+
[PATCH v2] hw/ide: replace TABs with space
Bring the block files in line with the QEMU coding style, with spaces for indentation. This patch partially resolves the issue 371. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/371 Signed-off-by: Yeqi Fu --- hw/ide/cmd646.c | 28 +-- hw/ide/core.c | 84 - hw/ide/microdrive.c | 360 +++--- include/hw/ide/internal.h | 248 +- 4 files changed, 360 insertions(+), 360 deletions(-) diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 26a90ed45f..a68357c1c5 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -36,20 +36,20 @@ #include "trace.h" /* CMD646 specific */ -#define CFR0x50 -#define CFR_INTR_CH0 0x04 -#define CNTRL 0x51 -#define CNTRL_EN_CH0 0x04 -#define CNTRL_EN_CH1 0x08 -#define ARTTIM23 0x57 -#defineARTTIM23_INTR_CH1 0x10 -#define MRDMODE0x71 -#define MRDMODE_INTR_CH0 0x04 -#define MRDMODE_INTR_CH1 0x08 -#define MRDMODE_BLK_CH0 0x10 -#define MRDMODE_BLK_CH1 0x20 -#define UDIDETCR0 0x73 -#define UDIDETCR1 0x7B +#define CFR 0x50 +#define CFR_INTR_CH0 0x04 +#define CNTRL0x51 +#define CNTRL_EN_CH0 0x04 +#define CNTRL_EN_CH1 0x08 +#define ARTTIM23 0x57 +#defineARTTIM23_INTR_CH1 0x10 +#define MRDMODE 0x71 +#define MRDMODE_INTR_CH0 0x04 +#define MRDMODE_INTR_CH1 0x08 +#define MRDMODE_BLK_CH00x10 +#define MRDMODE_BLK_CH10x20 +#define UDIDETCR00x73 +#define UDIDETCR10x7B static void cmd646_update_irq(PCIDevice *pd); diff --git a/hw/ide/core.c b/hw/ide/core.c index 2d034731cf..45d14a25e9 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -318,52 +318,52 @@ static void ide_cfata_identify(IDEState *s) cur_sec = s->cylinders * s->heads * s->sectors; -put_le16(p + 0, 0x848a); /* CF Storage Card signature */ -put_le16(p + 1, s->cylinders); /* Default cylinders */ -put_le16(p + 3, s->heads); /* Default heads */ -put_le16(p + 6, s->sectors); /* Default sectors per track */ +put_le16(p + 0, 0x848a);/* CF Storage Card signature */ +put_le16(p + 1, s->cylinders); /* Default cylinders */ +put_le16(p + 3, s->heads); /* Default heads */ +put_le16(p + 6, s->sectors);/* Default sectors per track */ /* *(p + 7) := nb_sectors >> 16 -- see ide_cfata_identify_size */ /* *(p + 8) := nb_sectors -- see ide_cfata_identify_size */ padstr((char *)(p + 10), s->drive_serial_str, 20); /* serial number */ -put_le16(p + 22, 0x0004); /* ECC bytes */ -padstr((char *) (p + 23), s->version, 8); /* Firmware Revision */ +put_le16(p + 22, 0x0004); /* ECC bytes */ +padstr((char *) (p + 23), s->version, 8); /* Firmware Revision */ padstr((char *) (p + 27), s->drive_model_str, 40);/* Model number */ #if MAX_MULT_SECTORS > 1 put_le16(p + 47, 0x8000 | MAX_MULT_SECTORS); #else put_le16(p + 47, 0x); #endif -put_le16(p + 49, 0x0f00); /* Capabilities */ -put_le16(p + 51, 0x0002); /* PIO cycle timing mode */ -put_le16(p + 52, 0x0001); /* DMA cycle timing mode */ -put_le16(p + 53, 0x0003); /* Translation params valid */ -put_le16(p + 54, s->cylinders);/* Current cylinders */ -put_le16(p + 55, s->heads);/* Current heads */ -put_le16(p + 56, s->sectors); /* Current sectors */ -put_le16(p + 57, cur_sec); /* Current capacity */ -put_le16(p + 58, cur_sec >> 16); /* Current capacity */ -if (s->mult_sectors) /* Multiple sector setting */ +put_le16(p + 49, 0x0f00); /* Capabilities */ +put_le16(p + 51, 0x0002); /* PIO cycle timing mode */ +put_le16(p + 52, 0x0001); /* DMA cycle timing mode */ +put_le16(p + 53, 0x0003); /* Translation params valid */ +put_le16(p + 54, s->cylinders); /* Current cylinders */ +put_le16(p + 55, s->heads); /* Current heads */ +put_le16(p + 56, s->sectors); /* Current sectors */ +put_le16(p + 57, cur_sec); /* Current capacity */ +put_le16(p + 58, cur_sec >> 16);/* Current capacity */ +if (s->mult_sectors)/* Multiple sector setting */ put_le16(p + 59, 0x100 | s->mult_sectors); /* *(p + 60) := nb_sectors -- see ide_cfata_identify_size */ /* *(p + 61) := nb_sectors >> 16 -- see ide_cfata_identify_size */ -
[PATCH v3] hw/block: replace TABs with space
Bring the block files in line with the QEMU coding style, with spaces
for indentation. This patch partially resolves the issue 371.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/371
Signed-off-by: Yeqi Fu
---
hw/block/fdc.c | 4 +-
hw/block/nand.c | 222 +++
hw/block/onenand.c | 128 +++---
hw/block/tc58128.c | 136
include/hw/block/flash.h | 20 ++--
5 files changed, 255 insertions(+), 255 deletions(-)
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index 64ae4a6899..d7cc4d3ec1 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -601,8 +601,8 @@ enum {
};
enum {
-FD_STATE_MULTI = 0x01,/* multi track flag */
-FD_STATE_FORMAT = 0x02,/* format flag */
+FD_STATE_MULTI = 0x01, /* multi track flag */
+FD_STATE_FORMAT = 0x02, /* format flag */
};
enum {
diff --git a/hw/block/nand.c b/hw/block/nand.c
index 1aee1cb2b1..9c1b89cfa6 100644
--- a/hw/block/nand.c
+++ b/hw/block/nand.c
@@ -30,33 +30,33 @@
#include "qemu/module.h"
#include "qom/object.h"
-# define NAND_CMD_READ00x00
-# define NAND_CMD_READ10x01
-# define NAND_CMD_READ20x50
-# define NAND_CMD_LPREAD2 0x30
-# define NAND_CMD_NOSERIALREAD20x35
-# define NAND_CMD_RANDOMREAD1 0x05
-# define NAND_CMD_RANDOMREAD2 0xe0
-# define NAND_CMD_READID 0x90
-# define NAND_CMD_RESET0xff
-# define NAND_CMD_PAGEPROGRAM1 0x80
-# define NAND_CMD_PAGEPROGRAM2 0x10
-# define NAND_CMD_CACHEPROGRAM20x15
-# define NAND_CMD_BLOCKERASE1 0x60
-# define NAND_CMD_BLOCKERASE2 0xd0
-# define NAND_CMD_READSTATUS 0x70
-# define NAND_CMD_COPYBACKPRG1 0x85
-
-# define NAND_IOSTATUS_ERROR (1 << 0)
-# define NAND_IOSTATUS_PLANE0 (1 << 1)
-# define NAND_IOSTATUS_PLANE1 (1 << 2)
-# define NAND_IOSTATUS_PLANE2 (1 << 3)
-# define NAND_IOSTATUS_PLANE3 (1 << 4)
+# define NAND_CMD_READ0 0x00
+# define NAND_CMD_READ1 0x01
+# define NAND_CMD_READ2 0x50
+# define NAND_CMD_LPREAD2 0x30
+# define NAND_CMD_NOSERIALREAD2 0x35
+# define NAND_CMD_RANDOMREAD1 0x05
+# define NAND_CMD_RANDOMREAD2 0xe0
+# define NAND_CMD_READID0x90
+# define NAND_CMD_RESET 0xff
+# define NAND_CMD_PAGEPROGRAM1 0x80
+# define NAND_CMD_PAGEPROGRAM2 0x10
+# define NAND_CMD_CACHEPROGRAM2 0x15
+# define NAND_CMD_BLOCKERASE1 0x60
+# define NAND_CMD_BLOCKERASE2 0xd0
+# define NAND_CMD_READSTATUS0x70
+# define NAND_CMD_COPYBACKPRG1 0x85
+
+# define NAND_IOSTATUS_ERROR(1 << 0)
+# define NAND_IOSTATUS_PLANE0 (1 << 1)
+# define NAND_IOSTATUS_PLANE1 (1 << 2)
+# define NAND_IOSTATUS_PLANE2 (1 << 3)
+# define NAND_IOSTATUS_PLANE3 (1 << 4)
# define NAND_IOSTATUS_READY(1 << 6)
-# define NAND_IOSTATUS_UNPROTCT(1 << 7)
+# define NAND_IOSTATUS_UNPROTCT (1 << 7)
-# define MAX_PAGE 0x800
-# define MAX_OOB 0x40
+# define MAX_PAGE 0x800
+# define MAX_OOB0x40
typedef struct NANDFlashState NANDFlashState;
struct NANDFlashState {
@@ -102,40 +102,40 @@ static void mem_and(uint8_t *dest, const uint8_t *src,
size_t n)
}
}
-# define NAND_NO_AUTOINCR 0x0001
-# define NAND_BUSWIDTH_16 0x0002
-# define NAND_NO_PADDING 0x0004
-# define NAND_CACHEPRG 0x0008
-# define NAND_COPYBACK 0x0010
-# define NAND_IS_AND 0x0020
-# define NAND_4PAGE_ARRAY 0x0040
-# define NAND_NO_READRDY 0x0100
-# define NAND_SAMSUNG_LP (NAND_NO_PADDING | NAND_COPYBACK)
+# define NAND_NO_AUTOINCR 0x0001
+# define NAND_BUSWIDTH_16 0x0002
+# define NAND_NO_PADDING0x0004
+# define NAND_CACHEPRG 0x0008
+# define NAND_COPYBACK 0x0010
+# define NAND_IS_AND0x0020
+# define NAND_4PAGE_ARRAY 0x0040
+# define NAND_NO_READRDY0x0100
+# define NAND_SAMSUNG_LP(NAND_NO_PADDING | NAND_COPYBACK)
# define NAND_IO
-# define PAGE(addr)((addr) >> ADDR_SHIFT)
-# define PAGE_START(page) (PAGE(page) * (NAND_PAGE_SIZE + OOB_SIZE))
-# define PAGE_MASK ((1 << ADDR_SHIFT) - 1)
-# define OOB_SHIFT (PAGE_SHIFT - 5)
-# define OOB_SIZE (1 << OOB_SHIFT)
-# define SECTOR(addr) ((addr) >> (9 + ADDR_SHIFT - PAGE_SHIFT))
-# define SECTOR_OFFSET(addr) ((addr) & ((511 >> PAGE_SHIFT) << 8))
-
-# define NAND_PAGE_SIZE 256
-# define PAGE_SHIFT8
-# define PAGE_SECTORS 1
-# define ADDR_SHIFT8
+# define PAGE(addr) ((addr) >> ADDR_SHIFT)
+# define PAGE_START(page)(PAGE(page) * (NAND_PAGE_SIZE + OOB_SIZE))
+# define PAGE_MASK ((1 << ADDR_SHIFT) - 1)
+# define OOB_SHIFT (PAGE_SHIFT - 5)
+# de
[PATCH] hw/ide: replace TABs with space Bring the block files in line with the QEMU coding style, with spaces for indentation. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/371
Signed-off-by: Yeqi Fu --- hw/ide/cmd646.c | 28 +-- hw/ide/core.c | 84 - hw/ide/microdrive.c | 360 +++--- include/hw/ide/internal.h | 254 +-- 4 files changed, 363 insertions(+), 363 deletions(-) diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 26a90ed45f..a68357c1c5 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -36,20 +36,20 @@ #include "trace.h" /* CMD646 specific */ -#define CFR0x50 -#define CFR_INTR_CH0 0x04 -#define CNTRL 0x51 -#define CNTRL_EN_CH0 0x04 -#define CNTRL_EN_CH1 0x08 -#define ARTTIM23 0x57 -#defineARTTIM23_INTR_CH1 0x10 -#define MRDMODE0x71 -#define MRDMODE_INTR_CH0 0x04 -#define MRDMODE_INTR_CH1 0x08 -#define MRDMODE_BLK_CH0 0x10 -#define MRDMODE_BLK_CH1 0x20 -#define UDIDETCR0 0x73 -#define UDIDETCR1 0x7B +#define CFR 0x50 +#define CFR_INTR_CH0 0x04 +#define CNTRL0x51 +#define CNTRL_EN_CH0 0x04 +#define CNTRL_EN_CH1 0x08 +#define ARTTIM23 0x57 +#defineARTTIM23_INTR_CH1 0x10 +#define MRDMODE 0x71 +#define MRDMODE_INTR_CH0 0x04 +#define MRDMODE_INTR_CH1 0x08 +#define MRDMODE_BLK_CH00x10 +#define MRDMODE_BLK_CH10x20 +#define UDIDETCR00x73 +#define UDIDETCR10x7B static void cmd646_update_irq(PCIDevice *pd); diff --git a/hw/ide/core.c b/hw/ide/core.c index 2d034731cf..09b2f4a310 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -318,52 +318,52 @@ static void ide_cfata_identify(IDEState *s) cur_sec = s->cylinders * s->heads * s->sectors; -put_le16(p + 0, 0x848a); /* CF Storage Card signature */ -put_le16(p + 1, s->cylinders); /* Default cylinders */ -put_le16(p + 3, s->heads); /* Default heads */ -put_le16(p + 6, s->sectors); /* Default sectors per track */ +put_le16(p + 0, 0x848a);/* CF Storage Card signature */ +put_le16(p + 1, s->cylinders); /* Default cylinders */ +put_le16(p + 3, s->heads); /* Default heads */ +put_le16(p + 6, s->sectors);/* Default sectors per track */ /* *(p + 7) := nb_sectors >> 16 -- see ide_cfata_identify_size */ /* *(p + 8) := nb_sectors -- see ide_cfata_identify_size */ padstr((char *)(p + 10), s->drive_serial_str, 20); /* serial number */ -put_le16(p + 22, 0x0004); /* ECC bytes */ -padstr((char *) (p + 23), s->version, 8); /* Firmware Revision */ +put_le16(p + 22, 0x0004); /* ECC bytes */ +padstr((char *) (p + 23), s->version, 8); /* Firmware Revision */ padstr((char *) (p + 27), s->drive_model_str, 40);/* Model number */ #if MAX_MULT_SECTORS > 1 put_le16(p + 47, 0x8000 | MAX_MULT_SECTORS); #else put_le16(p + 47, 0x); #endif -put_le16(p + 49, 0x0f00); /* Capabilities */ -put_le16(p + 51, 0x0002); /* PIO cycle timing mode */ -put_le16(p + 52, 0x0001); /* DMA cycle timing mode */ -put_le16(p + 53, 0x0003); /* Translation params valid */ -put_le16(p + 54, s->cylinders);/* Current cylinders */ -put_le16(p + 55, s->heads);/* Current heads */ -put_le16(p + 56, s->sectors); /* Current sectors */ -put_le16(p + 57, cur_sec); /* Current capacity */ -put_le16(p + 58, cur_sec >> 16); /* Current capacity */ -if (s->mult_sectors) /* Multiple sector setting */ +put_le16(p + 49, 0x0f00); /* Capabilities */ +put_le16(p + 51, 0x0002); /* PIO cycle timing mode */ +put_le16(p + 52, 0x0001); /* DMA cycle timing mode */ +put_le16(p + 53, 0x0003); /* Translation params valid */ +put_le16(p + 54, s->cylinders); /* Current cylinders */ +put_le16(p + 55, s->heads); /* Current heads */ +put_le16(p + 56, s->sectors); /* Current sectors */ +put_le16(p + 57, cur_sec); /* Current capacity */ +put_le16(p + 58, cur_sec >> 16);/* Current capacity */ +if (s->mult_sectors)/* Multiple sector setting */ put_le16(p + 59, 0x100 | s->mult_sectors); /* *(p + 60) := nb_sectors -- see ide_cfata_identify_size */ /* *(p + 61) := nb_sectors >> 16 -- see ide_cfata_identify_size */ -put_le16(p + 63, 0x0203); /* Multiword DMA capability */ -put_le16(p + 64, 0x0001); /* Flow Control PIO support */ -put_le16(p + 65, 0x0096); /* Min. Multiword DMA cycle */ -put_le16(p + 66, 0x0096); /* Rec. Multiword DMA cycle */
[PATCH v2] hw/block: replace TABs with space Bring the block files in line with the QEMU coding style, with spaces for indentation. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/371
Signed-off-by: Yeqi Fu
---
hw/block/fdc.c | 4 +-
hw/block/nand.c | 222 +++
hw/block/onenand.c | 126 +++---
hw/block/tc58128.c | 138
include/hw/block/flash.h | 20 ++--
5 files changed, 255 insertions(+), 255 deletions(-)
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index 64ae4a6899..d7cc4d3ec1 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -601,8 +601,8 @@ enum {
};
enum {
-FD_STATE_MULTI = 0x01,/* multi track flag */
-FD_STATE_FORMAT = 0x02,/* format flag */
+FD_STATE_MULTI = 0x01, /* multi track flag */
+FD_STATE_FORMAT = 0x02, /* format flag */
};
enum {
diff --git a/hw/block/nand.c b/hw/block/nand.c
index 1aee1cb2b1..d4402f2c65 100644
--- a/hw/block/nand.c
+++ b/hw/block/nand.c
@@ -30,33 +30,33 @@
#include "qemu/module.h"
#include "qom/object.h"
-# define NAND_CMD_READ00x00
-# define NAND_CMD_READ10x01
-# define NAND_CMD_READ20x50
-# define NAND_CMD_LPREAD2 0x30
-# define NAND_CMD_NOSERIALREAD20x35
-# define NAND_CMD_RANDOMREAD1 0x05
-# define NAND_CMD_RANDOMREAD2 0xe0
-# define NAND_CMD_READID 0x90
-# define NAND_CMD_RESET0xff
-# define NAND_CMD_PAGEPROGRAM1 0x80
-# define NAND_CMD_PAGEPROGRAM2 0x10
-# define NAND_CMD_CACHEPROGRAM20x15
-# define NAND_CMD_BLOCKERASE1 0x60
-# define NAND_CMD_BLOCKERASE2 0xd0
-# define NAND_CMD_READSTATUS 0x70
-# define NAND_CMD_COPYBACKPRG1 0x85
-
-# define NAND_IOSTATUS_ERROR (1 << 0)
-# define NAND_IOSTATUS_PLANE0 (1 << 1)
-# define NAND_IOSTATUS_PLANE1 (1 << 2)
-# define NAND_IOSTATUS_PLANE2 (1 << 3)
-# define NAND_IOSTATUS_PLANE3 (1 << 4)
+# define NAND_CMD_READ0 0x00
+# define NAND_CMD_READ1 0x01
+# define NAND_CMD_READ2 0x50
+# define NAND_CMD_LPREAD2 0x30
+# define NAND_CMD_NOSERIALREAD2 0x35
+# define NAND_CMD_RANDOMREAD1 0x05
+# define NAND_CMD_RANDOMREAD2 0xe0
+# define NAND_CMD_READID0x90
+# define NAND_CMD_RESET 0xff
+# define NAND_CMD_PAGEPROGRAM1 0x80
+# define NAND_CMD_PAGEPROGRAM2 0x10
+# define NAND_CMD_CACHEPROGRAM2 0x15
+# define NAND_CMD_BLOCKERASE1 0x60
+# define NAND_CMD_BLOCKERASE2 0xd0
+# define NAND_CMD_READSTATUS0x70
+# define NAND_CMD_COPYBACKPRG1 0x85
+
+# define NAND_IOSTATUS_ERROR(1 << 0)
+# define NAND_IOSTATUS_PLANE0 (1 << 1)
+# define NAND_IOSTATUS_PLANE1 (1 << 2)
+# define NAND_IOSTATUS_PLANE2 (1 << 3)
+# define NAND_IOSTATUS_PLANE3 (1 << 4)
# define NAND_IOSTATUS_READY(1 << 6)
-# define NAND_IOSTATUS_UNPROTCT(1 << 7)
+# define NAND_IOSTATUS_UNPROTCT (1 << 7)
-# define MAX_PAGE 0x800
-# define MAX_OOB 0x40
+# define MAX_PAGE 0x800
+# define MAX_OOB0x40
typedef struct NANDFlashState NANDFlashState;
struct NANDFlashState {
@@ -102,40 +102,40 @@ static void mem_and(uint8_t *dest, const uint8_t *src,
size_t n)
}
}
-# define NAND_NO_AUTOINCR 0x0001
-# define NAND_BUSWIDTH_16 0x0002
-# define NAND_NO_PADDING 0x0004
-# define NAND_CACHEPRG 0x0008
-# define NAND_COPYBACK 0x0010
-# define NAND_IS_AND 0x0020
-# define NAND_4PAGE_ARRAY 0x0040
-# define NAND_NO_READRDY 0x0100
-# define NAND_SAMSUNG_LP (NAND_NO_PADDING | NAND_COPYBACK)
+# define NAND_NO_AUTOINCR 0x0001
+# define NAND_BUSWIDTH_16 0x0002
+# define NAND_NO_PADDING0x0004
+# define NAND_CACHEPRG 0x0008
+# define NAND_COPYBACK 0x0010
+# define NAND_IS_AND0x0020
+# define NAND_4PAGE_ARRAY 0x0040
+# define NAND_NO_READRDY0x0100
+# define NAND_SAMSUNG_LP(NAND_NO_PADDING | NAND_COPYBACK)
# define NAND_IO
-# define PAGE(addr)((addr) >> ADDR_SHIFT)
-# define PAGE_START(page) (PAGE(page) * (NAND_PAGE_SIZE + OOB_SIZE))
-# define PAGE_MASK ((1 << ADDR_SHIFT) - 1)
-# define OOB_SHIFT (PAGE_SHIFT - 5)
-# define OOB_SIZE (1 << OOB_SHIFT)
-# define SECTOR(addr) ((addr) >> (9 + ADDR_SHIFT - PAGE_SHIFT))
-# define SECTOR_OFFSET(addr) ((addr) & ((511 >> PAGE_SHIFT) << 8))
-
-# define NAND_PAGE_SIZE 256
-# define PAGE_SHIFT8
-# define PAGE_SECTORS 1
-# define ADDR_SHIFT8
+# define PAGE(addr) ((addr) >> ADDR_SHIFT)
+# define PAGE_START(page)(PAGE(page) * (NAND_PAGE_SIZE + OOB_SIZE))
+# define PAGE_MASK ((1 << ADDR_SHIFT) - 1)
+# define OOB_SHIFT (PAGE_SHIFT - 5)
+# define OOB_SIZE(1 << OOB_SHIFT)
+# define SECTOR(addr)((addr) >> (9 + ADDR_SHIFT - PAGE_SHIFT))
+# define SECTOR_OFFSET(addr) ((addr) & ((511 >> PAGE
[PATCH] hw/block: replace TABs with space Bring the block files in line with the QEMU coding style, with spaces for indentation. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/371
Signed-off-by: Yeqi Fu
---
hw/block/fdc.c | 4 +-
hw/block/nand.c| 222 ++---
hw/block/onenand.c | 126 -
hw/block/tc58128.c | 136 +--
4 files changed, 244 insertions(+), 244 deletions(-)
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index 64ae4a6899..d7cc4d3ec1 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -601,8 +601,8 @@ enum {
};
enum {
-FD_STATE_MULTI = 0x01,/* multi track flag */
-FD_STATE_FORMAT = 0x02,/* format flag */
+FD_STATE_MULTI = 0x01, /* multi track flag */
+FD_STATE_FORMAT = 0x02, /* format flag */
};
enum {
diff --git a/hw/block/nand.c b/hw/block/nand.c
index 1aee1cb2b1..79832b9cd5 100644
--- a/hw/block/nand.c
+++ b/hw/block/nand.c
@@ -30,33 +30,33 @@
#include "qemu/module.h"
#include "qom/object.h"
-# define NAND_CMD_READ00x00
-# define NAND_CMD_READ10x01
-# define NAND_CMD_READ20x50
-# define NAND_CMD_LPREAD2 0x30
-# define NAND_CMD_NOSERIALREAD20x35
-# define NAND_CMD_RANDOMREAD1 0x05
-# define NAND_CMD_RANDOMREAD2 0xe0
-# define NAND_CMD_READID 0x90
-# define NAND_CMD_RESET0xff
-# define NAND_CMD_PAGEPROGRAM1 0x80
-# define NAND_CMD_PAGEPROGRAM2 0x10
-# define NAND_CMD_CACHEPROGRAM20x15
-# define NAND_CMD_BLOCKERASE1 0x60
-# define NAND_CMD_BLOCKERASE2 0xd0
-# define NAND_CMD_READSTATUS 0x70
-# define NAND_CMD_COPYBACKPRG1 0x85
-
-# define NAND_IOSTATUS_ERROR (1 << 0)
-# define NAND_IOSTATUS_PLANE0 (1 << 1)
-# define NAND_IOSTATUS_PLANE1 (1 << 2)
-# define NAND_IOSTATUS_PLANE2 (1 << 3)
-# define NAND_IOSTATUS_PLANE3 (1 << 4)
+# define NAND_CMD_READ0 0x00
+# define NAND_CMD_READ1 0x01
+# define NAND_CMD_READ2 0x50
+# define NAND_CMD_LPREAD2 0x30
+# define NAND_CMD_NOSERIALREAD2 0x35
+# define NAND_CMD_RANDOMREAD1 0x05
+# define NAND_CMD_RANDOMREAD2 0xe0
+# define NAND_CMD_READID0x90
+# define NAND_CMD_RESET 0xff
+# define NAND_CMD_PAGEPROGRAM1 0x80
+# define NAND_CMD_PAGEPROGRAM2 0x10
+# define NAND_CMD_CACHEPROGRAM2 0x15
+# define NAND_CMD_BLOCKERASE1 0x60
+# define NAND_CMD_BLOCKERASE2 0xd0
+# define NAND_CMD_READSTATUS0x70
+# define NAND_CMD_COPYBACKPRG1 0x85
+
+# define NAND_IOSTATUS_ERROR(1 << 0)
+# define NAND_IOSTATUS_PLANE0 (1 << 1)
+# define NAND_IOSTATUS_PLANE1 (1 << 2)
+# define NAND_IOSTATUS_PLANE2 (1 << 3)
+# define NAND_IOSTATUS_PLANE3 (1 << 4)
# define NAND_IOSTATUS_READY(1 << 6)
-# define NAND_IOSTATUS_UNPROTCT(1 << 7)
+# define NAND_IOSTATUS_UNPROTCT (1 << 7)
-# define MAX_PAGE 0x800
-# define MAX_OOB 0x40
+# define MAX_PAGE 0x800
+# define MAX_OOB0x40
typedef struct NANDFlashState NANDFlashState;
struct NANDFlashState {
@@ -102,40 +102,40 @@ static void mem_and(uint8_t *dest, const uint8_t *src,
size_t n)
}
}
-# define NAND_NO_AUTOINCR 0x0001
-# define NAND_BUSWIDTH_16 0x0002
-# define NAND_NO_PADDING 0x0004
-# define NAND_CACHEPRG 0x0008
-# define NAND_COPYBACK 0x0010
-# define NAND_IS_AND 0x0020
-# define NAND_4PAGE_ARRAY 0x0040
-# define NAND_NO_READRDY 0x0100
-# define NAND_SAMSUNG_LP (NAND_NO_PADDING | NAND_COPYBACK)
+# define NAND_NO_AUTOINCR 0x0001
+# define NAND_BUSWIDTH_16 0x0002
+# define NAND_NO_PADDING0x0004
+# define NAND_CACHEPRG 0x0008
+# define NAND_COPYBACK 0x0010
+# define NAND_IS_AND0x0020
+# define NAND_4PAGE_ARRAY 0x0040
+# define NAND_NO_READRDY0x0100
+# define NAND_SAMSUNG_LP(NAND_NO_PADDING | NAND_COPYBACK)
# define NAND_IO
-# define PAGE(addr)((addr) >> ADDR_SHIFT)
-# define PAGE_START(page) (PAGE(page) * (NAND_PAGE_SIZE + OOB_SIZE))
-# define PAGE_MASK ((1 << ADDR_SHIFT) - 1)
-# define OOB_SHIFT (PAGE_SHIFT - 5)
-# define OOB_SIZE (1 << OOB_SHIFT)
-# define SECTOR(addr) ((addr) >> (9 + ADDR_SHIFT - PAGE_SHIFT))
-# define SECTOR_OFFSET(addr) ((addr) & ((511 >> PAGE_SHIFT) << 8))
-
-# define NAND_PAGE_SIZE 256
-# define PAGE_SHIFT8
-# define PAGE_SECTORS 1
-# define ADDR_SHIFT8
+# define PAGE(addr) ((addr) >> ADDR_SHIFT)
+# define PAGE_START(page)(PAGE(page) * (NAND_PAGE_SIZE + OOB_SIZE))
+# define PAGE_MASK ((1 << ADDR_SHIFT) - 1)
+# define OOB_SHIFT (PAGE_SHIFT - 5)
+# define OOB_SIZE(1 << OOB_SHIFT)
+# define SECTOR(addr)((addr) >> (9 + ADDR_SHIFT - PAGE_SHIFT))
+# define SECTOR_OFFSET(addr) ((addr) & ((511 >> PAGE_SHIFT) << 8))
+
+# define NAND_PAGE_SIZE
[PATCH v2] block: replace TABs with space
Bring the block files in line with the QEMU coding style, with spaces
for indentation.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/371
Signed-off-by: Yeqi Fu
---
block/bochs.c | 14 +++
block/file-posix.c | 92 ++---
block/file-win32.c | 53 +-
block/parallels.c | 28 +++---
block/qcow.c| 44 +++---
include/block/nbd.h | 2 +-
6 files changed, 116 insertions(+), 117 deletions(-)
diff --git a/block/bochs.c b/block/bochs.c
index 2f5ae52c90..85d06f3315 100644
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -293,15 +293,15 @@ static void bochs_close(BlockDriverState *bs)
}
static BlockDriver bdrv_bochs = {
-.format_name = "bochs",
-.instance_size = sizeof(BDRVBochsState),
-.bdrv_probe= bochs_probe,
-.bdrv_open = bochs_open,
-.bdrv_child_perm = bdrv_default_perms,
+.format_name = "bochs",
+.instance_size = sizeof(BDRVBochsState),
+.bdrv_probe = bochs_probe,
+.bdrv_open = bochs_open,
+.bdrv_child_perm = bdrv_default_perms,
.bdrv_refresh_limits = bochs_refresh_limits,
.bdrv_co_preadv = bochs_co_preadv,
-.bdrv_close= bochs_close,
-.is_format = true,
+.bdrv_close = bochs_close,
+.is_format = true,
};
static void bdrv_bochs_init(void)
diff --git a/block/file-posix.c b/block/file-posix.c
index 5760cf22d1..18159b6d83 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -124,7 +124,7 @@
#define FTYPE_FILE 0
#define FTYPE_CD 1
-#define MAX_BLOCKSIZE 4096
+#define MAX_BLOCKSIZE 4096
/* Posix file locking bytes. Libvirt takes byte 0, we start from higher bytes,
* leaving a few more bytes for its future use. */
@@ -3819,42 +3819,42 @@ static void coroutine_fn
cdrom_co_lock_medium(BlockDriverState *bs, bool locked)
}
static BlockDriver bdrv_host_cdrom = {
-.format_name= "host_cdrom",
-.protocol_name = "host_cdrom",
-.instance_size = sizeof(BDRVRawState),
+.format_name = "host_cdrom",
+.protocol_name = "host_cdrom",
+.instance_size = sizeof(BDRVRawState),
.bdrv_needs_filename = true,
-.bdrv_probe_device = cdrom_probe_device,
+.bdrv_probe_device = cdrom_probe_device,
.bdrv_parse_filename = cdrom_parse_filename,
-.bdrv_file_open = cdrom_open,
-.bdrv_close = raw_close,
+.bdrv_file_open = cdrom_open,
+.bdrv_close = raw_close,
.bdrv_reopen_prepare = raw_reopen_prepare,
-.bdrv_reopen_commit = raw_reopen_commit,
-.bdrv_reopen_abort = raw_reopen_abort,
+.bdrv_reopen_commit = raw_reopen_commit,
+.bdrv_reopen_abort = raw_reopen_abort,
.bdrv_co_create_opts = bdrv_co_create_opts_simple,
-.create_opts = &bdrv_create_opts_simple,
-.mutable_opts= mutable_opts,
+.create_opts = &bdrv_create_opts_simple,
+.mutable_opts = mutable_opts,
.bdrv_co_invalidate_cache = raw_co_invalidate_cache,
-.bdrv_co_preadv = raw_co_preadv,
-.bdrv_co_pwritev= raw_co_pwritev,
-.bdrv_co_flush_to_disk = raw_co_flush_to_disk,
+.bdrv_co_preadv = raw_co_preadv,
+.bdrv_co_pwritev = raw_co_pwritev,
+.bdrv_co_flush_to_disk = raw_co_flush_to_disk,
.bdrv_refresh_limits = raw_refresh_limits,
-.bdrv_co_io_plug= raw_co_io_plug,
-.bdrv_co_io_unplug = raw_co_io_unplug,
+.bdrv_co_io_plug = raw_co_io_plug,
+.bdrv_co_io_unplug = raw_co_io_unplug,
.bdrv_attach_aio_context = raw_aio_attach_aio_context,
-.bdrv_co_truncate = raw_co_truncate,
-.bdrv_co_getlength = raw_co_getlength,
-.has_variable_length= true,
-.bdrv_co_get_allocated_file_size= raw_co_get_allocated_file_size,
+.bdrv_co_truncate = raw_co_truncate,
+.bdrv_co_getlength = raw_co_getlength,
+.has_variable_length = true,
+.bdrv_co_get_allocated_file_size = raw_co_get_allocated_file_size,
/* removable device support */
-.bdrv_co_is_inserted= cdrom_co_is_inserted,
-.bdrv_co_eject = cdrom_co_eject,
-.bdrv_co_lock_medium= cdrom_co_lock_medium,
+.bdrv_co_is_inserted = cdrom_co_is_inserted,
+.bdrv_co_eject = cdrom_co_eject,
+.bdrv_co_lock_medium = cdrom_co_lock_medium,
/* generic scsi device */
-.bdrv_co_ioctl = hdev_co_ioctl,
+.bdrv_co_ioctl = hdev_co_ioctl,
};
#endif /* __linux__ */
@@ -3949,38 +3949,38 @@ static void coroutine_fn
cdrom_co_lock_medium(BlockDriverState *bs, bool locked)
}
static BlockDriver bdrv_host_cdrom = {
-.format_name= "host_cdrom",
-.protocol_name = "host_cdrom",
-.instance_size = sizeof(BDRVRawState),
+.format_name = "host_cdrom",
+.protocol_name = "host_cdrom",
+.instance
[PATCH] block: replace TABs with space
Bring the block files in line with the QEMU coding style, with spaces
for indentation.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/371
Signed-off-by: Yeqi Fu
---
block/bochs.c | 12 +--
block/file-posix.c | 52 ++---
block/file-win32.c | 38 -
block/parallels.c | 10 -
block/qcow.c| 10 -
include/block/nbd.h | 2 +-
6 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/block/bochs.c b/block/bochs.c
index 2f5ae52c90..8ff38ac0d9 100644
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -293,15 +293,15 @@ static void bochs_close(BlockDriverState *bs)
}
static BlockDriver bdrv_bochs = {
-.format_name = "bochs",
-.instance_size = sizeof(BDRVBochsState),
-.bdrv_probe= bochs_probe,
-.bdrv_open = bochs_open,
+.format_name= "bochs",
+.instance_size = sizeof(BDRVBochsState),
+.bdrv_probe = bochs_probe,
+.bdrv_open = bochs_open,
.bdrv_child_perm = bdrv_default_perms,
.bdrv_refresh_limits = bochs_refresh_limits,
.bdrv_co_preadv = bochs_co_preadv,
-.bdrv_close= bochs_close,
-.is_format = true,
+.bdrv_close = bochs_close,
+.is_format = true,
};
static void bdrv_bochs_init(void)
diff --git a/block/file-posix.c b/block/file-posix.c
index 5760cf22d1..9ba1600a77 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -124,7 +124,7 @@
#define FTYPE_FILE 0
#define FTYPE_CD 1
-#define MAX_BLOCKSIZE 4096
+#define MAX_BLOCKSIZE 4096
/* Posix file locking bytes. Libvirt takes byte 0, we start from higher bytes,
* leaving a few more bytes for its future use. */
@@ -3819,14 +3819,14 @@ static void coroutine_fn
cdrom_co_lock_medium(BlockDriverState *bs, bool locked)
}
static BlockDriver bdrv_host_cdrom = {
-.format_name= "host_cdrom",
-.protocol_name = "host_cdrom",
-.instance_size = sizeof(BDRVRawState),
+.format_name = "host_cdrom",
+.protocol_name = "host_cdrom",
+.instance_size = sizeof(BDRVRawState),
.bdrv_needs_filename = true,
-.bdrv_probe_device = cdrom_probe_device,
+.bdrv_probe_device = cdrom_probe_device,
.bdrv_parse_filename = cdrom_parse_filename,
-.bdrv_file_open = cdrom_open,
-.bdrv_close = raw_close,
+.bdrv_file_open = cdrom_open,
+.bdrv_close = raw_close,
.bdrv_reopen_prepare = raw_reopen_prepare,
.bdrv_reopen_commit = raw_reopen_commit,
.bdrv_reopen_abort = raw_reopen_abort,
@@ -3835,12 +3835,12 @@ static BlockDriver bdrv_host_cdrom = {
.mutable_opts= mutable_opts,
.bdrv_co_invalidate_cache = raw_co_invalidate_cache,
-.bdrv_co_preadv = raw_co_preadv,
-.bdrv_co_pwritev= raw_co_pwritev,
-.bdrv_co_flush_to_disk = raw_co_flush_to_disk,
-.bdrv_refresh_limits = raw_refresh_limits,
-.bdrv_co_io_plug= raw_co_io_plug,
-.bdrv_co_io_unplug = raw_co_io_unplug,
+.bdrv_co_preadv = raw_co_preadv,
+.bdrv_co_pwritev = raw_co_pwritev,
+.bdrv_co_flush_to_disk = raw_co_flush_to_disk,
+.bdrv_refresh_limits = raw_refresh_limits,
+.bdrv_co_io_plug = raw_co_io_plug,
+.bdrv_co_io_unplug = raw_co_io_unplug,
.bdrv_attach_aio_context = raw_aio_attach_aio_context,
.bdrv_co_truncate = raw_co_truncate,
@@ -3949,27 +3949,27 @@ static void coroutine_fn
cdrom_co_lock_medium(BlockDriverState *bs, bool locked)
}
static BlockDriver bdrv_host_cdrom = {
-.format_name= "host_cdrom",
-.protocol_name = "host_cdrom",
-.instance_size = sizeof(BDRVRawState),
+.format_name = "host_cdrom",
+.protocol_name = "host_cdrom",
+.instance_size = sizeof(BDRVRawState),
.bdrv_needs_filename = true,
-.bdrv_probe_device = cdrom_probe_device,
+.bdrv_probe_device = cdrom_probe_device,
.bdrv_parse_filename = cdrom_parse_filename,
-.bdrv_file_open = cdrom_open,
-.bdrv_close = raw_close,
+.bdrv_file_open = cdrom_open,
+.bdrv_close = raw_close,
.bdrv_reopen_prepare = raw_reopen_prepare,
.bdrv_reopen_commit = raw_reopen_commit,
.bdrv_reopen_abort = raw_reopen_abort,
.bdrv_co_create_opts = bdrv_co_create_opts_simple,
.create_opts = &bdrv_create_opts_simple,
-.mutable_opts = mutable_opts,
+.mutable_opts= mutable_opts,
-.bdrv_co_preadv = raw_co_preadv,
-.bdrv_co_pwritev= raw_co_pwritev,
-.bdrv_co_flush_to_disk = raw_co_flush_to_disk,
-.bdrv_refresh_limits = raw_refresh_limits,
-.bdrv_co_io_plug= raw_co_io_plug,
-.bdrv_co
