i386/pc: pc_basic_device_init(): delegate FDC creation request
commitfd53c87cf6651b0dfe9f5107cfe77d2f697bd4f6
authorLaszlo Ersek <lersek@redhat.com>
Thu, 28 May 2015 20:04:08 +0000 (28 22:04 +0200)
committerMichael S. Tsirkin <mst@redhat.com>
Sun, 31 May 2015 18:24:06 +0000 (31 20:24 +0200)
tree01b03523539d7a5a0b5d98d36a35ef5a740032e7
parentb829c2a98f1f67308eb02fcddb52d8fa67775f18
i386/pc: pc_basic_device_init(): delegate FDC creation request

This patch introduces no observable change, but it allows the callers of
pc_basic_device_init(), ie. pc_init1() and pc_q35_init(), to request (or
not request) the creation of the FDC explicitly.

At the moment both callers pass constant create_fdctrl=true (hence no
observable change).

Assuming a board passes create_fdctrl=false, "floppy" will be NULL on
output, and (beyond the FDC not being created) that NULL will be passed on
to pc_cmos_init(). Luckily, pc_cmos_init() already handles that case.

Cc: Markus Armbruster <armbru@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: John Snow <jsnow@redhat.com>
Cc: "Gabriel L. Somlo" <gsomlo@gmail.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>
Cc: qemu-block@nongnu.org
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
hw/i386/pc.c
hw/i386/pc_piix.c
hw/i386/pc_q35.c
include/hw/i386/pc.h