Merge commit '8546b09965392da55fc1ce797ef774cb6e298468' into upstream-merge
commit5bcd3bb97c55d21c73188ebf8b4737228921c6e7
authorAvi Kivity <avi@redhat.com>
Mon, 21 Jun 2010 15:28:43 +0000 (21 18:28 +0300)
committerAvi Kivity <avi@redhat.com>
Mon, 21 Jun 2010 15:29:09 +0000 (21 18:29 +0300)
treecf240c8b7e98d16aadf42a2310d26d82a5f2ecd0
parent5db1fcbb4107e90b0ce9dcd5424b367e8110686c
parent8546b09965392da55fc1ce797ef774cb6e298468
Merge commit '8546b09965392da55fc1ce797ef774cb6e298468' into upstream-merge

* commit '8546b09965392da55fc1ce797ef774cb6e298468':
  apic: convert to qdev

Signed-off-by: Avi Kivity <avi@redhat.com>
hw/apic.c
hw/apic.h