[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] [S390] Make virtio-pci building conditional aga
From: |
Aurelien Jarno |
Subject: |
Re: [Qemu-devel] [PATCH] [S390] Make virtio-pci building conditional again |
Date: |
Thu, 8 Apr 2010 21:49:27 +0200 |
User-agent: |
Mutt/1.5.20 (2009-06-14) |
On Tue, Apr 06, 2010 at 12:11:43PM +0200, Alexander Graf wrote:
> Commit b305b9d7d6990e492966ffb1fdf619482adeb7e2 made building of virtio-pci
> conditional and not enabled on S390x, because it collides with the S390 bus.
>
> Commit 087431d1d1bf4e785edfa89e8cd05fcdac558dc3 accidentially reverted that
> behavior, breaking S390x again.
>
> So here's a follow-up patch disabling building of virtio-pci on S390x again.
>
> This unbreaks the S390x target.
Thanks, applied.
> Signed-off-by: Alexander Graf <address@hidden>
> ---
> Makefile.target | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/Makefile.target b/Makefile.target
> index 45cbe56..2624b1d 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -164,7 +164,8 @@ ifdef CONFIG_SOFTMMU
> obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o vl.o
> # virtio has to be here due to weird dependency between PCI and virtio-net.
> # need to fix this properly
> -obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-pci.o
> virtio-serial-bus.o
> +obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o
> +obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
> obj-y += event_notifier.o
> obj-y += vhost_net.o
> obj-$(CONFIG_VHOST_NET) += vhost.o
> --
> 1.6.0.2
>
>
>
>
--
Aurelien Jarno GPG: 1024D/F1BCDB73
address@hidden http://www.aurel32.net