diff --git a/doc-Update-multi-thread-compression-doc.patch b/doc-Update-multi-thread-compression-doc.patch index 33ef835acaf040ed3a404b6f0314a9e5c4af0673..2d2a35f49bd3882412b31900a4acf80858d32c82 100644 --- a/doc-Update-multi-thread-compression-doc.patch +++ b/doc-Update-multi-thread-compression-doc.patch @@ -1,85 +1,26 @@ -From 642df85795097017e9370a9721f702cbec50c173 Mon Sep 17 00:00:00 2001 -From: Zeyu Jin -Date: Sat, 30 Jan 2021 16:36:47 +0800 +From a88a27c5e6639652c1fbbcd5259bb5f1b26cbe70 Mon Sep 17 00:00:00 2001 +From: Jiajie Li +Date: Wed, 10 Mar 2021 15:29:47 +0800 Subject: [PATCH] doc: Update multi-thread compression doc -Modify the doc to fit the previous changes. - -Signed-off-by: Zeyu Jin -Signed-off-by: Ying Fang +Signed-off-by: Jiajie Li --- - docs/multi-thread-compression.txt | 31 ++++++++++++++++++------------- - 1 file changed, 18 insertions(+), 13 deletions(-) + docs/multi-thread-compression.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/multi-thread-compression.txt b/docs/multi-thread-compression.txt -index bb88c6bdf1..d429963cb0 100644 +index d429963cb0..26107478cb 100644 --- a/docs/multi-thread-compression.txt +++ b/docs/multi-thread-compression.txt -@@ -33,14 +33,15 @@ thread compression can be used to accelerate the compression process. - - The decompression speed of Zlib is at least 4 times as quick as - compression, if the source and destination CPU have equal speed, --keeping the compression thread count 4 times the decompression --thread count can avoid resource waste. -+and you choose Zlib as compression method, keeping the compression -+thread count 4 times the decompression thread count can avoid resource waste. - - Compression level can be used to control the compression speed and the --compression ratio. High compression ratio will take more time, level 0 --stands for no compression, level 1 stands for the best compression --speed, and level 9 stands for the best compression ratio. Users can --select a level number between 0 and 9. -+compression ratio. High compression ratio will take more time, -+level 1 stands for the best compression speed, and higher level means higher -+compression ration. For Zlib, users can select a level number between 0 and 9, -+where level 0 stands for no compression. For Zstd, users can select a -+level number between 1 and 22. +@@ -41,7 +41,7 @@ compression ratio. High compression ratio will take more time, + level 1 stands for the best compression speed, and higher level means higher + compression ration. For Zlib, users can select a level number between 0 and 9, + where level 0 stands for no compression. For Zstd, users can select a +-level number between 1 and 22. ++level number between 1 and 19. When to use the multiple thread compression in live migration -@@ -116,16 +117,19 @@ to support the multiple thread compression migration: - 2. Activate compression on the source: - {qemu} migrate_set_capability compress on - --3. Set the compression thread count on source: -+3. Set the compression method: -+ {qemu} migrate_set_parameter compress_method zstd -+ -+4. Set the compression thread count on source: - {qemu} migrate_set_parameter compress_threads 12 - --4. Set the compression level on the source: -+5. Set the compression level on the source: - {qemu} migrate_set_parameter compress_level 1 - --5. Set the decompression thread count on destination: -+6. Set the decompression thread count on destination: - {qemu} migrate_set_parameter decompress_threads 3 - --6. Start outgoing migration: -+7. Start outgoing migration: - {qemu} migrate -d tcp:destination.host:4444 - {qemu} info migrate - Capabilities: ... compress: on -@@ -136,6 +140,7 @@ The following are the default settings: - compress_threads: 8 - decompress_threads: 2 - compress_level: 1 (which means best speed) -+ compress_method: zlib - - So, only the first two steps are required to use the multiple - thread compression in migration. You can do more if the default -@@ -143,7 +148,7 @@ settings are not appropriate. - - TODO - ==== --Some faster (de)compression method such as LZ4 and Quicklz can help --to reduce the CPU consumption when doing (de)compression. If using --these faster (de)compression method, less (de)compression threads -+Comparing to Zlib, Some faster (de)compression method such as LZ4 -+and Quicklz can help to reduce the CPU consumption when doing (de)compression. -+If using these faster (de)compression method, less (de)compression threads - are needed when doing the migration. -- 2.27.0 diff --git a/qemu.spec b/qemu.spec index 631f1a24aaf7aabf3aeadb640670a432024d5b59..69dccf769263e237fbb21089dd3c93673db58766 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,6 +1,6 @@ Name: qemu Version: 4.1.0 -Release: 54 +Release: 55 Epoch: 2 Summary: QEMU is a generic and open source machine emulator and virtualizer License: GPLv2 and BSD and MIT and CC-BY-SA-4.0 @@ -324,6 +324,7 @@ Patch0311: nvram-add-nrf51_soc-flash-read-method.patch Patch0312: spapr_pci-add-spapr-msi-read-method.patch Patch0313: tz-ppc-add-dummy-read-write-methods.patch Patch0314: imx7-ccm-add-digprog-mmio-write-method.patch +Patch0315: doc-Update-multi-thread-compression-doc.patch BuildRequires: flex BuildRequires: bison @@ -713,6 +714,9 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Sun Apr 25 2021 Chen Qun +- doc: Update multi-thread compression doc + * Fri Mar 26 2021 Chen Qun - hw/pci-host: add pci-intack write method - pci-host: add pcie-msi read method