| Message ID | 20181126200009.862-17-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Virtio devices split from virtio-pci | expand |
On 26/11/2018 21:00, Juan Quintela wrote: > Otherwise, it has no implementation. > > Signed-off-by: Juan Quintela <quintela@redhat.com> > --- > default-configs/virtio.mak | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/default-configs/virtio.mak b/default-configs/virtio.mak > index 5ae4a61018..ecb4420e74 100644 > --- a/default-configs/virtio.mak > +++ b/default-configs/virtio.mak > @@ -1,7 +1,7 @@ > CONFIG_VHOST_USER_SCSI=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX)) > CONFIG_VHOST_USER_BLK=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX)) > CONFIG_VIRTIO=y > -CONFIG_VIRTIO_9P=y > +CONFIG_VIRTIO_9P=$(CONFIG_VIRTFS) > CONFIG_VIRTIO_BALLOON=y > CONFIG_VIRTIO_BLK=y > CONFIG_VIRTIO_CRYPTO=y > I think you should also replace "#ifdef CONFIG_VIRTFS" by "#ifdef CONFIG_VIRTIO_9P" in: hw/s390x/virtio-ccw.h include/hw/xen/xen_backend.h hw/xen/xen_backend.c Thanks, Laurent
Laurent Vivier <lvivier@redhat.com> wrote: > On 26/11/2018 21:00, Juan Quintela wrote: >> Otherwise, it has no implementation. >> >> Signed-off-by: Juan Quintela <quintela@redhat.com> >> --- >> default-configs/virtio.mak | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/default-configs/virtio.mak b/default-configs/virtio.mak >> index 5ae4a61018..ecb4420e74 100644 >> --- a/default-configs/virtio.mak >> +++ b/default-configs/virtio.mak >> @@ -1,7 +1,7 @@ >> CONFIG_VHOST_USER_SCSI=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX)) >> CONFIG_VHOST_USER_BLK=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX)) >> CONFIG_VIRTIO=y >> -CONFIG_VIRTIO_9P=y >> +CONFIG_VIRTIO_9P=$(CONFIG_VIRTFS) >> CONFIG_VIRTIO_BALLOON=y >> CONFIG_VIRTIO_BLK=y >> CONFIG_VIRTIO_CRYPTO=y >> > > I think you should also replace "#ifdef CONFIG_VIRTFS" by "#ifdef > CONFIG_VIRTIO_9P" in: > > hw/s390x/virtio-ccw.h > include/hw/xen/xen_backend.h > hw/xen/xen_backend.c After trying again, I remember why it failed. CONFIG_VIRTFS is defined in config-host.mak (and everyting in config-host.mak is defined also in config-host.h). CONFIG_VIRTIO_* is defined on config-devices.mak, and that is not defined in any include file. Sniff. Removed (again) that bit. Later, Juan.
diff --git a/default-configs/virtio.mak b/default-configs/virtio.mak index 5ae4a61018..ecb4420e74 100644 --- a/default-configs/virtio.mak +++ b/default-configs/virtio.mak @@ -1,7 +1,7 @@ CONFIG_VHOST_USER_SCSI=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX)) CONFIG_VHOST_USER_BLK=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX)) CONFIG_VIRTIO=y -CONFIG_VIRTIO_9P=y +CONFIG_VIRTIO_9P=$(CONFIG_VIRTFS) CONFIG_VIRTIO_BALLOON=y CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_CRYPTO=y
Otherwise, it has no implementation. Signed-off-by: Juan Quintela <quintela@redhat.com> --- default-configs/virtio.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)