Re: [Qemu-devel] [PATCH] Fixup some dynamic casts in the Qemu device tree to correspond to the QOM type-checking system. These patches change from using Linux kernel style upcasts to typesafe object oriented casts with runtime checking semantics.

[Mike Day <ncmike@ncultra.org>]

Peter Maydell <peter.maydell@linaro.org> writes:

> On 19 August 2013 19:33, Mike Day <ncmike@ncultra.org> wrote:
>> These patches apply to Paolo Bonzini's rcu tree:
>>
>> https://github.com/bonzini/qemu/tree/rcu
>> commit 781e47bf1693a80b84eec298a6a1c7b29ab2c135
>>
>> Signed-off-by: Mike Day <ncmike@ncultra.org>
>> ---
>>  hw/misc/ivshmem.c              | 2 +-
>>  hw/pci-bridge/pci_bridge_dev.c | 6 +++---
>>  hw/pci/pci_bridge.c            | 2 +-
>>  3 files changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
>> index ebcb52a..46d8c27 100644
>> --- a/hw/misc/ivshmem.c
>> +++ b/hw/misc/ivshmem.c
>> @@ -789,7 +789,7 @@ static void pci_ivshmem_uninit(PCIDevice *dev)
>>
>>  static void pci_ivshmem_instance_finalize(Object *obj)
>>  {
>> -    IVShmemState *s = IVSHMEM(dev);
>> +    IVShmemState *s = IVSHMEM(obj);
>
> This should have been a flat-out compiler error, right?

Yes, correct, but Paolo hasn't previously submitted this specific change
code afaik.

>>      if (s->migration_blocker) {
>>          migrate_del_blocker(s->migration_blocker);
>> diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c
>> index c995d5d..22caf14 100644
>> --- a/hw/pci-bridge/pci_bridge_dev.c
>> +++ b/hw/pci-bridge/pci_bridge_dev.c
>> @@ -87,7 +87,6 @@ shpc_error:
>>  bridge_error:
>>      return err;
>>  }
>> -
>
> Stray blank line change.

Thanks - and git just found it for me too. Apologies.

Mike
-- 

Mike Day | + 1 919 371-8786 | ncmike@ncultra.org
"Endurance is a Virtue"