Commit 2059839b authored by Markus Armbruster's avatar Markus Armbruster
Browse files

hw: Default -drive to if=ide explicitly where it works 



Block backends defined with -drive if=ide are meant to be picked up by
machine initialization code: a suitable frontend gets created and
wired up automatically.

if=ide drives not picked up that way can still be used with -device as
if they had if=none, but that's unclean and best avoided.  Unused ones
produce an "Orphaned drive without device" warning.

-drive parameter "if" is optional, and the default depends on the
machine type.  If a machine type doesn't specify a default, the
default is "ide".

Many machine types default to if=ide, even though they don't actually
have an IDE controller.  A future patch will change these defaults to
something more sensible.  To prepare for it, this patch makes default
"ide" explicit for the machines that actually pick up if=ide drives:

* alpha: clipper
* arm/aarch64: spitz borzoi terrier tosa
* i386/x86_64: generic-pc-machine (with concrete subtypes pc-q35-*
  pc-i440fx-* pc-* isapc xenfv)
* mips64el: fulong2e
* mips/mipsel/mips64el: malta mips
* ppc/ppc64: mac99 g3beige prep
* sh4/sh4eb: r2d
* sparc64: sun4u sun4v

Note that ppc64 machine powernv already sets an "ide" default
explicitly.  Its IDE controller isn't implemented, yet.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Message-Id: <1487153147-11530-2-git-send-email-armbru@redhat.com>
parent b8562561

hw/alpha/dp264.c

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ static void clipper_machine_init(MachineClass *mc) 
{

    mc->desc = "Alpha DP264/CLIPPER";

    mc->init = clipper_init;

    mc->block_default_type = IF_IDE;

    mc->max_cpus = 4;

    mc->is_default = 1;

}

hw/arm/spitz.c

+3 −0
Original line number Diff line number Diff line
@@ -998,6 +998,7 @@ static void spitzpda_class_init(ObjectClass *oc, void *data) 


    mc->desc = "Sharp SL-C3000 (Spitz) PDA (PXA270)";

    mc->init = spitz_init;

    mc->block_default_type = IF_IDE;

}



static const TypeInfo spitzpda_type = {
@@ -1012,6 +1013,7 @@ static void borzoipda_class_init(ObjectClass *oc, void *data) 


    mc->desc = "Sharp SL-C3100 (Borzoi) PDA (PXA270)";

    mc->init = borzoi_init;

    mc->block_default_type = IF_IDE;

}



static const TypeInfo borzoipda_type = {
@@ -1026,6 +1028,7 @@ static void terrierpda_class_init(ObjectClass *oc, void *data) 


    mc->desc = "Sharp SL-C3200 (Terrier) PDA (PXA270)";

    mc->init = terrier_init;

    mc->block_default_type = IF_IDE;

}



static const TypeInfo terrierpda_type = {

hw/arm/tosa.c

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ static void tosapda_machine_init(MachineClass *mc) 
{

    mc->desc = "Sharp SL-6000 (Tosa) PDA (PXA255)";

    mc->init = tosa_init;

    mc->block_default_type = IF_IDE;

}



DEFINE_MACHINE("tosa", tosapda_machine_init)

hw/i386/pc.c

+1 −0
Original line number Diff line number Diff line
@@ -2339,6 +2339,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) 
    mc->query_hotpluggable_cpus = pc_query_hotpluggable_cpus;

    mc->default_boot_order = "cad";

    mc->hot_add_cpu = pc_hot_add_cpu;

    mc->block_default_type = IF_IDE;

    mc->max_cpus = 255;

    mc->reset = pc_machine_reset;

    hc->pre_plug = pc_machine_device_pre_plug_cb;

hw/mips/mips_fulong2e.c

+1 −0
Original line number Diff line number Diff line
@@ -387,6 +387,7 @@ static void mips_fulong2e_machine_init(MachineClass *mc) 
{

    mc->desc = "Fulong 2e mini pc";

    mc->init = mips_fulong2e_init;

    mc->block_default_type = IF_IDE;

}



DEFINE_MACHINE("fulong2e", mips_fulong2e_machine_init)