c98bb6b512
Signed-off-by: Jie Yang <yangjieyj.yang@huawei.com> (cherry picked from commit e9cfa81784d4a86efd4392a487c0294d440c03c0)
65 lines
2.6 KiB
Diff
65 lines
2.6 KiB
Diff
From f5435cecabd10dd8d7a97d9e0091e28b45e46957 Mon Sep 17 00:00:00 2001
|
|
From: zhouli57 <zhouli57@huawei.com>
|
|
Date: Mon, 7 Mar 2022 08:43:32 +0800
|
|
Subject: [PATCH 1/8] docs: correct the command for booting with the raw image
|
|
|
|
Signed-off-by: zhouli57 <zhouli57@huawei.com>
|
|
---
|
|
docs/boot.ch.md | 8 +++-----
|
|
docs/boot.md | 4 ++--
|
|
2 files changed, 5 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/docs/boot.ch.md b/docs/boot.ch.md
|
|
index 31153a9..774e4a8 100644
|
|
--- a/docs/boot.ch.md
|
|
+++ b/docs/boot.ch.md
|
|
@@ -225,7 +225,7 @@ fi
|
|
-m 2G \
|
|
-append "console=${con} reboot=k panic=1 root=/dev/vda rw" \
|
|
-drive file=/path/to/rootfs,id=rootfs,readonly=off,direct=off \
|
|
- -device virtio-blk-device,drive=rootfs,id=rootfs \
|
|
+ -device virtio-blk-pci,drive=rootfs,id=blk1,bus=pcie.0,addr=0x2 \
|
|
-drive file=/path/to/OVMF_CODE.fd,if=pflash,unit=0,readonly=true \
|
|
-drive file=/path/to/OVMF_VARS.fd,if=pflash,unit=1 \
|
|
-qmp unix:/path/to/socket,server,nowait \
|
|
@@ -237,12 +237,10 @@ fi
|
|
```shell
|
|
/usr/bin/stratovirt \
|
|
-machine ${machine} \
|
|
- -kernel /path/to/kernel \
|
|
-smp 1 \
|
|
-m 2G \
|
|
- -append "console=${con} reboot=k panic=1 root=/dev/vda rw" \
|
|
- -drive file=/path/to/rootfs,id=rootfs,readonly=off,direct=off \
|
|
- -device virtio-blk-device,drive=rootfs \
|
|
+ -drive file=/path/to/raw_image,id=raw_image,readonly=off,direct=off \
|
|
+ -device virtio-blk-pci,drive=raw_image,id=blk1,bus=pcie.0,addr=0x2 \
|
|
-drive file=/path/to/OVMF_CODE.fd,if=pflash,unit=0,readonly=true \
|
|
-drive file=/path/to/OVMF_VARS.fd,if=pflash,unit=1 \
|
|
-qmp unix:/path/to/socket,server,nowait \
|
|
diff --git a/docs/boot.md b/docs/boot.md
|
|
index 64d75b4..66541fa 100644
|
|
--- a/docs/boot.md
|
|
+++ b/docs/boot.md
|
|
@@ -230,7 +230,7 @@ fi
|
|
-m 2G \
|
|
-append "console=${con} reboot=k panic=1 root=/dev/vda rw" \
|
|
-drive file=/path/to/rootfs,id=rootfs,readonly=off,direct=off \
|
|
- -device virtio-blk-device,drive=rootfs,id=rootfs \
|
|
+ -device virtio-blk-pci,drive=rootfs,id=blk1,bus=pcie.0,addr=0x2 \
|
|
-drive file=/path/to/OVMF_CODE.fd,if=pflash,unit=0,readonly=true \
|
|
-drive file=/path/to/OVMF_VARS.fd,if=pflash,unit=1 \
|
|
-qmp unix:/path/to/socket,server,nowait \
|
|
@@ -245,7 +245,7 @@ The command for booting with the raw image is as follows:
|
|
-smp 1 \
|
|
-m 2G \
|
|
-drive file=/path/to/raw_image,id=raw_image,readonly=off,direct=off \
|
|
- -device virtio-blk-device,drive=raw_image \
|
|
+ -device virtio-blk-pci,drive=raw_image,id=blk1,bus=pcie.0,addr=0x2 \
|
|
-drive file=/path/to/OVMF_CODE.fd,if=pflash,unit=0,readonly=true \
|
|
-drive file=/path/to/OVMF_VARS.fd,if=pflash,unit=1 \
|
|
-qmp unix:/path/to/socket,server,nowait \
|
|
--
|
|
2.20.1
|
|
|