Il 19/08/2013 20:57, Mike Day ha scritto:
>>> >> 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.
> 
Yes, it's just a conflict resolution pasto.

I squashed the changes into the branch.

Paolo

Reply via email to