[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/9] s390x/ipl: Improved code indentation in s390_ip
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH 7/9] s390x/ipl: Improved code indentation in s390_ipl_init() |
Date: |
Wed, 28 Jan 2015 15:31:36 +0100 |
From: Thomas Huth <address@hidden>
The indentation of the code in s390_ipl_init() can be simplified
a little bit by removing superfluous else-statements.
Suggested-by: Michael Mueller <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/ipl.c | 47 ++++++++++++++++++++++++-----------------------
1 file changed, 24 insertions(+), 23 deletions(-)
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 3b77c9a..4ba8409 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -62,6 +62,7 @@ typedef struct S390IPLState {
static int s390_ipl_init(SysBusDevice *dev)
{
S390IPLState *ipl = S390_IPL(dev);
+ uint64_t pentry = KERN_IMAGE_START;
int kernel_size;
if (!ipl->kernel) {
@@ -94,31 +95,31 @@ static int s390_ipl_init(SysBusDevice *dev)
hw_error("could not load bootloader '%s'\n", bios_name);
}
return 0;
+ }
+
+ kernel_size = load_elf(ipl->kernel, NULL, NULL, &pentry, NULL,
+ NULL, 1, ELF_MACHINE, 0);
+ if (kernel_size < 0) {
+ kernel_size = load_image_targphys(ipl->kernel, 0, ram_size);
+ }
+ if (kernel_size < 0) {
+ fprintf(stderr, "could not load kernel '%s'\n", ipl->kernel);
+ return -1;
+ }
+ /*
+ * Is it a Linux kernel (starting at 0x10000)? If yes, we fill in the
+ * kernel parameters here as well. Note: For old kernels (up to 3.2)
+ * we can not rely on the ELF entry point - it was 0x800 (the SALIPL
+ * loader) and it won't work. For this case we force it to 0x10000, too.
+ */
+ if (pentry == KERN_IMAGE_START || pentry == 0x800) {
+ ipl->start_addr = KERN_IMAGE_START;
+ /* Overwrite parameters in the kernel image, which are "rom" */
+ strcpy(rom_ptr(KERN_PARM_AREA), ipl->cmdline);
} else {
- uint64_t pentry = KERN_IMAGE_START;
- kernel_size = load_elf(ipl->kernel, NULL, NULL, &pentry, NULL,
- NULL, 1, ELF_MACHINE, 0);
- if (kernel_size < 0) {
- kernel_size = load_image_targphys(ipl->kernel, 0, ram_size);
- }
- if (kernel_size < 0) {
- fprintf(stderr, "could not load kernel '%s'\n", ipl->kernel);
- return -1;
- }
- /*
- * Is it a Linux kernel (starting at 0x10000)? If yes, we fill in the
- * kernel parameters here as well. Note: For old kernels (up to 3.2)
- * we can not rely on the ELF entry point - it was 0x800 (the SALIPL
- * loader) and it won't work. For this case we force it to 0x10000,
too.
- */
- if (pentry == KERN_IMAGE_START || pentry == 0x800) {
- ipl->start_addr = KERN_IMAGE_START;
- /* Overwrite parameters in the kernel image, which are "rom" */
- strcpy(rom_ptr(KERN_PARM_AREA), ipl->cmdline);
- } else {
- ipl->start_addr = pentry;
- }
+ ipl->start_addr = pentry;
}
+
if (ipl->initrd) {
ram_addr_t initrd_offset;
int initrd_size;
--
1.7.9.5
- [Qemu-devel] [PATCH 0/9] s390x bugfixes and cleanup, Cornelia Huck, 2015/01/28
- [Qemu-devel] [PATCH 1/9] s390: Plug memory leak on s390_pci_generate_event() error path, Cornelia Huck, 2015/01/28
- [Qemu-devel] [PATCH 6/9] s390x/kvm: unknown DIAGNOSE code should give a specification exception, Cornelia Huck, 2015/01/28
- [Qemu-devel] [PATCH 4/9] s390x/pci: fix dma notifications in rpcit instruction, Cornelia Huck, 2015/01/28
- [Qemu-devel] [PATCH 8/9] pc-bios/s390-ccw: fix sparse warnings, Cornelia Huck, 2015/01/28
- [Qemu-devel] [PATCH 3/9] s390x/pci: check for invalid function handle, Cornelia Huck, 2015/01/28
- [Qemu-devel] [PATCH 5/9] s390x/kvm: Fix diag-308 register decoding, Cornelia Huck, 2015/01/28
- [Qemu-devel] [PATCH 2/9] s390x/pci: avoid sign extension in stpcifc, Cornelia Huck, 2015/01/28
- [Qemu-devel] [PATCH 7/9] s390x/ipl: Improved code indentation in s390_ipl_init(),
Cornelia Huck <=
- [Qemu-devel] [PATCH 9/9] pc-bios/s390-ccw: update binary, Cornelia Huck, 2015/01/28