Merge commit 'fd37d8813ca796f5c9993404baffe79981d9b634' into upstream-merge
commit1bbef52c1e13543cba05c3d4f783b17d4f4087a3
authorAvi Kivity <avi@redhat.com>
Wed, 9 Sep 2009 08:41:09 +0000 (9 11:41 +0300)
committerAvi Kivity <avi@redhat.com>
Wed, 9 Sep 2009 08:41:09 +0000 (9 11:41 +0300)
treef32e831a7c3fcfcf491aecbeee8d8a23624e6727
parent24e5b4d71b653252ad5a4a4fdc52d8515985e5e2
parentfd37d8813ca796f5c9993404baffe79981d9b634
Merge commit 'fd37d8813ca796f5c9993404baffe79981d9b634' into upstream-merge

* commit 'fd37d8813ca796f5c9993404baffe79981d9b634':
  Create PIIX3State instead of using PCIDevice for PIIX3
  We want the argument pass to set_irq to be opaque
  Move smm_enabled and isa_memory_mappings to PCII440FXState

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