Commit c9fc677a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/elmarco/tags/leak-pull-request' into staging 



# gpg: Signature made Wed 01 Mar 2017 09:02:53 GMT
# gpg:                using RSA key 0xDAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/leak-pull-request: (28 commits)
  tests: fix virtio-blk-test leaks
  tests: add specialized device_find function
  tests: fix usb-test leaks
  tests: allows to run single test in usb-hcd-ehci-test
  usb: release the created buses
  bus: do not unref hotplug handler
  tests: fix virtio-9p-test leaks
  tests: fix virtio-scsi-test leak
  tests: fix e1000e leaks
  tests: fix i440fx-test leaks
  tests: fix e1000-test leak
  tests: fix tco-test leaks
  tests: fix eepro100-test leak
  pc: pcihp: avoid adding ACPI_PCIHP_PROP_BSEL twice
  tests: fix ipmi-bt-test leak
  tests: fix ipmi-kcs-test leak
  tests: fix bios-tables-test leak
  tests: fix hd-geo-test leaks
  tests: fix ide-test leaks
  tests: fix vhost-user-test leaks
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ab711e21 80e1eea3

hw/acpi/pcihp.c

+0 −11
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ 


#define ACPI_PCIHP_ADDR 0xae00

#define ACPI_PCIHP_SIZE 0x0014

#define ACPI_PCIHP_LEGACY_SIZE 0x000f

#define PCI_UP_BASE 0x0000

#define PCI_DOWN_BASE 0x0004

#define PCI_EJ_BASE 0x0008
@@ -302,16 +301,6 @@ void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus, 
    s->root= root_bus;

    s->legacy_piix = !bridges_enabled;



    if (s->legacy_piix) {

        unsigned *bus_bsel = g_malloc(sizeof *bus_bsel);



        s->io_len = ACPI_PCIHP_LEGACY_SIZE;



        *bus_bsel = ACPI_PCIHP_BSEL_DEFAULT;

        object_property_add_uint32_ptr(OBJECT(root_bus), ACPI_PCIHP_PROP_BSEL,

                                       bus_bsel, NULL);

    }



    memory_region_init_io(&s->io, owner, &acpi_pcihp_io_ops, s,

                          "acpi-pci-hotplug", s->io_len);

    memory_region_add_subregion(address_space_io, s->io_base, &s->io);

hw/acpi/piix4.c

+2 −0
Original line number Diff line number Diff line
@@ -440,6 +440,8 @@ static void piix4_update_bus_hotplug(PCIBus *pci_bus, void *opaque) 
{

    PIIX4PMState *s = opaque;



    /* pci_bus cannot outlive PIIX4PMState, because /machine keeps it alive

     * and it's not hot-unpluggable */

    qbus_set_hotplug_handler(BUS(pci_bus), DEVICE(s), &error_abort);

}

hw/core/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static void qbus_initfn(Object *obj) 
                             TYPE_HOTPLUG_HANDLER,

                             (Object **)&bus->hotplug_handler,

                             object_property_allow_set_link,

                             OBJ_PROP_LINK_UNREF_ON_RELEASE,

                             0,

                             NULL);

    object_property_add_bool(obj, "realized",

                             bus_get_realized, bus_set_realized, NULL);

hw/core/ptimer.c

+8 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include "qemu/host-utils.h"

#include "sysemu/replay.h"

#include "sysemu/qtest.h"

#include "block/aio.h"



#define DELTA_ADJUST     1

#define DELTA_NO_ADJUST -1
@@ -353,3 +354,10 @@ ptimer_state *ptimer_init(QEMUBH *bh, uint8_t policy_mask) 
    s->policy_mask = policy_mask;

    return s;

}



void ptimer_free(ptimer_state *s)

{

    qemu_bh_delete(s->bh);

    timer_free(s->timer);

    g_free(s);

}

hw/i386/acpi-build.c

+2 −2
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque) 


        *bus_bsel = (*bsel_alloc)++;

        object_property_add_uint32_ptr(OBJECT(bus), ACPI_PCIHP_PROP_BSEL,

                                       bus_bsel, NULL);

                                       bus_bsel, &error_abort);

    }



    return bsel_alloc;
@@ -471,7 +471,7 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque) 
static void acpi_set_pci_info(void)

{

    PCIBus *bus = find_i440fx(); /* TODO: Q35 support */

    unsigned bsel_alloc = 0;

    unsigned bsel_alloc = ACPI_PCIHP_BSEL_DEFAULT;



    if (bus) {

        /* Scan all PCI buses. Set property to enable acpi based hotplug. */