Skip to content

Commit

Permalink
blockdev: Improve message for orphaned -drive
Browse files Browse the repository at this point in the history
We warn when a -drive isn't supported by the machine type (commit
a66c9dc):

    $ qemu-system-x86_64 -S -display none -drive if=mtd
    Warning: Orphaned drive without device: id=mtd0,file=,if=mtd,bus=0,unit=0

Improve this to point to the offending bit of configuration:

    qemu-system-x86_64: -drive if=mtd: warning: machine type does not support if=mtd,bus=0,unit=0

Especially nice when it's hidden behind -readconfig foo.cfg:

    qemu-system-x86_64:foo.cfg:140: warning: machine type does not support if=mtd,bus=0,unit=0

Signed-off-by: Markus Armbruster <[email protected]>
Message-Id: <[email protected]>
Reviewed-by: John Snow <[email protected]>
  • Loading branch information
Markus Armbruster committed Feb 21, 2017
1 parent 2a7ae4e commit 664cc62
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions blockdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ bool drive_check_orphaned(void)
{
BlockBackend *blk;
DriveInfo *dinfo;
Location loc;
bool rs = false;

for (blk = blk_next(NULL); blk; blk = blk_next(blk)) {
Expand All @@ -239,10 +240,12 @@ bool drive_check_orphaned(void)
/* 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 : "",
if_name[dinfo->type], dinfo->bus, dinfo->unit);
loc_push_none(&loc);
qemu_opts_loc_restore(dinfo->opts);
error_report("warning: machine type does not support"
" if=%s,bus=%d,unit=%d",
if_name[dinfo->type], dinfo->bus, dinfo->unit);
loc_pop(&loc);
rs = true;
}
}
Expand Down

0 comments on commit 664cc62

Please sign in to comment.