[Qemu-devel] [PATCH 0/2] docs: Minor updates around ide-drive

[Qemu-devel] [PATCH 0/2] docs: Minor updates around ide-drive

[Markus Armbruster]

Markus Armbruster (2):
  docs qemu-doc: Avoid ide-drive, it's deprecated
  docs/qdev-device-use.txt: update section Default Devices

 docs/bootindex.txt       |  2 +-
 docs/qdev-device-use.txt | 13 +++++++------
 qemu-options.hx          |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

-- 
2.7.4

[Qemu-devel] [PATCH 1/2] docs qemu-doc: Avoid ide-drive, it's deprecated

[Markus Armbruster]

Suggested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 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):
 
 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 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.
 
 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 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.:
 
 @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.7.4

Re: [Qemu-devel] [PATCH 1/2] docs qemu-doc: Avoid ide-drive, it's deprecated

[Thomas Huth]

On 09.05.2017 11:41, Markus Armbruster wrote:
> Suggested-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  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):
>  
>  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 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.
>  
>  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 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.:
>  
>  @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 
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

[Qemu-devel] [PATCH 2/2] docs/qdev-device-use.txt: update section Default Devices

[Markus Armbruster]

Resynchronize the table of default device suppressions with vl.c's
default_list[].

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 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:
 
     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-serial
+    VGA                 VGA, cirrus-vga, isa-vga, isa-cirrus-vga,
+                        vmware-svga, qxl-vga, virtio-vga
+    virtioconsole       virtio-serial-pci, virtio-serial
 
 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
-- 
2.7.4

Re: [Qemu-devel] [PATCH 2/2] docs/qdev-device-use.txt: update section Default Devices

[Thomas Huth]

On 09.05.2017 11:41, Markus Armbruster wrote:
> Resynchronize the table of default device suppressions with vl.c's
> default_list[].
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  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:
>  
>      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-serial

virtio-serial-s390 has been removed by commit 7b3fdbd9a8267, so that
should be OK.

> +    VGA                 VGA, cirrus-vga, isa-vga, isa-cirrus-vga,
> +                        vmware-svga, qxl-vga, virtio-vga
> +    virtioconsole       virtio-serial-pci, virtio-serial
>  
>  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

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [Qemu-devel] [PATCH 0/2] docs: Minor updates around ide-drive

[Markus Armbruster]

I mis-pasted cc: Thomas.  Sorry for the inconvenience.

Re: [Qemu-devel] [PATCH 0/2] docs: Minor updates around ide-drive

[John Snow]

On 05/09/2017 05:41 AM, Markus Armbruster wrote:
> Markus Armbruster (2):
>   docs qemu-doc: Avoid ide-drive, it's deprecated
>   docs/qdev-device-use.txt: update section Default Devices
> 
>  docs/bootindex.txt       |  2 +-
>  docs/qdev-device-use.txt | 13 +++++++------
>  qemu-options.hx          |  2 +-
>  3 files changed, 9 insertions(+), 8 deletions(-)
> 

Shame on me for not noticing, but thank you.

Acked-by: John Snow <jsnow@redhat.com>

Re: [Qemu-devel] [PATCH 0/2] docs: Minor updates around ide-drive

[Markus Armbruster]

John Snow <jsnow@redhat.com> writes:

> On 05/09/2017 05:41 AM, Markus Armbruster wrote:
>> Markus Armbruster (2):
>>   docs qemu-doc: Avoid ide-drive, it's deprecated
>>   docs/qdev-device-use.txt: update section Default Devices
>> 
>>  docs/bootindex.txt       |  2 +-
>>  docs/qdev-device-use.txt | 13 +++++++------
>>  qemu-options.hx          |  2 +-
>>  3 files changed, 9 insertions(+), 8 deletions(-)
>> 
>
> Shame on me for not noticing, but thank you.
>
> Acked-by: John Snow <jsnow@redhat.com>

Thanks!

The canonical path is through your tree, but I could stick it into a
miscellaneous pull request if you like.

Re: [Qemu-devel] [PATCH 0/2] docs: Minor updates around ide-drive

[Markus Armbruster]

Markus Armbruster <armbru@redhat.com> writes:

> John Snow <jsnow@redhat.com> writes:
>
>> On 05/09/2017 05:41 AM, Markus Armbruster wrote:
>>> Markus Armbruster (2):
>>>   docs qemu-doc: Avoid ide-drive, it's deprecated
>>>   docs/qdev-device-use.txt: update section Default Devices
>>> 
>>>  docs/bootindex.txt       |  2 +-
>>>  docs/qdev-device-use.txt | 13 +++++++------
>>>  qemu-options.hx          |  2 +-
>>>  3 files changed, 9 insertions(+), 8 deletions(-)
>>> 
>>
>> Shame on me for not noticing, but thank you.
>>
>> Acked-by: John Snow <jsnow@redhat.com>
>
> Thanks!
>
> The canonical path is through your tree, but I could stick it into a
> miscellaneous pull request if you like.

Nevermind, qemu-trivial picked it up.

Re: [Qemu-devel] [PATCH 0/2] docs: Minor updates around ide-drive

[John Snow]

On 05/23/2017 10:56 AM, Markus Armbruster wrote:
> Markus Armbruster <armbru@redhat.com> writes:
> 
>> John Snow <jsnow@redhat.com> writes:
>>
>>> On 05/09/2017 05:41 AM, Markus Armbruster wrote:
>>>> Markus Armbruster (2):
>>>>   docs qemu-doc: Avoid ide-drive, it's deprecated
>>>>   docs/qdev-device-use.txt: update section Default Devices
>>>>
>>>>  docs/bootindex.txt       |  2 +-
>>>>  docs/qdev-device-use.txt | 13 +++++++------
>>>>  qemu-options.hx          |  2 +-
>>>>  3 files changed, 9 insertions(+), 8 deletions(-)
>>>>
>>>
>>> Shame on me for not noticing, but thank you.
>>>
>>> Acked-by: John Snow <jsnow@redhat.com>
>>
>> Thanks!
>>
>> The canonical path is through your tree, but I could stick it into a
>> miscellaneous pull request if you like.
> 
> Nevermind, qemu-trivial picked it up.
> 

That was my assumption since it went to -trivial :)
Glad my inaction helped sort it out.

Re: [Qemu-devel] [PATCH 0/2] docs: Minor updates around ide-drive

[Michael Tokarev]

09.05.2017 12:41, Markus Armbruster wrote:
> Markus Armbruster (2):
>   docs qemu-doc: Avoid ide-drive, it's deprecated
>   docs/qdev-device-use.txt: update section Default Devices

Applied to -trivial, thanks!

/mjt