[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL 06/16] fdc: Exit if ISA controller does not suppo
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PULL 06/16] fdc: Exit if ISA controller does not support DMA |
Date: |
Mon, 26 Mar 2018 19:10:21 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 |
On 26/03/2018 19:06, Thomas Huth wrote:
> On 26.03.2018 15:36, Paolo Bonzini wrote:
>> From: Alexey Kardashevskiy <address@hidden>
>>
>> A "powernv" machine type defines an ISA bus but it does not add any DMA
>> controller to it so it is possible to hit assert(fdctrl->dma) by
>> adding "-machine powernv -device isa-fdc".
>>
>> This replaces assert() with an error message.
>>
>> Signed-off-by: Alexey Kardashevskiy <address@hidden>
>> [thuth: Slightly adjusted error message and updated
>> scripts/device-crash-test]
>
> That's strange, the hunk with the update to device-crash-test seems to be
> missing ... ?
>
> device-crash-test now reports some "Didn't fail as expected" warnings :-(
Probably I applied this patch to an older tree where the warnings had
not been added.
I'll send a v2 pull request.
Paolo
>> Signed-off-by: Thomas Huth <address@hidden>
>> Message-Id: <address@hidden>
>> Signed-off-by: Paolo Bonzini <address@hidden>
>> ---
>> hw/block/fdc.c | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/hw/block/fdc.c b/hw/block/fdc.c
>> index 7b7dd41..cd29e27 100644
>> --- a/hw/block/fdc.c
>> +++ b/hw/block/fdc.c
>> @@ -2695,7 +2695,10 @@ static void isabus_fdc_realize(DeviceState *dev,
>> Error **errp)
>> fdctrl->dma_chann = isa->dma;
>> if (fdctrl->dma_chann != -1) {
>> fdctrl->dma = isa_get_dma(isa_bus_from_device(isadev), isa->dma);
>> - assert(fdctrl->dma);
>> + if (!fdctrl->dma) {
>> + error_setg(errp, "ISA controller does not support DMA");
>> + return;
>> + }
>> }
>>
>> qdev_set_legacy_instance_id(dev, isa->iobase, 2);
>>
>
> FWIW, this is the hunk that was part of the version that I sent to the list:
>
> diff --git a/scripts/device-crash-test b/scripts/device-crash-test
> index 7ff351d..99d20cb 100755
> --- a/scripts/device-crash-test
> +++ b/scripts/device-crash-test
> @@ -217,7 +217,6 @@ ERROR_WHITELIST = [
> {'exitcode':-6, 'log':r"Object .* is not an instance of type
> generic-pc-machine", 'loglevel':logging.ERROR},
> {'exitcode':-6, 'log':r"Object .* is not an instance of type e500-ccsr",
> 'loglevel':logging.ERROR},
> {'exitcode':-6, 'log':r"vmstate_register_with_alias_id: Assertion
> `!se->compat \|\| se->instance_id == 0' failed", 'loglevel':logging.ERROR},
> - {'exitcode':-6, 'device':'isa-fdc', 'loglevel':logging.ERROR,
> 'expected':True},
> {'exitcode':-11, 'device':'gus', 'loglevel':logging.ERROR,
> 'expected':True},
> {'exitcode':-11, 'device':'isa-serial', 'loglevel':logging.ERROR,
> 'expected':True},
> {'exitcode':-11, 'device':'sb16', 'loglevel':logging.ERROR,
> 'expected':True},
>
> Thomas
>
- [Qemu-devel] [PULL 00/16] Misc fixes for QEMU 2.12.0-rc1, Paolo Bonzini, 2018/03/26
- [Qemu-devel] [PULL 02/16] WHPX fix WHvGetCapability out WrittenSizeInBytes, Paolo Bonzini, 2018/03/26
- [Qemu-devel] [PULL 03/16] WHPX fix WHvSetPartitionProperty in PropertyCode, Paolo Bonzini, 2018/03/26
- [Qemu-devel] [PULL 04/16] WHPX improve vcpu_post_run perf, Paolo Bonzini, 2018/03/26
- [Qemu-devel] [PULL 05/16] hw/net/can: Fix segfaults when using the devices without bus, Paolo Bonzini, 2018/03/26
- [Qemu-devel] [PULL 01/16] scripts/get_maintainer.pl: Print proper error message for missing $file, Paolo Bonzini, 2018/03/26
- [Qemu-devel] [PULL 07/16] hw/audio: Fix crashes when devices are used on ISA bus without DMA, Paolo Bonzini, 2018/03/26
- [Qemu-devel] [PULL 06/16] fdc: Exit if ISA controller does not support DMA, Paolo Bonzini, 2018/03/26
- [Qemu-devel] [PULL 08/16] scripts/device-crash-test: Remove fixed isapc-with-iommu entry, Paolo Bonzini, 2018/03/26
- [Qemu-devel] [PULL 09/16] vhost-user-test: do not hang if chardev creation failed, Paolo Bonzini, 2018/03/26
- [Qemu-devel] [PULL 11/16] tcg: Really fix cpu_io_recompile, Paolo Bonzini, 2018/03/26
- [Qemu-devel] [PULL 12/16] chardev-socket: remove useless if, Paolo Bonzini, 2018/03/26
- [Qemu-devel] [PULL 13/16] scsi: turn "is this a SCSI device?" into a conditional hint, Paolo Bonzini, 2018/03/26
- [Qemu-devel] [PULL 14/16] iothread: fix breakage on windows, Paolo Bonzini, 2018/03/26
- [Qemu-devel] [PULL 15/16] chardev/char-fe: Allow NULL chardev in qemu_chr_fe_init(), Paolo Bonzini, 2018/03/26
- [Qemu-devel] [PULL 10/16] vhost-user-test: add back memfd check, Paolo Bonzini, 2018/03/26
- [Qemu-devel] [PULL 16/16] qemu-pr-helper: Actually allow users to specify pidfile, Paolo Bonzini, 2018/03/26
- Re: [Qemu-devel] [PULL 00/16] Misc fixes for QEMU 2.12.0-rc1, Peter Maydell, 2018/03/27