diff for duplicates of <20190215103239.28640-3-berrange@redhat.com> diff --git a/a/1.txt b/N1/1.txt index cfad54b..3409edc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,3 +1,5 @@ +From: Daniel P. Berrangé <berrange@redhat.com> + This reverts commit d7741743f4f3d2683d1bb6938f88dc0167c21afa. Relying on setting properties on parents types which may not @@ -7,16 +9,19 @@ be explicit about which devices get which properties, even if this needs repetition. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> +Message-Id: <20190215103239.28640-3-berrange@redhat.com> +Reviewed-by: Michael S. Tsirkin <mst@redhat.com> +Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- include/hw/qdev-core.h | 3 --- qom/object.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h -index 0a84c42756..9614f76ae6 100644 +index 33ed3b8dde..fa55dc10ae 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h -@@ -250,8 +250,6 @@ struct PropertyInfo { +@@ -251,8 +251,6 @@ struct PropertyInfo { /** * GlobalProperty: * @used: Set to true if property was used when initializing a device. @@ -25,7 +30,7 @@ index 0a84c42756..9614f76ae6 100644 * * An error is fatal for non-hotplugged devices, when the global is applied. */ -@@ -260,7 +258,6 @@ typedef struct GlobalProperty { +@@ -261,7 +259,6 @@ typedef struct GlobalProperty { const char *property; const char *value; bool used; @@ -34,7 +39,7 @@ index 0a84c42756..9614f76ae6 100644 static inline void diff --git a/qom/object.c b/qom/object.c -index b8c732063b..4e5226ca12 100644 +index d3412e7fdc..99c4fa707e 100644 --- a/qom/object.c +++ b/qom/object.c @@ -385,9 +385,6 @@ void object_apply_global_props(Object *obj, const GPtrArray *props, Error **errp @@ -48,4 +53,4 @@ index b8c732063b..4e5226ca12 100644 object_property_parse(obj, p->value, p->property, &err); if (err != NULL) { -- -2.20.1 +MST diff --git a/a/content_digest b/N1/content_digest index ba3368b..2402efe 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,15 @@ - "ref\020190215103239.28640-1-berrange@redhat.com\0" - "From\0Daniel P. Berrang\303\251 <berrange@redhat.com>\0" - "Subject\0[Qemu-devel] [PATCH v2 2/2] Revert \"globals: Allow global properties to be optional\"\0" - "Date\0Fri, 15 Feb 2019 10:32:39 +0000\0" + "ref\020190515121146.7248-1-mst@redhat.com\0" + "From\0Michael S. Tsirkin <mst@redhat.com>\0" + "Subject\0[Qemu-devel] [PULL 02/37] Revert \"globals: Allow global properties to be optional\"\0" + "Date\0Thu, 16 May 2019 08:17:48 -0400\0" "To\0qemu-devel@nongnu.org\0" - "Cc\0Michael S. Tsirkin <mst@redhat.com>" - Gonglei <arei.gonglei@huawei.com> - Marcel Apfelbaum <marcel.apfelbaum@gmail.com> - Eduardo Habkost <ehabkost@redhat.com> - Gerd Hoffmann <kraxel@redhat.com> - " Andreas F\303\244rber <afaerber@suse.de>" - " Daniel P. Berrang\303\251 <berrange@redhat.com>\0" + "Cc\0Peter Maydell <peter.maydell@linaro.org>" + " Daniel P. Berrang\303\251 <berrange@redhat.com>" + " Andreas F\303\244rber <afaerber@suse.de>\0" "\00:1\0" "b\0" + "From: Daniel P. Berrang\303\251 <berrange@redhat.com>\n" + "\n" "This reverts commit d7741743f4f3d2683d1bb6938f88dc0167c21afa.\n" "\n" "Relying on setting properties on parents types which may not\n" @@ -21,16 +19,19 @@ "this needs repetition.\n" "\n" "Signed-off-by: Daniel P. Berrang\303\251 <berrange@redhat.com>\n" + "Message-Id: <20190215103239.28640-3-berrange@redhat.com>\n" + "Reviewed-by: Michael S. Tsirkin <mst@redhat.com>\n" + "Signed-off-by: Michael S. Tsirkin <mst@redhat.com>\n" "---\n" " include/hw/qdev-core.h | 3 ---\n" " qom/object.c | 3 ---\n" " 2 files changed, 6 deletions(-)\n" "\n" "diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h\n" - "index 0a84c42756..9614f76ae6 100644\n" + "index 33ed3b8dde..fa55dc10ae 100644\n" "--- a/include/hw/qdev-core.h\n" "+++ b/include/hw/qdev-core.h\n" - "@@ -250,8 +250,6 @@ struct PropertyInfo {\n" + "@@ -251,8 +251,6 @@ struct PropertyInfo {\n" " /**\n" " * GlobalProperty:\n" " * @used: Set to true if property was used when initializing a device.\n" @@ -39,7 +40,7 @@ " *\n" " * An error is fatal for non-hotplugged devices, when the global is applied.\n" " */\n" - "@@ -260,7 +258,6 @@ typedef struct GlobalProperty {\n" + "@@ -261,7 +259,6 @@ typedef struct GlobalProperty {\n" " const char *property;\n" " const char *value;\n" " bool used;\n" @@ -48,7 +49,7 @@ " \n" " static inline void\n" "diff --git a/qom/object.c b/qom/object.c\n" - "index b8c732063b..4e5226ca12 100644\n" + "index d3412e7fdc..99c4fa707e 100644\n" "--- a/qom/object.c\n" "+++ b/qom/object.c\n" "@@ -385,9 +385,6 @@ void object_apply_global_props(Object *obj, const GPtrArray *props, Error **errp\n" @@ -62,6 +63,6 @@ " object_property_parse(obj, p->value, p->property, &err);\n" " if (err != NULL) {\n" "-- \n" - 2.20.1 + MST -85c5d20c432595b2f9d15349066f13eb30c3c07dcc96a1cc0fd8af0a624f0a0c +3987925edccf439ab114f760a70c65a76413668128036349a5cfab55986fa837
diff --git a/a/1.txt b/N2/1.txt index cfad54b..3409edc 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,3 +1,5 @@ +From: Daniel P. Berrangé <berrange@redhat.com> + This reverts commit d7741743f4f3d2683d1bb6938f88dc0167c21afa. Relying on setting properties on parents types which may not @@ -7,16 +9,19 @@ be explicit about which devices get which properties, even if this needs repetition. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> +Message-Id: <20190215103239.28640-3-berrange@redhat.com> +Reviewed-by: Michael S. Tsirkin <mst@redhat.com> +Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- include/hw/qdev-core.h | 3 --- qom/object.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h -index 0a84c42756..9614f76ae6 100644 +index 33ed3b8dde..fa55dc10ae 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h -@@ -250,8 +250,6 @@ struct PropertyInfo { +@@ -251,8 +251,6 @@ struct PropertyInfo { /** * GlobalProperty: * @used: Set to true if property was used when initializing a device. @@ -25,7 +30,7 @@ index 0a84c42756..9614f76ae6 100644 * * An error is fatal for non-hotplugged devices, when the global is applied. */ -@@ -260,7 +258,6 @@ typedef struct GlobalProperty { +@@ -261,7 +259,6 @@ typedef struct GlobalProperty { const char *property; const char *value; bool used; @@ -34,7 +39,7 @@ index 0a84c42756..9614f76ae6 100644 static inline void diff --git a/qom/object.c b/qom/object.c -index b8c732063b..4e5226ca12 100644 +index d3412e7fdc..99c4fa707e 100644 --- a/qom/object.c +++ b/qom/object.c @@ -385,9 +385,6 @@ void object_apply_global_props(Object *obj, const GPtrArray *props, Error **errp @@ -48,4 +53,4 @@ index b8c732063b..4e5226ca12 100644 object_property_parse(obj, p->value, p->property, &err); if (err != NULL) { -- -2.20.1 +MST diff --git a/a/content_digest b/N2/content_digest index ba3368b..d71f8e7 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,17 +1,15 @@ - "ref\020190215103239.28640-1-berrange@redhat.com\0" - "From\0Daniel P. Berrang\303\251 <berrange@redhat.com>\0" - "Subject\0[Qemu-devel] [PATCH v2 2/2] Revert \"globals: Allow global properties to be optional\"\0" - "Date\0Fri, 15 Feb 2019 10:32:39 +0000\0" + "ref\020190520231008.20140-1-mst@redhat.com\0" + "From\0Michael S. Tsirkin <mst@redhat.com>\0" + "Subject\0[Qemu-devel] [PULL v2 02/36] Revert \"globals: Allow global properties to be optional\"\0" + "Date\0Mon, 20 May 2019 19:10:30 -0400\0" "To\0qemu-devel@nongnu.org\0" - "Cc\0Michael S. Tsirkin <mst@redhat.com>" - Gonglei <arei.gonglei@huawei.com> - Marcel Apfelbaum <marcel.apfelbaum@gmail.com> - Eduardo Habkost <ehabkost@redhat.com> - Gerd Hoffmann <kraxel@redhat.com> - " Andreas F\303\244rber <afaerber@suse.de>" - " Daniel P. Berrang\303\251 <berrange@redhat.com>\0" + "Cc\0Peter Maydell <peter.maydell@linaro.org>" + " Daniel P. Berrang\303\251 <berrange@redhat.com>" + " Andreas F\303\244rber <afaerber@suse.de>\0" "\00:1\0" "b\0" + "From: Daniel P. Berrang\303\251 <berrange@redhat.com>\n" + "\n" "This reverts commit d7741743f4f3d2683d1bb6938f88dc0167c21afa.\n" "\n" "Relying on setting properties on parents types which may not\n" @@ -21,16 +19,19 @@ "this needs repetition.\n" "\n" "Signed-off-by: Daniel P. Berrang\303\251 <berrange@redhat.com>\n" + "Message-Id: <20190215103239.28640-3-berrange@redhat.com>\n" + "Reviewed-by: Michael S. Tsirkin <mst@redhat.com>\n" + "Signed-off-by: Michael S. Tsirkin <mst@redhat.com>\n" "---\n" " include/hw/qdev-core.h | 3 ---\n" " qom/object.c | 3 ---\n" " 2 files changed, 6 deletions(-)\n" "\n" "diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h\n" - "index 0a84c42756..9614f76ae6 100644\n" + "index 33ed3b8dde..fa55dc10ae 100644\n" "--- a/include/hw/qdev-core.h\n" "+++ b/include/hw/qdev-core.h\n" - "@@ -250,8 +250,6 @@ struct PropertyInfo {\n" + "@@ -251,8 +251,6 @@ struct PropertyInfo {\n" " /**\n" " * GlobalProperty:\n" " * @used: Set to true if property was used when initializing a device.\n" @@ -39,7 +40,7 @@ " *\n" " * An error is fatal for non-hotplugged devices, when the global is applied.\n" " */\n" - "@@ -260,7 +258,6 @@ typedef struct GlobalProperty {\n" + "@@ -261,7 +259,6 @@ typedef struct GlobalProperty {\n" " const char *property;\n" " const char *value;\n" " bool used;\n" @@ -48,7 +49,7 @@ " \n" " static inline void\n" "diff --git a/qom/object.c b/qom/object.c\n" - "index b8c732063b..4e5226ca12 100644\n" + "index d3412e7fdc..99c4fa707e 100644\n" "--- a/qom/object.c\n" "+++ b/qom/object.c\n" "@@ -385,9 +385,6 @@ void object_apply_global_props(Object *obj, const GPtrArray *props, Error **errp\n" @@ -62,6 +63,6 @@ " object_property_parse(obj, p->value, p->property, &err);\n" " if (err != NULL) {\n" "-- \n" - 2.20.1 + MST -85c5d20c432595b2f9d15349066f13eb30c3c07dcc96a1cc0fd8af0a624f0a0c +4808e50fdfe260b12433c54feb6d02182d32bb6f39f7a6abd5495864a7261973
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.