From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39596) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyCq9-0006Lo-Am for qemu-devel@nongnu.org; Fri, 29 May 2015 01:28:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyCq4-0005DO-CS for qemu-devel@nongnu.org; Fri, 29 May 2015 01:28:17 -0400 From: Shannon Zhao Date: Fri, 29 May 2015 13:27:01 +0800 Message-ID: <1432877231-5136-4-git-send-email-zhaoshenglong@huawei.com> In-Reply-To: <1432877231-5136-1-git-send-email-zhaoshenglong@huawei.com> References: <1432877231-5136-1-git-send-email-zhaoshenglong@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v2 03/13] hw/isa/i82378.c: Fix misusing qemu_allocate_irqs for single irq List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, pbonzini@redhat.com, mjt@tls.msk.ru, shannon.zhao@linaro.org, peter.maydell@linaro.org From: Shannon Zhao valgrind complains about: ==32654== 8 bytes in 1 blocks are definitely lost in loss record 476 of 4,036 ==32654== at 0x4C2845D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==32654== by 0x336F47: malloc_and_trace (vl.c:2556) ==32654== by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3) ==32654== by 0x3C093B: qemu_extend_irqs (irq.c:55) ==32654== by 0x3C09C7: qemu_allocate_irqs (irq.c:64) ==32654== by 0x3EA4CF: i82378_realize (i82378.c:92) ==32654== by 0x420991: pci_qdev_realize (pci.c:1781) ==32654== by 0x3BD47C: device_set_realized (qdev.c:1058) ==32654== by 0x4A6516: property_set_bool (object.c:1514) ==32654== by 0x4A4E10: object_property_set (object.c:837) ==32654== by 0x4A7132: object_property_set_qobject (qom-qobject.c:24) ==32654== by 0x4A507F: object_property_set_bool (object.c:905) Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- hw/isa/i82378.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index 9da9dfc..fcf97d8 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -65,7 +65,6 @@ static void i82378_realize(PCIDevice *pci, Error **errp) uint8_t *pci_conf; ISABus *isabus; ISADevice *isa; - qemu_irq *out0_irq; pci_conf = pci->config; pci_set_word(pci_conf + PCI_COMMAND, @@ -88,11 +87,9 @@ static void i82378_realize(PCIDevice *pci, Error **errp) All devices accept byte access only, except timer */ - /* Workaround the fact that i8259 is not qdev'ified... */ - out0_irq = qemu_allocate_irqs(i82378_request_out0_irq, s, 1); - /* 2 82C59 (irq) */ - s->i8259 = i8259_init(isabus, *out0_irq); + s->i8259 = i8259_init(isabus, + qemu_allocate_irq(i82378_request_out0_irq, s, 0)); isa_bus_irqs(isabus, s->i8259); /* 1 82C54 (pit) */ -- 2.0.4