Re: [Qemu-devel] [PATCH v4 0/9] s390x: zPCI detangling

[Thomas Huth]

On 08.08.2017 11:46, Cornelia Huck wrote:
> On Tue, 8 Aug 2017 11:29:50 +0200
> Thomas Huth <address@hidden> wrote:
> 
>> On 08.08.2017 11:15, Cornelia Huck wrote:
>>> On Fri, 4 Aug 2017 16:59:34 +0200
>>> Cornelia Huck <address@hidden> wrote:
>>>   
>>>> On Fri,  4 Aug 2017 13:29:37 +0200
>>>> Cornelia Huck <address@hidden> wrote:
>>>>  
>>>>> Next version, not so many changes from v3.
>>>>>
>>>>> As you might have guessed, the goals are still the same:
>>>>> - Being able to disable PCI support in a build completely.
>>>>> - Properly fencing off PCI if the relevant facility bit is not provided.
>>>>>
>>>>> Changes v3->v4:
>>>>> - introduce pci_available boolean
>>>>> - use pci_available to fence off setting the zcpi facility bit
>>>>> - collected tags
>>>>>
>>>>> Branch is still git://github.com/cohuck/qemu no-zpci-cpumodel    
>>>>
>>>> make check on a build with pci disabled revealed an interesting
>>>> inconsistency: We create a virtio-9p-ccw device, but the base
>>>> virtio-9p-device is in code that is not built for !pci.
>>>>
>>>> If I remove the pci dependency for hw/9pfs/ and fsdev/, things look
>>>> fine (at least on s390x). We probably need a different dependency,
>>>> though.
>>>>
>>>> virtio-9p maintainers, any suggestions?  
>>>
>>> I have the patch below, which is ugly, but seems to work for me. Better
>>> ideas welcome :)  
>>
>> I haven't tried whether it works, but you could maybe change the define
>> of CONFIG_VIRTFS instead:
>>
>> diff --git a/configure b/configure
>> index dd73cce..64d21f6 100755
>> --- a/configure
>> +++ b/configure
>> @@ -5771,7 +5771,7 @@ if test "$libattr" = "yes" ; then
>>    echo "CONFIG_LIBATTR=y" >> $config_host_mak
>>  fi
>>  if test "$virtfs" = "yes" ; then
>> -  echo "CONFIG_VIRTFS=y" >> $config_host_mak
>> +  echo 'CONFIG_VIRTFS=$(call lor, 
>> $(CONFIG_VIRTIO_PCI),$(CONFIG_VIRTIO_CCW)' >> $config_host_mak
>>  fi
>>  if test "$vhost_scsi" = "yes" ; then
>>    echo "CONFIG_VHOST_SCSI=y" >> $config_host_mak
>>
>> ... I think that should simplify the other statements quite a bit since
>> you then only have to test CONFIG_VIRTFS in the other locations?
>>
>>  Thomas
> 
> Would be a simplification if it worked, yes; not sure whether we should
> change the semantic of --enable-virtfs to error out if we don't have
> either virtio-pci or virtio-ccw?

I don't think that this would work: configure is run once for all
targets, but the CONFIG_PCI and CONFIG_CCW settings are only valid for
individual targets, so you can not use the value of these config
variables during "configure" yet.

 Thomas