summaryrefslogtreecommitdiff
path: root/kexec_tools
diff options
context:
space:
mode:
authorThiƩbaud Weksteen <tweek@google.com>2020-10-26 13:42:59 +0100
committerThiƩbaud Weksteen <tweek@google.com>2020-10-26 15:53:22 +0100
commit358f74151fbd2abbfa013b115173a7962f795289 (patch)
treeeaedaa366cffe08a60b3727934f904d2902b1faa /kexec_tools
parent7ebc9e6cd61d5b167ccccbea85f42387370f51a7 (diff)
downloadextras-358f74151fbd2abbfa013b115173a7962f795289.tar.gz
kexec_tools: format files
Format *.c according to the new .clang-format. The following command was used to generate this change: $ find . \( -name \*.c -o -name \*.h \) -exec clang-format \ --style=file -i {} \; Test: mm Bug: 171699326 Change-Id: If58e1eea829eb445e2acf2020a220b67285a87f0
Diffstat (limited to 'kexec_tools')
-rw-r--r--kexec_tools/kexec.h10
-rw-r--r--kexec_tools/kexecload.c90
2 files changed, 46 insertions, 54 deletions
diff --git a/kexec_tools/kexec.h b/kexec_tools/kexec.h
index c45b1b31..a772fa6c 100644
--- a/kexec_tools/kexec.h
+++ b/kexec_tools/kexec.h
@@ -1,24 +1,24 @@
#ifndef _SYS_KEXEC_H
#define _SYS_KEXEC_H
-#include <sys/cdefs.h>
#include <linux/kexec.h>
-#include <unistd.h>
+#include <sys/cdefs.h>
#include <sys/syscall.h>
+#include <unistd.h>
#include "kexec.h"
#define KEXEC_SEGMENT_MAX 16
#define KEXEC_TYPE_DEFAULT 0
-#define KEXEC_TYPE_CRASH 1
+#define KEXEC_TYPE_CRASH 1
/*
* Prototypes
*/
static inline long kexec_load(unsigned int entry, unsigned long nr_segments,
- struct kexec_segment *segment, unsigned long flags) {
- return syscall(__NR_kexec_load, entry, nr_segments, segment, flags);
+ struct kexec_segment* segment, unsigned long flags) {
+ return syscall(__NR_kexec_load, entry, nr_segments, segment, flags);
}
#endif /* _SYS_KEXEC_H */
diff --git a/kexec_tools/kexecload.c b/kexec_tools/kexecload.c
index 71365435..cef01475 100644
--- a/kexec_tools/kexecload.c
+++ b/kexec_tools/kexecload.c
@@ -1,10 +1,10 @@
#include <errno.h>
-#include <getopt.h>
#include <fcntl.h>
-#include <sys/mman.h>
-#include <stdlib.h>
+#include <getopt.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
+#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/syscall.h>
#include <sys/types.h>
@@ -14,20 +14,19 @@
#include "kexec.h"
// Offsets same as in kernel asm/kexec.h
-#define KEXEC_ARM_ATAGS_OFFSET 0x1000
+#define KEXEC_ARM_ATAGS_OFFSET 0x1000
#define KEXEC_ARM_ZIMAGE_OFFSET 0x8000
#define MEMORY_SIZE 0x0800000
// Physical buffer address cannot overlap with other regions
#define START_ADDRESS 0x44000000
-#define ROUND_TO_PAGE(address,pagesize) (((address) + (pagesize) - 1) & (~((pagesize) - 1)))
+#define ROUND_TO_PAGE(address, pagesize) (((address) + (pagesize)-1) & (~((pagesize)-1)))
/*
* Gives file position and resets current position to begining of file
*/
-int get_file_size(int f)
-{
+int get_file_size(int f) {
struct stat st;
fstat(f, &st);
return st.st_size;
@@ -48,40 +47,33 @@ int test_kexeccall() {
return 0;
}
-void usage(void)
-{
+void usage(void) {
fprintf(stderr,
"usage: kexecload [ <option> ] <atags path> <kernel path>\n"
"\n"
"options:\n"
" -t tests syscall\n"
- " -s <start address> specify start address of kernel\n"
- );
+ " -s <start address> specify start address of kernel\n");
}
/*
* Loads kexec into the kernel and sets kexec on crash
*/
-int main(int argc, char *argv[])
-{
+int main(int argc, char* argv[]) {
int rv;
- int atag_file,
- zimage_file;
- int atag_size,
- zimage_size;
- void *atag_buffer;
- void *zimage_buffer;
+ int atag_file, zimage_file;
+ int atag_size, zimage_size;
+ void* atag_buffer;
+ void* zimage_buffer;
struct kexec_segment segment[2];
int page_size = getpagesize();
- void *start_address = (void *)START_ADDRESS;
+ void* start_address = (void*)START_ADDRESS;
int c;
- const struct option longopts[] = {
- {"start_address", required_argument, 0, 's'},
- {"test", 0, 0, 't'},
- {"help", 0, 0, 'h'},
- {0, 0, 0, 0}
- };
+ const struct option longopts[] = {{"start_address", required_argument, 0, 's'},
+ {"test", 0, 0, 't'},
+ {"help", 0, 0, 'h'},
+ {0, 0, 0, 0}};
while (1) {
c = getopt_long(argc, argv, "s:th", longopts, NULL);
@@ -90,19 +82,19 @@ int main(int argc, char *argv[])
}
/* Alphabetical cases */
switch (c) {
- case 's':
- start_address = (void *) strtoul(optarg, 0, 16);
- break;
- case 'h':
- usage();
- return 1;
- case 't':
- test_kexeccall();
- return 1;
- case '?':
- return 1;
- default:
- abort();
+ case 's':
+ start_address = (void*)strtoul(optarg, 0, 16);
+ break;
+ case 'h':
+ usage();
+ return 1;
+ case 't':
+ test_kexeccall();
+ return 1;
+ case '?':
+ return 1;
+ default:
+ abort();
}
}
@@ -118,7 +110,8 @@ int main(int argc, char *argv[])
zimage_file = open(argv[1], O_RDONLY);
if (atag_file < 0 || zimage_file < 0) {
- fprintf(stderr, "Error during opening of atag file or the zImage file %s\n", strerror(errno));
+ fprintf(stderr, "Error during opening of atag file or the zImage file %s\n",
+ strerror(errno));
return 1;
}
@@ -130,26 +123,27 @@ int main(int argc, char *argv[])
return 1;
}
- atag_buffer = (char *) mmap(NULL, atag_size, PROT_READ, MAP_POPULATE | MAP_PRIVATE, atag_file, 0);
- zimage_buffer = (char *) mmap(NULL, zimage_size, PROT_READ, MAP_POPULATE | MAP_PRIVATE, zimage_file, 0);
+ atag_buffer = (char*)mmap(NULL, atag_size, PROT_READ, MAP_POPULATE | MAP_PRIVATE, atag_file, 0);
+ zimage_buffer =
+ (char*)mmap(NULL, zimage_size, PROT_READ, MAP_POPULATE | MAP_PRIVATE, zimage_file, 0);
- if(atag_buffer == MAP_FAILED || zimage_buffer == MAP_FAILED) {
+ if (atag_buffer == MAP_FAILED || zimage_buffer == MAP_FAILED) {
fprintf(stderr, "Unable to map files into memory");
return 1;
}
segment[0].buf = zimage_buffer;
segment[0].bufsz = zimage_size;
- segment[0].mem = (void *) ((uintptr_t) start_address + KEXEC_ARM_ZIMAGE_OFFSET);
+ segment[0].mem = (void*)((uintptr_t)start_address + KEXEC_ARM_ZIMAGE_OFFSET);
segment[0].memsz = zimage_size;
segment[1].buf = atag_buffer;
segment[1].bufsz = atag_size;
- segment[1].mem = (void *) ((uintptr_t) start_address + KEXEC_ARM_ATAGS_OFFSET);
+ segment[1].mem = (void*)((uintptr_t)start_address + KEXEC_ARM_ATAGS_OFFSET);
segment[1].memsz = atag_size;
- rv = kexec_load(((uintptr_t) start_address + KEXEC_ARM_ZIMAGE_OFFSET),
- 2, (void *) segment, KEXEC_ARCH_DEFAULT | KEXEC_ON_CRASH);
+ rv = kexec_load(((uintptr_t)start_address + KEXEC_ARM_ZIMAGE_OFFSET), 2, (void*)segment,
+ KEXEC_ARCH_DEFAULT | KEXEC_ON_CRASH);
if (rv != 0) {
fprintf(stderr, "Kexec_load returned non-zero exit code: %d with errno %d\n", rv, errno);
@@ -160,6 +154,4 @@ int main(int argc, char *argv[])
printf("New kernel should start at 0x%08x\n", START_ADDRESS + KEXEC_ARM_ZIMAGE_OFFSET);
return 0;
-
}
-