This fixes LeakSanitizer warnings.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>

---

hw/core/cpu-common.c | 1 +

1 file changed, 1 insertion(+)

diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/core/cpu-common.c

+++ b/hw/core/cpu-common.c

@@ -XXX,XX +XXX,XX @@ static void cpu_common_finalize(Object *obj)

qemu_cond_destroy(cpu->halt_cond);

g_free(cpu->halt_cond);

g_free(cpu->thread);

+ g_free(cpu->cpu_ases);

}

static int64_t cpu_common_get_arch_id(CPUState *cpu)

--

2.45.2

macio ide_irq is connected to the IDE bus. This fixes the leak of

ide_irq.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>

---

hw/ide/macio.c | 11 ++++++++---

1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/hw/ide/macio.c b/hw/ide/macio.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/ide/macio.c

+++ b/hw/ide/macio.c

@@ -XXX,XX +XXX,XX @@ static void macio_ide_realizefn(DeviceState *dev, Error **errp)

s->bus.dma = &s->dma;

}

-static void pmac_ide_irq(void *opaque, int n, int level)

+static void pmac_irq(void *opaque, int n, int level)

{

MACIOIDEState *s = opaque;

uint32_t mask = 0x80000000u >> n;

@@ -XXX,XX +XXX,XX @@ static void pmac_ide_irq(void *opaque, int n, int level)

}

}

+static void pmac_ide_irq(void *opaque, int n, int level)

+{

+ pmac_irq(opaque, 1, level);

+}

+

static void macio_ide_initfn(Object *obj)

{

SysBusDevice *d = SYS_BUS_DEVICE(obj);

@@ -XXX,XX +XXX,XX @@ static void macio_ide_initfn(Object *obj)

sysbus_init_mmio(d, &s->mem);

sysbus_init_irq(d, &s->real_ide_irq);

sysbus_init_irq(d, &s->real_dma_irq);

- s->dma_irq = qemu_allocate_irq(pmac_ide_irq, s, 0);

- s->ide_irq = qemu_allocate_irq(pmac_ide_irq, s, 1);

+ s->dma_irq = qemu_allocate_irq(pmac_irq, s, 0);

+ qdev_init_gpio_in_named_with_opaque(DEVICE(obj), pmac_ide_irq, s, NULL, 1);

object_property_add_link(obj, "dbdma", TYPE_MAC_DBDMA,

(Object **) &s->dbdma,

--

2.45.2

A function pointer is sufficient for internal usage. Replacing qemu_irq

with one fixes the leak of qemu_irq.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>

---

include/hw/ppc/mac_dbdma.h | 5 +++--

hw/ide/macio.c | 11 +++++++----

hw/misc/macio/mac_dbdma.c | 10 +++++-----

3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/include/hw/ppc/mac_dbdma.h b/include/hw/ppc/mac_dbdma.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/ppc/mac_dbdma.h

+++ b/include/hw/ppc/mac_dbdma.h

@@ -XXX,XX +XXX,XX @@

typedef struct DBDMA_io DBDMA_io;

typedef void (*DBDMA_flush)(DBDMA_io *io);

+typedef void (*DBDMA_irq)(DBDMA_io *io);

typedef void (*DBDMA_rw)(DBDMA_io *io);

typedef void (*DBDMA_end)(DBDMA_io *io);

struct DBDMA_io {

@@ -XXX,XX +XXX,XX @@ typedef struct dbdma_cmd {

typedef struct DBDMA_channel {

int channel;

uint32_t regs[DBDMA_REGS];

- qemu_irq irq;

+ DBDMA_irq irq;

DBDMA_io io;

DBDMA_rw rw;

DBDMA_flush flush;

@@ -XXX,XX +XXX,XX @@ typedef struct DBDMAState DBDMAState;

/* Externally callable functions */

-void DBDMA_register_channel(void *dbdma, int nchan, qemu_irq irq,

+void DBDMA_register_channel(void *dbdma, int nchan, DBDMA_irq irq,

DBDMA_rw rw, DBDMA_flush flush,

void *opaque);

void DBDMA_kick(DBDMAState *dbdma);

diff --git a/hw/ide/macio.c b/hw/ide/macio.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/ide/macio.c

+++ b/hw/ide/macio.c

@@ -XXX,XX +XXX,XX @@ static void macio_ide_realizefn(DeviceState *dev, Error **errp)

s->bus.dma = &s->dma;

}

-static void pmac_irq(void *opaque, int n, int level)

+static void pmac_irq(MACIOIDEState *s, int n, int level)

{

- MACIOIDEState *s = opaque;

uint32_t mask = 0x80000000u >> n;

/* We need to reflect the IRQ state in the irq register */

@@ -XXX,XX +XXX,XX @@ static void pmac_irq(void *opaque, int n, int level)

}

}

+static void pmac_dma_irq(DBDMA_io *io)

+{

+ pmac_irq(io->opaque, 0, 1);

+}

+

static void pmac_ide_irq(void *opaque, int n, int level)

{

pmac_irq(opaque, 1, level);

@@ -XXX,XX +XXX,XX @@ static void macio_ide_initfn(Object *obj)

sysbus_init_mmio(d, &s->mem);

sysbus_init_irq(d, &s->real_ide_irq);

sysbus_init_irq(d, &s->real_dma_irq);

- s->dma_irq = qemu_allocate_irq(pmac_irq, s, 0);

qdev_init_gpio_in_named_with_opaque(DEVICE(obj), pmac_ide_irq, s, NULL, 1);

object_property_add_link(obj, "dbdma", TYPE_MAC_DBDMA,

@@ -XXX,XX +XXX,XX @@ void macio_ide_init_drives(MACIOIDEState *s, DriveInfo **hd_table)

void macio_ide_register_dma(MACIOIDEState *s)

{

- DBDMA_register_channel(s->dbdma, s->channel, s->dma_irq,

+ DBDMA_register_channel(s->dbdma, s->channel, pmac_dma_irq,

pmac_ide_transfer, pmac_ide_flush, s);

}

diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/misc/macio/mac_dbdma.c

+++ b/hw/misc/macio/mac_dbdma.c

@@ -XXX,XX +XXX,XX @@ static void kill_channel(DBDMA_channel *ch)

ch->regs[DBDMA_STATUS] |= DEAD;

ch->regs[DBDMA_STATUS] &= ~ACTIVE;

- qemu_irq_raise(ch->irq);

+ ch->irq(&ch->io);

}

static void conditional_interrupt(DBDMA_channel *ch)

@@ -XXX,XX +XXX,XX @@ static void conditional_interrupt(DBDMA_channel *ch)

case INTR_NEVER: /* don't interrupt */

return;

case INTR_ALWAYS: /* always interrupt */

- qemu_irq_raise(ch->irq);

+ ch->irq(&ch->io);

DBDMA_DPRINTFCH(ch, "%s: raise\n", __func__);

return;

}

@@ -XXX,XX +XXX,XX @@ static void conditional_interrupt(DBDMA_channel *ch)

switch(intr) {

case INTR_IFSET: /* intr if condition bit is 1 */

if (cond) {

- qemu_irq_raise(ch->irq);

+ ch->irq(&ch->io);

DBDMA_DPRINTFCH(ch, "%s: raise\n", __func__);

}

return;

case INTR_IFCLR: /* intr if condition bit is 0 */

if (!cond) {

- qemu_irq_raise(ch->irq);

+ ch->irq(&ch->io);

DBDMA_DPRINTFCH(ch, "%s: raise\n", __func__);

}

return;

@@ -XXX,XX +XXX,XX @@ void DBDMA_kick(DBDMAState *dbdma)

qemu_bh_schedule(dbdma->bh);

}

-void DBDMA_register_channel(void *dbdma, int nchan, qemu_irq irq,

+void DBDMA_register_channel(void *dbdma, int nchan, DBDMA_irq irq,

DBDMA_rw rw, DBDMA_flush flush,

void *opaque)

{

--

2.45.2

This fixes qemu_irq array leak.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>

---

hw/isa/vt82c686.c | 7 ++++---

1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/isa/vt82c686.c

+++ b/hw/isa/vt82c686.c

@@ -XXX,XX +XXX,XX @@ static void via_isa_realize(PCIDevice *d, Error **errp)

ViaISAState *s = VIA_ISA(d);

DeviceState *dev = DEVICE(d);

PCIBus *pci_bus = pci_get_bus(d);

- qemu_irq *isa_irq;

+ qemu_irq isa_irq;

ISABus *isa_bus;

int i;

qdev_init_gpio_out(dev, &s->cpu_intr, 1);

qdev_init_gpio_in_named(dev, via_isa_pirq, "pirq", PCI_NUM_PINS);

- isa_irq = qemu_allocate_irqs(via_isa_request_i8259_irq, s, 1);

+ qdev_init_gpio_in_named(dev, via_isa_request_i8259_irq, "i8259", 1);

+ isa_irq = qdev_get_gpio_in_named(dev, "i8259", 0);

isa_bus = isa_bus_new(dev, pci_address_space(d), pci_address_space_io(d),

errp);

@@ -XXX,XX +XXX,XX @@ static void via_isa_realize(PCIDevice *d, Error **errp)

return;

}

- s->isa_irqs_in = i8259_init(isa_bus, *isa_irq);

+ s->isa_irqs_in = i8259_init(isa_bus, isa_irq);

isa_bus_register_input_irqs(isa_bus, s->isa_irqs_in);

i8254_pit_init(isa_bus, 0x40, 0, NULL);

i8257_dma_init(OBJECT(d), isa_bus, 0);

--

2.45.2

This fixes LeakSanitizer warnings.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

---

hw/ppc/spapr_vof.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/ppc/spapr_vof.c b/hw/ppc/spapr_vof.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/ppc/spapr_vof.c

+++ b/hw/ppc/spapr_vof.c

@@ -XXX,XX +XXX,XX @@ target_ulong spapr_h_vof_client(PowerPCCPU *cpu, SpaprMachineState *spapr,

void spapr_vof_client_dt_finalize(SpaprMachineState *spapr, void *fdt)

{

- char *stdout_path = spapr_vio_stdout_path(spapr->vio_bus);

+ g_autofree char *stdout_path = spapr_vio_stdout_path(spapr->vio_bus);

vof_build_dt(fdt, spapr->vof);

--

2.45.2

FDT properties are aligned by 4 bytes, not 8 bytes.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>

---

hw/ppc/vof.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/ppc/vof.c b/hw/ppc/vof.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/ppc/vof.c

+++ b/hw/ppc/vof.c

@@ -XXX,XX +XXX,XX @@ static void vof_dt_memory_available(void *fdt, GArray *claimed, uint64_t base)

mem0_reg = fdt_getprop(fdt, offset, "reg", &proplen);

g_assert(mem0_reg && proplen == sizeof(uint32_t) * (ac + sc));

if (sc == 2) {

- mem0_end = be64_to_cpu(*(uint64_t *)(mem0_reg + sizeof(uint32_t) * ac));

+ mem0_end = ldq_be_p(mem0_reg + sizeof(uint32_t) * ac);

} else {

mem0_end = be32_to_cpu(*(uint32_t *)(mem0_reg + sizeof(uint32_t) * ac));

}

--

2.45.2

This fixes LeakSanitizer warnings.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>

---

hw/virtio/vhost-user-base.c | 2 ++

1 file changed, 2 insertions(+)

diff --git a/hw/virtio/vhost-user-base.c b/hw/virtio/vhost-user-base.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/virtio/vhost-user-base.c

+++ b/hw/virtio/vhost-user-base.c

@@ -XXX,XX +XXX,XX @@ static void vub_disconnect(DeviceState *dev)

{

VirtIODevice *vdev = VIRTIO_DEVICE(dev);

VHostUserBase *vub = VHOST_USER_BASE(vdev);

+ struct vhost_virtqueue *vhost_vqs = vub->vhost_dev.vqs;

if (!vub->connected) {

return;

@@ -XXX,XX +XXX,XX @@ static void vub_disconnect(DeviceState *dev)

vub_stop(vdev);

vhost_dev_cleanup(&vub->vhost_dev);

+ g_free(vhost_vqs);

/* Re-instate the event handler for new connections */

qemu_chr_fe_set_handlers(&vub->chardev,

--

2.45.2

A test function may not be executed depending on the test command line

so it is wrong to free data with a test function. Use

qtest_add_data_func_full() to register a function to free data.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>

---

tests/qtest/device-introspect-test.c | 7 +++----

1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/qtest/device-introspect-test.c b/tests/qtest/device-introspect-test.c

index XXXXXXX..XXXXXXX 100644

--- a/tests/qtest/device-introspect-test.c

+++ b/tests/qtest/device-introspect-test.c

@@ -XXX,XX +XXX,XX @@ static void test_device_intro_concrete(const void *args)

qobject_unref(types);

qtest_quit(qts);

- g_free((void *)args);

}

static void test_abstract_interfaces(void)

@@ -XXX,XX +XXX,XX @@ static void add_machine_test_case(const char *mname)

path = g_strdup_printf("device/introspect/concrete/defaults/%s", mname);

args = g_strdup_printf("-M %s", mname);

- qtest_add_data_func(path, args, test_device_intro_concrete);

+ qtest_add_data_func_full(path, args, test_device_intro_concrete, g_free);

g_free(path);

path = g_strdup_printf("device/introspect/concrete/nodefaults/%s", mname);

args = g_strdup_printf("-nodefaults -M %s", mname);

- qtest_add_data_func(path, args, test_device_intro_concrete);

+ qtest_add_data_func_full(path, args, test_device_intro_concrete, g_free);

g_free(path);

}

@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv)

qtest_add_func("device/introspect/abstract-interfaces", test_abstract_interfaces);

if (g_test_quick()) {

qtest_add_data_func("device/introspect/concrete/defaults/none",

- g_strdup(common_args), test_device_intro_concrete);

+ common_args, test_device_intro_concrete);

} else {

qtest_cb_for_every_machine(add_machine_test_case, true);

}

--

2.45.2

This fixes LeakSanitizer warnings.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>

---

tests/qtest/libqtest.c | 2 ++

1 file changed, 2 insertions(+)

diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c

index XXXXXXX..XXXXXXX 100644

--- a/tests/qtest/libqtest.c

+++ b/tests/qtest/libqtest.c

@@ -XXX,XX +XXX,XX @@ QDict *qtest_qmp_receive(QTestState *s)

response, s->eventData)) {

/* Stash the event for a later consumption */

s->pending_events = g_list_append(s->pending_events, response);

+ } else {

+ qobject_unref(response);

}

}

}

--

2.45.2

This fixes LeakSanitizer warnings.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>

---

tests/qtest/libqtest.c | 1 +

1 file changed, 1 insertion(+)

diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c

index XXXXXXX..XXXXXXX 100644

--- a/tests/qtest/libqtest.c

+++ b/tests/qtest/libqtest.c

@@ -XXX,XX +XXX,XX @@ static struct MachInfo *qtest_get_machines(const char *var)

int idx;

if (g_strcmp0(qemu_var, var)) {

+ g_free(qemu_var);

qemu_var = g_strdup(var);

/* new qemu, clear the cache */

--

2.45.2

A test run may create boot files several times. Delete the previous boot

file before creating a new one.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>

---

tests/qtest/migration-test.c | 18 +++++++++++-------

1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c

index XXXXXXX..XXXXXXX 100644

--- a/tests/qtest/migration-test.c

+++ b/tests/qtest/migration-test.c

@@ -XXX,XX +XXX,XX @@ static char *bootpath;

#include "tests/migration/aarch64/a-b-kernel.h"

#include "tests/migration/s390x/a-b-bios.h"

+static void bootfile_delete(void)

+{

+ unlink(bootpath);

+ g_free(bootpath);

+ bootpath = NULL;

+}

+

static void bootfile_create(char *dir, bool suspend_me)

{

const char *arch = qtest_get_arch();

unsigned char *content;

size_t len;

+ if (bootpath) {

+ bootfile_delete();

+ }

+

bootpath = g_strdup_printf("%s/bootsect", dir);

if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {

/* the assembled x86 boot sector should be exactly one sector large */

@@ -XXX,XX +XXX,XX @@ static void bootfile_create(char *dir, bool suspend_me)

fclose(bootfile);

}

-static void bootfile_delete(void)

-{

- unlink(bootpath);

- g_free(bootpath);

- bootpath = NULL;

-}

-

/*

* Wait for some output in the serial output file,

* we get an 'A' followed by an endless string of 'B's

--

2.45.2

This fixes LeakSanitizer warnings.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>

---

tests/qtest/qos-test.c | 16 ++++++++++++----

1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tests/qtest/qos-test.c b/tests/qtest/qos-test.c

index XXXXXXX..XXXXXXX 100644

--- a/tests/qtest/qos-test.c

+++ b/tests/qtest/qos-test.c

@@ -XXX,XX +XXX,XX @@

static char *old_path;

-

/**

* qos_set_machines_devices_available(): sets availability of qgraph

* machines and devices.

@@ -XXX,XX +XXX,XX @@ static void subprocess_run_one_test(const void *arg)

g_test_trap_assert_passed();

}

+static void destroy_pathv(void *arg)

+{

+ g_free(((char **)arg)[0]);

+ g_free(arg);

+}

+

/*

* in this function, 2 path will be built:

* path_str, a one-string path (ex "pc/i440FX-pcihost/...")

@@ -XXX,XX +XXX,XX @@ static void walk_path(QOSGraphNode *orig_path, int len)

if (path->u.test.subprocess) {

gchar *subprocess_path = g_strdup_printf("/%s/%s/subprocess",

qtest_get_arch(), path_str);

- qtest_add_data_func(path_str, subprocess_path, subprocess_run_one_test);

- g_test_add_data_func(subprocess_path, path_vec, run_one_test);

+ qtest_add_data_func_full(path_str, subprocess_path,

+ subprocess_run_one_test, g_free);

+ g_test_add_data_func_full(subprocess_path, path_vec,

+ run_one_test, destroy_pathv);

} else {

- qtest_add_data_func(path_str, path_vec, run_one_test);

+ qtest_add_data_func_full(path_str, path_vec,

+ run_one_test, destroy_pathv);

}

g_free(path_str);

--

2.45.2

These GThreads are never referenced.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>

---

tests/qtest/vhost-user-test.c | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c

index XXXXXXX..XXXXXXX 100644

--- a/tests/qtest/vhost-user-test.c

+++ b/tests/qtest/vhost-user-test.c

@@ -XXX,XX +XXX,XX @@ static void *vhost_user_test_setup_reconnect(GString *cmd_line, void *arg)

{

TestServer *s = test_server_new("reconnect", arg);

- g_thread_new("connect", connect_thread, s);

+ g_thread_unref(g_thread_new("connect", connect_thread, s));

append_mem_opts(s, cmd_line, 256, TEST_MEMFD_AUTO);

s->vu_ops->append_opts(s, cmd_line, ",server=on");

@@ -XXX,XX +XXX,XX @@ static void *vhost_user_test_setup_connect_fail(GString *cmd_line, void *arg)

s->test_fail = true;

- g_thread_new("connect", connect_thread, s);

+ g_thread_unref(g_thread_new("connect", connect_thread, s));

append_mem_opts(s, cmd_line, 256, TEST_MEMFD_AUTO);

s->vu_ops->append_opts(s, cmd_line, ",server=on");

@@ -XXX,XX +XXX,XX @@ static void *vhost_user_test_setup_flags_mismatch(GString *cmd_line, void *arg)

s->test_flags = TEST_FLAGS_DISCONNECT;

- g_thread_new("connect", connect_thread, s);

+ g_thread_unref(g_thread_new("connect", connect_thread, s));

append_mem_opts(s, cmd_line, 256, TEST_MEMFD_AUTO);

s->vu_ops->append_opts(s, cmd_line, ",server=on");

--

2.45.2