Commit a1cf5fac authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-block-2017-02-21' into staging 



Changes to -drive without if= and with if=scsi

# gpg: Signature made Tue 21 Feb 2017 12:22:35 GMT
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-block-2017-02-21:
  hw/i386: Deprecate -drive if=scsi with PC machine types
  hw: Deprecate -drive if=scsi with non-onboard HBAs
  hw/scsi: Concentrate -drive if=scsi auto-create in one place
  hw: Drop superfluous special checks for orphaned -drive
  blockdev: Make orphaned -drive fatal
  blockdev: Improve message for orphaned -drive
  hw/arm/highbank: Default -drive to if=ide instead of if=scsi
  hw: Default -drive to if=none instead of scsi when scsi cannot work
  hw: Default -drive to if=none instead of ide when ide cannot work
  hw/arm/cubieboard hw/arm/xlnx-ep108: Fix units_per_default_bus
  hw: Default -drive to if=ide explicitly where it works

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a0775e28 f778a82f

blockdev.c

+13 −10
Original line number Diff line number Diff line
@@ -227,27 +227,30 @@ DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit) 
    return NULL;

}



bool drive_check_orphaned(void)

void drive_check_orphaned(void)

{

    BlockBackend *blk;

    DriveInfo *dinfo;

    bool rs = false;

    Location loc;

    bool orphans = false;



    for (blk = blk_next(NULL); blk; blk = blk_next(blk)) {

        dinfo = blk_legacy_dinfo(blk);

        /* If dinfo->bdrv->dev is NULL, it has no device attached. */

        /* Unless this is a default drive, this may be an oversight. */

        if (!blk_get_attached_dev(blk) && !dinfo->is_default &&

            dinfo->type != IF_NONE) {

            fprintf(stderr, "Warning: Orphaned drive without device: "

                    "id=%s,file=%s,if=%s,bus=%d,unit=%d\n",

                    blk_name(blk), blk_bs(blk) ? blk_bs(blk)->filename : "",

            loc_push_none(&loc);

            qemu_opts_loc_restore(dinfo->opts);

            error_report("machine type does not support"

                         " if=%s,bus=%d,unit=%d",

                         if_name[dinfo->type], dinfo->bus, dinfo->unit);

            rs = true;

            loc_pop(&loc);

            orphans = true;

        }

    }



    return rs;

    if (orphans) {

        exit(1);

    }

}



DriveInfo *drive_get_by_index(BlockInterfaceType type, int index)

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/cubieboard.c

+4 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ static void cubieboard_init(MachineState *machine) 
    memory_region_add_subregion(get_system_memory(), AW_A10_SDRAM_BASE,

                                &s->sdram);



    /* TODO create and connect IDE devices for ide_drive_get() */



    cubieboard_binfo.ram_size = machine->ram_size;

    cubieboard_binfo.kernel_filename = machine->kernel_filename;

    cubieboard_binfo.kernel_cmdline = machine->kernel_cmdline;
@@ -82,6 +84,8 @@ static void cubieboard_machine_init(MachineClass *mc) 
{

    mc->desc = "cubietech cubieboard";

    mc->init = cubieboard_init;

    mc->block_default_type = IF_IDE;

    mc->units_per_default_bus = 1;

}



DEFINE_MACHINE("cubieboard", cubieboard_machine_init)

hw/arm/highbank.c

+6 −2
Original line number Diff line number Diff line
@@ -363,6 +363,8 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) 
        sysbus_connect_irq(SYS_BUS_DEVICE(dev), 2, pic[82]);

    }



    /* TODO create and connect IDE devices for ide_drive_get() */



    highbank_binfo.ram_size = ram_size;

    highbank_binfo.kernel_filename = kernel_filename;

    highbank_binfo.kernel_cmdline = kernel_cmdline;
@@ -405,7 +407,8 @@ static void highbank_class_init(ObjectClass *oc, void *data) 


    mc->desc = "Calxeda Highbank (ECX-1000)";

    mc->init = highbank_init;

    mc->block_default_type = IF_SCSI;

    mc->block_default_type = IF_IDE;

    mc->units_per_default_bus = 1;

    mc->max_cpus = 4;

}
@@ -421,7 +424,8 @@ static void midway_class_init(ObjectClass *oc, void *data) 


    mc->desc = "Calxeda Midway (ECX-2000)";

    mc->init = midway_init;

    mc->block_default_type = IF_SCSI;

    mc->block_default_type = IF_IDE;

    mc->units_per_default_bus = 1;

    mc->max_cpus = 4;

}

hw/arm/realview.c

+1 −2
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static void realview_init(MachineState *machine, 
        }

        n = drive_get_max_bus(IF_SCSI);

        while (n >= 0) {

            pci_create_simple(pci_bus, -1, "lsi53c895a");

            lsi53c895a_create(pci_bus);

            n--;

        }

    }
@@ -443,7 +443,6 @@ static void realview_pbx_a9_class_init(ObjectClass *oc, void *data) 


    mc->desc = "ARM RealView Platform Baseboard Explore for Cortex-A9";

    mc->init = realview_pbx_a9_init;

    mc->block_default_type = IF_SCSI;

    mc->max_cpus = 4;

}