From nobody Wed Nov 5 18:25:49 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496593034963852.22012372715; Sun, 4 Jun 2017 09:17:14 -0700 (PDT) Received: from localhost ([::1]:57561 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHY5j-0004Cq-NG for importer@patchew.org; Sun, 04 Jun 2017 12:09:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35099) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHXzC-00071R-Pw for qemu-devel@nongnu.org; Sun, 04 Jun 2017 12:02:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHXz9-0003w1-Mg for qemu-devel@nongnu.org; Sun, 04 Jun 2017 12:02:38 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:52731) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHXz9-0003uK-E7; Sun, 04 Jun 2017 12:02:35 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 12A60404E4; Sun, 4 Jun 2017 19:02:34 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 629375E3; Sun, 4 Jun 2017 18:45:28 +0300 (MSK) Received: (nullmailer pid 16360 invoked by uid 1000); Sun, 04 Jun 2017 15:45:27 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 4 Jun 2017 18:45:07 +0300 Message-Id: <1c9f3b887baa785d0d9942ce960492b9101fb0b9.1496591095.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 03/22] docs qemu-doc: Avoid ide-drive, it's deprecated X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Michael Tokarev , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Markus Armbruster Suggested-by: Thomas Huth Signed-off-by: Markus Armbruster Reviewed-by: Thomas Huth Signed-off-by: Michael Tokarev --- 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): =20 qemu -drive file=3Ddisk1.img,if=3Dnone,id=3Ddisk1 - -device ide-drive,drive=3Ddisk1,bootindex=3D4 + -device ide-hd,drive=3Ddisk1,bootindex=3D4 -drive file=3Ddisk2.img,if=3Dnone,id=3Ddisk2 -device virtio-blk-pci,drive=3Ddisk2,bootindex=3D3 -netdev type=3Duser,id=3Dnet0 -device virtio-net-pci,netdev=3Dnet0,bo= otindex=3D2 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. =20 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. =20 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.: =20 @example -qemu-system-i386 -global ide-drive.physical_block_size=3D4096 -drive file= =3Dfile,if=3Dide,index=3D0,media=3Ddisk +qemu-system-i386 -global ide-hd.physical_block_size=3D4096 disk-image.img @end example =20 In particular, you can use this to set driver properties for devices which= are=20 --=20 2.11.0