hw/i386/pc: don't carry FDC from pc_basic_device_init() to pc_cmos_init()
commit220a8846429ac954932e16010efb07af0aba4529
authorLaszlo Ersek <lersek@redhat.com>
Thu, 25 Jun 2015 13:35:07 +0000 (25 15:35 +0200)
committerMichael S. Tsirkin <mst@redhat.com>
Wed, 8 Jul 2015 07:09:56 +0000 (8 10:09 +0300)
tree65a1ab91e62f065fa4d9ce0002808fe2467a0f6e
parentb86f46132cd86b03f9e4a1cf6295f8b416e16afa
hw/i386/pc: don't carry FDC from pc_basic_device_init() to pc_cmos_init()

Thanks to the last patch, pc_cmos_init() doesn't need the (optional)
board-default FDC any longer as an input parameter. Update
pc_basic_device_init() not to hand it back to pc_init1() / pc_q35_init(),
and update the latter not to carry the FDC to pc_cmos_init(). This
simplifies the code.

pc_init1() | pc_q35_init()
  pc_basic_device_init()
  pc_cmos_init()

Cc: Jan Tomko <jtomko@redhat.com>
Cc: John Snow <jsnow@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
hw/i386/pc.c
hw/i386/pc_piix.c
hw/i386/pc_q35.c
include/hw/i386/pc.h