[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 03/22] docs qemu-doc: Avoid ide-drive, it's depreca
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 03/22] docs qemu-doc: Avoid ide-drive, it's deprecated |
Date: |
Sun, 4 Jun 2017 18:45:07 +0300 |
From: Markus Armbruster <address@hidden>
Suggested-by: Thomas Huth <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
docs/bootindex.txt | 2 +-
docs/qdev-device-use.txt | 4 ++--
qemu-options.hx | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/bootindex.txt b/docs/bootindex.txt
index b9a8ba122f..6937862ba0 100644
--- a/docs/bootindex.txt
+++ b/docs/bootindex.txt
@@ -13,7 +13,7 @@ Let's assume we have a QEMU machine with two NICs (virtio,
e1000) and two
disks (IDE, virtio):
qemu -drive file=disk1.img,if=none,id=disk1
- -device ide-drive,drive=disk1,bootindex=4
+ -device ide-hd,drive=disk1,bootindex=4
-drive file=disk2.img,if=none,id=disk2
-device virtio-blk-pci,drive=disk2,bootindex=3
-netdev type=user,id=net0 -device virtio-net-pci,netdev=net0,bootindex=2
diff --git a/docs/qdev-device-use.txt b/docs/qdev-device-use.txt
index 4274fe9f25..95a0c3ae55 100644
--- a/docs/qdev-device-use.txt
+++ b/docs/qdev-device-use.txt
@@ -31,8 +31,8 @@ A QEMU block device (drive) has a host and a guest part.
In the general case, the guest device is connected to a controller
device. For instance, the IDE controller provides two IDE buses, each
-of which can have up to two ide-drive devices, and each ide-drive
-device is a guest part, and is connected to a host part.
+of which can have up to two devices, and each device is a guest part,
+and is connected to a host part.
Except we sometimes lump controller, bus(es) and drive device(s) all
together into a single device. For instance, the ISA floppy
diff --git a/qemu-options.hx b/qemu-options.hx
index a6c9b9e763..10995dc932 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -262,7 +262,7 @@ STEXI
Set default value of @var{driver}'s property @var{prop} to @var{value}, e.g.:
@example
-qemu-system-i386 -global ide-drive.physical_block_size=4096 -drive
file=file,if=ide,index=0,media=disk
+qemu-system-i386 -global ide-hd.physical_block_size=4096 disk-image.img
@end example
In particular, you can use this to set driver properties for devices which are
--
2.11.0
- [Qemu-trivial] [PULL 10/22] target/arm: add data cache invalidation cp15 instruction to cortex-r5, (continued)
- [Qemu-trivial] [PULL 10/22] target/arm: add data cache invalidation cp15 instruction to cortex-r5, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 05/22] tests/libqtest: Print error instead of aborting when env variable is missing, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 07/22] altera_timer: fix incorrect memset, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 17/22] qemu-ga: remove useless allocation, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 14/22] hw/mips: add missing include, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 11/22] hw/xtensa: sim: use g_string/g_new, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 01/22] qemu-doc: Move the qemu-ga description into a separate chapter, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 19/22] ide-test: check return of fwrite, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 22/22] hw/core: nmi.c can be compiled as common-obj nowadays, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 04/22] docs/qdev-device-use.txt: update section Default Devices, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 03/22] docs qemu-doc: Avoid ide-drive, it's deprecated,
Michael Tokarev <=
- [Qemu-trivial] [PULL 20/22] dump: fix memory_mapping_filter leak, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 15/22] qapi: Fix some QMP documentation regressions, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 13/22] register: display register prefix (name) since it is available, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 18/22] help: Add newline to end of thread option help text, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 12/22] hw/sparc: use ARRAY_SIZE() macro, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 06/22] configure: Detect native NetBSD curses(3), Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 09/22] block: Correct documentation for BLOCK_WRITE_THRESHOLD, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 16/22] scsi/lsi53c895a: Remove unused lsi_mem_*() return value, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 21/22] ivshmem-server: ivshmem-client: Build when eventfd() is available, Michael Tokarev, 2017/06/04
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/22] Trivial patches for 2017-06-04, Peter Maydell, 2017/06/05