[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/23] block: Don't look for child references in appe
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 05/23] block: Don't look for child references in append_open_options() |
Date: |
Mon, 1 Oct 2018 19:18:43 +0200 |
From: Alberto Garcia <address@hidden>
In the previous patch we removed child references from bs->options, so
there's no need to look for them here anymore.
Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/block.c b/block.c
index db71ea5b9a..98aca56785 100644
--- a/block.c
+++ b/block.c
@@ -5150,23 +5150,12 @@ static bool append_open_options(QDict *d,
BlockDriverState *bs)
{
const QDictEntry *entry;
QemuOptDesc *desc;
- BdrvChild *child;
bool found_any = false;
for (entry = qdict_first(bs->options); entry;
entry = qdict_next(bs->options, entry))
{
- /* Exclude node-name references to children */
- QLIST_FOREACH(child, &bs->children, next) {
- if (!strcmp(entry->key, child->name)) {
- break;
- }
- }
- if (child) {
- continue;
- }
-
- /* And exclude all non-driver-specific options */
+ /* Exclude all non-driver-specific options */
for (desc = bdrv_runtime_opts.desc; desc->name; desc++) {
if (!strcmp(qdict_entry_key(entry), desc->name)) {
break;
--
2.13.6
- [Qemu-devel] [PULL 00/23] Block layer patches, Kevin Wolf, 2018/10/01
- [Qemu-devel] [PULL 02/23] qemu-io: Fix writethrough check in reopen, Kevin Wolf, 2018/10/01
- [Qemu-devel] [PULL 01/23] file-posix: Include filename in locking error message, Kevin Wolf, 2018/10/01
- [Qemu-devel] [PULL 03/23] file-posix: x-check-cache-dropped should default to false on reopen, Kevin Wolf, 2018/10/01
- [Qemu-devel] [PULL 04/23] block: Remove child references from bs->{options, explicit_options}, Kevin Wolf, 2018/10/01
- [Qemu-devel] [PULL 06/23] block: Allow child references on reopen, Kevin Wolf, 2018/10/01
- [Qemu-devel] [PULL 07/23] block: Forbid trying to change unsupported options during reopen, Kevin Wolf, 2018/10/01
- [Qemu-devel] [PULL 05/23] block: Don't look for child references in append_open_options(),
Kevin Wolf <=
- [Qemu-devel] [PULL 10/23] block: Allow changing 'detect-zeroes' on reopen, Kevin Wolf, 2018/10/01
- [Qemu-devel] [PULL 09/23] block: Allow changing 'discard' on reopen, Kevin Wolf, 2018/10/01
- [Qemu-devel] [PULL 08/23] file-posix: Forbid trying to change unsupported options during reopen, Kevin Wolf, 2018/10/01
- [Qemu-devel] [PULL 17/23] qcow2: Resize the cache upon image resizing, Kevin Wolf, 2018/10/01
- [Qemu-devel] [PULL 19/23] qcow2: Explicit number replaced by a constant, Kevin Wolf, 2018/10/01