[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 11/24] Revert "block: Remove dead deprecation warning
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 11/24] Revert "block: Remove dead deprecation warning code" |
Date: |
Tue, 10 Jul 2018 17:42:51 +0200 |
From: Cornelia Huck <address@hidden>
This reverts commit 6266e900b8083945cb766b45c124fb3c42932cb3.
Some deprecated -drive options were still in use by libvirt, only
fixed with libvirt commit b340c6c614 ("qemu: format serial and geometry
on frontend disk device"), which is not yet in any released version
of libvirt.
So let's hold off removing the deprecated options for one more QEMU
release.
Reported-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
blockdev.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/blockdev.c b/blockdev.c
index 72f5347df5..37eb40670b 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -775,6 +775,8 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType
block_default_type)
const char *filename;
Error *local_err = NULL;
int i;
+ const char *deprecated[] = {
+ };
/* Change legacy command line options into QMP ones */
static const struct {
@@ -851,6 +853,16 @@ DriveInfo *drive_new(QemuOpts *all_opts,
BlockInterfaceType block_default_type)
goto fail;
}
+ /* Other deprecated options */
+ if (!qtest_enabled()) {
+ for (i = 0; i < ARRAY_SIZE(deprecated); i++) {
+ if (qemu_opt_get(legacy_opts, deprecated[i]) != NULL) {
+ error_report("'%s' is deprecated, please use the corresponding
"
+ "option of '-device' instead", deprecated[i]);
+ }
+ }
+ }
+
/* Media type */
value = qemu_opt_get(legacy_opts, "media");
if (value) {
--
2.13.6
- [Qemu-block] [PULL 00/24] Block layer patches, Kevin Wolf, 2018/07/10
- [Qemu-block] [PULL 03/24] block: Fix copy-on-read crash with partial final cluster, Kevin Wolf, 2018/07/10
- [Qemu-block] [PULL 01/24] block: Poll after drain on attaching a node, Kevin Wolf, 2018/07/10
- [Qemu-block] [PULL 02/24] test-bdrv-drain: Test bdrv_append() to drained node, Kevin Wolf, 2018/07/10
- [Qemu-block] [PULL 04/24] iotests: 222: Don't run with luks, Kevin Wolf, 2018/07/10
- [Qemu-block] [PULL 06/24] block: split flags in copy_range, Kevin Wolf, 2018/07/10
- [Qemu-block] [PULL 05/24] block/io: fix copy_range, Kevin Wolf, 2018/07/10
- [Qemu-block] [PULL 07/24] block: add BDRV_REQ_SERIALISING flag, Kevin Wolf, 2018/07/10
- [Qemu-block] [PULL 11/24] Revert "block: Remove dead deprecation warning code",
Kevin Wolf <=
- [Qemu-block] [PULL 08/24] block/backup: fix fleecing scheme: use serialized writes, Kevin Wolf, 2018/07/10
- [Qemu-block] [PULL 09/24] qapi/block-core.json: Add missing documentation for blklogwrites log-append option, Kevin Wolf, 2018/07/10
- [Qemu-block] [PULL 10/24] block/blklogwrites: Make sure the log sector size is not too small, Kevin Wolf, 2018/07/10
- [Qemu-block] [PULL 13/24] Revert "block: Remove deprecated -drive option addr", Kevin Wolf, 2018/07/10
- [Qemu-block] [PULL 15/24] block: Prefix file driver trace points with "file_", Kevin Wolf, 2018/07/10
- [Qemu-block] [PULL 12/24] Revert "block: Remove deprecated -drive option serial", Kevin Wolf, 2018/07/10
- [Qemu-block] [PULL 14/24] Revert "block: Remove deprecated -drive geometry options", Kevin Wolf, 2018/07/10
- [Qemu-block] [PULL 16/24] block: Add copy offloading trace points, Kevin Wolf, 2018/07/10
- [Qemu-block] [PULL 17/24] block: Use BdrvChild to discard, Kevin Wolf, 2018/07/10
- [Qemu-block] [PULL 18/24] block: Use uint64_t for BdrvTrackedRequest byte fields, Kevin Wolf, 2018/07/10