mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/mips/malta: Add re-usable rng_seed_hex_new() method

Browse Source 
sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1.

Extract common code from reinitialize_rng_seed and load_kernel
to rng_seed_hex_new.  Using qemu_hexdump_line both fixes the
deprecation warning and simplifies the code base.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
[rth: Use qemu_hexdump_line.]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240412073346.458116-7-richard.henderson@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-04-12 00:33:25 -07:00 committed by Richard Henderson
parent 10e4927bc4
commit 3a8ff36671
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/mips/malta.c
View File

@ -26,6 +26,7 @@
#include "qemu/units.h" #include "qemu/units.h"
#include "qemu/bitops.h" #include "qemu/bitops.h"
#include "qemu/datadir.h" #include "qemu/datadir.h"
#include "qemu/cutils.h"
#include "qemu/guest-random.h" #include "qemu/guest-random.h"
#include "hw/clock.h" #include "hw/clock.h"
#include "hw/southbridge/piix.h" #include "hw/southbridge/piix.h"
@ -850,15 +851,18 @@ static void G_GNUC_PRINTF(3, 4) prom_set(uint32_t *prom_buf, int index,
va_end(ap); va_end(ap);
} }
static void reinitialize_rng_seed(void *opaque) static GString *rng_seed_hex_new(void)
{ {
char *rng_seed_hex = opaque;
uint8_t rng_seed[32]; uint8_t rng_seed[32];
qemu_guest_getrandom_nofail(rng_seed, sizeof(rng_seed)); qemu_guest_getrandom_nofail(rng_seed, sizeof(rng_seed));
for (size_t i = 0; i < sizeof(rng_seed); ++i) { return qemu_hexdump_line(NULL, rng_seed, sizeof(rng_seed), 0, 0);
sprintf(rng_seed_hex + i * 2, "%02x", rng_seed[i]); }
}
static void reinitialize_rng_seed(void *opaque)
{
g_autoptr(GString) hex = rng_seed_hex_new();
memcpy(opaque, hex->str, hex->len);
} }
/* Kernel */ /* Kernel */
@ -870,8 +874,6 @@ static uint64_t load_kernel(void)
uint32_t *prom_buf; uint32_t *prom_buf;
long prom_size; long prom_size;
int prom_index = 0; int prom_index = 0;
uint8_t rng_seed[32];
char rng_seed_hex[sizeof(rng_seed) * 2 + 1];
size_t rng_seed_prom_offset; size_t rng_seed_prom_offset;
kernel_size = load_elf(loaderparams.kernel_filename, NULL, kernel_size = load_elf(loaderparams.kernel_filename, NULL,
@ -946,14 +948,13 @@ static uint64_t load_kernel(void)
prom_set(prom_buf, prom_index++, "modetty0"); prom_set(prom_buf, prom_index++, "modetty0");
prom_set(prom_buf, prom_index++, "38400n8r"); prom_set(prom_buf, prom_index++, "38400n8r");
qemu_guest_getrandom_nofail(rng_seed, sizeof(rng_seed));
for (size_t i = 0; i < sizeof(rng_seed); ++i) {
sprintf(rng_seed_hex + i * 2, "%02x", rng_seed[i]);
}
prom_set(prom_buf, prom_index++, "rngseed"); prom_set(prom_buf, prom_index++, "rngseed");
rng_seed_prom_offset = prom_index * ENVP_ENTRY_SIZE + rng_seed_prom_offset = prom_index * ENVP_ENTRY_SIZE +
sizeof(uint32_t) * ENVP_NB_ENTRIES; sizeof(uint32_t) * ENVP_NB_ENTRIES;
prom_set(prom_buf, prom_index++, "%s", rng_seed_hex); {
g_autoptr(GString) hex = rng_seed_hex_new();
prom_set(prom_buf, prom_index++, "%s", hex->str);
}
prom_set(prom_buf, prom_index++, NULL); prom_set(prom_buf, prom_index++, NULL);