diff for duplicates of <1556808723-226478-10-git-send-email-imammedo@redhat.com>
diff --git a/a/content_digest b/N1/content_digest
index ea3081b..f9cb6a1 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -14,18 +14,18 @@
"To\0qemu-devel\@nongnu.org\0"
]
[
- "Cc\0Laszlo Ersek <lersek\@redhat.com>",
+ "Cc\0Andrew Jones <drjones\@redhat.com>",
+ " Ben Warren <ben\@skyportsystems.com>",
" Michael S. Tsirkin <mst\@redhat.com>",
- " Gonglei <arei.gonglei\@huawei.com>",
- " Philippe Mathieu-Daud\303\251 <philmd\@redhat.com>",
+ " Laszlo Ersek <lersek\@redhat.com>",
+ " linuxarm\@huawei.com",
+ " Shameer Kolothum <shameerali.kolothum.thodi\@huawei.com>",
" Shannon Zhao <shannon.zhaosl\@gmail.com>",
+ " Gonglei <arei.gonglei\@huawei.com>",
" Wei Yang <richardw.yang\@linux.intel.com>",
- " Andrew Jones <drjones\@redhat.com>",
- " Shameer Kolothum <shameerali.kolothum.thodi\@huawei.com>",
- " Ben Warren <ben\@skyportsystems.com>",
- " xuwei5\@hisilicon.com",
" xuwei5\@huawei.com",
- " linuxarm\@huawei.com\0"
+ " xuwei5\@hisilicon.com",
+ " Philippe Mathieu-Daud\303\251 <philmd\@redhat.com>\0"
]
[
"\0000:1\0"
@@ -145,4 +145,4 @@
"2.7.4"
]
-ad56678aeb1b389f359a69c023cf35f1b9357fe1161298e37ad76ef812e2ce0c
+2551a80bc083ba5e6199b50aff71e4a7c9dd33bb2e3e32363411ee59bf1ec9a7
diff --git a/a/1.txt b/N2/1.txt
index b411238..dadbdb1 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -1,3 +1,5 @@
+From: Igor Mammedov <imammedo@redhat.com>
+
For testcase to use UEFI firmware, one needs to provide and specify
firmware and varstore blob names in test_data { uefi_fl1, uefi_fl2 }
fields respectively and RAM start address plus size where to look for
@@ -6,25 +8,15 @@ bootable cdrom image from uefi-boot-images with EFI test utility.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
+Message-Id: <1556808723-226478-10-git-send-email-imammedo@redhat.com>
+Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
+Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
-v4:
- * fixup commit message (typo/spelling) (Wei Yang <richardw.yang@linux.intel.com>)
- * get rid of test_acpi_rsdp_address()
-v3:
- * drop data_dir prefix and firmware will come from pc-bios directly
- * add cdrom option so test could use it for providing boot cdrom image
- * add TODO comment convert '-drive if=pflash' to new syntax (Laszlo)
-v2:
- * move RAM start address and size to test_data, as it could differ
- between boards (and even versions)
-
-dfd
----
- tests/bios-tables-test.c | 52 ++++++++++++++++++++++++++++++++----------------
- 1 file changed, 35 insertions(+), 17 deletions(-)
+ tests/bios-tables-test.c | 50 +++++++++++++++++++++++++++-------------
+ 1 file changed, 34 insertions(+), 16 deletions(-)
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
-index 4d13a3c..84e1ce2 100644
+index 4d13a3cce6..84e1ce2972 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -26,6 +26,11 @@
@@ -57,7 +49,8 @@ index 4d13a3c..84e1ce2 100644
static void test_acpi_one(const char *params, test_data *data)
{
char *args;
--
++ bool use_uefi = data->uefi_fl1 && data->uefi_fl2;
+
- /* Disable kernel irqchip to be able to override apic irq0. */
- args = g_strdup_printf("-machine %s,accel=%s,kernel-irqchip=off "
- "-net none -display none %s "
@@ -65,8 +58,6 @@ index 4d13a3c..84e1ce2 100644
- "-device ide-hd,drive=hd0 ",
- data->machine, "kvm:tcg",
- params ? params : "", disk);
-+ bool use_uefi = data->uefi_fl1 && data->uefi_fl2;
-+
+ if (use_uefi) {
+ /*
+ * TODO: convert '-drive if=pflash' to new syntax (see e33763be7cd3)
@@ -106,4 +97,4 @@ index 4d13a3c..84e1ce2 100644
test_acpi_rxsdt_table(data);
test_acpi_fadt_table(data);
--
-2.7.4
\ No newline at end of file
+MST
\ No newline at end of file
diff --git a/a/content_digest b/N2/content_digest
index ea3081b..9e8915d 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -1,31 +1,25 @@
[
- "ref\0001556808723-226478-1-git-send-email-imammedo\@redhat.com\0"
+ "ref\00020190515121146.7248-1-mst\@redhat.com\0"
]
[
- "From\0Igor Mammedov <imammedo\@redhat.com>\0"
+ "From\0Michael S. Tsirkin <mst\@redhat.com>\0"
]
[
- "Subject\0[Qemu-devel] [PATCH v4 09/15] tests: acpi: add a way to start tests with UEFI firmware\0"
+ "Subject\0[Qemu-devel] [PULL 31/37] tests: acpi: add a way to start tests with UEFI firmware\0"
]
[
- "Date\0Thu, 2 May 2019 16:51:57 +0200\0"
+ "Date\0Thu, 16 May 2019 08:20:48 -0400\0"
]
[
"To\0qemu-devel\@nongnu.org\0"
]
[
- "Cc\0Laszlo Ersek <lersek\@redhat.com>",
- " Michael S. Tsirkin <mst\@redhat.com>",
- " Gonglei <arei.gonglei\@huawei.com>",
- " Philippe Mathieu-Daud\303\251 <philmd\@redhat.com>",
- " Shannon Zhao <shannon.zhaosl\@gmail.com>",
- " Wei Yang <richardw.yang\@linux.intel.com>",
- " Andrew Jones <drjones\@redhat.com>",
- " Shameer Kolothum <shameerali.kolothum.thodi\@huawei.com>",
- " Ben Warren <ben\@skyportsystems.com>",
- " xuwei5\@hisilicon.com",
- " xuwei5\@huawei.com",
- " linuxarm\@huawei.com\0"
+ "Cc\0Laurent Vivier <lvivier\@redhat.com>",
+ " Peter Maydell <peter.maydell\@linaro.org>",
+ " Thomas Huth <thuth\@redhat.com>",
+ " Igor Mammedov <imammedo\@redhat.com>",
+ " Paolo Bonzini <pbonzini\@redhat.com>",
+ " Laszlo Ersek <lersek\@redhat.com>\0"
]
[
"\0000:1\0"
@@ -34,6 +28,8 @@
"b\0"
]
[
+ "From: Igor Mammedov <imammedo\@redhat.com>\n",
+ "\n",
"For testcase to use UEFI firmware, one needs to provide and specify\n",
"firmware and varstore blob names in test_data { uefi_fl1, uefi_fl2 }\n",
"fields respectively and RAM start address plus size where to look for\n",
@@ -42,25 +38,15 @@
"\n",
"Signed-off-by: Igor Mammedov <imammedo\@redhat.com>\n",
"Reviewed-by: Laszlo Ersek <lersek\@redhat.com>\n",
+ "Message-Id: <1556808723-226478-10-git-send-email-imammedo\@redhat.com>\n",
+ "Reviewed-by: Michael S. Tsirkin <mst\@redhat.com>\n",
+ "Signed-off-by: Michael S. Tsirkin <mst\@redhat.com>\n",
"---\n",
- "v4:\n",
- " * fixup commit message (typo/spelling) (Wei Yang <richardw.yang\@linux.intel.com>)\n",
- " * get rid of test_acpi_rsdp_address()\n",
- "v3:\n",
- " * drop data_dir prefix and firmware will come from pc-bios directly\n",
- " * add cdrom option so test could use it for providing boot cdrom image\n",
- " * add TODO comment convert '-drive if=pflash' to new syntax (Laszlo)\n",
- "v2:\n",
- " * move RAM start address and size to test_data, as it could differ\n",
- " between boards (and even versions)\n",
- "\n",
- "dfd\n",
- "---\n",
- " tests/bios-tables-test.c | 52 ++++++++++++++++++++++++++++++++----------------\n",
- " 1 file changed, 35 insertions(+), 17 deletions(-)\n",
+ " tests/bios-tables-test.c | 50 +++++++++++++++++++++++++++-------------\n",
+ " 1 file changed, 34 insertions(+), 16 deletions(-)\n",
"\n",
"diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c\n",
- "index 4d13a3c..84e1ce2 100644\n",
+ "index 4d13a3cce6..84e1ce2972 100644\n",
"--- a/tests/bios-tables-test.c\n",
"+++ b/tests/bios-tables-test.c\n",
"\@\@ -26,6 +26,11 \@\@\n",
@@ -93,7 +79,8 @@
" static void test_acpi_one(const char *params, test_data *data)\n",
" {\n",
" char *args;\n",
- "-\n",
+ "+ bool use_uefi = data->uefi_fl1 && data->uefi_fl2;\n",
+ " \n",
"- /* Disable kernel irqchip to be able to override apic irq0. */\n",
"- args = g_strdup_printf(\"-machine %s,accel=%s,kernel-irqchip=off \"\n",
"- \"-net none -display none %s \"\n",
@@ -101,8 +88,6 @@
"- \"-device ide-hd,drive=hd0 \",\n",
"- data->machine, \"kvm:tcg\",\n",
"- params ? params : \"\", disk);\n",
- "+ bool use_uefi = data->uefi_fl1 && data->uefi_fl2;\n",
- "+\n",
"+ if (use_uefi) {\n",
"+ /*\n",
"+ * TODO: convert '-drive if=pflash' to new syntax (see e33763be7cd3)\n",
@@ -142,7 +127,7 @@
" test_acpi_rxsdt_table(data);\n",
" test_acpi_fadt_table(data);\n",
"-- \n",
- "2.7.4"
+ "MST"
]
-ad56678aeb1b389f359a69c023cf35f1b9357fe1161298e37ad76ef812e2ce0c
+109e81ab0c156ca8df5b261ea9245097b9bbba3fc963a6b21f7b94ae459d4bd7
diff --git a/a/1.txt b/N3/1.txt
index b411238..dadbdb1 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -1,3 +1,5 @@
+From: Igor Mammedov <imammedo@redhat.com>
+
For testcase to use UEFI firmware, one needs to provide and specify
firmware and varstore blob names in test_data { uefi_fl1, uefi_fl2 }
fields respectively and RAM start address plus size where to look for
@@ -6,25 +8,15 @@ bootable cdrom image from uefi-boot-images with EFI test utility.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
+Message-Id: <1556808723-226478-10-git-send-email-imammedo@redhat.com>
+Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
+Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
-v4:
- * fixup commit message (typo/spelling) (Wei Yang <richardw.yang@linux.intel.com>)
- * get rid of test_acpi_rsdp_address()
-v3:
- * drop data_dir prefix and firmware will come from pc-bios directly
- * add cdrom option so test could use it for providing boot cdrom image
- * add TODO comment convert '-drive if=pflash' to new syntax (Laszlo)
-v2:
- * move RAM start address and size to test_data, as it could differ
- between boards (and even versions)
-
-dfd
----
- tests/bios-tables-test.c | 52 ++++++++++++++++++++++++++++++++----------------
- 1 file changed, 35 insertions(+), 17 deletions(-)
+ tests/bios-tables-test.c | 50 +++++++++++++++++++++++++++-------------
+ 1 file changed, 34 insertions(+), 16 deletions(-)
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
-index 4d13a3c..84e1ce2 100644
+index 4d13a3cce6..84e1ce2972 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -26,6 +26,11 @@
@@ -57,7 +49,8 @@ index 4d13a3c..84e1ce2 100644
static void test_acpi_one(const char *params, test_data *data)
{
char *args;
--
++ bool use_uefi = data->uefi_fl1 && data->uefi_fl2;
+
- /* Disable kernel irqchip to be able to override apic irq0. */
- args = g_strdup_printf("-machine %s,accel=%s,kernel-irqchip=off "
- "-net none -display none %s "
@@ -65,8 +58,6 @@ index 4d13a3c..84e1ce2 100644
- "-device ide-hd,drive=hd0 ",
- data->machine, "kvm:tcg",
- params ? params : "", disk);
-+ bool use_uefi = data->uefi_fl1 && data->uefi_fl2;
-+
+ if (use_uefi) {
+ /*
+ * TODO: convert '-drive if=pflash' to new syntax (see e33763be7cd3)
@@ -106,4 +97,4 @@ index 4d13a3c..84e1ce2 100644
test_acpi_rxsdt_table(data);
test_acpi_fadt_table(data);
--
-2.7.4
\ No newline at end of file
+MST
\ No newline at end of file
diff --git a/a/content_digest b/N3/content_digest
index ea3081b..bfefe38 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -1,31 +1,25 @@
[
- "ref\0001556808723-226478-1-git-send-email-imammedo\@redhat.com\0"
+ "ref\00020190520231008.20140-1-mst\@redhat.com\0"
]
[
- "From\0Igor Mammedov <imammedo\@redhat.com>\0"
+ "From\0Michael S. Tsirkin <mst\@redhat.com>\0"
]
[
- "Subject\0[Qemu-devel] [PATCH v4 09/15] tests: acpi: add a way to start tests with UEFI firmware\0"
+ "Subject\0[Qemu-devel] [PULL v2 30/36] tests: acpi: add a way to start tests with UEFI firmware\0"
]
[
- "Date\0Thu, 2 May 2019 16:51:57 +0200\0"
+ "Date\0Mon, 20 May 2019 19:11:27 -0400\0"
]
[
"To\0qemu-devel\@nongnu.org\0"
]
[
- "Cc\0Laszlo Ersek <lersek\@redhat.com>",
- " Michael S. Tsirkin <mst\@redhat.com>",
- " Gonglei <arei.gonglei\@huawei.com>",
- " Philippe Mathieu-Daud\303\251 <philmd\@redhat.com>",
- " Shannon Zhao <shannon.zhaosl\@gmail.com>",
- " Wei Yang <richardw.yang\@linux.intel.com>",
- " Andrew Jones <drjones\@redhat.com>",
- " Shameer Kolothum <shameerali.kolothum.thodi\@huawei.com>",
- " Ben Warren <ben\@skyportsystems.com>",
- " xuwei5\@hisilicon.com",
- " xuwei5\@huawei.com",
- " linuxarm\@huawei.com\0"
+ "Cc\0Laurent Vivier <lvivier\@redhat.com>",
+ " Peter Maydell <peter.maydell\@linaro.org>",
+ " Thomas Huth <thuth\@redhat.com>",
+ " Igor Mammedov <imammedo\@redhat.com>",
+ " Paolo Bonzini <pbonzini\@redhat.com>",
+ " Laszlo Ersek <lersek\@redhat.com>\0"
]
[
"\0000:1\0"
@@ -34,6 +28,8 @@
"b\0"
]
[
+ "From: Igor Mammedov <imammedo\@redhat.com>\n",
+ "\n",
"For testcase to use UEFI firmware, one needs to provide and specify\n",
"firmware and varstore blob names in test_data { uefi_fl1, uefi_fl2 }\n",
"fields respectively and RAM start address plus size where to look for\n",
@@ -42,25 +38,15 @@
"\n",
"Signed-off-by: Igor Mammedov <imammedo\@redhat.com>\n",
"Reviewed-by: Laszlo Ersek <lersek\@redhat.com>\n",
+ "Message-Id: <1556808723-226478-10-git-send-email-imammedo\@redhat.com>\n",
+ "Reviewed-by: Michael S. Tsirkin <mst\@redhat.com>\n",
+ "Signed-off-by: Michael S. Tsirkin <mst\@redhat.com>\n",
"---\n",
- "v4:\n",
- " * fixup commit message (typo/spelling) (Wei Yang <richardw.yang\@linux.intel.com>)\n",
- " * get rid of test_acpi_rsdp_address()\n",
- "v3:\n",
- " * drop data_dir prefix and firmware will come from pc-bios directly\n",
- " * add cdrom option so test could use it for providing boot cdrom image\n",
- " * add TODO comment convert '-drive if=pflash' to new syntax (Laszlo)\n",
- "v2:\n",
- " * move RAM start address and size to test_data, as it could differ\n",
- " between boards (and even versions)\n",
- "\n",
- "dfd\n",
- "---\n",
- " tests/bios-tables-test.c | 52 ++++++++++++++++++++++++++++++++----------------\n",
- " 1 file changed, 35 insertions(+), 17 deletions(-)\n",
+ " tests/bios-tables-test.c | 50 +++++++++++++++++++++++++++-------------\n",
+ " 1 file changed, 34 insertions(+), 16 deletions(-)\n",
"\n",
"diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c\n",
- "index 4d13a3c..84e1ce2 100644\n",
+ "index 4d13a3cce6..84e1ce2972 100644\n",
"--- a/tests/bios-tables-test.c\n",
"+++ b/tests/bios-tables-test.c\n",
"\@\@ -26,6 +26,11 \@\@\n",
@@ -93,7 +79,8 @@
" static void test_acpi_one(const char *params, test_data *data)\n",
" {\n",
" char *args;\n",
- "-\n",
+ "+ bool use_uefi = data->uefi_fl1 && data->uefi_fl2;\n",
+ " \n",
"- /* Disable kernel irqchip to be able to override apic irq0. */\n",
"- args = g_strdup_printf(\"-machine %s,accel=%s,kernel-irqchip=off \"\n",
"- \"-net none -display none %s \"\n",
@@ -101,8 +88,6 @@
"- \"-device ide-hd,drive=hd0 \",\n",
"- data->machine, \"kvm:tcg\",\n",
"- params ? params : \"\", disk);\n",
- "+ bool use_uefi = data->uefi_fl1 && data->uefi_fl2;\n",
- "+\n",
"+ if (use_uefi) {\n",
"+ /*\n",
"+ * TODO: convert '-drive if=pflash' to new syntax (see e33763be7cd3)\n",
@@ -142,7 +127,7 @@
" test_acpi_rxsdt_table(data);\n",
" test_acpi_fadt_table(data);\n",
"-- \n",
- "2.7.4"
+ "MST"
]
-ad56678aeb1b389f359a69c023cf35f1b9357fe1161298e37ad76ef812e2ce0c
+0e52d04db885dbdc13496ab25523723cbed32d63e7f3803ae68a7e7e561447fd
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.