From nobody Thu May 2 17:11:59 2024 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 149432312418214.454760267065012; Tue, 9 May 2017 02:45:24 -0700 (PDT) Received: from localhost ([::1]:36149 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d81hr-0004zR-16 for importer@patchew.org; Tue, 09 May 2017 05:45:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d81e0-0001Cb-90 for qemu-devel@nongnu.org; Tue, 09 May 2017 05:41:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d81dw-0001Wf-Dy for qemu-devel@nongnu.org; Tue, 09 May 2017 05:41:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60480) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d81dw-0001WL-87; Tue, 09 May 2017 05:41:20 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 768704E4C3; Tue, 9 May 2017 09:41:18 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-149.ams2.redhat.com [10.36.116.149]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2A04AA24FF; Tue, 9 May 2017 09:41:18 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9ADA0113864C; Tue, 9 May 2017 11:41:16 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 768704E4C3 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=armbru@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 768704E4C3 From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 9 May 2017 11:41:15 +0200 Message-Id: <1494322876-28843-2-git-send-email-armbru@redhat.com> In-Reply-To: <1494322876-28843-1-git-send-email-armbru@redhat.com> References: <1494322876-28843-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 09 May 2017 09:41:18 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/2] 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, "thuth@redhat.comthuth"@redhat.com 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" Suggested-by: Thomas Huth Signed-off-by: Markus Armbruster Acked-by: John Snow Reviewed-by: Thomas Huth --- 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 b9a8ba1..6937862 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 b059405..caf779b 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 f68829f..37147b3 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -224,7 +224,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.7.4 From nobody Thu May 2 17:11:59 2024 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 149432298701124.02223691968095; Tue, 9 May 2017 02:43:07 -0700 (PDT) Received: from localhost ([::1]:36126 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d81fd-0002Yg-DZ for importer@patchew.org; Tue, 09 May 2017 05:43:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36231) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d81e0-0001Ca-8l for qemu-devel@nongnu.org; Tue, 09 May 2017 05:41:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d81dw-0001WZ-Bl for qemu-devel@nongnu.org; Tue, 09 May 2017 05:41:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47428) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d81dw-0001WJ-5o; Tue, 09 May 2017 05:41:20 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 712E561D36; Tue, 9 May 2017 09:41:18 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-149.ams2.redhat.com [10.36.116.149]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 287A1782A5; Tue, 9 May 2017 09:41:18 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9DBD011386CB; Tue, 9 May 2017 11:41:16 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 712E561D36 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=armbru@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 712E561D36 From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 9 May 2017 11:41:16 +0200 Message-Id: <1494322876-28843-3-git-send-email-armbru@redhat.com> In-Reply-To: <1494322876-28843-1-git-send-email-armbru@redhat.com> References: <1494322876-28843-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 09 May 2017 09:41:18 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/2] docs/qdev-device-use.txt: update section Default Devices 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, "thuth@redhat.comthuth"@redhat.com 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" Resynchronize the table of default device suppressions with vl.c's default_list[]. Signed-off-by: Markus Armbruster Acked-by: John Snow Reviewed-by: Thomas Huth --- docs/qdev-device-use.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/qdev-device-use.txt b/docs/qdev-device-use.txt index caf779b..f9f9eaa 100644 --- a/docs/qdev-device-use.txt +++ b/docs/qdev-device-use.txt @@ -401,12 +401,13 @@ type. some DEVNAMEs: =20 default device suppressing DEVNAMEs - CD-ROM ide-cd, ide-drive, scsi-cd - isa-fdc's driveA isa-fdc + CD-ROM ide-cd, ide-drive, ide-hd, scsi-cd, scsi-hd + isa-fdc's driveA floppy, isa-fdc parallel isa-parallel serial isa-serial - VGA VGA, cirrus-vga, vmware-svga - virtioconsole virtio-serial-pci, virtio-serial-s390, virtio-seri= al + VGA VGA, cirrus-vga, isa-vga, isa-cirrus-vga, + vmware-svga, qxl-vga, virtio-vga + virtioconsole virtio-serial-pci, virtio-serial =20 The default NIC is connected to a default part created along with it. It is *not* suppressed by configuring a NIC with -device (you may call --=20 2.7.4