[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 3/6] blockdev: with -drive if=virtio, use generic virtio-b
From: |
Laurent Vivier |
Subject: |
Re: [PATCH v2 3/6] blockdev: with -drive if=virtio, use generic virtio-blk |
Date: |
Fri, 19 Mar 2021 19:15:18 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 |
Le 19/03/2021 à 15:46, Cornelia Huck a écrit :
> On Fri, 19 Mar 2021 14:25:34 +0100
> Laurent Vivier <laurent@vivier.eu> wrote:
>
>> Rather than checking if the machine is an s390x to use virtio-blk-ccw
>> instead of virtio-blk-pci, use the alias virtio-blk that is set to
>> the expected target.
>
> One side effect: if we add a new architecture and don't define the
> aliases for it, this function probably won't do the right thing; prior
> to the patch, it would simply default to virtio-blk-pci. Probably not a
> big deal, but we need to be careful to keep the alias defines up to
> date, which previously wasn't such a big deal.
But it will be easy to detect because we will have the error "unknown device:
virtio-blk".
It will be a good reminder to add the aliases...
Thanks,
Laurent
>
>>
>> This also enables the use of virtio-blk-device for targets without
>> PCI or CCW.
>>
>> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
>> ---
>> blockdev.c | 6 +-----
>> 1 file changed, 1 insertion(+), 5 deletions(-)
>>
>> diff --git a/blockdev.c b/blockdev.c
>> index 5cc7c7effe9f..64da5350e3ad 100644
>> --- a/blockdev.c
>> +++ b/blockdev.c
>> @@ -969,11 +969,7 @@ DriveInfo *drive_new(QemuOpts *all_opts,
>> BlockInterfaceType block_default_type,
>> QemuOpts *devopts;
>> devopts = qemu_opts_create(qemu_find_opts("device"), NULL, 0,
>> &error_abort);
>> - if (arch_type == QEMU_ARCH_S390X) {
>> - qemu_opt_set(devopts, "driver", "virtio-blk-ccw", &error_abort);
>> - } else {
>> - qemu_opt_set(devopts, "driver", "virtio-blk-pci", &error_abort);
>> - }
>> + qemu_opt_set(devopts, "driver", "virtio-blk", &error_abort);
>> qemu_opt_set(devopts, "drive", qdict_get_str(bs_opts, "id"),
>> &error_abort);
>> }
>
- [PATCH v2 0/6] iotests: fix failures with non-PCI machines, Laurent Vivier, 2021/03/19
- [PATCH v2 1/6] qdev: define list of archs with virtio-pci or virtio-ccw, Laurent Vivier, 2021/03/19
- [PATCH v2 2/6] m68k: add the virtio devices aliases, Laurent Vivier, 2021/03/19
- [PATCH v2 3/6] blockdev: with -drive if=virtio, use generic virtio-blk, Laurent Vivier, 2021/03/19
- [PATCH v2 4/6] iotests: Revert "iotests: use -ccw on s390x for 040, 139, and 182", Laurent Vivier, 2021/03/19
- [PATCH v2 5/6] iotests: test m68k with the virt machine, Laurent Vivier, 2021/03/19
- [PATCH v2 6/6] iotests: iothreads need ioeventfd, Laurent Vivier, 2021/03/19