86bdfa9211
- sync some bugfix patches from upstream - fix the virtio features negotiation flaw - fix CVE-2022-4144 Signed-off-by: yezengruan <yezengruan@huawei.com>
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From 4dd2cdf016e40c88b57480d9c296d6c7c2cb6600 Mon Sep 17 00:00:00 2001
|
|
From: tangzhongrui <tangzhongrui@cmss.chinamobile.com>
|
|
Date: Thu, 1 Dec 2022 20:24:53 +0800
|
|
Subject: [PATCH 06/17] Fix several typos in documentation
|
|
|
|
Signed-off-by: tangzhongrui tangzhongrui@cmss.chinamobile.com
|
|
---
|
|
docs/can.txt | 2 +-
|
|
hw/virtio/virtio-mem.c | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/docs/can.txt b/docs/can.txt
|
|
index 0d310237df..873c95a35d 100644
|
|
--- a/docs/can.txt
|
|
+++ b/docs/can.txt
|
|
@@ -166,7 +166,7 @@ and with bitrate switch
|
|
|
|
cangen can0 -b
|
|
|
|
-The test can be run viceversa, generate messages in the guest system and capture them
|
|
+The test can be run vice-versa, generate messages in the guest system and capture them
|
|
in the host one and much more combinations.
|
|
|
|
Links to other resources
|
|
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
|
|
index 341c3fa2c1..becac0d93b 100644
|
|
--- a/hw/virtio/virtio-mem.c
|
|
+++ b/hw/virtio/virtio-mem.c
|
|
@@ -877,7 +877,7 @@ static int virtio_mem_mig_sanity_checks_post_load(void *opaque, int version_id)
|
|
return -EINVAL;
|
|
}
|
|
/*
|
|
- * Note: Preparation for resizeable memory regions. The maximum size
|
|
+ * Note: Preparation for resizable memory regions. The maximum size
|
|
* of the memory region must not change during migration.
|
|
*/
|
|
if (tmp->region_size != new_region_size) {
|
|
--
|
|
2.27.0
|
|
|