[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 6/8] blockdev: Improve message for orphaned -driv
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 6/8] blockdev: Improve message for orphaned -drive |
Date: |
Wed, 15 Feb 2017 11:05:45 +0100 |
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 <address@hidden>
---
blockdev.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index db82ac9..eb75f35 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -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)) {
@@ -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;
}
}
--
2.7.4
- [Qemu-devel] [PATCH v3 0/8] More sensible default for -drive interface type, Markus Armbruster, 2017/02/15
- [Qemu-devel] [PATCH v3 6/8] blockdev: Improve message for orphaned -drive,
Markus Armbruster <=
- [Qemu-devel] [PATCH v3 7/8] blockdev: Make orphaned -drive fatal, Markus Armbruster, 2017/02/15
- [Qemu-devel] [PATCH v3 8/8] hw: Drop superfluous special checks for orphaned -drive, Markus Armbruster, 2017/02/15
- [Qemu-devel] [PATCH v3 2/8] hw/arm/cubieboard hw/arm/xlnx-ep108: Fix units_per_default_bus, Markus Armbruster, 2017/02/15
- [Qemu-devel] [PATCH v3 5/8] hw/arm/highbank: Default -drive to if=ide instead of if=scsi, Markus Armbruster, 2017/02/15
- [Qemu-devel] [PATCH v3 1/8] hw: Default -drive to if=ide explicitly where it works, Markus Armbruster, 2017/02/15
- [Qemu-devel] [PATCH v3 4/8] hw: Default -drive to if=none instead of scsi when scsi cannot work, Markus Armbruster, 2017/02/15
- [Qemu-devel] [PATCH v3 3/8] hw: Default -drive to if=none instead of ide when ide cannot work, Markus Armbruster, 2017/02/15