shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

Merge pull request #25244 from yuwata/reboot-util-follow-ups

Browse Source 
reboot-util: several cleanups
This commit is contained in:
Luca Boccassi 2022-11-04 12:13:01 +01:00 committed by GitHub
commit 441c62f769
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/meson.build
View File

@ -464,9 +464,9 @@ libshared_deps = [threads,
librt,
libseccomp,
libselinux,
libzstd,
libxenctrl,
libxz,
libxenctrl]
libzstd]
libshared_sym_path = '@0@/libshared.sym'.format(meson.current_source_dir())

11
src/shared/reboot-util.c
View File

@ -1,11 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <error.h>
#include <fcntl.h>
#include <stdint.h>
#include <stdio.h>
#include <string.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <unistd.h>
@ -22,7 +18,6 @@
#include "fd-util.h"
#include "fileio.h"
#include "log.h"
#include "memory-util.h"
#include "proc-cmdline.h"
#include "raw-reboot.h"
#include "reboot-util.h"
@ -127,9 +122,9 @@ int shall_restore_state(void) {
static int xen_kexec_loaded(void) {
#if HAVE_XENCTRL
size_t size;
_cleanup_close_ int privcmd_fd = -1, buf_fd = -1;
void *buffer;
xen_kexec_status_t *buffer;
size_t size;
int r;
if (access("/proc/xen", F_OK) < 0) {
@ -154,7 +149,7 @@ static int xen_kexec_loaded(void) {
if (buffer == MAP_FAILED)
return log_debug_errno(errno, "Cannot allocate buffer for hypercall: %m");
*(xen_kexec_status_t*) buffer = (xen_kexec_status_t) {
*buffer = (xen_kexec_status_t) {
.type = KEXEC_TYPE_DEFAULT,
};