Drop useless casts from g_malloc() & friends to pointer

These memory allocation functions return void *, and casting to
another pointer type is useless clutter.  Drop these casts.

If you really want another pointer type, consider g_new().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20220923120025.448759-3-armbru@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Markus Armbruster 2022-09-23 14:00:24 +02:00 committed by Laurent Vivier
parent 4bb5923605
commit 0a553c12c7
10 changed files with 15 additions and 17 deletions

View File

@ -702,7 +702,7 @@ static uint32_t mipid_txrx(void *opaque, uint32_t cmd, int len)
static void *mipid_init(void) static void *mipid_init(void)
{ {
struct mipid_s *s = (struct mipid_s *) g_malloc0(sizeof(*s)); struct mipid_s *s = g_malloc0(sizeof(*s));
s->id = 0x838f03; s->id = 0x838f03;
mipid_reset(s); mipid_reset(s);
@ -1300,7 +1300,7 @@ static int n810_atag_setup(const struct arm_boot_info *info, void *p)
static void n8x0_init(MachineState *machine, static void n8x0_init(MachineState *machine,
struct arm_boot_info *binfo, int model) struct arm_boot_info *binfo, int model)
{ {
struct n800_s *s = (struct n800_s *) g_malloc0(sizeof(*s)); struct n800_s *s = g_malloc0(sizeof(*s));
MachineClass *mc = MACHINE_GET_CLASS(machine); MachineClass *mc = MACHINE_GET_CLASS(machine);
if (machine->ram_size != mc->default_ram_size) { if (machine->ram_size != mc->default_ram_size) {

View File

@ -211,7 +211,7 @@ static void fifo_reset(Exynos4210UartFIFO *q)
g_free(q->data); g_free(q->data);
q->data = NULL; q->data = NULL;
q->data = (uint8_t *)g_malloc0(q->size); q->data = g_malloc0(q->size);
q->sp = 0; q->sp = 0;
q->rp = 0; q->rp = 0;

View File

@ -1007,7 +1007,7 @@ static const GraphicHwOps blizzard_ops = {
void *s1d13745_init(qemu_irq gpio_int) void *s1d13745_init(qemu_irq gpio_int)
{ {
BlizzardState *s = (BlizzardState *) g_malloc0(sizeof(*s)); BlizzardState *s = g_malloc0(sizeof(*s));
DisplaySurface *surface; DisplaySurface *surface;
s->fb = g_malloc(0x180000); s->fb = g_malloc(0x180000);

View File

@ -133,7 +133,7 @@ static void cbus_sel(void *opaque, int line, int level)
CBus *cbus_init(qemu_irq dat) CBus *cbus_init(qemu_irq dat)
{ {
CBusPriv *s = (CBusPriv *) g_malloc0(sizeof(*s)); CBusPriv *s = g_malloc0(sizeof(*s));
s->dat_out = dat; s->dat_out = dat;
s->cbus.clk = qemu_allocate_irq(cbus_clk, s, 0); s->cbus.clk = qemu_allocate_irq(cbus_clk, s, 0);
@ -388,7 +388,7 @@ static void retu_io(void *opaque, int rw, int reg, uint16_t *val)
void *retu_init(qemu_irq irq, int vilma) void *retu_init(qemu_irq irq, int vilma)
{ {
CBusRetu *s = (CBusRetu *) g_malloc0(sizeof(*s)); CBusRetu *s = g_malloc0(sizeof(*s));
s->irq = irq; s->irq = irq;
s->irqen = 0xffff; s->irqen = 0xffff;
@ -604,7 +604,7 @@ static void tahvo_io(void *opaque, int rw, int reg, uint16_t *val)
void *tahvo_init(qemu_irq irq, int betty) void *tahvo_init(qemu_irq irq, int betty)
{ {
CBusTahvo *s = (CBusTahvo *) g_malloc0(sizeof(*s)); CBusTahvo *s = g_malloc0(sizeof(*s));
s->irq = irq; s->irq = irq;
s->irqen = 0xffff; s->irqen = 0xffff;

View File

@ -315,7 +315,7 @@ eeprom_t *eeprom93xx_new(DeviceState *dev, uint16_t nwords)
addrbits = 6; addrbits = 6;
} }
eeprom = (eeprom_t *)g_malloc0(sizeof(*eeprom) + nwords * 2); eeprom = g_malloc0(sizeof(*eeprom) + nwords * 2);
eeprom->size = nwords; eeprom->size = nwords;
eeprom->addrbits = addrbits; eeprom->addrbits = addrbits;
/* Output DO is tristate, read results in 1. */ /* Output DO is tristate, read results in 1. */

View File

@ -140,7 +140,7 @@ static void emulated_apdu_from_guest(CCIDCardState *base,
const uint8_t *apdu, uint32_t len) const uint8_t *apdu, uint32_t len)
{ {
EmulatedState *card = EMULATED_CCID_CARD(base); EmulatedState *card = EMULATED_CCID_CARD(base);
EmulEvent *event = (EmulEvent *)g_malloc(sizeof(EmulEvent) + len); EmulEvent *event = g_malloc(sizeof(EmulEvent) + len);
assert(event); assert(event);
event->p.data.type = EMUL_GUEST_APDU; event->p.data.type = EMUL_GUEST_APDU;

View File

@ -2262,8 +2262,7 @@ static int kvm_get_supported_feature_msrs(KVMState *s)
} }
assert(msr_list.nmsrs > 0); assert(msr_list.nmsrs > 0);
kvm_feature_msrs = (struct kvm_msr_list *) \ kvm_feature_msrs = g_malloc0(sizeof(msr_list) +
g_malloc0(sizeof(msr_list) +
msr_list.nmsrs * sizeof(msr_list.indices[0])); msr_list.nmsrs * sizeof(msr_list.indices[0]));
kvm_feature_msrs->nmsrs = msr_list.nmsrs; kvm_feature_msrs->nmsrs = msr_list.nmsrs;

View File

@ -1164,9 +1164,8 @@ static void whpx_translate_cpu_breakpoints(
(breakpoints->breakpoints ? breakpoints->breakpoints->used : 0); (breakpoints->breakpoints ? breakpoints->breakpoints->used : 0);
struct whpx_breakpoint_collection *new_breakpoints = struct whpx_breakpoint_collection *new_breakpoints =
(struct whpx_breakpoint_collection *)g_malloc0( g_malloc0(sizeof(struct whpx_breakpoint_collection)
sizeof(struct whpx_breakpoint_collection) + + max_breakpoints * sizeof(struct whpx_breakpoint));
max_breakpoints * sizeof(struct whpx_breakpoint));
new_breakpoints->allocated = max_breakpoints; new_breakpoints->allocated = max_breakpoints;
new_breakpoints->used = 0; new_breakpoints->used = 0;

View File

@ -1033,7 +1033,7 @@ int kvm_arch_remove_hw_breakpoint(target_ulong addr,
} }
size = nb_hw_breakpoints * sizeof(struct kvm_hw_breakpoint); size = nb_hw_breakpoints * sizeof(struct kvm_hw_breakpoint);
hw_breakpoints = hw_breakpoints =
(struct kvm_hw_breakpoint *)g_realloc(hw_breakpoints, size); g_realloc(hw_breakpoints, size);
} else { } else {
g_free(hw_breakpoints); g_free(hw_breakpoints);
hw_breakpoints = NULL; hw_breakpoints = NULL;

View File

@ -50,8 +50,8 @@ int vnc_hextile_send_framebuffer_update(VncState *vs, int x,
int has_fg, has_bg; int has_fg, has_bg;
uint8_t *last_fg, *last_bg; uint8_t *last_fg, *last_bg;
last_fg = (uint8_t *) g_malloc(VNC_SERVER_FB_BYTES); last_fg = g_malloc(VNC_SERVER_FB_BYTES);
last_bg = (uint8_t *) g_malloc(VNC_SERVER_FB_BYTES); last_bg = g_malloc(VNC_SERVER_FB_BYTES);
has_fg = has_bg = 0; has_fg = has_bg = 0;
for (j = y; j < (y + h); j += 16) { for (j = y; j < (y + h); j += 16) {
for (i = x; i < (x + w); i += 16) { for (i = x; i < (x + w); i += 16) {