[Qemu-commits] [qemu/qemu] d15ae2: qom: Remove parent pointer when unparenting

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: d15ae221eada39949b025d641f82d2c4a2ad8dde
      
https://github.com/qemu/qemu/commit/d15ae221eada39949b025d641f82d2c4a2ad8dde
  Author: Peter Crosthwaite <address@hidden>
  Date:   2014-06-30 (Mon, 30 Jun 2014)

  Changed paths:
    M qom/object.c

  Log Message:
  -----------
  qom: Remove parent pointer when unparenting

Certain parts of the QOM framework test this pointer to determine if
an object is parented. Nuke it when the object is unparented to allow
for reuse of an object after unparenting.

Signed-off-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>


  Commit: 127a4e1a51c038ec9167083b65d376dddcc64530
      
https://github.com/qemu/qemu/commit/127a4e1a51c038ec9167083b65d376dddcc64530
  Author: Andreas Färber <address@hidden>
  Date:   2014-06-30 (Mon, 30 Jun 2014)

  Changed paths:
    M hw/sd/sdhci.c

  Log Message:
  -----------
  sdhci: Fix misuse of qemu_free_irqs()

It does a g_free() on the pointer, so don't pass a local &foo reference.

Reviewed-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Cc: address@hidden
Signed-off-by: Andreas Färber <address@hidden>


  Commit: f3c7d0389fe8a2792fd4c1cf151b885de03c8f62
      
https://github.com/qemu/qemu/commit/f3c7d0389fe8a2792fd4c1cf151b885de03c8f62
  Author: Andreas Färber <address@hidden>
  Date:   2014-06-30 (Mon, 30 Jun 2014)

  Changed paths:
    M hw/arm/omap1.c
    M hw/arm/omap2.c
    M hw/arm/pxa2xx.c
    M hw/arm/spitz.c
    M hw/arm/z2.c
    M hw/core/irq.c
    M hw/dma/omap_dma.c
    M hw/ide/microdrive.c
    M hw/misc/cbus.c
    M hw/pcmcia/pxa2xx.c
    M hw/sd/omap_mmc.c
    M hw/sd/sdhci.c
    M hw/sh4/sh7750.c
    M hw/timer/omap_gptimer.c

  Log Message:
  -----------
  hw: Fix qemu_allocate_irqs() leaks

Replace qemu_allocate_irqs(foo, bar, 1)[0]
with qemu_allocate_irq(foo, bar, 0).

This avoids leaking the dereferenced qemu_irq *.

Cc: Markus Armbruster <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
[PC Changes:
 * Applied change to instance in sh4/sh7750.c
]
Signed-off-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Kirill Batuzov <address@hidden>
[AF: Fix IRQ index in sh4/sh7750.c]
Cc: address@hidden
Signed-off-by: Andreas Färber <address@hidden>


  Commit: f173d57a4cd3bb2a8362fe376cd9fd776b2f57d5
      
https://github.com/qemu/qemu/commit/f173d57a4cd3bb2a8362fe376cd9fd776b2f57d5
  Author: Peter Crosthwaite <address@hidden>
  Date:   2014-07-01 (Tue, 01 Jul 2014)

  Changed paths:
    M hw/char/serial-pci.c
    M hw/core/irq.c
    M hw/core/qdev.c
    M hw/ipack/ipack.c
    M include/hw/irq.h

  Log Message:
  -----------
  irq: Allocate IRQs individually

Allocate each IRQ individually on array allocations. This prepares for
QOMification of IRQs, where pointers to individual IRQs may be taken
and handed around for usage as QOM Links. The g_renew() scheme used here
is too fragile and would break all existing links should an IRQ list
be extended.

We now have to pass the IRQ count to qemu_free_irqs(). We have so few
call sites however, so this change is reasonably trivial.

Cc: address@hidden
Cc: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Acked-by: Alberto Garcia <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>


  Commit: 615c4895703164134379b68214130dd502721174
      
https://github.com/qemu/qemu/commit/615c4895703164134379b68214130dd502721174
  Author: Andreas Färber <address@hidden>
  Date:   2014-07-01 (Tue, 01 Jul 2014)

  Changed paths:
    M hw/core/irq.c
    M include/hw/irq.h

  Log Message:
  -----------
  irq: Slim conversion of qemu_irq to QOM

As a prequel to any big Pin refactoring plans, do an in-place conversion
of qemu_irq to an Object, so that we can reference it in link<> properties.

Signed-off-by: Andreas Färber <address@hidden>
[ PC Changes:
 * Removed array-alloctor ref counting logic (limit changes just to
 * single IRQ allocator)
 * Removed WIP marking from subject line
]
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>


  Commit: b3959efdbb2dc3d5959e3b0a8e188126930beca8
      
https://github.com/qemu/qemu/commit/b3959efdbb2dc3d5959e3b0a8e188126930beca8
  Author: Peter Maydell <address@hidden>
  Date:   2014-07-01 (Tue, 01 Jul 2014)

  Changed paths:
    M hw/arm/omap1.c
    M hw/arm/omap2.c
    M hw/arm/pxa2xx.c
    M hw/arm/spitz.c
    M hw/arm/z2.c
    M hw/char/serial-pci.c
    M hw/core/irq.c
    M hw/core/qdev.c
    M hw/dma/omap_dma.c
    M hw/ide/microdrive.c
    M hw/ipack/ipack.c
    M hw/misc/cbus.c
    M hw/pcmcia/pxa2xx.c
    M hw/sd/omap_mmc.c
    M hw/sd/sdhci.c
    M hw/sh4/sh7750.c
    M hw/timer/omap_gptimer.c
    M include/hw/irq.h
    M qom/object.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.1' into 
staging

QOM and device refactorings

* QOM unparenting cleanup
* IRQ conversion to QOM

# gpg: Signature made Tue 01 Jul 2014 04:03:23 BST using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <address@hidden>"
# gpg:                 aka "Andreas Färber <address@hidden>"

* remotes/afaerber/tags/qom-devices-for-2.1:
  irq: Slim conversion of qemu_irq to QOM
  irq: Allocate IRQs individually
  hw: Fix qemu_allocate_irqs() leaks
  sdhci: Fix misuse of qemu_free_irqs()
  qom: Remove parent pointer when unparenting

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/d94a65871259...b3959efdbb2d