[Qemu-devel] [PATCH v3 0/4]
v3 cover [Qemu-devel] [PATCH v3 0/4]
Changes from v2:
Patch 1: Fixed prototype for id_generate() (thanks Alberto)
Used *const instead of * const (thanks Eric, Markus) Updated function comment (thanks Markus)
Made random in range 0-99 instead of 0-98 (thanks, Marksu)
Patch 2: Cleaned up comments (thanks Markus)
use else if instead of nested if (thanks Markus) assign node_name on same line as gen_node_name (thanks Markus)
Patch 3,4: new - fix iotests (thanks Kevin)
Changes from RFC v1:
Patch 1: Several typos / grammatical errors (thanks Eric, John)
Make id_subsys_str[] const pointer to const strings (thanks Eric) Moved id_subsys_str[] out from id_generate() (thanks John) Assert on null string for given id (thanks Eric) Zero-pad the 2-digit random # (thanks John)
Patch 2: None
Born from the conversation on qemu-devel, this generation scheme uses the format ultimately proposed by Kevin, after list discussion.
It attempts to keep the ID strings as small as possible, while fulfilling:
1.) Guarantee no collisions with a user-specified ID
2.) Identify the sub-system the ID belongs to
3.) Guarantee of uniqueness
4.) Spoiling predictibility, to avoid creating an assumption
of object ordering and parsing (i.e., we don't want users to think they can guess the next ID based on prior behavior).
See patch 1 for the generation scheme details.
Jeff Cody (4):
util - add automated ID generation utility
block: auto-generated node-names
block: add filter for generated node-names
qemu-iotests: update tests for generated node-names
block.c | 19 ++++++++++++------- include/qemu-common.h | 8 ++++++++ tests/qemu-iotests/041 | 4 ++-- tests/qemu-iotests/051 | 3 ++- tests/qemu-iotests/051.out | 2 +- tests/qemu-iotests/067 | 3 ++- tests/qemu-iotests/067.out | 5 +++++ tests/qemu-iotests/081 | 3 ++- tests/qemu-iotests/081.out | 2 +- tests/qemu-iotests/common.filter | 5 +++++ util/id.c | 37 +++++++++++++++++++++++++++++++++++++ 11 files changed, 77 insertions(+), 14 deletions(-)
Signature · 1 line
1.9.3
PATCH v3 1/4 util - add automated ID generation utility
Multiple sub-systems in QEMU may find it useful to generate IDs for objects that a user may reference via QMP or HMP. This patch presents a standardized way to do it, so that automatic ID generation follows the same rules.
This patch enforces the following rules when generating an ID:
1.) Guarantee no collisions with a user-specified ID
2.) Identify the sub-system the ID belongs to
3.) Guarantee of uniqueness
4.) Spoiling predictability, to avoid creating an assumption
of object ordering and parsing (i.e., we don't want users to think they can guess the next ID based on prior behavior).
The scheme for this is as follows (no spaces):
# subsys D RR Reserved char --| | | | Subsystem String ----| | | Unique number (64-bit) --| | Two-digit random number ---|
For example, a generated node-name for the block sub-system may look like this:
#block076
The caller of id_generate() is responsible for freeing the generated node name string with g_free().
--- include/qemu-common.h | 8 ++++++++ util/id.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+)
include/qemu-common.h +8 -0
@@ -246,6 +246,14 @@ int64_t qemu_strtosz_suffix_unit(const char *nptr, char **end,#define STR_OR_NULL (str) ((str) ? (str) : "null")/* id.c */ + +typedef enum IdSubSystems { +ID_QDEV , +ID_BLOCK , +ID_MAX /* last element, used as array size */ +}IdSubSystems ; + +char *id_generate (IdSubSystems id);bool id_wellformed (const char *id);/* path.c */
util/id.c +37 -0
@@ -26,3 +26,40 @@ bool id_wellformed(const char *id) }return true; } + +#define ID_SPECIAL_CHAR '#' + +static const char *const id_subsys_str[] = { + [ID_QDEV ] ="qdev" , + [ID_BLOCK ] ="block" , +}; + +/* +* Generates an ID of the form PREFIX SUBSYSTEM NUMBER +* where: +* +* - PREFIX is the reserved character '#' +* - SUBSYSTEM identifies the subsystem creating the ID +* - NUMBER is a decimal number unique within SUBSYSTEM. +* +* Example: "#block146" +* +* Note that these IDs do not satisfy id_wellformed(). +* +* The caller is responsible for freeing the returned string with g_free() +*/ +char *id_generate (IdSubSystems id) +{ +static uint64_t id_counters[ID_MAX ]; +uint32_t rnd; + +assert (id <ID_MAX ); +assert (id_subsys_str[id]); + + rnd =g_random_int_range (0 ,100 ); + +return g_strdup_printf ("%c%s%" PRIu64"%02" PRId32,ID_SPECIAL_CHAR , + id_subsys_str[id], + id_counters[id]++, + rnd); +}
Signature · 1 line
1.9.3
Re: [Qemu-devel] [PATCH v3 1/4] util - add automated ID generation utility
Quoted 44 lines · Jeff Cody
Multiple sub-systems in QEMU may find it useful to generate IDs for objects that a user may reference via QMP or HMP. This patch presents a standardized way to do it, so that automatic ID generation follows the same rules.
This patch enforces the following rules when generating an ID:
1.) Guarantee no collisions with a user-specified ID
2.) Identify the sub-system the ID belongs to
3.) Guarantee of uniqueness
4.) Spoiling predictability, to avoid creating an assumption
of object ordering and parsing (i.e., we don't want users to think they can guess the next ID based on prior behavior).The scheme for this is as follows (no spaces):
# subsys D RR Reserved char --| | | | Subsystem String ----| | | Unique number (64-bit) --| | Two-digit random number ---|For example, a generated node-name for the block sub-system may look like this:
#block076The caller of
id_generate()is responsible for freeing the generated node name string withg_free().Reviewed-by John Snow <[email protected]>Reviewed-by Eric Blake <[email protected]>Reviewed-by Alberto Garcia <[email protected]>Signed-off-by Jeff Cody <[email protected]>--- include/qemu-common.h | 8 ++++++++ util/id.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+)include/qemu-common.h +0
-0
include/qemu-common.h int64_t qemu_strtosz_suffix_unit(const char *nptr, char **end, · line 251
Quoted 6 lines
include/qemu-common.h +3
-0@@ -246,6 +246,14 @@ int64_t qemu_strtosz_suffix_unit(const char *nptr, char **end,#define STR_OR_NULL (str) ((str) ? (str) : "null")/* id.c */ + +typedef enum IdSubSystems { + ID_QDEV,
ID_QDEV is not used in this series. Do you intend to use it in a followup-series? Can we reasonably expect that series will be accepted?
You could sidestep these questions by making id_generate() take a string argument ;)
Quoted 8 lines
include/qemu-common.h +5
-0+ID_BLOCK , + ID_MAX /* last element, used as array size */ +} IdSubSystems; + +char *id_generate (IdSubSystems id);bool id_wellformed (const char *id);/* path.c */
[...]
Re: [Qemu-devel] [PATCH v3 1/4] util - add automated ID generation utility
Quoted 48 lines · Markus Armbruster
Quoted 46 lines · Jeff Cody
Multiple sub-systems in QEMU may find it useful to generate IDs for objects that a user may reference via QMP or HMP. This patch presents a standardized way to do it, so that automatic ID generation follows the same rules.
This patch enforces the following rules when generating an ID:
1.) Guarantee no collisions with a user-specified ID
2.) Identify the sub-system the ID belongs to
3.) Guarantee of uniqueness
4.) Spoiling predictability, to avoid creating an assumption
of object ordering and parsing (i.e., we don't want users to think they can guess the next ID based on prior behavior).The scheme for this is as follows (no spaces):
# subsys D RR Reserved char --| | | | Subsystem String ----| | | Unique number (64-bit) --| | Two-digit random number ---|For example, a generated node-name for the block sub-system may look like this:
#block076The caller of
id_generate()is responsible for freeing the generated node name string withg_free().Reviewed-by John Snow <[email protected]>Reviewed-by Eric Blake <[email protected]>Reviewed-by Alberto Garcia <[email protected]>Signed-off-by Jeff Cody <[email protected]>--- include/qemu-common.h | 8 ++++++++ util/id.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+)include/qemu-common.h +0
-0@@ -246,6 +246,14 @@ int64_t qemu_strtosz_suffix_unit(const char *nptr, char **end,#define STR_OR_NULL (str) ((str) ? (str) : "null")
Quoted 8 lines
include/qemu-common.h int64_t qemu_strtosz_suffix_unit(const char *nptr, char **end, · line 251
Quoted 4 lines
include/qemu-common.h +3
-0/* id.c */ + +typedef enum IdSubSystems { + ID_QDEV,
ID_QDEVis not used in this series. Do you intend to use it in a followup-series? Can we reasonably expect that series will be accepted?
John Arbuckle has a patch on list that uses it. I haven't reviewed it, however - but I guess it depends ultimately on whether qdev will allow autogeneration for its IDs or not.
Quoted 3 lines
You could sidestep these questions by making
id_generate()take a string argument ;)
I'd rather avoid having each system specifying a string inline in their code. It is cleaner to have the strings defined in a central location, I think (not to mention, easier to reference).
Quoted 9 lines
Quoted 8 lines
include/qemu-common.h +5
-0+ID_BLOCK , + ID_MAX /* last element, used as array size */ +} IdSubSystems; + +char *id_generate (IdSubSystems id);bool id_wellformed (const char *id);/* path.c */ [...]
Re: [Qemu-devel] [PATCH v3 1/4] util - add automated ID generation utility
Quoted 58 lines · Jeff Cody
Quoted 48 lines · Markus Armbruster
Quoted 46 lines · Jeff Cody
Multiple sub-systems in QEMU may find it useful to generate IDs for objects that a user may reference via QMP or HMP. This patch presents a standardized way to do it, so that automatic ID generation follows the same rules.
This patch enforces the following rules when generating an ID:
1.) Guarantee no collisions with a user-specified ID
2.) Identify the sub-system the ID belongs to
3.) Guarantee of uniqueness
4.) Spoiling predictability, to avoid creating an assumption
of object ordering and parsing (i.e., we don't want users to think they can guess the next ID based on prior behavior).The scheme for this is as follows (no spaces):
# subsys D RR Reserved char --| | | | Subsystem String ----| | | Unique number (64-bit) --| | Two-digit random number ---|For example, a generated node-name for the block sub-system may look like this:
#block076The caller of
id_generate()is responsible for freeing the generated node name string withg_free().Reviewed-by John Snow <[email protected]>Reviewed-by Eric Blake <[email protected]>Reviewed-by Alberto Garcia <[email protected]>Signed-off-by Jeff Cody <[email protected]>--- include/qemu-common.h | 8 ++++++++ util/id.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+)include/qemu-common.h +0
-0@@ -246,6 +246,14 @@ int64_t qemu_strtosz_suffix_unit(const char *nptr, char **end,#define STR_OR_NULL (str) ((str) ? (str) : "null")Quoted 8 lines
include/qemu-common.h int64_t qemu_strtosz_suffix_unit(const char *nptr, char **end, · line 251
Quoted 4 lines
include/qemu-common.h +3
-0/* id.c */ + +typedef enum IdSubSystems { + ID_QDEV,
ID_QDEVis not used in this series. Do you intend to use it in a followup-series? Can we reasonably expect that series will be accepted?
Quoted 3 lines
John Arbuckle has a patch on list that uses it. I haven't reviewed it, however - but I guess it depends ultimately on whether qdev will allow autogeneration for its IDs or not.
Then that patch should add ID_QDEV.
Quoted 7 lines
Quoted 3 lines
You could sidestep these questions by making
id_generate()take a string argument ;)I'd rather avoid having each system specifying a string inline in their code. It is cleaner to have the strings defined in a central location, I think (not to mention, easier to reference).
Covered by your artistic license :)
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
include/qemu-common.h +5
-0+ID_BLOCK , + ID_MAX /* last element, used as array size */ +} IdSubSystems; + +char *id_generate (IdSubSystems id);bool id_wellformed (const char *id);/* path.c */ [...]
Re: [Qemu-devel] [PATCH v3 1/4] util - add automated ID generation utility
Quoted 70 lines · Markus Armbruster
Quoted 58 lines · Jeff Cody
Quoted 48 lines · Markus Armbruster
Quoted 46 lines · Jeff Cody
Multiple sub-systems in QEMU may find it useful to generate IDs for objects that a user may reference via QMP or HMP. This patch presents a standardized way to do it, so that automatic ID generation follows the same rules.
This patch enforces the following rules when generating an ID:
1.) Guarantee no collisions with a user-specified ID
2.) Identify the sub-system the ID belongs to
3.) Guarantee of uniqueness
4.) Spoiling predictability, to avoid creating an assumption
of object ordering and parsing (i.e., we don't want users to think they can guess the next ID based on prior behavior).The scheme for this is as follows (no spaces):
# subsys D RR Reserved char --| | | | Subsystem String ----| | | Unique number (64-bit) --| | Two-digit random number ---|For example, a generated node-name for the block sub-system may look like this:
#block076The caller of
id_generate()is responsible for freeing the generated node name string withg_free().Reviewed-by John Snow <[email protected]>Reviewed-by Eric Blake <[email protected]>Reviewed-by Alberto Garcia <[email protected]>Signed-off-by Jeff Cody <[email protected]>--- include/qemu-common.h | 8 ++++++++ util/id.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+)include/qemu-common.h +0
-0@@ -246,6 +246,14 @@ int64_t qemu_strtosz_suffix_unit(const char *nptr, char **end,#define STR_OR_NULL (str) ((str) ? (str) : "null")Quoted 8 lines
include/qemu-common.h int64_t qemu_strtosz_suffix_unit(const char *nptr, char **end, · line 251
Quoted 4 lines
include/qemu-common.h +3
-0/* id.c */ + +typedef enum IdSubSystems { + ID_QDEV,
ID_QDEVis not used in this series. Do you intend to use it in a followup-series? Can we reasonably expect that series will be accepted?Quoted 3 lines
John Arbuckle has a patch on list that uses it. I haven't reviewed it, however - but I guess it depends ultimately on whether qdev will allow autogeneration for its IDs or not.
Then that patch should add
ID_QDEV.Quoted 4 lines
Quoted 3 lines
You could sidestep these questions by making
id_generate()take a string argument ;)
Quoted 6 lines
Quoted 3 lines
I'd rather avoid having each system specifying a string inline in their code. It is cleaner to have the strings defined in a central location, I think (not to mention, easier to reference).
Covered by your artistic license :)
I think our engineering license would have us do it the way Jeff already is -- If we want a central unique ID generator utility, it would be best to disallow different areas of code from specifying their own IDs ... it's bound to lead to collisions and heartbreak someday.
Easiest to just keep an enum and if you decide you need to use this facility, add your name to the Registry Of Accepted Subcomponents and keep moving.
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
include/qemu-common.h +5
-0+ID_BLOCK , + ID_MAX /* last element, used as array size */ +} IdSubSystems; + +char *id_generate (IdSubSystems id);bool id_wellformed (const char *id);/* path.c */ [...]
Re: [Qemu-devel] [PATCH v3 1/4] util - add automated ID generation utility
In reply to Markus ArmbrusterQuoted 60 lines · Markus Armbruster
Quoted 58 lines · Jeff Cody
Quoted 56 lines · Markus Armbruster
Quoted 44 lines · Jeff Cody
Multiple sub-systems in QEMU may find it useful to generate IDs for objects that a user may reference via QMP or HMP. This patch presents a standardized way to do it, so that automatic ID generation follows the same rules.
This patch enforces the following rules when generating an ID:
1.) Guarantee no collisions with a user-specified ID
2.) Identify the sub-system the ID belongs to
3.) Guarantee of uniqueness
4.) Spoiling predictability, to avoid creating an assumption
of object ordering and parsing (i.e., we don't want users to think they can guess the next ID based on prior behavior).The scheme for this is as follows (no spaces):
# subsys D RR Reserved char --| | | | Subsystem String ----| | | Unique number (64-bit) --| | Two-digit random number ---|For example, a generated node-name for the block sub-system may look like this:
#block076The caller of
id_generate()is responsible for freeing the generated node name string withg_free().Reviewed-by John Snow <[email protected]>Reviewed-by Eric Blake <[email protected]>Reviewed-by Alberto Garcia <[email protected]>Signed-off-by Jeff Cody <[email protected]>---
include/qemu-common.h| 8 ++++++++util/id.c| 37 +++++++++++++++++++++++++++++++++++++2 files changed, 45 insertions(+)include/qemu-common.h +0
-0include/qemu-common.h int64_t qemu_strtosz_suffix_unit(const char *nptr, char **end, · line 251
Quoted 6 lines
include/qemu-common.h +3
-0@@ -246,6 +246,14 @@ int64_t qemu_strtosz_suffix_unit(const char *nptr, char **end,#define STR_OR_NULL (str) ((str) ? (str) : "null")/* id.c */ + +typedef enum IdSubSystems { + ID_QDEV,
ID_QDEVis not used in this series. Do you intend to use it in a followup-series? Can we reasonably expect that series will be accepted?
Quoted 13 lines
Quoted 3 lines
John Arbuckle has a patch on list that uses it. I haven't reviewed it, however - but I guess it depends ultimately on whether qdev will allow autogeneration for its IDs or not.
Then that patch should add
ID_QDEV.Quoted 7 lines
Quoted 3 lines
You could sidestep these questions by making
id_generate()take a string argument ;)I'd rather avoid having each system specifying a string inline in their code. It is cleaner to have the strings defined in a central location, I think (not to mention, easier to reference).
I can see the benefit of using a string. The id_generate() function could use va_args like printf() uses to allow almost any kind of string argument. An empty string argument could mean to default to ID_MAX. But I also think using an enumeration is good enough, so either way is good.
PATCH v3 2/4 block: auto-generated node-names
In reply to Jeff CodyIf a node-name is not specified, automatically generate the node-name.
Generated node-names will use the "block" sub-system identifier.
--- block.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
block.c +12 -7
@@ -763,12 +763,15 @@ static void bdrv_assign_node_name(BlockDriverState *bs,const char *node_name, Error **errp) { + char *gen_node_name = NULL; +if (!node_name) { -return ; - } - -/* Check for empty string or invalid characters */ -if (!id_wellformed (node_name)) { + node_name = gen_node_name =id_generate (ID_BLOCK ); + }else if (!id_wellformed (node_name)) { +/* +* Check for empty string or invalid characters, but not if it is +* generated (generated names use characters not available to the user) +*/ error_setg (errp,"Invalid node name" );return ; }
@@ -777,18 +780,20 @@ static void bdrv_assign_node_name(BlockDriverState *bs,if (blk_by_name (node_name)) {error_setg (errp,"node-name=%s is conflicting with a device id" , node_name); -return ; + goto out; }/* takes care of avoiding duplicates node names */ if (bdrv_find_node (node_name)) {error_setg (errp,"Duplicate node name" ); -return ; + goto out; }/* copy node name into the bs and insert it into the graph list */ pstrcpy (bs->node_name,sizeof (bs->node_name), node_name);QTAILQ_INSERT_TAIL (&graph_bdrv_states, bs, node_list); +out: +g_free (gen_node_name); }static QemuOptsList bdrv_runtime_opts = {
Signature · 1 line
1.9.3
Re: [Qemu-devel] [PATCH v3 2/4] block: auto-generated node-names
Quoted 26 lines · Jeff Cody
If a node-name is not specified, automatically generate the node-name.
Generated node-names will use the "block" sub-system identifier.
Reviewed-by Eric Blake <[email protected]>Reviewed-by John Snow <[email protected]>Signed-off-by Jeff Cody <[email protected]>--- block.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)block.c +2
-4@@ -763,12 +763,15 @@ static void bdrv_assign_node_name(BlockDriverState *bs,const char *node_name, Error **errp) { + char *gen_node_name = NULL; +if (!node_name) { -return ; - } - -/* Check for empty string or invalid characters */
block.c static void bdrv_assign_node_name(BlockDriverState *bs, · line 777
Quoted 10 lines
block.c +6
-1-if (!id_wellformed (node_name)) { + node_name = gen_node_name =id_generate (ID_BLOCK ); + }else if (!id_wellformed (node_name)) { +/* +* Check for empty string or invalid characters, but not if it is +* generated (generated names use characters not available to the user) +*/ error_setg (errp,"Invalid node name" );return ; }
I'd drop the comment, as the code is obvious enough now. Could be done on commit.
Quoted 13 lines
block.c +2
-2@@ -777,18 +780,20 @@ static void bdrv_assign_node_name(BlockDriverState *bs,if (blk_by_name (node_name)) {error_setg (errp,"node-name=%s is conflicting with a device id" , node_name); -return ; + goto out; }/* takes care of avoiding duplicates node names */ if (bdrv_find_node (node_name)) {error_setg (errp,"Duplicate node name" ); -return ; + goto out;
block.c static void bdrv_assign_node_name(BlockDriverState *bs, · line 799
Quoted 10 lines
block.c +2
-0}/* copy node name into the bs and insert it into the graph list */ pstrcpy (bs->node_name,sizeof (bs->node_name), node_name);QTAILQ_INSERT_TAIL (&graph_bdrv_states, bs, node_list); +out: +g_free (gen_node_name); }static QemuOptsList bdrv_runtime_opts = {
PATCH v3 3/4 block: add filter for generated node-names
In reply to Jeff Cody--- tests/qemu-iotests/common.filter | 5 +++++ 1 file changed, 5 insertions(+)
tests/qemu-iotests/common.filter +5 -0
@@ -128,6 +128,11 @@ _filter_date() -e 's/[A-Z][a-z][a-z] [A-z][a-z][a-z] *[0-9][0-9]* [0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9][0-9][0-9][0-9]$/DATE/' } +_filter_generated_node_ids() +{ + sed -re 's/\#block[0-9]{3,}/NODE_NAME/' +} + # replace occurrences of the actual TEST_DIR value with TEST_DIR _filter_testdir() {
Signature · 1 line
1.9.3
PATCH v3 4/4 qemu-iotests: update tests for generated node-names
In reply to Jeff Cody--- tests/qemu-iotests/041 | 4 ++-- tests/qemu-iotests/051 | 3 ++- tests/qemu-iotests/051.out | 2 +- tests/qemu-iotests/067 | 3 ++- tests/qemu-iotests/067.out | 5 +++++ tests/qemu-iotests/081 | 3 ++- tests/qemu-iotests/081.out | 2 +- 7 files changed, 15 insertions(+), 7 deletions(-)
tests/qemu-iotests/041 +2 -2
@@ -780,7 +780,7 @@ class TestRepairQuorum(iotests.QMPTestCase): # here we check that the last registered quorum file has not been # swapped out and unref result = self.vm.qmp('query-named-block-nodes') - self.assert_qmp(result, 'return[0]/file', quorum_img3) + self.assert_qmp(result, 'return[1]/file', quorum_img3) self.vm.shutdown() def test_cancel_after_ready(self):
@@ -799,7 +799,7 @@ class TestRepairQuorum(iotests.QMPTestCase): result = self.vm.qmp('query-named-block-nodes') # here we check that the last registered quorum file has not been # swapped out and unref - self.assert_qmp(result, 'return[0]/file', quorum_img3) + self.assert_qmp(result, 'return[1]/file', quorum_img3) self.vm.shutdown() self.assertTrue(iotests.compare_images(quorum_img2, quorum_repair_img), 'target image does not match source after mirroring')
tests/qemu-iotests/051 +2 -1
@@ -108,7 +108,8 @@ echo echo === Overriding backing file === echo -echo "info block" | run_qemu -drive file="$TEST_IMG",driver=qcow2,backing.file.filename="$TEST_IMG.orig" -nodefaults +echo "info block" | run_qemu -drive file="$TEST_IMG",driver=qcow2,backing.file.filename="$TEST_IMG.orig" -nodefaults\ + | _filter_generated_node_ids # Drivers that don't support backing files run_qemu -drive file="$TEST_IMG",driver=raw,backing.file.filename="$TEST_IMG.orig"
tests/qemu-iotests/051.out +1 -1
@@ -59,7 +59,7 @@ QEMU X.Y.Z monitor - type 'help' for more information Testing: -drive file=TEST_DIR/t.qcow2,driver=qcow2,backing.file.filename=TEST_DIR/t.qcow2.orig -nodefaults QEMU X.Y.Z monitor - type 'help' for more information (qemu) i[K[Din[K[D[Dinf[K[D[D[Dinfo[K[D[D[D[Dinfo [K[D[D[D[D[Dinfo b[K[D[D[D[D[D[Dinfo bl[K[D[D[D[D[D[D[Dinfo blo[K[D[D[D[D[D[D[D[Dinfo bloc[K[D[D[D[D[D[D[D[D[Dinfo block[K -ide0-hd0: TEST_DIR/t.qcow2 (qcow2) +ide0-hd0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) Cache mode: writeback Backing file: TEST_DIR/t.qcow2.orig (chain depth: 1) (qemu) q[K[Dqu[K[D[Dqui[K[D[D[Dquit[K
tests/qemu-iotests/067 +2 -1
@@ -48,7 +48,8 @@ function do_run_qemu() function run_qemu() { do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp | _filter_qemu \ - | sed -e 's/\("actual-size":\s*\)[0-9]\+/\1SIZE/g' + | sed -e 's/\("actual-size":\s*\)[0-9]\+/\1SIZE/g' \ + | _filter_generated_node_ids } size=128M
tests/qemu-iotests/067.out +5 -0
@@ -40,6 +40,7 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virti }, "iops_wr": 0, "ro": false, + "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "qcow2", "iops": 0,
@@ -151,6 +152,7 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk }, "iops_wr": 0, "ro": false, + "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "qcow2", "iops": 0,
@@ -270,6 +272,7 @@ Testing: }, "iops_wr": 0, "ro": false, + "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "qcow2", "iops": 0,
@@ -390,6 +393,7 @@ Testing: }, "iops_wr": 0, "ro": false, + "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "qcow2", "iops": 0,
@@ -480,6 +484,7 @@ Testing: }, "iops_wr": 0, "ro": false, + "node-name": "NODE_NAME", "backing_file_depth": 0, "drv": "qcow2", "iops": 0,
tests/qemu-iotests/081 +2 -1
@@ -53,7 +53,8 @@ function do_run_qemu() function run_qemu() { - do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_qmp | _filter_qemu_io + do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_qmp\ + | _filter_qemu_io | _filter_generated_node_ids } test_quorum=$($QEMU_IMG --help|grep quorum)
tests/qemu-iotests/081.out +1 -1
@@ -30,7 +30,7 @@ Testing: -drive file=TEST_DIR/2.IMGFMT,format=IMGFMT,if=none,id=drive2 QMP_VERSION {"return": {}} {"return": {}} -{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "QUORUM_REPORT_BAD", "data": {"node-name": "", "sectors-count": 20480, "sector-num": 0}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "QUORUM_REPORT_BAD", "data": {"node-name": "NODE_NAME", "sectors-count": 20480, "sector-num": 0}} read 10485760/10485760 bytes at offset 0 10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) {"return": ""}
Signature · 1 line
1.9.3
Re: [Qemu-devel] [PATCH v3 4/4] qemu-iotests: update tests for generated node-names
Shouldn't PATCH 3+4 be squashed into PATCH 2 to keep bisection working?
Re: [Qemu-devel] [PATCH v3 4/4] qemu-iotests: update tests for generated node-names
Quoted 1 line · Markus Armbruster
Shouldn't PATCH 3+4 be squashed into PATCH 2 to keep bisection working?
Yes, they should!
Am 13.10.2015 um 01:36 hat Jeff Cody geschrieben:
Quoted 5 lines
Born from the conversation on qemu-devel, this generation scheme uses the format ultimately proposed by Kevin, after list discussion.
It attempts to keep the ID strings as small as possible, while fulfilling:
Quoted 8 lines
1.) Guarantee no collisions with a user-specified ID
2.) Identify the sub-system the ID belongs to
3.) Guarantee of uniqueness
4.) Spoiling predictibility, to avoid creating an assumption
of object ordering and parsing (i.e., we don't want users to think they can guess the next ID based on prior behavior).See patch 1 for the generation scheme details.
Thanks, squashed patches 2-4 and applied to the block branch.
Kevin
Quoted 13 lines · Kevin Wolf
Am 13.10.2015 um 01:36 hat Jeff Cody geschrieben:
Quoted 12 lines
Born from the conversation on qemu-devel, this generation scheme uses the format ultimately proposed by Kevin, after list discussion.
It attempts to keep the ID strings as small as possible, while fulfilling:
1.) Guarantee no collisions with a user-specified ID
2.) Identify the sub-system the ID belongs to
3.) Guarantee of uniqueness
4.) Spoiling predictibility, to avoid creating an assumption
of object ordering and parsing (i.e., we don't want users to think they can guess the next ID based on prior behavior).
Quoted 3 lines
Quoted 1 line
See patch 1 for the generation scheme details.
Thanks, squashed patches 2-4 and applied to the block branch.
If you drop ID_QDEV, you can add my R-by.