diff mbox

[v2] vl: disable default cdrom when using explicitely scsi-hd

Message ID 1487623279-29930-1-git-send-email-hpoussin@reactos.org
State New
Headers show

Commit Message

Hervé Poussineau Feb. 20, 2017, 8:41 p.m. UTC
In commit af6bf1328ef90fae617857c02697e0174b84d596 (May 2011),
ide-hd, ide-cd and scsi-cd have been added to disable default cdrom,
"or else you can't put one on secondary master without -nodefaults".

Make it the same for scsi-hd, so you can put one on scsi-id 2 without
using -nodefaults.
scsi-hd has probably been forgotten, as it has been added in the
preceding commit (b443ae67130d32ad06b06fc9aa6d04d05ccd93ce).

Affected users are the ones using a machine with SCSI devices and start QEMU
with -device scsi-hd but without -device scsi-cd or -cdrom
In that case, the default cdrom device will disappear instead of being empty.

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 vl.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Hervé Poussineau Feb. 27, 2017, 6:45 p.m. UTC | #1
Ping?

Le 20/02/2017 à 21:41, Hervé Poussineau a écrit :
> In commit af6bf1328ef90fae617857c02697e0174b84d596 (May 2011),
> ide-hd, ide-cd and scsi-cd have been added to disable default cdrom,
> "or else you can't put one on secondary master without -nodefaults".
>
> Make it the same for scsi-hd, so you can put one on scsi-id 2 without
> using -nodefaults.
> scsi-hd has probably been forgotten, as it has been added in the
> preceding commit (b443ae67130d32ad06b06fc9aa6d04d05ccd93ce).
>
> Affected users are the ones using a machine with SCSI devices and start QEMU
> with -device scsi-hd but without -device scsi-cd or -cdrom
> In that case, the default cdrom device will disappear instead of being empty.
>
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
>  vl.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/vl.c b/vl.c
> index 27d9829..4af95b3 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -226,6 +226,7 @@ static struct {
>      { .driver = "ide-hd",               .flag = &default_cdrom     },
>      { .driver = "ide-drive",            .flag = &default_cdrom     },
>      { .driver = "scsi-cd",              .flag = &default_cdrom     },
> +    { .driver = "scsi-hd",              .flag = &default_cdrom     },
>      { .driver = "virtio-serial-pci",    .flag = &default_virtcon   },
>      { .driver = "virtio-serial",        .flag = &default_virtcon   },
>      { .driver = "VGA",                  .flag = &default_vga       },
>
John Snow Feb. 27, 2017, 7:25 p.m. UTC | #2
On 02/27/2017 01:45 PM, Hervé Poussineau wrote:
> Ping?
> 
> Le 20/02/2017 à 21:41, Hervé Poussineau a écrit :
>> In commit af6bf1328ef90fae617857c02697e0174b84d596 (May 2011),
>> ide-hd, ide-cd and scsi-cd have been added to disable default cdrom,
>> "or else you can't put one on secondary master without -nodefaults".
>>
>> Make it the same for scsi-hd, so you can put one on scsi-id 2 without
>> using -nodefaults.
>> scsi-hd has probably been forgotten, as it has been added in the
>> preceding commit (b443ae67130d32ad06b06fc9aa6d04d05ccd93ce).
>>
>> Affected users are the ones using a machine with SCSI devices and
>> start QEMU
>> with -device scsi-hd but without -device scsi-cd or -cdrom
>> In that case, the default cdrom device will disappear instead of being
>> empty.
>>
>> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
>> ---
>>  vl.c | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/vl.c b/vl.c
>> index 27d9829..4af95b3 100644
>> --- a/vl.c
>> +++ b/vl.c
>> @@ -226,6 +226,7 @@ static struct {
>>      { .driver = "ide-hd",               .flag = &default_cdrom     },
>>      { .driver = "ide-drive",            .flag = &default_cdrom     },
>>      { .driver = "scsi-cd",              .flag = &default_cdrom     },
>> +    { .driver = "scsi-hd",              .flag = &default_cdrom     },
>>      { .driver = "virtio-serial-pci",    .flag = &default_virtcon   },
>>      { .driver = "virtio-serial",        .flag = &default_virtcon   },
>>      { .driver = "VGA",                  .flag = &default_vga       },
>>
> 
> 

ACK

Paolo, for you?

--js
Paolo Bonzini Feb. 28, 2017, 10:40 a.m. UTC | #3
On 27/02/2017 20:25, John Snow wrote:
> 
> 
> On 02/27/2017 01:45 PM, Hervé Poussineau wrote:
>> Ping?
>>
>> Le 20/02/2017 à 21:41, Hervé Poussineau a écrit :
>>> In commit af6bf1328ef90fae617857c02697e0174b84d596 (May 2011),
>>> ide-hd, ide-cd and scsi-cd have been added to disable default cdrom,
>>> "or else you can't put one on secondary master without -nodefaults".
>>>
>>> Make it the same for scsi-hd, so you can put one on scsi-id 2 without
>>> using -nodefaults.
>>> scsi-hd has probably been forgotten, as it has been added in the
>>> preceding commit (b443ae67130d32ad06b06fc9aa6d04d05ccd93ce).
>>>
>>> Affected users are the ones using a machine with SCSI devices and
>>> start QEMU
>>> with -device scsi-hd but without -device scsi-cd or -cdrom
>>> In that case, the default cdrom device will disappear instead of being
>>> empty.
>>>
>>> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
>>> ---
>>>  vl.c | 1 +
>>>  1 file changed, 1 insertion(+)
>>>
>>> diff --git a/vl.c b/vl.c
>>> index 27d9829..4af95b3 100644
>>> --- a/vl.c
>>> +++ b/vl.c
>>> @@ -226,6 +226,7 @@ static struct {
>>>      { .driver = "ide-hd",               .flag = &default_cdrom     },
>>>      { .driver = "ide-drive",            .flag = &default_cdrom     },
>>>      { .driver = "scsi-cd",              .flag = &default_cdrom     },
>>> +    { .driver = "scsi-hd",              .flag = &default_cdrom     },
>>>      { .driver = "virtio-serial-pci",    .flag = &default_virtcon   },
>>>      { .driver = "virtio-serial",        .flag = &default_virtcon   },
>>>      { .driver = "VGA",                  .flag = &default_vga       },
>>>
>>
>>
> 
> ACK
> 
> Paolo, for you?

Or for Eduardo or Markus...  I'll pick it.

Paolo
diff mbox

Patch

diff --git a/vl.c b/vl.c
index 27d9829..4af95b3 100644
--- a/vl.c
+++ b/vl.c
@@ -226,6 +226,7 @@  static struct {
     { .driver = "ide-hd",               .flag = &default_cdrom     },
     { .driver = "ide-drive",            .flag = &default_cdrom     },
     { .driver = "scsi-cd",              .flag = &default_cdrom     },
+    { .driver = "scsi-hd",              .flag = &default_cdrom     },
     { .driver = "virtio-serial-pci",    .flag = &default_virtcon   },
     { .driver = "virtio-serial",        .flag = &default_virtcon   },
     { .driver = "VGA",                  .flag = &default_vga       },