diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2012-11-20 15:30:34 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-12-11 11:05:10 +0100 |
| commit | 2d0d2837dcf786da415cf4165d37f4ddd684ff57 (patch) | |
| tree | 24a5c080b47b3d5fed294391914ca30949f1fe93 /hw/leon3.c | |
| parent | c208e8c2d88eea2bbafc2850d8856525637e495d (diff) | |
| download | focaccia-qemu-2d0d2837dcf786da415cf4165d37f4ddd684ff57.tar.gz focaccia-qemu-2d0d2837dcf786da415cf4165d37f4ddd684ff57.zip | |
Support default block interfaces per QEMUMachine
There are QEMUMachines that have neither IF_IDE nor IF_SCSI as a default/standard interface to their block devices / drives. Therefore, this patch introduces a new field default_block_type per QEMUMachine struct. The prior use_scsi field becomes thereby obsolete and is replaced through .default_block_type = IF_SCSI. This patch also changes the default for s390x to IF_VIRTIO and removes an early hack that converts IF_IDE drives. Other parties have already claimed interest (e.g. IF_SD for exynos) To create a sane default, for machines that dont specify a default_block_type, this patch makes IF_IDE = 0 and IF_NONE = 1. I checked all users of IF_NONE (blockdev.c and ww/device-hotplug.c) as well as IF_IDE and it seems that it is ok to change the defines - in other words, I found no obvious (to me) assumption in the code regarding IF_NONE==0. IF_NONE is only set if there is an explicit if=none. Without if=* the interface becomes IF_DEFAULT. I would suggest to have some additional care, e.g. by letting this patch sit some days in the block tree. Based on an initial patch from Einar Lueck <elelueck@de.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> CC: Igor Mitsyanko <i.mitsyanko@samsung.com> CC: Markus Armbruster <armbru@redhat.com> CC: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Alexander Graf <agraf@suse.de> Acked-by: Igor Mitsyanko <i.mitsyanko@samsung.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw/leon3.c')
| -rw-r--r-- | hw/leon3.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/leon3.c b/hw/leon3.c index 774273828f..ef83dffd85 100644 --- a/hw/leon3.c +++ b/hw/leon3.c @@ -212,7 +212,6 @@ static QEMUMachine leon3_generic_machine = { .name = "leon3_generic", .desc = "Leon-3 generic", .init = leon3_generic_hw_init, - .use_scsi = 0, }; static void leon3_machine_init(void) |