virtio: PCI proxy devices should depend on CONFIG_VIRTIO_PCI

[Qemu-devel] [PATCH] virtio: PCI proxy devices should depend on CONFIG_VIRTIO_PCI

Paolo Bonzini posted 1 patch 5 years, 2 months ago

Download mbox

Test docker-clang@ubuntu passed

Test docker-mingw@fedora passed

Test asan passed

Test checkpatch passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/1548946740-28714-1-git-send-email-pbonzini@redhat.com

Maintainers: "Michael S. Tsirkin" <mst@redhat.com>

hw/virtio/Makefile.objs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[Qemu-devel] [PATCH] virtio: PCI proxy devices should depend on CONFIG_VIRTIO_PCI

Posted by Paolo Bonzini 5 years, 2 months ago

... otherwise, they break the build in the rare case where
CONFIG_VIRTIO_PCI is disabled (which will not be so rare
once kconfig goes in).

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/virtio/Makefile.objs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs
index ea7913d..d335dd0 100644
--- a/hw/virtio/Makefile.objs
+++ b/hw/virtio/Makefile.objs
@@ -11,7 +11,7 @@ obj-$(call land,$(CONFIG_VIRTIO_CRYPTO),$(CONFIG_VIRTIO_PCI)) += virtio-crypto-p
 
 obj-$(CONFIG_LINUX) += vhost.o vhost-backend.o vhost-user.o
 obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o
-ifeq ($(CONFIG_PCI),y)
+ifeq ($(CONFIG_VIRTIO_PCI),y)
 obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock-pci.o
 obj-$(CONFIG_VHOST_USER_BLK) += vhost-user-blk-pci.o
 obj-$(CONFIG_VHOST_USER_SCSI) += vhost-user-scsi-pci.o
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH] virtio: PCI proxy devices should depend on CONFIG_VIRTIO_PCI

Posted by Thomas Huth 5 years, 2 months ago

On 2019-01-31 15:59, Paolo Bonzini wrote:
> ... otherwise, they break the build in the rare case where
> CONFIG_VIRTIO_PCI is disabled (which will not be so rare
> once kconfig goes in).
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  hw/virtio/Makefile.objs | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs
> index ea7913d..d335dd0 100644
> --- a/hw/virtio/Makefile.objs
> +++ b/hw/virtio/Makefile.objs
> @@ -11,7 +11,7 @@ obj-$(call land,$(CONFIG_VIRTIO_CRYPTO),$(CONFIG_VIRTIO_PCI)) += virtio-crypto-p
>  
>  obj-$(CONFIG_LINUX) += vhost.o vhost-backend.o vhost-user.o
>  obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o
> -ifeq ($(CONFIG_PCI),y)
> +ifeq ($(CONFIG_VIRTIO_PCI),y)
>  obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock-pci.o
>  obj-$(CONFIG_VHOST_USER_BLK) += vhost-user-blk-pci.o
>  obj-$(CONFIG_VHOST_USER_SCSI) += vhost-user-scsi-pci.o

Miroslav hit this already, too:

https://lists.gnu.org/archive/html/qemu-devel/2019-01/msg06552.html

 Thomas