* [PATCH v1] hw/ppc: change indentation to spaces from TABs
@ 2022-04-05 12:19 Guo Zhi
2022-04-06 10:08 ` Bin Meng
0 siblings, 1 reply; 15+ messages in thread
From: Guo Zhi @ 2022-04-05 12:19 UTC (permalink / raw)
To: Cédric Le Goater, Daniel Henrique Barboza, David Gibson, Greg Kurz
Cc: qemu-ppc, Guo Zhi, qemu-devel
There are still some files in the QEMU PPC code base that use TABs for indentation instead of using spaces.
The TABs should be replaced so that we have a consistent coding style.
If this patch is applied, issue:
https://gitlab.com/qemu-project/qemu/-/issues/374
can be closed.
Signed-off-by: Guo Zhi <qtxuning1999@sjtu.edu.cn>
---
hw/core/uboot_image.h | 185 ++++++++++++++++++++---------------------
hw/ppc/ppc440_bamboo.c | 6 +-
hw/ppc/spapr_rtas.c | 18 ++--
include/hw/ppc/ppc.h | 10 +--
4 files changed, 109 insertions(+), 110 deletions(-)
diff --git a/hw/core/uboot_image.h b/hw/core/uboot_image.h
index 608022de6e..980e9cc014 100644
--- a/hw/core/uboot_image.h
+++ b/hw/core/uboot_image.h
@@ -12,7 +12,7 @@
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
@@ -32,128 +32,127 @@
/*
* Operating System Codes
*/
-#define IH_OS_INVALID 0 /* Invalid OS */
-#define IH_OS_OPENBSD 1 /* OpenBSD */
-#define IH_OS_NETBSD 2 /* NetBSD */
-#define IH_OS_FREEBSD 3 /* FreeBSD */
-#define IH_OS_4_4BSD 4 /* 4.4BSD */
-#define IH_OS_LINUX 5 /* Linux */
-#define IH_OS_SVR4 6 /* SVR4 */
-#define IH_OS_ESIX 7 /* Esix */
-#define IH_OS_SOLARIS 8 /* Solaris */
-#define IH_OS_IRIX 9 /* Irix */
-#define IH_OS_SCO 10 /* SCO */
-#define IH_OS_DELL 11 /* Dell */
-#define IH_OS_NCR 12 /* NCR */
-#define IH_OS_LYNXOS 13 /* LynxOS */
-#define IH_OS_VXWORKS 14 /* VxWorks */
-#define IH_OS_PSOS 15 /* pSOS */
-#define IH_OS_QNX 16 /* QNX */
-#define IH_OS_U_BOOT 17 /* Firmware */
-#define IH_OS_RTEMS 18 /* RTEMS */
-#define IH_OS_ARTOS 19 /* ARTOS */
-#define IH_OS_UNITY 20 /* Unity OS */
+#define IH_OS_INVALID 0 /* Invalid OS */
+#define IH_OS_OPENBSD 1 /* OpenBSD */
+#define IH_OS_NETBSD 2 /* NetBSD */
+#define IH_OS_FREEBSD 3 /* FreeBSD */
+#define IH_OS_4_4BSD 4 /* 4.4BSD */
+#define IH_OS_LINUX 5 /* Linux */
+#define IH_OS_SVR4 6 /* SVR4 */
+#define IH_OS_ESIX 7 /* Esix */
+#define IH_OS_SOLARIS 8 /* Solaris */
+#define IH_OS_IRIX 9 /* Irix */
+#define IH_OS_SCO 10 /* SCO */
+#define IH_OS_DELL 11 /* Dell */
+#define IH_OS_NCR 12 /* NCR */
+#define IH_OS_LYNXOS 13 /* LynxOS */
+#define IH_OS_VXWORKS 14 /* VxWorks */
+#define IH_OS_PSOS 15 /* pSOS */
+#define IH_OS_QNX 16 /* QNX */
+#define IH_OS_U_BOOT 17 /* Firmware */
+#define IH_OS_RTEMS 18 /* RTEMS */
+#define IH_OS_ARTOS 19 /* ARTOS */
+#define IH_OS_UNITY 20 /* Unity OS */
/*
* CPU Architecture Codes (supported by Linux)
*/
-#define IH_CPU_INVALID 0 /* Invalid CPU */
-#define IH_CPU_ALPHA 1 /* Alpha */
-#define IH_CPU_ARM 2 /* ARM */
-#define IH_CPU_I386 3 /* Intel x86 */
-#define IH_CPU_IA64 4 /* IA64 */
-#define IH_CPU_MIPS 5 /* MIPS */
-#define IH_CPU_MIPS64 6 /* MIPS 64 Bit */
-#define IH_CPU_PPC 7 /* PowerPC */
-#define IH_CPU_S390 8 /* IBM S390 */
-#define IH_CPU_SH 9 /* SuperH */
-#define IH_CPU_SPARC 10 /* Sparc */
-#define IH_CPU_SPARC64 11 /* Sparc 64 Bit */
-#define IH_CPU_M68K 12 /* M68K */
-#define IH_CPU_NIOS 13 /* Nios-32 */
-#define IH_CPU_MICROBLAZE 14 /* MicroBlaze */
-#define IH_CPU_NIOS2 15 /* Nios-II */
-#define IH_CPU_BLACKFIN 16 /* Blackfin */
-#define IH_CPU_AVR32 17 /* AVR32 */
+#define IH_CPU_INVALID 0 /* Invalid CPU */
+#define IH_CPU_ALPHA 1 /* Alpha */
+#define IH_CPU_ARM 2 /* ARM */
+#define IH_CPU_I386 3 /* Intel x86 */
+#define IH_CPU_IA64 4 /* IA64 */
+#define IH_CPU_MIPS 5 /* MIPS */
+#define IH_CPU_MIPS64 6 /* MIPS 64 Bit */
+#define IH_CPU_PPC 7 /* PowerPC */
+#define IH_CPU_S390 8 /* IBM S390 */
+#define IH_CPU_SH 9 /* SuperH */
+#define IH_CPU_SPARC 10 /* Sparc */
+#define IH_CPU_SPARC64 11 /* Sparc 64 Bit */
+#define IH_CPU_M68K 12 /* M68K */
+#define IH_CPU_NIOS 13 /* Nios-32 */
+#define IH_CPU_MICROBLAZE 14 /* MicroBlaze */
+#define IH_CPU_NIOS2 15 /* Nios-II */
+#define IH_CPU_BLACKFIN 16 /* Blackfin */
+#define IH_CPU_AVR32 17 /* AVR32 */
/*
* Image Types
*
* "Standalone Programs" are directly runnable in the environment
- * provided by U-Boot; it is expected that (if they behave
- * well) you can continue to work in U-Boot after return from
- * the Standalone Program.
+ * provided by U-Boot; it is expected that (if they behave
+ * well) you can continue to work in U-Boot after return from
+ * the Standalone Program.
* "OS Kernel Images" are usually images of some Embedded OS which
- * will take over control completely. Usually these programs
- * will install their own set of exception handlers, device
- * drivers, set up the MMU, etc. - this means, that you cannot
- * expect to re-enter U-Boot except by resetting the CPU.
+ * will take over control completely. Usually these programs
+ * will install their own set of exception handlers, device
+ * drivers, set up the MMU, etc. - this means, that you cannot
+ * expect to re-enter U-Boot except by resetting the CPU.
* "RAMDisk Images" are more or less just data blocks, and their
- * parameters (address, size) are passed to an OS kernel that is
- * being started.
+ * parameters (address, size) are passed to an OS kernel that is
+ * being started.
* "Multi-File Images" contain several images, typically an OS
- * (Linux) kernel image and one or more data images like
- * RAMDisks. This construct is useful for instance when you want
- * to boot over the network using BOOTP etc., where the boot
- * server provides just a single image file, but you want to get
- * for instance an OS kernel and a RAMDisk image.
+ * (Linux) kernel image and one or more data images like
+ * RAMDisks. This construct is useful for instance when you want
+ * to boot over the network using BOOTP etc., where the boot
+ * server provides just a single image file, but you want to get
+ * for instance an OS kernel and a RAMDisk image.
*
- * "Multi-File Images" start with a list of image sizes, each
- * image size (in bytes) specified by an "uint32_t" in network
- * byte order. This list is terminated by an "(uint32_t)0".
- * Immediately after the terminating 0 follow the images, one by
- * one, all aligned on "uint32_t" boundaries (size rounded up to
- * a multiple of 4 bytes - except for the last file).
+ * "Multi-File Images" start with a list of image sizes, each
+ * image size (in bytes) specified by an "uint32_t" in network
+ * byte order. This list is terminated by an "(uint32_t)0".
+ * Immediately after the terminating 0 follow the images, one by
+ * one, all aligned on "uint32_t" boundaries (size rounded up to
+ * a multiple of 4 bytes - except for the last file).
*
* "Firmware Images" are binary images containing firmware (like
- * U-Boot or FPGA images) which usually will be programmed to
- * flash memory.
+ * U-Boot or FPGA images) which usually will be programmed to
+ * flash memory.
*
* "Script files" are command sequences that will be executed by
- * U-Boot's command interpreter; this feature is especially
- * useful when you configure U-Boot to use a real shell (hush)
- * as command interpreter (=> Shell Scripts).
+ * U-Boot's command interpreter; this feature is especially
+ * useful when you configure U-Boot to use a real shell (hush)
+ * as command interpreter (=> Shell Scripts).
*/
-#define IH_TYPE_INVALID 0 /* Invalid Image */
-#define IH_TYPE_STANDALONE 1 /* Standalone Program */
-#define IH_TYPE_KERNEL 2 /* OS Kernel Image */
-#define IH_TYPE_RAMDISK 3 /* RAMDisk Image */
-#define IH_TYPE_MULTI 4 /* Multi-File Image */
-#define IH_TYPE_FIRMWARE 5 /* Firmware Image */
-#define IH_TYPE_SCRIPT 6 /* Script file */
-#define IH_TYPE_FILESYSTEM 7 /* Filesystem Image (any type) */
-#define IH_TYPE_FLATDT 8 /* Binary Flat Device Tree Blob */
-#define IH_TYPE_KERNEL_NOLOAD 14 /* OS Kernel Image (noload) */
+#define IH_TYPE_INVALID 0 /* Invalid Image */
+#define IH_TYPE_STANDALONE 1 /* Standalone Program */
+#define IH_TYPE_KERNEL 2 /* OS Kernel Image */
+#define IH_TYPE_RAMDISK 3 /* RAMDisk Image */
+#define IH_TYPE_MULTI 4 /* Multi-File Image */
+#define IH_TYPE_FIRMWARE 5 /* Firmware Image */
+#define IH_TYPE_SCRIPT 6 /* Script file */
+#define IH_TYPE_FILESYSTEM 7 /* Filesystem Image (any type) */
+#define IH_TYPE_FLATDT 8 /* Binary Flat Device Tree Blob */
+#define IH_TYPE_KERNEL_NOLOAD 14 /* OS Kernel Image (noload) */
/*
* Compression Types
*/
-#define IH_COMP_NONE 0 /* No Compression Used */
-#define IH_COMP_GZIP 1 /* gzip Compression Used */
-#define IH_COMP_BZIP2 2 /* bzip2 Compression Used */
+#define IH_COMP_NONE 0 /* No Compression Used */
+#define IH_COMP_GZIP 1 /* gzip Compression Used */
+#define IH_COMP_BZIP2 2 /* bzip2 Compression Used */
-#define IH_MAGIC 0x27051956 /* Image Magic Number */
-#define IH_NMLEN 32 /* Image Name Length */
+#define IH_MAGIC 0x27051956 /* Image Magic Number */
+#define IH_NMLEN 32 /* Image Name Length */
/*
* all data in network byte order (aka natural aka bigendian)
*/
typedef struct uboot_image_header {
- uint32_t ih_magic; /* Image Header Magic Number */
- uint32_t ih_hcrc; /* Image Header CRC Checksum */
- uint32_t ih_time; /* Image Creation Timestamp */
- uint32_t ih_size; /* Image Data Size */
- uint32_t ih_load; /* Data Load Address */
- uint32_t ih_ep; /* Entry Point Address */
- uint32_t ih_dcrc; /* Image Data CRC Checksum */
- uint8_t ih_os; /* Operating System */
- uint8_t ih_arch; /* CPU architecture */
- uint8_t ih_type; /* Image Type */
- uint8_t ih_comp; /* Compression Type */
- uint8_t ih_name[IH_NMLEN]; /* Image Name */
+ uint32_t ih_magic; /* Image Header Magic Number */
+ uint32_t ih_hcrc; /* Image Header CRC Checksum */
+ uint32_t ih_time; /* Image Creation Timestamp */
+ uint32_t ih_size; /* Image Data Size */
+ uint32_t ih_load; /* Data Load Address */
+ uint32_t ih_ep; /* Entry Point Address */
+ uint32_t ih_dcrc; /* Image Data CRC Checksum */
+ uint8_t ih_os; /* Operating System */
+ uint8_t ih_arch; /* CPU architecture */
+ uint8_t ih_type; /* Image Type */
+ uint8_t ih_comp; /* Compression Type */
+ uint8_t ih_name[IH_NMLEN]; /* Image Name */
} uboot_image_header_t;
-
#endif /* UBOOT_IMAGE_H */
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index 7fb620b9a0..5ec3a9a17f 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -3,9 +3,9 @@
*
* Copyright 2007 IBM Corporation.
* Authors:
- * Jerone Young <jyoung5@us.ibm.com>
- * Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
- * Hollis Blanchard <hollisb@us.ibm.com>
+ * Jerone Young <jyoung5@us.ibm.com>
+ * Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
+ * Hollis Blanchard <hollisb@us.ibm.com>
*
* This work is licensed under the GNU GPL license version 2 or later.
*
diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
index d7c04237fe..d58b65e88f 100644
--- a/hw/ppc/spapr_rtas.c
+++ b/hw/ppc/spapr_rtas.c
@@ -474,16 +474,16 @@ static void rtas_ibm_nmi_interlock(PowerPCCPU *cpu,
if (spapr->fwnmi_machine_check_interlock != cpu->vcpu_id) {
/*
- * The vCPU that hit the NMI should invoke "ibm,nmi-interlock"
+ * The vCPU that hit the NMI should invoke "ibm,nmi-interlock"
* This should be PARAM_ERROR, but Linux calls "ibm,nmi-interlock"
- * for system reset interrupts, despite them not being interlocked.
- * PowerVM silently ignores this and returns success here. Returning
- * failure causes Linux to print the error "FWNMI: nmi-interlock
- * failed: -3", although no other apparent ill effects, this is a
- * regression for the user when enabling FWNMI. So for now, match
- * PowerVM. When most Linux clients are fixed, this could be
- * changed.
- */
+ * for system reset interrupts, despite them not being interlocked.
+ * PowerVM silently ignores this and returns success here. Returning
+ * failure causes Linux to print the error "FWNMI: nmi-interlock
+ * failed: -3", although no other apparent ill effects, this is a
+ * regression for the user when enabling FWNMI. So for now, match
+ * PowerVM. When most Linux clients are fixed, this could be
+ * changed.
+ */
rtas_st(rets, 0, RTAS_OUT_SUCCESS);
return;
}
diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h
index 364f165b4b..02af03ada2 100644
--- a/include/hw/ppc/ppc.h
+++ b/include/hw/ppc/ppc.h
@@ -99,11 +99,11 @@ enum {
ARCH_MAC99_U3,
};
-#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00)
-#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01)
-#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02)
-#define FW_CFG_PPC_TBFREQ (FW_CFG_ARCH_LOCAL + 0x03)
-#define FW_CFG_PPC_CLOCKFREQ (FW_CFG_ARCH_LOCAL + 0x04)
+#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00)
+#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01)
+#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02)
+#define FW_CFG_PPC_TBFREQ (FW_CFG_ARCH_LOCAL + 0x03)
+#define FW_CFG_PPC_CLOCKFREQ (FW_CFG_ARCH_LOCAL + 0x04)
#define FW_CFG_PPC_IS_KVM (FW_CFG_ARCH_LOCAL + 0x05)
#define FW_CFG_PPC_KVM_HC (FW_CFG_ARCH_LOCAL + 0x06)
#define FW_CFG_PPC_KVM_PID (FW_CFG_ARCH_LOCAL + 0x07)
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v1] hw/ppc: change indentation to spaces from TABs
2022-04-05 12:19 [PATCH v1] hw/ppc: change indentation to spaces from TABs Guo Zhi
@ 2022-04-06 10:08 ` Bin Meng
2022-04-08 19:19 ` Daniel Henrique Barboza
0 siblings, 1 reply; 15+ messages in thread
From: Bin Meng @ 2022-04-06 10:08 UTC (permalink / raw)
To: Guo Zhi
Cc: Daniel Henrique Barboza, qemu-devel@nongnu.org Developers,
Greg Kurz, qemu-ppc, Cédric Le Goater, David Gibson
On Tue, Apr 5, 2022 at 10:36 PM Guo Zhi <qtxuning1999@sjtu.edu.cn> wrote:
>
> There are still some files in the QEMU PPC code base that use TABs for indentation instead of using spaces.
> The TABs should be replaced so that we have a consistent coding style.
>
> If this patch is applied, issue:
>
> https://gitlab.com/qemu-project/qemu/-/issues/374
>
> can be closed.
>
> Signed-off-by: Guo Zhi <qtxuning1999@sjtu.edu.cn>
> ---
> hw/core/uboot_image.h | 185 ++++++++++++++++++++---------------------
> hw/ppc/ppc440_bamboo.c | 6 +-
> hw/ppc/spapr_rtas.c | 18 ++--
> include/hw/ppc/ppc.h | 10 +--
> 4 files changed, 109 insertions(+), 110 deletions(-)
>
> diff --git a/hw/core/uboot_image.h b/hw/core/uboot_image.h
uboot_image.h was taken from the U-Boot source, I believe it should be
kept as it is.
> index 608022de6e..980e9cc014 100644
> --- a/hw/core/uboot_image.h
> +++ b/hw/core/uboot_image.h
> @@ -12,7 +12,7 @@
> *
> * This program is distributed in the hope that it will be useful,
> * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> * GNU General Public License for more details.
> *
> * You should have received a copy of the GNU General Public License along
> @@ -32,128 +32,127 @@
> /*
> * Operating System Codes
> */
> -#define IH_OS_INVALID 0 /* Invalid OS */
> -#define IH_OS_OPENBSD 1 /* OpenBSD */
> -#define IH_OS_NETBSD 2 /* NetBSD */
> -#define IH_OS_FREEBSD 3 /* FreeBSD */
> -#define IH_OS_4_4BSD 4 /* 4.4BSD */
> -#define IH_OS_LINUX 5 /* Linux */
> -#define IH_OS_SVR4 6 /* SVR4 */
> -#define IH_OS_ESIX 7 /* Esix */
> -#define IH_OS_SOLARIS 8 /* Solaris */
> -#define IH_OS_IRIX 9 /* Irix */
> -#define IH_OS_SCO 10 /* SCO */
> -#define IH_OS_DELL 11 /* Dell */
> -#define IH_OS_NCR 12 /* NCR */
> -#define IH_OS_LYNXOS 13 /* LynxOS */
> -#define IH_OS_VXWORKS 14 /* VxWorks */
> -#define IH_OS_PSOS 15 /* pSOS */
> -#define IH_OS_QNX 16 /* QNX */
> -#define IH_OS_U_BOOT 17 /* Firmware */
> -#define IH_OS_RTEMS 18 /* RTEMS */
> -#define IH_OS_ARTOS 19 /* ARTOS */
> -#define IH_OS_UNITY 20 /* Unity OS */
> +#define IH_OS_INVALID 0 /* Invalid OS */
> +#define IH_OS_OPENBSD 1 /* OpenBSD */
> +#define IH_OS_NETBSD 2 /* NetBSD */
> +#define IH_OS_FREEBSD 3 /* FreeBSD */
> +#define IH_OS_4_4BSD 4 /* 4.4BSD */
> +#define IH_OS_LINUX 5 /* Linux */
> +#define IH_OS_SVR4 6 /* SVR4 */
> +#define IH_OS_ESIX 7 /* Esix */
> +#define IH_OS_SOLARIS 8 /* Solaris */
> +#define IH_OS_IRIX 9 /* Irix */
> +#define IH_OS_SCO 10 /* SCO */
> +#define IH_OS_DELL 11 /* Dell */
> +#define IH_OS_NCR 12 /* NCR */
> +#define IH_OS_LYNXOS 13 /* LynxOS */
> +#define IH_OS_VXWORKS 14 /* VxWorks */
> +#define IH_OS_PSOS 15 /* pSOS */
> +#define IH_OS_QNX 16 /* QNX */
> +#define IH_OS_U_BOOT 17 /* Firmware */
> +#define IH_OS_RTEMS 18 /* RTEMS */
> +#define IH_OS_ARTOS 19 /* ARTOS */
> +#define IH_OS_UNITY 20 /* Unity OS */
>
> /*
> * CPU Architecture Codes (supported by Linux)
> */
> -#define IH_CPU_INVALID 0 /* Invalid CPU */
> -#define IH_CPU_ALPHA 1 /* Alpha */
> -#define IH_CPU_ARM 2 /* ARM */
> -#define IH_CPU_I386 3 /* Intel x86 */
> -#define IH_CPU_IA64 4 /* IA64 */
> -#define IH_CPU_MIPS 5 /* MIPS */
> -#define IH_CPU_MIPS64 6 /* MIPS 64 Bit */
> -#define IH_CPU_PPC 7 /* PowerPC */
> -#define IH_CPU_S390 8 /* IBM S390 */
> -#define IH_CPU_SH 9 /* SuperH */
> -#define IH_CPU_SPARC 10 /* Sparc */
> -#define IH_CPU_SPARC64 11 /* Sparc 64 Bit */
> -#define IH_CPU_M68K 12 /* M68K */
> -#define IH_CPU_NIOS 13 /* Nios-32 */
> -#define IH_CPU_MICROBLAZE 14 /* MicroBlaze */
> -#define IH_CPU_NIOS2 15 /* Nios-II */
> -#define IH_CPU_BLACKFIN 16 /* Blackfin */
> -#define IH_CPU_AVR32 17 /* AVR32 */
> +#define IH_CPU_INVALID 0 /* Invalid CPU */
> +#define IH_CPU_ALPHA 1 /* Alpha */
> +#define IH_CPU_ARM 2 /* ARM */
> +#define IH_CPU_I386 3 /* Intel x86 */
> +#define IH_CPU_IA64 4 /* IA64 */
> +#define IH_CPU_MIPS 5 /* MIPS */
> +#define IH_CPU_MIPS64 6 /* MIPS 64 Bit */
> +#define IH_CPU_PPC 7 /* PowerPC */
> +#define IH_CPU_S390 8 /* IBM S390 */
> +#define IH_CPU_SH 9 /* SuperH */
> +#define IH_CPU_SPARC 10 /* Sparc */
> +#define IH_CPU_SPARC64 11 /* Sparc 64 Bit */
> +#define IH_CPU_M68K 12 /* M68K */
> +#define IH_CPU_NIOS 13 /* Nios-32 */
> +#define IH_CPU_MICROBLAZE 14 /* MicroBlaze */
> +#define IH_CPU_NIOS2 15 /* Nios-II */
> +#define IH_CPU_BLACKFIN 16 /* Blackfin */
> +#define IH_CPU_AVR32 17 /* AVR32 */
>
> /*
> * Image Types
> *
> * "Standalone Programs" are directly runnable in the environment
> - * provided by U-Boot; it is expected that (if they behave
> - * well) you can continue to work in U-Boot after return from
> - * the Standalone Program.
> + * provided by U-Boot; it is expected that (if they behave
> + * well) you can continue to work in U-Boot after return from
> + * the Standalone Program.
> * "OS Kernel Images" are usually images of some Embedded OS which
> - * will take over control completely. Usually these programs
> - * will install their own set of exception handlers, device
> - * drivers, set up the MMU, etc. - this means, that you cannot
> - * expect to re-enter U-Boot except by resetting the CPU.
> + * will take over control completely. Usually these programs
> + * will install their own set of exception handlers, device
> + * drivers, set up the MMU, etc. - this means, that you cannot
> + * expect to re-enter U-Boot except by resetting the CPU.
> * "RAMDisk Images" are more or less just data blocks, and their
> - * parameters (address, size) are passed to an OS kernel that is
> - * being started.
> + * parameters (address, size) are passed to an OS kernel that is
> + * being started.
> * "Multi-File Images" contain several images, typically an OS
> - * (Linux) kernel image and one or more data images like
> - * RAMDisks. This construct is useful for instance when you want
> - * to boot over the network using BOOTP etc., where the boot
> - * server provides just a single image file, but you want to get
> - * for instance an OS kernel and a RAMDisk image.
> + * (Linux) kernel image and one or more data images like
> + * RAMDisks. This construct is useful for instance when you want
> + * to boot over the network using BOOTP etc., where the boot
> + * server provides just a single image file, but you want to get
> + * for instance an OS kernel and a RAMDisk image.
> *
> - * "Multi-File Images" start with a list of image sizes, each
> - * image size (in bytes) specified by an "uint32_t" in network
> - * byte order. This list is terminated by an "(uint32_t)0".
> - * Immediately after the terminating 0 follow the images, one by
> - * one, all aligned on "uint32_t" boundaries (size rounded up to
> - * a multiple of 4 bytes - except for the last file).
> + * "Multi-File Images" start with a list of image sizes, each
> + * image size (in bytes) specified by an "uint32_t" in network
> + * byte order. This list is terminated by an "(uint32_t)0".
> + * Immediately after the terminating 0 follow the images, one by
> + * one, all aligned on "uint32_t" boundaries (size rounded up to
> + * a multiple of 4 bytes - except for the last file).
> *
> * "Firmware Images" are binary images containing firmware (like
> - * U-Boot or FPGA images) which usually will be programmed to
> - * flash memory.
> + * U-Boot or FPGA images) which usually will be programmed to
> + * flash memory.
> *
> * "Script files" are command sequences that will be executed by
> - * U-Boot's command interpreter; this feature is especially
> - * useful when you configure U-Boot to use a real shell (hush)
> - * as command interpreter (=> Shell Scripts).
> + * U-Boot's command interpreter; this feature is especially
> + * useful when you configure U-Boot to use a real shell (hush)
> + * as command interpreter (=> Shell Scripts).
> */
>
> -#define IH_TYPE_INVALID 0 /* Invalid Image */
> -#define IH_TYPE_STANDALONE 1 /* Standalone Program */
> -#define IH_TYPE_KERNEL 2 /* OS Kernel Image */
> -#define IH_TYPE_RAMDISK 3 /* RAMDisk Image */
> -#define IH_TYPE_MULTI 4 /* Multi-File Image */
> -#define IH_TYPE_FIRMWARE 5 /* Firmware Image */
> -#define IH_TYPE_SCRIPT 6 /* Script file */
> -#define IH_TYPE_FILESYSTEM 7 /* Filesystem Image (any type) */
> -#define IH_TYPE_FLATDT 8 /* Binary Flat Device Tree Blob */
> -#define IH_TYPE_KERNEL_NOLOAD 14 /* OS Kernel Image (noload) */
> +#define IH_TYPE_INVALID 0 /* Invalid Image */
> +#define IH_TYPE_STANDALONE 1 /* Standalone Program */
> +#define IH_TYPE_KERNEL 2 /* OS Kernel Image */
> +#define IH_TYPE_RAMDISK 3 /* RAMDisk Image */
> +#define IH_TYPE_MULTI 4 /* Multi-File Image */
> +#define IH_TYPE_FIRMWARE 5 /* Firmware Image */
> +#define IH_TYPE_SCRIPT 6 /* Script file */
> +#define IH_TYPE_FILESYSTEM 7 /* Filesystem Image (any type) */
> +#define IH_TYPE_FLATDT 8 /* Binary Flat Device Tree Blob */
> +#define IH_TYPE_KERNEL_NOLOAD 14 /* OS Kernel Image (noload) */
>
> /*
> * Compression Types
> */
> -#define IH_COMP_NONE 0 /* No Compression Used */
> -#define IH_COMP_GZIP 1 /* gzip Compression Used */
> -#define IH_COMP_BZIP2 2 /* bzip2 Compression Used */
> +#define IH_COMP_NONE 0 /* No Compression Used */
> +#define IH_COMP_GZIP 1 /* gzip Compression Used */
> +#define IH_COMP_BZIP2 2 /* bzip2 Compression Used */
>
> -#define IH_MAGIC 0x27051956 /* Image Magic Number */
> -#define IH_NMLEN 32 /* Image Name Length */
> +#define IH_MAGIC 0x27051956 /* Image Magic Number */
> +#define IH_NMLEN 32 /* Image Name Length */
>
> /*
> * all data in network byte order (aka natural aka bigendian)
> */
>
> typedef struct uboot_image_header {
> - uint32_t ih_magic; /* Image Header Magic Number */
> - uint32_t ih_hcrc; /* Image Header CRC Checksum */
> - uint32_t ih_time; /* Image Creation Timestamp */
> - uint32_t ih_size; /* Image Data Size */
> - uint32_t ih_load; /* Data Load Address */
> - uint32_t ih_ep; /* Entry Point Address */
> - uint32_t ih_dcrc; /* Image Data CRC Checksum */
> - uint8_t ih_os; /* Operating System */
> - uint8_t ih_arch; /* CPU architecture */
> - uint8_t ih_type; /* Image Type */
> - uint8_t ih_comp; /* Compression Type */
> - uint8_t ih_name[IH_NMLEN]; /* Image Name */
> + uint32_t ih_magic; /* Image Header Magic Number */
> + uint32_t ih_hcrc; /* Image Header CRC Checksum */
> + uint32_t ih_time; /* Image Creation Timestamp */
> + uint32_t ih_size; /* Image Data Size */
> + uint32_t ih_load; /* Data Load Address */
> + uint32_t ih_ep; /* Entry Point Address */
> + uint32_t ih_dcrc; /* Image Data CRC Checksum */
> + uint8_t ih_os; /* Operating System */
> + uint8_t ih_arch; /* CPU architecture */
> + uint8_t ih_type; /* Image Type */
> + uint8_t ih_comp; /* Compression Type */
> + uint8_t ih_name[IH_NMLEN]; /* Image Name */
> } uboot_image_header_t;
>
> -
> #endif /* UBOOT_IMAGE_H */
> diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
> index 7fb620b9a0..5ec3a9a17f 100644
> --- a/hw/ppc/ppc440_bamboo.c
> +++ b/hw/ppc/ppc440_bamboo.c
> @@ -3,9 +3,9 @@
> *
> * Copyright 2007 IBM Corporation.
> * Authors:
> - * Jerone Young <jyoung5@us.ibm.com>
> - * Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
> - * Hollis Blanchard <hollisb@us.ibm.com>
> + * Jerone Young <jyoung5@us.ibm.com>
> + * Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
> + * Hollis Blanchard <hollisb@us.ibm.com>
> *
> * This work is licensed under the GNU GPL license version 2 or later.
> *
> diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
> index d7c04237fe..d58b65e88f 100644
> --- a/hw/ppc/spapr_rtas.c
> +++ b/hw/ppc/spapr_rtas.c
> @@ -474,16 +474,16 @@ static void rtas_ibm_nmi_interlock(PowerPCCPU *cpu,
>
> if (spapr->fwnmi_machine_check_interlock != cpu->vcpu_id) {
> /*
> - * The vCPU that hit the NMI should invoke "ibm,nmi-interlock"
> + * The vCPU that hit the NMI should invoke "ibm,nmi-interlock"
> * This should be PARAM_ERROR, but Linux calls "ibm,nmi-interlock"
> - * for system reset interrupts, despite them not being interlocked.
> - * PowerVM silently ignores this and returns success here. Returning
> - * failure causes Linux to print the error "FWNMI: nmi-interlock
> - * failed: -3", although no other apparent ill effects, this is a
> - * regression for the user when enabling FWNMI. So for now, match
> - * PowerVM. When most Linux clients are fixed, this could be
> - * changed.
> - */
> + * for system reset interrupts, despite them not being interlocked.
> + * PowerVM silently ignores this and returns success here. Returning
> + * failure causes Linux to print the error "FWNMI: nmi-interlock
> + * failed: -3", although no other apparent ill effects, this is a
> + * regression for the user when enabling FWNMI. So for now, match
> + * PowerVM. When most Linux clients are fixed, this could be
> + * changed.
> + */
> rtas_st(rets, 0, RTAS_OUT_SUCCESS);
> return;
> }
> diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h
> index 364f165b4b..02af03ada2 100644
> --- a/include/hw/ppc/ppc.h
> +++ b/include/hw/ppc/ppc.h
> @@ -99,11 +99,11 @@ enum {
> ARCH_MAC99_U3,
> };
>
> -#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00)
> -#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01)
> -#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02)
> -#define FW_CFG_PPC_TBFREQ (FW_CFG_ARCH_LOCAL + 0x03)
> -#define FW_CFG_PPC_CLOCKFREQ (FW_CFG_ARCH_LOCAL + 0x04)
> +#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00)
> +#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01)
> +#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02)
> +#define FW_CFG_PPC_TBFREQ (FW_CFG_ARCH_LOCAL + 0x03)
> +#define FW_CFG_PPC_CLOCKFREQ (FW_CFG_ARCH_LOCAL + 0x04)
> #define FW_CFG_PPC_IS_KVM (FW_CFG_ARCH_LOCAL + 0x05)
> #define FW_CFG_PPC_KVM_HC (FW_CFG_ARCH_LOCAL + 0x06)
> #define FW_CFG_PPC_KVM_PID (FW_CFG_ARCH_LOCAL + 0x07)
> --
Regards,
Bin
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v1] hw/ppc: change indentation to spaces from TABs
2022-04-06 10:08 ` Bin Meng
@ 2022-04-08 19:19 ` Daniel Henrique Barboza
2022-04-11 6:45 ` Thomas Huth
0 siblings, 1 reply; 15+ messages in thread
From: Daniel Henrique Barboza @ 2022-04-08 19:19 UTC (permalink / raw)
To: Bin Meng, Guo Zhi
Cc: Thomas Huth, qemu-devel@nongnu.org Developers, Greg Kurz,
qemu-ppc, Cédric Le Goater, David Gibson
On 4/6/22 07:08, Bin Meng wrote:
> On Tue, Apr 5, 2022 at 10:36 PM Guo Zhi <qtxuning1999@sjtu.edu.cn> wrote:
>>
>> There are still some files in the QEMU PPC code base that use TABs for indentation instead of using spaces.
>> The TABs should be replaced so that we have a consistent coding style.
>>
>> If this patch is applied, issue:
>>
>> https://gitlab.com/qemu-project/qemu/-/issues/374
>>
>> can be closed.
Please add the following tag in the commit:
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/374
This will make Gitlab automatically close the issue when the patch is accepted.
>>
>> Signed-off-by: Guo Zhi <qtxuning1999@sjtu.edu.cn>
>> ---
>> hw/core/uboot_image.h | 185 ++++++++++++++++++++---------------------
>> hw/ppc/ppc440_bamboo.c | 6 +-
>> hw/ppc/spapr_rtas.c | 18 ++--
>> include/hw/ppc/ppc.h | 10 +--
>> 4 files changed, 109 insertions(+), 110 deletions(-)
>>
>> diff --git a/hw/core/uboot_image.h b/hw/core/uboot_image.h
>
> uboot_image.h was taken from the U-Boot source, I believe it should be
> kept as it is.
(CCing Thomas since het explictly listed hw/core/uboot_image.h in the bug)
I am not sure about keeping this file as is. Commit f831f955d42096 added lines to this
header, for example:
diff --git a/hw/core/uboot_image.h b/hw/core/uboot_image.h
index 34c11a70a6..608022de6e 100644
--- a/hw/core/uboot_image.h
+++ b/hw/core/uboot_image.h
@@ -124,6 +124,7 @@
#define IH_TYPE_SCRIPT 6 /* Script file */
#define IH_TYPE_FILESYSTEM 7 /* Filesystem Image (any type) */
#define IH_TYPE_FLATDT 8 /* Binary Flat Device Tree Blob */
+#define IH_TYPE_KERNEL_NOLOAD 14 /* OS Kernel Image (noload) */
I personally don't mind changing tabs from spaces in this file.
Thanks,
Daniel
>
>> index 608022de6e..980e9cc014 100644
>> --- a/hw/core/uboot_image.h
>> +++ b/hw/core/uboot_image.h
>> @@ -12,7 +12,7 @@
>> *
>> * This program is distributed in the hope that it will be useful,
>> * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> * GNU General Public License for more details.
>> *
>> * You should have received a copy of the GNU General Public License along
>> @@ -32,128 +32,127 @@
>> /*
>> * Operating System Codes
>> */
>> -#define IH_OS_INVALID 0 /* Invalid OS */
>> -#define IH_OS_OPENBSD 1 /* OpenBSD */
>> -#define IH_OS_NETBSD 2 /* NetBSD */
>> -#define IH_OS_FREEBSD 3 /* FreeBSD */
>> -#define IH_OS_4_4BSD 4 /* 4.4BSD */
>> -#define IH_OS_LINUX 5 /* Linux */
>> -#define IH_OS_SVR4 6 /* SVR4 */
>> -#define IH_OS_ESIX 7 /* Esix */
>> -#define IH_OS_SOLARIS 8 /* Solaris */
>> -#define IH_OS_IRIX 9 /* Irix */
>> -#define IH_OS_SCO 10 /* SCO */
>> -#define IH_OS_DELL 11 /* Dell */
>> -#define IH_OS_NCR 12 /* NCR */
>> -#define IH_OS_LYNXOS 13 /* LynxOS */
>> -#define IH_OS_VXWORKS 14 /* VxWorks */
>> -#define IH_OS_PSOS 15 /* pSOS */
>> -#define IH_OS_QNX 16 /* QNX */
>> -#define IH_OS_U_BOOT 17 /* Firmware */
>> -#define IH_OS_RTEMS 18 /* RTEMS */
>> -#define IH_OS_ARTOS 19 /* ARTOS */
>> -#define IH_OS_UNITY 20 /* Unity OS */
>> +#define IH_OS_INVALID 0 /* Invalid OS */
>> +#define IH_OS_OPENBSD 1 /* OpenBSD */
>> +#define IH_OS_NETBSD 2 /* NetBSD */
>> +#define IH_OS_FREEBSD 3 /* FreeBSD */
>> +#define IH_OS_4_4BSD 4 /* 4.4BSD */
>> +#define IH_OS_LINUX 5 /* Linux */
>> +#define IH_OS_SVR4 6 /* SVR4 */
>> +#define IH_OS_ESIX 7 /* Esix */
>> +#define IH_OS_SOLARIS 8 /* Solaris */
>> +#define IH_OS_IRIX 9 /* Irix */
>> +#define IH_OS_SCO 10 /* SCO */
>> +#define IH_OS_DELL 11 /* Dell */
>> +#define IH_OS_NCR 12 /* NCR */
>> +#define IH_OS_LYNXOS 13 /* LynxOS */
>> +#define IH_OS_VXWORKS 14 /* VxWorks */
>> +#define IH_OS_PSOS 15 /* pSOS */
>> +#define IH_OS_QNX 16 /* QNX */
>> +#define IH_OS_U_BOOT 17 /* Firmware */
>> +#define IH_OS_RTEMS 18 /* RTEMS */
>> +#define IH_OS_ARTOS 19 /* ARTOS */
>> +#define IH_OS_UNITY 20 /* Unity OS */
>>
>> /*
>> * CPU Architecture Codes (supported by Linux)
>> */
>> -#define IH_CPU_INVALID 0 /* Invalid CPU */
>> -#define IH_CPU_ALPHA 1 /* Alpha */
>> -#define IH_CPU_ARM 2 /* ARM */
>> -#define IH_CPU_I386 3 /* Intel x86 */
>> -#define IH_CPU_IA64 4 /* IA64 */
>> -#define IH_CPU_MIPS 5 /* MIPS */
>> -#define IH_CPU_MIPS64 6 /* MIPS 64 Bit */
>> -#define IH_CPU_PPC 7 /* PowerPC */
>> -#define IH_CPU_S390 8 /* IBM S390 */
>> -#define IH_CPU_SH 9 /* SuperH */
>> -#define IH_CPU_SPARC 10 /* Sparc */
>> -#define IH_CPU_SPARC64 11 /* Sparc 64 Bit */
>> -#define IH_CPU_M68K 12 /* M68K */
>> -#define IH_CPU_NIOS 13 /* Nios-32 */
>> -#define IH_CPU_MICROBLAZE 14 /* MicroBlaze */
>> -#define IH_CPU_NIOS2 15 /* Nios-II */
>> -#define IH_CPU_BLACKFIN 16 /* Blackfin */
>> -#define IH_CPU_AVR32 17 /* AVR32 */
>> +#define IH_CPU_INVALID 0 /* Invalid CPU */
>> +#define IH_CPU_ALPHA 1 /* Alpha */
>> +#define IH_CPU_ARM 2 /* ARM */
>> +#define IH_CPU_I386 3 /* Intel x86 */
>> +#define IH_CPU_IA64 4 /* IA64 */
>> +#define IH_CPU_MIPS 5 /* MIPS */
>> +#define IH_CPU_MIPS64 6 /* MIPS 64 Bit */
>> +#define IH_CPU_PPC 7 /* PowerPC */
>> +#define IH_CPU_S390 8 /* IBM S390 */
>> +#define IH_CPU_SH 9 /* SuperH */
>> +#define IH_CPU_SPARC 10 /* Sparc */
>> +#define IH_CPU_SPARC64 11 /* Sparc 64 Bit */
>> +#define IH_CPU_M68K 12 /* M68K */
>> +#define IH_CPU_NIOS 13 /* Nios-32 */
>> +#define IH_CPU_MICROBLAZE 14 /* MicroBlaze */
>> +#define IH_CPU_NIOS2 15 /* Nios-II */
>> +#define IH_CPU_BLACKFIN 16 /* Blackfin */
>> +#define IH_CPU_AVR32 17 /* AVR32 */
>>
>> /*
>> * Image Types
>> *
>> * "Standalone Programs" are directly runnable in the environment
>> - * provided by U-Boot; it is expected that (if they behave
>> - * well) you can continue to work in U-Boot after return from
>> - * the Standalone Program.
>> + * provided by U-Boot; it is expected that (if they behave
>> + * well) you can continue to work in U-Boot after return from
>> + * the Standalone Program.
>> * "OS Kernel Images" are usually images of some Embedded OS which
>> - * will take over control completely. Usually these programs
>> - * will install their own set of exception handlers, device
>> - * drivers, set up the MMU, etc. - this means, that you cannot
>> - * expect to re-enter U-Boot except by resetting the CPU.
>> + * will take over control completely. Usually these programs
>> + * will install their own set of exception handlers, device
>> + * drivers, set up the MMU, etc. - this means, that you cannot
>> + * expect to re-enter U-Boot except by resetting the CPU.
>> * "RAMDisk Images" are more or less just data blocks, and their
>> - * parameters (address, size) are passed to an OS kernel that is
>> - * being started.
>> + * parameters (address, size) are passed to an OS kernel that is
>> + * being started.
>> * "Multi-File Images" contain several images, typically an OS
>> - * (Linux) kernel image and one or more data images like
>> - * RAMDisks. This construct is useful for instance when you want
>> - * to boot over the network using BOOTP etc., where the boot
>> - * server provides just a single image file, but you want to get
>> - * for instance an OS kernel and a RAMDisk image.
>> + * (Linux) kernel image and one or more data images like
>> + * RAMDisks. This construct is useful for instance when you want
>> + * to boot over the network using BOOTP etc., where the boot
>> + * server provides just a single image file, but you want to get
>> + * for instance an OS kernel and a RAMDisk image.
>> *
>> - * "Multi-File Images" start with a list of image sizes, each
>> - * image size (in bytes) specified by an "uint32_t" in network
>> - * byte order. This list is terminated by an "(uint32_t)0".
>> - * Immediately after the terminating 0 follow the images, one by
>> - * one, all aligned on "uint32_t" boundaries (size rounded up to
>> - * a multiple of 4 bytes - except for the last file).
>> + * "Multi-File Images" start with a list of image sizes, each
>> + * image size (in bytes) specified by an "uint32_t" in network
>> + * byte order. This list is terminated by an "(uint32_t)0".
>> + * Immediately after the terminating 0 follow the images, one by
>> + * one, all aligned on "uint32_t" boundaries (size rounded up to
>> + * a multiple of 4 bytes - except for the last file).
>> *
>> * "Firmware Images" are binary images containing firmware (like
>> - * U-Boot or FPGA images) which usually will be programmed to
>> - * flash memory.
>> + * U-Boot or FPGA images) which usually will be programmed to
>> + * flash memory.
>> *
>> * "Script files" are command sequences that will be executed by
>> - * U-Boot's command interpreter; this feature is especially
>> - * useful when you configure U-Boot to use a real shell (hush)
>> - * as command interpreter (=> Shell Scripts).
>> + * U-Boot's command interpreter; this feature is especially
>> + * useful when you configure U-Boot to use a real shell (hush)
>> + * as command interpreter (=> Shell Scripts).
>> */
>>
>> -#define IH_TYPE_INVALID 0 /* Invalid Image */
>> -#define IH_TYPE_STANDALONE 1 /* Standalone Program */
>> -#define IH_TYPE_KERNEL 2 /* OS Kernel Image */
>> -#define IH_TYPE_RAMDISK 3 /* RAMDisk Image */
>> -#define IH_TYPE_MULTI 4 /* Multi-File Image */
>> -#define IH_TYPE_FIRMWARE 5 /* Firmware Image */
>> -#define IH_TYPE_SCRIPT 6 /* Script file */
>> -#define IH_TYPE_FILESYSTEM 7 /* Filesystem Image (any type) */
>> -#define IH_TYPE_FLATDT 8 /* Binary Flat Device Tree Blob */
>> -#define IH_TYPE_KERNEL_NOLOAD 14 /* OS Kernel Image (noload) */
>> +#define IH_TYPE_INVALID 0 /* Invalid Image */
>> +#define IH_TYPE_STANDALONE 1 /* Standalone Program */
>> +#define IH_TYPE_KERNEL 2 /* OS Kernel Image */
>> +#define IH_TYPE_RAMDISK 3 /* RAMDisk Image */
>> +#define IH_TYPE_MULTI 4 /* Multi-File Image */
>> +#define IH_TYPE_FIRMWARE 5 /* Firmware Image */
>> +#define IH_TYPE_SCRIPT 6 /* Script file */
>> +#define IH_TYPE_FILESYSTEM 7 /* Filesystem Image (any type) */
>> +#define IH_TYPE_FLATDT 8 /* Binary Flat Device Tree Blob */
>> +#define IH_TYPE_KERNEL_NOLOAD 14 /* OS Kernel Image (noload) */
>>
>> /*
>> * Compression Types
>> */
>> -#define IH_COMP_NONE 0 /* No Compression Used */
>> -#define IH_COMP_GZIP 1 /* gzip Compression Used */
>> -#define IH_COMP_BZIP2 2 /* bzip2 Compression Used */
>> +#define IH_COMP_NONE 0 /* No Compression Used */
>> +#define IH_COMP_GZIP 1 /* gzip Compression Used */
>> +#define IH_COMP_BZIP2 2 /* bzip2 Compression Used */
>>
>> -#define IH_MAGIC 0x27051956 /* Image Magic Number */
>> -#define IH_NMLEN 32 /* Image Name Length */
>> +#define IH_MAGIC 0x27051956 /* Image Magic Number */
>> +#define IH_NMLEN 32 /* Image Name Length */
>>
>> /*
>> * all data in network byte order (aka natural aka bigendian)
>> */
>>
>> typedef struct uboot_image_header {
>> - uint32_t ih_magic; /* Image Header Magic Number */
>> - uint32_t ih_hcrc; /* Image Header CRC Checksum */
>> - uint32_t ih_time; /* Image Creation Timestamp */
>> - uint32_t ih_size; /* Image Data Size */
>> - uint32_t ih_load; /* Data Load Address */
>> - uint32_t ih_ep; /* Entry Point Address */
>> - uint32_t ih_dcrc; /* Image Data CRC Checksum */
>> - uint8_t ih_os; /* Operating System */
>> - uint8_t ih_arch; /* CPU architecture */
>> - uint8_t ih_type; /* Image Type */
>> - uint8_t ih_comp; /* Compression Type */
>> - uint8_t ih_name[IH_NMLEN]; /* Image Name */
>> + uint32_t ih_magic; /* Image Header Magic Number */
>> + uint32_t ih_hcrc; /* Image Header CRC Checksum */
>> + uint32_t ih_time; /* Image Creation Timestamp */
>> + uint32_t ih_size; /* Image Data Size */
>> + uint32_t ih_load; /* Data Load Address */
>> + uint32_t ih_ep; /* Entry Point Address */
>> + uint32_t ih_dcrc; /* Image Data CRC Checksum */
>> + uint8_t ih_os; /* Operating System */
>> + uint8_t ih_arch; /* CPU architecture */
>> + uint8_t ih_type; /* Image Type */
>> + uint8_t ih_comp; /* Compression Type */
>> + uint8_t ih_name[IH_NMLEN]; /* Image Name */
>> } uboot_image_header_t;
>>
>> -
>> #endif /* UBOOT_IMAGE_H */
>> diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
>> index 7fb620b9a0..5ec3a9a17f 100644
>> --- a/hw/ppc/ppc440_bamboo.c
>> +++ b/hw/ppc/ppc440_bamboo.c
>> @@ -3,9 +3,9 @@
>> *
>> * Copyright 2007 IBM Corporation.
>> * Authors:
>> - * Jerone Young <jyoung5@us.ibm.com>
>> - * Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
>> - * Hollis Blanchard <hollisb@us.ibm.com>
>> + * Jerone Young <jyoung5@us.ibm.com>
>> + * Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
>> + * Hollis Blanchard <hollisb@us.ibm.com>
>> *
>> * This work is licensed under the GNU GPL license version 2 or later.
>> *
>> diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
>> index d7c04237fe..d58b65e88f 100644
>> --- a/hw/ppc/spapr_rtas.c
>> +++ b/hw/ppc/spapr_rtas.c
>> @@ -474,16 +474,16 @@ static void rtas_ibm_nmi_interlock(PowerPCCPU *cpu,
>>
>> if (spapr->fwnmi_machine_check_interlock != cpu->vcpu_id) {
>> /*
>> - * The vCPU that hit the NMI should invoke "ibm,nmi-interlock"
>> + * The vCPU that hit the NMI should invoke "ibm,nmi-interlock"
>> * This should be PARAM_ERROR, but Linux calls "ibm,nmi-interlock"
>> - * for system reset interrupts, despite them not being interlocked.
>> - * PowerVM silently ignores this and returns success here. Returning
>> - * failure causes Linux to print the error "FWNMI: nmi-interlock
>> - * failed: -3", although no other apparent ill effects, this is a
>> - * regression for the user when enabling FWNMI. So for now, match
>> - * PowerVM. When most Linux clients are fixed, this could be
>> - * changed.
>> - */
>> + * for system reset interrupts, despite them not being interlocked.
>> + * PowerVM silently ignores this and returns success here. Returning
>> + * failure causes Linux to print the error "FWNMI: nmi-interlock
>> + * failed: -3", although no other apparent ill effects, this is a
>> + * regression for the user when enabling FWNMI. So for now, match
>> + * PowerVM. When most Linux clients are fixed, this could be
>> + * changed.
>> + */
>> rtas_st(rets, 0, RTAS_OUT_SUCCESS);
>> return;
>> }
>> diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h
>> index 364f165b4b..02af03ada2 100644
>> --- a/include/hw/ppc/ppc.h
>> +++ b/include/hw/ppc/ppc.h
>> @@ -99,11 +99,11 @@ enum {
>> ARCH_MAC99_U3,
>> };
>>
>> -#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00)
>> -#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01)
>> -#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02)
>> -#define FW_CFG_PPC_TBFREQ (FW_CFG_ARCH_LOCAL + 0x03)
>> -#define FW_CFG_PPC_CLOCKFREQ (FW_CFG_ARCH_LOCAL + 0x04)
>> +#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00)
>> +#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01)
>> +#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02)
>> +#define FW_CFG_PPC_TBFREQ (FW_CFG_ARCH_LOCAL + 0x03)
>> +#define FW_CFG_PPC_CLOCKFREQ (FW_CFG_ARCH_LOCAL + 0x04)
>> #define FW_CFG_PPC_IS_KVM (FW_CFG_ARCH_LOCAL + 0x05)
>> #define FW_CFG_PPC_KVM_HC (FW_CFG_ARCH_LOCAL + 0x06)
>> #define FW_CFG_PPC_KVM_PID (FW_CFG_ARCH_LOCAL + 0x07)
>> --
>
>
> Regards,
> Bin
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v1] hw/ppc: change indentation to spaces from TABs
2022-04-08 19:19 ` Daniel Henrique Barboza
@ 2022-04-11 6:45 ` Thomas Huth
2022-04-11 6:57 ` Bin Meng
0 siblings, 1 reply; 15+ messages in thread
From: Thomas Huth @ 2022-04-11 6:45 UTC (permalink / raw)
To: Daniel Henrique Barboza, Bin Meng, Guo Zhi
Cc: qemu-devel@nongnu.org Developers, Greg Kurz, qemu-ppc,
Cédric Le Goater, David Gibson
On 08/04/2022 21.19, Daniel Henrique Barboza wrote:
>
>
> On 4/6/22 07:08, Bin Meng wrote:
>> On Tue, Apr 5, 2022 at 10:36 PM Guo Zhi <qtxuning1999@sjtu.edu.cn> wrote:
>>>
>>> There are still some files in the QEMU PPC code base that use TABs for
>>> indentation instead of using spaces.
>>> The TABs should be replaced so that we have a consistent coding style.
>>>
>>> If this patch is applied, issue:
>>>
>>> https://gitlab.com/qemu-project/qemu/-/issues/374
>>>
>>> can be closed.
>
> Please add the following tag in the commit:
>
>
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/374
>
>
> This will make Gitlab automatically close the issue when the patch is accepted.
>
>>>
>>> Signed-off-by: Guo Zhi <qtxuning1999@sjtu.edu.cn>
>>> ---
>>> hw/core/uboot_image.h | 185 ++++++++++++++++++++---------------------
>>> hw/ppc/ppc440_bamboo.c | 6 +-
>>> hw/ppc/spapr_rtas.c | 18 ++--
>>> include/hw/ppc/ppc.h | 10 +--
>>> 4 files changed, 109 insertions(+), 110 deletions(-)
>>>
>>> diff --git a/hw/core/uboot_image.h b/hw/core/uboot_image.h
>>
>> uboot_image.h was taken from the U-Boot source, I believe it should be
>> kept as it is.
>
>
> (CCing Thomas since het explictly listed hw/core/uboot_image.h in the bug)
>
>
> I am not sure about keeping this file as is.
Seems like uboot_image.h has originally been taken from U-Boot's
include/image.h file ... but the two files are completely out of sync
nowadays, e.g. U-Boot switched to enums instead of #defines at one point in
time. So I think it does not make much sense to keep the TABs in here, and
I'd rather like to see them replaced with spaces indeed.
Thomas
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v1] hw/ppc: change indentation to spaces from TABs
2022-04-11 6:45 ` Thomas Huth
@ 2022-04-11 6:57 ` Bin Meng
2022-04-11 7:23 ` Thomas Huth
0 siblings, 1 reply; 15+ messages in thread
From: Bin Meng @ 2022-04-11 6:57 UTC (permalink / raw)
To: Thomas Huth
Cc: Daniel Henrique Barboza, Greg Kurz,
qemu-devel@nongnu.org Developers, qemu-ppc,
Cédric Le Goater, Guo Zhi, David Gibson
On Mon, Apr 11, 2022 at 2:45 PM Thomas Huth <thuth@redhat.com> wrote:
>
> On 08/04/2022 21.19, Daniel Henrique Barboza wrote:
> >
> >
> > On 4/6/22 07:08, Bin Meng wrote:
> >> On Tue, Apr 5, 2022 at 10:36 PM Guo Zhi <qtxuning1999@sjtu.edu.cn> wrote:
> >>>
> >>> There are still some files in the QEMU PPC code base that use TABs for
> >>> indentation instead of using spaces.
> >>> The TABs should be replaced so that we have a consistent coding style.
> >>>
> >>> If this patch is applied, issue:
> >>>
> >>> https://gitlab.com/qemu-project/qemu/-/issues/374
> >>>
> >>> can be closed.
> >
> > Please add the following tag in the commit:
> >
> >
> > Resolves: https://gitlab.com/qemu-project/qemu/-/issues/374
> >
> >
> > This will make Gitlab automatically close the issue when the patch is accepted.
> >
> >>>
> >>> Signed-off-by: Guo Zhi <qtxuning1999@sjtu.edu.cn>
> >>> ---
> >>> hw/core/uboot_image.h | 185 ++++++++++++++++++++---------------------
> >>> hw/ppc/ppc440_bamboo.c | 6 +-
> >>> hw/ppc/spapr_rtas.c | 18 ++--
> >>> include/hw/ppc/ppc.h | 10 +--
> >>> 4 files changed, 109 insertions(+), 110 deletions(-)
> >>>
> >>> diff --git a/hw/core/uboot_image.h b/hw/core/uboot_image.h
> >>
> >> uboot_image.h was taken from the U-Boot source, I believe it should be
> >> kept as it is.
> >
> >
> > (CCing Thomas since het explictly listed hw/core/uboot_image.h in the bug)
> >
> >
> > I am not sure about keeping this file as is.
>
> Seems like uboot_image.h has originally been taken from U-Boot's
> include/image.h file ... but the two files are completely out of sync
> nowadays, e.g. U-Boot switched to enums instead of #defines at one point in
> time. So I think it does not make much sense to keep the TABs in here, and
> I'd rather like to see them replaced with spaces indeed.
This file has been sync'ed recently.
See http://patchwork.ozlabs.org/project/qemu-devel/patch/20220324134812.541274-1-bmeng.cn@gmail.com/
Regards,
Bin
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v1] hw/ppc: change indentation to spaces from TABs
2022-04-11 6:57 ` Bin Meng
@ 2022-04-11 7:23 ` Thomas Huth
0 siblings, 0 replies; 15+ messages in thread
From: Thomas Huth @ 2022-04-11 7:23 UTC (permalink / raw)
To: Bin Meng
Cc: Peter Maydell, open list:RISC-V, Daniel Henrique Barboza,
Greg Kurz, qemu-devel@nongnu.org Developers, qemu-ppc,
Cédric Le Goater, Guo Zhi, David Gibson
On 11/04/2022 08.57, Bin Meng wrote:
> On Mon, Apr 11, 2022 at 2:45 PM Thomas Huth <thuth@redhat.com> wrote:
>>
>> On 08/04/2022 21.19, Daniel Henrique Barboza wrote:
>>>
>>>
>>> On 4/6/22 07:08, Bin Meng wrote:
>>>> On Tue, Apr 5, 2022 at 10:36 PM Guo Zhi <qtxuning1999@sjtu.edu.cn> wrote:
>>>>>
>>>>> There are still some files in the QEMU PPC code base that use TABs for
>>>>> indentation instead of using spaces.
>>>>> The TABs should be replaced so that we have a consistent coding style.
>>>>>
>>>>> If this patch is applied, issue:
>>>>>
>>>>> https://gitlab.com/qemu-project/qemu/-/issues/374
>>>>>
>>>>> can be closed.
>>>
>>> Please add the following tag in the commit:
>>>
>>>
>>> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/374
>>>
>>>
>>> This will make Gitlab automatically close the issue when the patch is accepted.
>>>
>>>>>
>>>>> Signed-off-by: Guo Zhi <qtxuning1999@sjtu.edu.cn>
>>>>> ---
>>>>> hw/core/uboot_image.h | 185 ++++++++++++++++++++---------------------
>>>>> hw/ppc/ppc440_bamboo.c | 6 +-
>>>>> hw/ppc/spapr_rtas.c | 18 ++--
>>>>> include/hw/ppc/ppc.h | 10 +--
>>>>> 4 files changed, 109 insertions(+), 110 deletions(-)
>>>>>
>>>>> diff --git a/hw/core/uboot_image.h b/hw/core/uboot_image.h
>>>>
>>>> uboot_image.h was taken from the U-Boot source, I believe it should be
>>>> kept as it is.
>>>
>>>
>>> (CCing Thomas since het explictly listed hw/core/uboot_image.h in the bug)
>>>
>>>
>>> I am not sure about keeping this file as is.
>>
>> Seems like uboot_image.h has originally been taken from U-Boot's
>> include/image.h file ... but the two files are completely out of sync
>> nowadays, e.g. U-Boot switched to enums instead of #defines at one point in
>> time. So I think it does not make much sense to keep the TABs in here, and
>> I'd rather like to see them replaced with spaces indeed.
>
> This file has been sync'ed recently.
>
> See http://patchwork.ozlabs.org/project/qemu-devel/patch/20220324134812.541274-1-bmeng.cn@gmail.com/
Oh, ok, thanks, good to know. So we should maybe really rather drop the
uboot_image.h from the whitespace cleanup here, indeed (and rather add a
comment to the header file instead that this is a file that is sync'ed with
U-Boot and thus does not follow the QEMU coding conventions?)
Anyway, seems like that u-boot sync patch felt through the cracks, likely
since it was not quite clear which tree it should go through ... ARM? PPC?
RISC-V?
Thomas
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v1] hw/ppc: change indentation to spaces from TABs
@ 2022-04-11 7:23 ` Thomas Huth
0 siblings, 0 replies; 15+ messages in thread
From: Thomas Huth @ 2022-04-11 7:23 UTC (permalink / raw)
To: Bin Meng
Cc: Daniel Henrique Barboza, Guo Zhi, Cédric Le Goater,
David Gibson, Greg Kurz, qemu-ppc,
qemu-devel@nongnu.org Developers, Peter Maydell,
open list:RISC-V
On 11/04/2022 08.57, Bin Meng wrote:
> On Mon, Apr 11, 2022 at 2:45 PM Thomas Huth <thuth@redhat.com> wrote:
>>
>> On 08/04/2022 21.19, Daniel Henrique Barboza wrote:
>>>
>>>
>>> On 4/6/22 07:08, Bin Meng wrote:
>>>> On Tue, Apr 5, 2022 at 10:36 PM Guo Zhi <qtxuning1999@sjtu.edu.cn> wrote:
>>>>>
>>>>> There are still some files in the QEMU PPC code base that use TABs for
>>>>> indentation instead of using spaces.
>>>>> The TABs should be replaced so that we have a consistent coding style.
>>>>>
>>>>> If this patch is applied, issue:
>>>>>
>>>>> https://gitlab.com/qemu-project/qemu/-/issues/374
>>>>>
>>>>> can be closed.
>>>
>>> Please add the following tag in the commit:
>>>
>>>
>>> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/374
>>>
>>>
>>> This will make Gitlab automatically close the issue when the patch is accepted.
>>>
>>>>>
>>>>> Signed-off-by: Guo Zhi <qtxuning1999@sjtu.edu.cn>
>>>>> ---
>>>>> hw/core/uboot_image.h | 185 ++++++++++++++++++++---------------------
>>>>> hw/ppc/ppc440_bamboo.c | 6 +-
>>>>> hw/ppc/spapr_rtas.c | 18 ++--
>>>>> include/hw/ppc/ppc.h | 10 +--
>>>>> 4 files changed, 109 insertions(+), 110 deletions(-)
>>>>>
>>>>> diff --git a/hw/core/uboot_image.h b/hw/core/uboot_image.h
>>>>
>>>> uboot_image.h was taken from the U-Boot source, I believe it should be
>>>> kept as it is.
>>>
>>>
>>> (CCing Thomas since het explictly listed hw/core/uboot_image.h in the bug)
>>>
>>>
>>> I am not sure about keeping this file as is.
>>
>> Seems like uboot_image.h has originally been taken from U-Boot's
>> include/image.h file ... but the two files are completely out of sync
>> nowadays, e.g. U-Boot switched to enums instead of #defines at one point in
>> time. So I think it does not make much sense to keep the TABs in here, and
>> I'd rather like to see them replaced with spaces indeed.
>
> This file has been sync'ed recently.
>
> See http://patchwork.ozlabs.org/project/qemu-devel/patch/20220324134812.541274-1-bmeng.cn@gmail.com/
Oh, ok, thanks, good to know. So we should maybe really rather drop the
uboot_image.h from the whitespace cleanup here, indeed (and rather add a
comment to the header file instead that this is a file that is sync'ed with
U-Boot and thus does not follow the QEMU coding conventions?)
Anyway, seems like that u-boot sync patch felt through the cracks, likely
since it was not quite clear which tree it should go through ... ARM? PPC?
RISC-V?
Thomas
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v1] hw/ppc: change indentation to spaces from TABs
2022-04-11 7:23 ` Thomas Huth
@ 2022-04-11 16:32 ` Daniel Henrique Barboza
-1 siblings, 0 replies; 15+ messages in thread
From: Daniel Henrique Barboza @ 2022-04-11 16:32 UTC (permalink / raw)
To: Thomas Huth, Bin Meng
Cc: Peter Maydell, open list:RISC-V,
qemu-devel@nongnu.org Developers, Greg Kurz, qemu-ppc,
Cédric Le Goater, Guo Zhi, David Gibson
On 4/11/22 04:23, Thomas Huth wrote:
> On 11/04/2022 08.57, Bin Meng wrote:
>> On Mon, Apr 11, 2022 at 2:45 PM Thomas Huth <thuth@redhat.com> wrote:
>>>
>>> On 08/04/2022 21.19, Daniel Henrique Barboza wrote:
>>>>
>>>>
>>>> On 4/6/22 07:08, Bin Meng wrote:
>>>>> On Tue, Apr 5, 2022 at 10:36 PM Guo Zhi <qtxuning1999@sjtu.edu.cn> wrote:
>>>>>>
>>>>>> There are still some files in the QEMU PPC code base that use TABs for
>>>>>> indentation instead of using spaces.
>>>>>> The TABs should be replaced so that we have a consistent coding style.
>>>>>>
>>>>>> If this patch is applied, issue:
>>>>>>
>>>>>> https://gitlab.com/qemu-project/qemu/-/issues/374
>>>>>>
>>>>>> can be closed.
>>>>
>>>> Please add the following tag in the commit:
>>>>
>>>>
>>>> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/374
>>>>
>>>>
>>>> This will make Gitlab automatically close the issue when the patch is accepted.
>>>>
>>>>>>
>>>>>> Signed-off-by: Guo Zhi <qtxuning1999@sjtu.edu.cn>
>>>>>> ---
>>>>>> hw/core/uboot_image.h | 185 ++++++++++++++++++++---------------------
>>>>>> hw/ppc/ppc440_bamboo.c | 6 +-
>>>>>> hw/ppc/spapr_rtas.c | 18 ++--
>>>>>> include/hw/ppc/ppc.h | 10 +--
>>>>>> 4 files changed, 109 insertions(+), 110 deletions(-)
>>>>>>
>>>>>> diff --git a/hw/core/uboot_image.h b/hw/core/uboot_image.h
>>>>>
>>>>> uboot_image.h was taken from the U-Boot source, I believe it should be
>>>>> kept as it is.
>>>>
>>>>
>>>> (CCing Thomas since het explictly listed hw/core/uboot_image.h in the bug)
>>>>
>>>>
>>>> I am not sure about keeping this file as is.
>>>
>>> Seems like uboot_image.h has originally been taken from U-Boot's
>>> include/image.h file ... but the two files are completely out of sync
>>> nowadays, e.g. U-Boot switched to enums instead of #defines at one point in
>>> time. So I think it does not make much sense to keep the TABs in here, and
>>> I'd rather like to see them replaced with spaces indeed.
>>
>> This file has been sync'ed recently.
>>
>> See http://patchwork.ozlabs.org/project/qemu-devel/patch/20220324134812.541274-1-bmeng.cn@gmail.com/
>
> Oh, ok, thanks, good to know. So we should maybe really rather drop the uboot_image.h from the whitespace cleanup here, indeed (and rather add a comment to the header file instead that this is a file that is sync'ed with U-Boot and thus does not follow the QEMU coding conventions?)
Agree. I just updated the gitlab issue description to remove the reference to
this file.
Guo Zhi, can you please send another version of this patch with the updated
commit message and not touching uboot_image.h?
Thanks,
Daniel
>
> Anyway, seems like that u-boot sync patch felt through the cracks, likely since it was not quite clear which tree it should go through ... ARM? PPC? RISC-V?
>
> Thomas
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v1] hw/ppc: change indentation to spaces from TABs
@ 2022-04-11 16:32 ` Daniel Henrique Barboza
0 siblings, 0 replies; 15+ messages in thread
From: Daniel Henrique Barboza @ 2022-04-11 16:32 UTC (permalink / raw)
To: Thomas Huth, Bin Meng
Cc: Guo Zhi, Cédric Le Goater, David Gibson, Greg Kurz,
qemu-ppc, qemu-devel@nongnu.org Developers, Peter Maydell,
open list:RISC-V
On 4/11/22 04:23, Thomas Huth wrote:
> On 11/04/2022 08.57, Bin Meng wrote:
>> On Mon, Apr 11, 2022 at 2:45 PM Thomas Huth <thuth@redhat.com> wrote:
>>>
>>> On 08/04/2022 21.19, Daniel Henrique Barboza wrote:
>>>>
>>>>
>>>> On 4/6/22 07:08, Bin Meng wrote:
>>>>> On Tue, Apr 5, 2022 at 10:36 PM Guo Zhi <qtxuning1999@sjtu.edu.cn> wrote:
>>>>>>
>>>>>> There are still some files in the QEMU PPC code base that use TABs for
>>>>>> indentation instead of using spaces.
>>>>>> The TABs should be replaced so that we have a consistent coding style.
>>>>>>
>>>>>> If this patch is applied, issue:
>>>>>>
>>>>>> https://gitlab.com/qemu-project/qemu/-/issues/374
>>>>>>
>>>>>> can be closed.
>>>>
>>>> Please add the following tag in the commit:
>>>>
>>>>
>>>> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/374
>>>>
>>>>
>>>> This will make Gitlab automatically close the issue when the patch is accepted.
>>>>
>>>>>>
>>>>>> Signed-off-by: Guo Zhi <qtxuning1999@sjtu.edu.cn>
>>>>>> ---
>>>>>> hw/core/uboot_image.h | 185 ++++++++++++++++++++---------------------
>>>>>> hw/ppc/ppc440_bamboo.c | 6 +-
>>>>>> hw/ppc/spapr_rtas.c | 18 ++--
>>>>>> include/hw/ppc/ppc.h | 10 +--
>>>>>> 4 files changed, 109 insertions(+), 110 deletions(-)
>>>>>>
>>>>>> diff --git a/hw/core/uboot_image.h b/hw/core/uboot_image.h
>>>>>
>>>>> uboot_image.h was taken from the U-Boot source, I believe it should be
>>>>> kept as it is.
>>>>
>>>>
>>>> (CCing Thomas since het explictly listed hw/core/uboot_image.h in the bug)
>>>>
>>>>
>>>> I am not sure about keeping this file as is.
>>>
>>> Seems like uboot_image.h has originally been taken from U-Boot's
>>> include/image.h file ... but the two files are completely out of sync
>>> nowadays, e.g. U-Boot switched to enums instead of #defines at one point in
>>> time. So I think it does not make much sense to keep the TABs in here, and
>>> I'd rather like to see them replaced with spaces indeed.
>>
>> This file has been sync'ed recently.
>>
>> See http://patchwork.ozlabs.org/project/qemu-devel/patch/20220324134812.541274-1-bmeng.cn@gmail.com/
>
> Oh, ok, thanks, good to know. So we should maybe really rather drop the uboot_image.h from the whitespace cleanup here, indeed (and rather add a comment to the header file instead that this is a file that is sync'ed with U-Boot and thus does not follow the QEMU coding conventions?)
Agree. I just updated the gitlab issue description to remove the reference to
this file.
Guo Zhi, can you please send another version of this patch with the updated
commit message and not touching uboot_image.h?
Thanks,
Daniel
>
> Anyway, seems like that u-boot sync patch felt through the cracks, likely since it was not quite clear which tree it should go through ... ARM? PPC? RISC-V?
>
> Thomas
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v1] hw/ppc: change indentation to spaces from TABs
2022-04-11 16:32 ` Daniel Henrique Barboza
@ 2022-04-11 16:37 ` Guo Zhi
-1 siblings, 0 replies; 15+ messages in thread
From: Guo Zhi @ 2022-04-11 16:37 UTC (permalink / raw)
To: Daniel Henrique Barboza
Cc: Peter Maydell, Thomas Huth, open list:RISC-V, Greg Kurz,
qemu-devel@nongnu.org Developers, qemu-ppc,
Cédric Le Goater, Bin Meng, David Gibson
Sure, I will send a v2 patch.
Thanks,
Guo
----- Original Message -----
From: "Daniel Henrique Barboza" <danielhb413@gmail.com>
To: "Thomas Huth" <thuth@redhat.com>, "Bin Meng" <bmeng.cn@gmail.com>
Cc: "Guo Zhi" <qtxuning1999@sjtu.edu.cn>, "Cédric Le Goater" <clg@kaod.org>, "David Gibson" <david@gibson.dropbear.id.au>, "Greg Kurz" <groug@kaod.org>, "qemu-ppc" <qemu-ppc@nongnu.org>, "qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>, "Peter Maydell" <peter.maydell@linaro.org>, "open list:RISC-V" <qemu-riscv@nongnu.org>
Sent: Tuesday, April 12, 2022 12:32:23 AM
Subject: Re: [PATCH v1] hw/ppc: change indentation to spaces from TABs
On 4/11/22 04:23, Thomas Huth wrote:
> On 11/04/2022 08.57, Bin Meng wrote:
>> On Mon, Apr 11, 2022 at 2:45 PM Thomas Huth <thuth@redhat.com> wrote:
>>>
>>> On 08/04/2022 21.19, Daniel Henrique Barboza wrote:
>>>>
>>>>
>>>> On 4/6/22 07:08, Bin Meng wrote:
>>>>> On Tue, Apr 5, 2022 at 10:36 PM Guo Zhi <qtxuning1999@sjtu.edu.cn> wrote:
>>>>>>
>>>>>> There are still some files in the QEMU PPC code base that use TABs for
>>>>>> indentation instead of using spaces.
>>>>>> The TABs should be replaced so that we have a consistent coding style.
>>>>>>
>>>>>> If this patch is applied, issue:
>>>>>>
>>>>>> https://gitlab.com/qemu-project/qemu/-/issues/374
>>>>>>
>>>>>> can be closed.
>>>>
>>>> Please add the following tag in the commit:
>>>>
>>>>
>>>> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/374
>>>>
>>>>
>>>> This will make Gitlab automatically close the issue when the patch is accepted.
>>>>
>>>>>>
>>>>>> Signed-off-by: Guo Zhi <qtxuning1999@sjtu.edu.cn>
>>>>>> ---
>>>>>> hw/core/uboot_image.h | 185 ++++++++++++++++++++---------------------
>>>>>> hw/ppc/ppc440_bamboo.c | 6 +-
>>>>>> hw/ppc/spapr_rtas.c | 18 ++--
>>>>>> include/hw/ppc/ppc.h | 10 +--
>>>>>> 4 files changed, 109 insertions(+), 110 deletions(-)
>>>>>>
>>>>>> diff --git a/hw/core/uboot_image.h b/hw/core/uboot_image.h
>>>>>
>>>>> uboot_image.h was taken from the U-Boot source, I believe it should be
>>>>> kept as it is.
>>>>
>>>>
>>>> (CCing Thomas since het explictly listed hw/core/uboot_image.h in the bug)
>>>>
>>>>
>>>> I am not sure about keeping this file as is.
>>>
>>> Seems like uboot_image.h has originally been taken from U-Boot's
>>> include/image.h file ... but the two files are completely out of sync
>>> nowadays, e.g. U-Boot switched to enums instead of #defines at one point in
>>> time. So I think it does not make much sense to keep the TABs in here, and
>>> I'd rather like to see them replaced with spaces indeed.
>>
>> This file has been sync'ed recently.
>>
>> See http://patchwork.ozlabs.org/project/qemu-devel/patch/20220324134812.541274-1-bmeng.cn@gmail.com/
>
> Oh, ok, thanks, good to know. So we should maybe really rather drop the uboot_image.h from the whitespace cleanup here, indeed (and rather add a comment to the header file instead that this is a file that is sync'ed with U-Boot and thus does not follow the QEMU coding conventions?)
Agree. I just updated the gitlab issue description to remove the reference to
this file.
Guo Zhi, can you please send another version of this patch with the updated
commit message and not touching uboot_image.h?
Thanks,
Daniel
>
> Anyway, seems like that u-boot sync patch felt through the cracks, likely since it was not quite clear which tree it should go through ... ARM? PPC? RISC-V?
>
> Thomas
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v1] hw/ppc: change indentation to spaces from TABs
@ 2022-04-11 16:37 ` Guo Zhi
0 siblings, 0 replies; 15+ messages in thread
From: Guo Zhi @ 2022-04-11 16:37 UTC (permalink / raw)
To: Daniel Henrique Barboza
Cc: Thomas Huth, Bin Meng, Cédric Le Goater, David Gibson,
Greg Kurz, qemu-ppc, qemu-devel@nongnu.org Developers,
Peter Maydell, open list:RISC-V
Sure, I will send a v2 patch.
Thanks,
Guo
----- Original Message -----
From: "Daniel Henrique Barboza" <danielhb413@gmail.com>
To: "Thomas Huth" <thuth@redhat.com>, "Bin Meng" <bmeng.cn@gmail.com>
Cc: "Guo Zhi" <qtxuning1999@sjtu.edu.cn>, "Cédric Le Goater" <clg@kaod.org>, "David Gibson" <david@gibson.dropbear.id.au>, "Greg Kurz" <groug@kaod.org>, "qemu-ppc" <qemu-ppc@nongnu.org>, "qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>, "Peter Maydell" <peter.maydell@linaro.org>, "open list:RISC-V" <qemu-riscv@nongnu.org>
Sent: Tuesday, April 12, 2022 12:32:23 AM
Subject: Re: [PATCH v1] hw/ppc: change indentation to spaces from TABs
On 4/11/22 04:23, Thomas Huth wrote:
> On 11/04/2022 08.57, Bin Meng wrote:
>> On Mon, Apr 11, 2022 at 2:45 PM Thomas Huth <thuth@redhat.com> wrote:
>>>
>>> On 08/04/2022 21.19, Daniel Henrique Barboza wrote:
>>>>
>>>>
>>>> On 4/6/22 07:08, Bin Meng wrote:
>>>>> On Tue, Apr 5, 2022 at 10:36 PM Guo Zhi <qtxuning1999@sjtu.edu.cn> wrote:
>>>>>>
>>>>>> There are still some files in the QEMU PPC code base that use TABs for
>>>>>> indentation instead of using spaces.
>>>>>> The TABs should be replaced so that we have a consistent coding style.
>>>>>>
>>>>>> If this patch is applied, issue:
>>>>>>
>>>>>> https://gitlab.com/qemu-project/qemu/-/issues/374
>>>>>>
>>>>>> can be closed.
>>>>
>>>> Please add the following tag in the commit:
>>>>
>>>>
>>>> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/374
>>>>
>>>>
>>>> This will make Gitlab automatically close the issue when the patch is accepted.
>>>>
>>>>>>
>>>>>> Signed-off-by: Guo Zhi <qtxuning1999@sjtu.edu.cn>
>>>>>> ---
>>>>>> hw/core/uboot_image.h | 185 ++++++++++++++++++++---------------------
>>>>>> hw/ppc/ppc440_bamboo.c | 6 +-
>>>>>> hw/ppc/spapr_rtas.c | 18 ++--
>>>>>> include/hw/ppc/ppc.h | 10 +--
>>>>>> 4 files changed, 109 insertions(+), 110 deletions(-)
>>>>>>
>>>>>> diff --git a/hw/core/uboot_image.h b/hw/core/uboot_image.h
>>>>>
>>>>> uboot_image.h was taken from the U-Boot source, I believe it should be
>>>>> kept as it is.
>>>>
>>>>
>>>> (CCing Thomas since het explictly listed hw/core/uboot_image.h in the bug)
>>>>
>>>>
>>>> I am not sure about keeping this file as is.
>>>
>>> Seems like uboot_image.h has originally been taken from U-Boot's
>>> include/image.h file ... but the two files are completely out of sync
>>> nowadays, e.g. U-Boot switched to enums instead of #defines at one point in
>>> time. So I think it does not make much sense to keep the TABs in here, and
>>> I'd rather like to see them replaced with spaces indeed.
>>
>> This file has been sync'ed recently.
>>
>> See http://patchwork.ozlabs.org/project/qemu-devel/patch/20220324134812.541274-1-bmeng.cn@gmail.com/
>
> Oh, ok, thanks, good to know. So we should maybe really rather drop the uboot_image.h from the whitespace cleanup here, indeed (and rather add a comment to the header file instead that this is a file that is sync'ed with U-Boot and thus does not follow the QEMU coding conventions?)
Agree. I just updated the gitlab issue description to remove the reference to
this file.
Guo Zhi, can you please send another version of this patch with the updated
commit message and not touching uboot_image.h?
Thanks,
Daniel
>
> Anyway, seems like that u-boot sync patch felt through the cracks, likely since it was not quite clear which tree it should go through ... ARM? PPC? RISC-V?
>
> Thomas
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2] hw/ppc: change indentation to spaces from TABs
2022-04-11 16:37 ` Guo Zhi
(?)
@ 2022-04-12 2:12 ` Guo Zhi
2022-04-13 13:00 ` Daniel Henrique Barboza
2022-04-20 19:18 ` Daniel Henrique Barboza
-1 siblings, 2 replies; 15+ messages in thread
From: Guo Zhi @ 2022-04-12 2:12 UTC (permalink / raw)
To: Cédric Le Goater, Daniel Henrique Barboza, David Gibson, Greg Kurz
Cc: qemu-ppc, Guo Zhi, qemu-devel
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/374
There are still some files in the QEMU PPC code base that use TABs for indentation instead of using spaces. The TABs should be replaced so that we have a consistent coding style.
Signed-off-by: Guo Zhi <qtxuning1999@sjtu.edu.cn>
---
hw/ppc/ppc440_bamboo.c | 6 +++---
hw/ppc/spapr_rtas.c | 18 +++++++++---------
include/hw/ppc/ppc.h | 10 +++++-----
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index 7fb620b9a0..5ec3a9a17f 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -3,9 +3,9 @@
*
* Copyright 2007 IBM Corporation.
* Authors:
- * Jerone Young <jyoung5@us.ibm.com>
- * Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
- * Hollis Blanchard <hollisb@us.ibm.com>
+ * Jerone Young <jyoung5@us.ibm.com>
+ * Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
+ * Hollis Blanchard <hollisb@us.ibm.com>
*
* This work is licensed under the GNU GPL license version 2 or later.
*
diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
index d7c04237fe..d58b65e88f 100644
--- a/hw/ppc/spapr_rtas.c
+++ b/hw/ppc/spapr_rtas.c
@@ -474,16 +474,16 @@ static void rtas_ibm_nmi_interlock(PowerPCCPU *cpu,
if (spapr->fwnmi_machine_check_interlock != cpu->vcpu_id) {
/*
- * The vCPU that hit the NMI should invoke "ibm,nmi-interlock"
+ * The vCPU that hit the NMI should invoke "ibm,nmi-interlock"
* This should be PARAM_ERROR, but Linux calls "ibm,nmi-interlock"
- * for system reset interrupts, despite them not being interlocked.
- * PowerVM silently ignores this and returns success here. Returning
- * failure causes Linux to print the error "FWNMI: nmi-interlock
- * failed: -3", although no other apparent ill effects, this is a
- * regression for the user when enabling FWNMI. So for now, match
- * PowerVM. When most Linux clients are fixed, this could be
- * changed.
- */
+ * for system reset interrupts, despite them not being interlocked.
+ * PowerVM silently ignores this and returns success here. Returning
+ * failure causes Linux to print the error "FWNMI: nmi-interlock
+ * failed: -3", although no other apparent ill effects, this is a
+ * regression for the user when enabling FWNMI. So for now, match
+ * PowerVM. When most Linux clients are fixed, this could be
+ * changed.
+ */
rtas_st(rets, 0, RTAS_OUT_SUCCESS);
return;
}
diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h
index 364f165b4b..02af03ada2 100644
--- a/include/hw/ppc/ppc.h
+++ b/include/hw/ppc/ppc.h
@@ -99,11 +99,11 @@ enum {
ARCH_MAC99_U3,
};
-#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00)
-#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01)
-#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02)
-#define FW_CFG_PPC_TBFREQ (FW_CFG_ARCH_LOCAL + 0x03)
-#define FW_CFG_PPC_CLOCKFREQ (FW_CFG_ARCH_LOCAL + 0x04)
+#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00)
+#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01)
+#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02)
+#define FW_CFG_PPC_TBFREQ (FW_CFG_ARCH_LOCAL + 0x03)
+#define FW_CFG_PPC_CLOCKFREQ (FW_CFG_ARCH_LOCAL + 0x04)
#define FW_CFG_PPC_IS_KVM (FW_CFG_ARCH_LOCAL + 0x05)
#define FW_CFG_PPC_KVM_HC (FW_CFG_ARCH_LOCAL + 0x06)
#define FW_CFG_PPC_KVM_PID (FW_CFG_ARCH_LOCAL + 0x07)
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v2] hw/ppc: change indentation to spaces from TABs
2022-04-12 2:12 ` [PATCH v2] " Guo Zhi
@ 2022-04-13 13:00 ` Daniel Henrique Barboza
2022-04-13 15:03 ` Guo Zhi
2022-04-20 19:18 ` Daniel Henrique Barboza
1 sibling, 1 reply; 15+ messages in thread
From: Daniel Henrique Barboza @ 2022-04-13 13:00 UTC (permalink / raw)
To: Guo Zhi, Cédric Le Goater, David Gibson, Greg Kurz
Cc: qemu-ppc, qemu-devel
On 4/11/22 23:12, Guo Zhi wrote:
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/374
>
> There are still some files in the QEMU PPC code base that use TABs for indentation instead of using spaces. The TABs should be replaced so that we have a consistent coding style.
>
I forgot to mention about the commit msg. Ideally we want the commit msg
to have shorter lines. If you use 'vim' you can do that by selecting
the commit msg and hitting 'G' and 'W' in non-insert mode.
I've amended it before queueing, so don't worry about it. I also moved the
'Resolves' tag to the end of the commit msg, which I also forgot to mention
about.
> Signed-off-by: Guo Zhi <qtxuning1999@sjtu.edu.cn>
> ---
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
> hw/ppc/ppc440_bamboo.c | 6 +++---
> hw/ppc/spapr_rtas.c | 18 +++++++++---------
> include/hw/ppc/ppc.h | 10 +++++-----
> 3 files changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
> index 7fb620b9a0..5ec3a9a17f 100644
> --- a/hw/ppc/ppc440_bamboo.c
> +++ b/hw/ppc/ppc440_bamboo.c
> @@ -3,9 +3,9 @@
> *
> * Copyright 2007 IBM Corporation.
> * Authors:
> - * Jerone Young <jyoung5@us.ibm.com>
> - * Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
> - * Hollis Blanchard <hollisb@us.ibm.com>
> + * Jerone Young <jyoung5@us.ibm.com>
> + * Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
> + * Hollis Blanchard <hollisb@us.ibm.com>
> *
> * This work is licensed under the GNU GPL license version 2 or later.
> *
> diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
> index d7c04237fe..d58b65e88f 100644
> --- a/hw/ppc/spapr_rtas.c
> +++ b/hw/ppc/spapr_rtas.c
> @@ -474,16 +474,16 @@ static void rtas_ibm_nmi_interlock(PowerPCCPU *cpu,
>
> if (spapr->fwnmi_machine_check_interlock != cpu->vcpu_id) {
> /*
> - * The vCPU that hit the NMI should invoke "ibm,nmi-interlock"
> + * The vCPU that hit the NMI should invoke "ibm,nmi-interlock"
> * This should be PARAM_ERROR, but Linux calls "ibm,nmi-interlock"
> - * for system reset interrupts, despite them not being interlocked.
> - * PowerVM silently ignores this and returns success here. Returning
> - * failure causes Linux to print the error "FWNMI: nmi-interlock
> - * failed: -3", although no other apparent ill effects, this is a
> - * regression for the user when enabling FWNMI. So for now, match
> - * PowerVM. When most Linux clients are fixed, this could be
> - * changed.
> - */
> + * for system reset interrupts, despite them not being interlocked.
> + * PowerVM silently ignores this and returns success here. Returning
> + * failure causes Linux to print the error "FWNMI: nmi-interlock
> + * failed: -3", although no other apparent ill effects, this is a
> + * regression for the user when enabling FWNMI. So for now, match
> + * PowerVM. When most Linux clients are fixed, this could be
> + * changed.
> + */
> rtas_st(rets, 0, RTAS_OUT_SUCCESS);
> return;
> }
> diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h
> index 364f165b4b..02af03ada2 100644
> --- a/include/hw/ppc/ppc.h
> +++ b/include/hw/ppc/ppc.h
> @@ -99,11 +99,11 @@ enum {
> ARCH_MAC99_U3,
> };
>
> -#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00)
> -#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01)
> -#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02)
> -#define FW_CFG_PPC_TBFREQ (FW_CFG_ARCH_LOCAL + 0x03)
> -#define FW_CFG_PPC_CLOCKFREQ (FW_CFG_ARCH_LOCAL + 0x04)
> +#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00)
> +#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01)
> +#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02)
> +#define FW_CFG_PPC_TBFREQ (FW_CFG_ARCH_LOCAL + 0x03)
> +#define FW_CFG_PPC_CLOCKFREQ (FW_CFG_ARCH_LOCAL + 0x04)
> #define FW_CFG_PPC_IS_KVM (FW_CFG_ARCH_LOCAL + 0x05)
> #define FW_CFG_PPC_KVM_HC (FW_CFG_ARCH_LOCAL + 0x06)
> #define FW_CFG_PPC_KVM_PID (FW_CFG_ARCH_LOCAL + 0x07)
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2] hw/ppc: change indentation to spaces from TABs
2022-04-13 13:00 ` Daniel Henrique Barboza
@ 2022-04-13 15:03 ` Guo Zhi
0 siblings, 0 replies; 15+ messages in thread
From: Guo Zhi @ 2022-04-13 15:03 UTC (permalink / raw)
To: Daniel Henrique Barboza
Cc: qemu-devel@nongnu.org Developers, Greg Kurz, qemu-ppc,
Cédric Le Goater, David Gibson
Thanks for your help, I'll pay attention to the commit specification next time.
Guo
----- Original Message -----
From: "Daniel Henrique Barboza" <danielhb413@gmail.com>
To: "Guo Zhi" <qtxuning1999@sjtu.edu.cn>, "Cédric Le Goater" <clg@kaod.org>, "David Gibson" <david@gibson.dropbear.id.au>, "Greg Kurz" <groug@kaod.org>
Cc: "qemu-ppc" <qemu-ppc@nongnu.org>, "qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>
Sent: Wednesday, April 13, 2022 9:00:15 PM
Subject: Re: [PATCH v2] hw/ppc: change indentation to spaces from TABs
On 4/11/22 23:12, Guo Zhi wrote:
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/374
>
> There are still some files in the QEMU PPC code base that use TABs for indentation instead of using spaces. The TABs should be replaced so that we have a consistent coding style.
>
I forgot to mention about the commit msg. Ideally we want the commit msg
to have shorter lines. If you use 'vim' you can do that by selecting
the commit msg and hitting 'G' and 'W' in non-insert mode.
I've amended it before queueing, so don't worry about it. I also moved the
'Resolves' tag to the end of the commit msg, which I also forgot to mention
about.
> Signed-off-by: Guo Zhi <qtxuning1999@sjtu.edu.cn>
> ---
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
> hw/ppc/ppc440_bamboo.c | 6 +++---
> hw/ppc/spapr_rtas.c | 18 +++++++++---------
> include/hw/ppc/ppc.h | 10 +++++-----
> 3 files changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
> index 7fb620b9a0..5ec3a9a17f 100644
> --- a/hw/ppc/ppc440_bamboo.c
> +++ b/hw/ppc/ppc440_bamboo.c
> @@ -3,9 +3,9 @@
> *
> * Copyright 2007 IBM Corporation.
> * Authors:
> - * Jerone Young <jyoung5@us.ibm.com>
> - * Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
> - * Hollis Blanchard <hollisb@us.ibm.com>
> + * Jerone Young <jyoung5@us.ibm.com>
> + * Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
> + * Hollis Blanchard <hollisb@us.ibm.com>
> *
> * This work is licensed under the GNU GPL license version 2 or later.
> *
> diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
> index d7c04237fe..d58b65e88f 100644
> --- a/hw/ppc/spapr_rtas.c
> +++ b/hw/ppc/spapr_rtas.c
> @@ -474,16 +474,16 @@ static void rtas_ibm_nmi_interlock(PowerPCCPU *cpu,
>
> if (spapr->fwnmi_machine_check_interlock != cpu->vcpu_id) {
> /*
> - * The vCPU that hit the NMI should invoke "ibm,nmi-interlock"
> + * The vCPU that hit the NMI should invoke "ibm,nmi-interlock"
> * This should be PARAM_ERROR, but Linux calls "ibm,nmi-interlock"
> - * for system reset interrupts, despite them not being interlocked.
> - * PowerVM silently ignores this and returns success here. Returning
> - * failure causes Linux to print the error "FWNMI: nmi-interlock
> - * failed: -3", although no other apparent ill effects, this is a
> - * regression for the user when enabling FWNMI. So for now, match
> - * PowerVM. When most Linux clients are fixed, this could be
> - * changed.
> - */
> + * for system reset interrupts, despite them not being interlocked.
> + * PowerVM silently ignores this and returns success here. Returning
> + * failure causes Linux to print the error "FWNMI: nmi-interlock
> + * failed: -3", although no other apparent ill effects, this is a
> + * regression for the user when enabling FWNMI. So for now, match
> + * PowerVM. When most Linux clients are fixed, this could be
> + * changed.
> + */
> rtas_st(rets, 0, RTAS_OUT_SUCCESS);
> return;
> }
> diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h
> index 364f165b4b..02af03ada2 100644
> --- a/include/hw/ppc/ppc.h
> +++ b/include/hw/ppc/ppc.h
> @@ -99,11 +99,11 @@ enum {
> ARCH_MAC99_U3,
> };
>
> -#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00)
> -#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01)
> -#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02)
> -#define FW_CFG_PPC_TBFREQ (FW_CFG_ARCH_LOCAL + 0x03)
> -#define FW_CFG_PPC_CLOCKFREQ (FW_CFG_ARCH_LOCAL + 0x04)
> +#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00)
> +#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01)
> +#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02)
> +#define FW_CFG_PPC_TBFREQ (FW_CFG_ARCH_LOCAL + 0x03)
> +#define FW_CFG_PPC_CLOCKFREQ (FW_CFG_ARCH_LOCAL + 0x04)
> #define FW_CFG_PPC_IS_KVM (FW_CFG_ARCH_LOCAL + 0x05)
> #define FW_CFG_PPC_KVM_HC (FW_CFG_ARCH_LOCAL + 0x06)
> #define FW_CFG_PPC_KVM_PID (FW_CFG_ARCH_LOCAL + 0x07)
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2] hw/ppc: change indentation to spaces from TABs
2022-04-12 2:12 ` [PATCH v2] " Guo Zhi
2022-04-13 13:00 ` Daniel Henrique Barboza
@ 2022-04-20 19:18 ` Daniel Henrique Barboza
1 sibling, 0 replies; 15+ messages in thread
From: Daniel Henrique Barboza @ 2022-04-20 19:18 UTC (permalink / raw)
To: Guo Zhi, Cédric Le Goater, David Gibson, Greg Kurz
Cc: qemu-ppc, qemu-devel
Queued in gitlab.com/danielhb/qemu/tree/ppc-next. Thanks,
Daniel
On 4/11/22 23:12, Guo Zhi wrote:
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/374
>
> There are still some files in the QEMU PPC code base that use TABs for indentation instead of using spaces. The TABs should be replaced so that we have a consistent coding style.
>
> Signed-off-by: Guo Zhi <qtxuning1999@sjtu.edu.cn>
> ---
> hw/ppc/ppc440_bamboo.c | 6 +++---
> hw/ppc/spapr_rtas.c | 18 +++++++++---------
> include/hw/ppc/ppc.h | 10 +++++-----
> 3 files changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
> index 7fb620b9a0..5ec3a9a17f 100644
> --- a/hw/ppc/ppc440_bamboo.c
> +++ b/hw/ppc/ppc440_bamboo.c
> @@ -3,9 +3,9 @@
> *
> * Copyright 2007 IBM Corporation.
> * Authors:
> - * Jerone Young <jyoung5@us.ibm.com>
> - * Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
> - * Hollis Blanchard <hollisb@us.ibm.com>
> + * Jerone Young <jyoung5@us.ibm.com>
> + * Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
> + * Hollis Blanchard <hollisb@us.ibm.com>
> *
> * This work is licensed under the GNU GPL license version 2 or later.
> *
> diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
> index d7c04237fe..d58b65e88f 100644
> --- a/hw/ppc/spapr_rtas.c
> +++ b/hw/ppc/spapr_rtas.c
> @@ -474,16 +474,16 @@ static void rtas_ibm_nmi_interlock(PowerPCCPU *cpu,
>
> if (spapr->fwnmi_machine_check_interlock != cpu->vcpu_id) {
> /*
> - * The vCPU that hit the NMI should invoke "ibm,nmi-interlock"
> + * The vCPU that hit the NMI should invoke "ibm,nmi-interlock"
> * This should be PARAM_ERROR, but Linux calls "ibm,nmi-interlock"
> - * for system reset interrupts, despite them not being interlocked.
> - * PowerVM silently ignores this and returns success here. Returning
> - * failure causes Linux to print the error "FWNMI: nmi-interlock
> - * failed: -3", although no other apparent ill effects, this is a
> - * regression for the user when enabling FWNMI. So for now, match
> - * PowerVM. When most Linux clients are fixed, this could be
> - * changed.
> - */
> + * for system reset interrupts, despite them not being interlocked.
> + * PowerVM silently ignores this and returns success here. Returning
> + * failure causes Linux to print the error "FWNMI: nmi-interlock
> + * failed: -3", although no other apparent ill effects, this is a
> + * regression for the user when enabling FWNMI. So for now, match
> + * PowerVM. When most Linux clients are fixed, this could be
> + * changed.
> + */
> rtas_st(rets, 0, RTAS_OUT_SUCCESS);
> return;
> }
> diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h
> index 364f165b4b..02af03ada2 100644
> --- a/include/hw/ppc/ppc.h
> +++ b/include/hw/ppc/ppc.h
> @@ -99,11 +99,11 @@ enum {
> ARCH_MAC99_U3,
> };
>
> -#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00)
> -#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01)
> -#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02)
> -#define FW_CFG_PPC_TBFREQ (FW_CFG_ARCH_LOCAL + 0x03)
> -#define FW_CFG_PPC_CLOCKFREQ (FW_CFG_ARCH_LOCAL + 0x04)
> +#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00)
> +#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01)
> +#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02)
> +#define FW_CFG_PPC_TBFREQ (FW_CFG_ARCH_LOCAL + 0x03)
> +#define FW_CFG_PPC_CLOCKFREQ (FW_CFG_ARCH_LOCAL + 0x04)
> #define FW_CFG_PPC_IS_KVM (FW_CFG_ARCH_LOCAL + 0x05)
> #define FW_CFG_PPC_KVM_HC (FW_CFG_ARCH_LOCAL + 0x06)
> #define FW_CFG_PPC_KVM_PID (FW_CFG_ARCH_LOCAL + 0x07)
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2022-04-20 19:52 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-05 12:19 [PATCH v1] hw/ppc: change indentation to spaces from TABs Guo Zhi
2022-04-06 10:08 ` Bin Meng
2022-04-08 19:19 ` Daniel Henrique Barboza
2022-04-11 6:45 ` Thomas Huth
2022-04-11 6:57 ` Bin Meng
2022-04-11 7:23 ` Thomas Huth
2022-04-11 7:23 ` Thomas Huth
2022-04-11 16:32 ` Daniel Henrique Barboza
2022-04-11 16:32 ` Daniel Henrique Barboza
2022-04-11 16:37 ` Guo Zhi
2022-04-11 16:37 ` Guo Zhi
2022-04-12 2:12 ` [PATCH v2] " Guo Zhi
2022-04-13 13:00 ` Daniel Henrique Barboza
2022-04-13 15:03 ` Guo Zhi
2022-04-20 19:18 ` Daniel Henrique Barboza
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.