Commit d321e6d5 authored by Thomas Huth's avatar Thomas Huth Committed by Paolo Bonzini
Browse files

default-configs: Replace $(and ...) with $(call land, ...) 



Using $(and ...) is dangerous here: It only works as long as the first
argument is set to 'y' or completely unset. It does not work if the
first argument is set to 'n' for example. Let's use the "land" make
function instead which has been written explicitely for this purpose.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Message-Id: <1505759538-15365-1-git-send-email-thuth@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 262a69f4

default-configs/pci.mak

+1 −1
Original line number Diff line number Diff line
@@ -43,4 +43,4 @@ CONFIG_VGA=y 
CONFIG_VGA_PCI=y

CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM)

CONFIG_ROCKER=y

CONFIG_VHOST_USER_SCSI=$(and $(CONFIG_VHOST_USER),$(CONFIG_LINUX))
 
CONFIG_VHOST_USER_SCSI=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))

default-configs/ppc-softmmu.mak

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ CONFIG_XILINX_ETHLITE=y 
CONFIG_PREP=y

CONFIG_MAC=y

CONFIG_E500=y

CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))

CONFIG_OPENPIC_KVM=$(call land,$(CONFIG_E500),$(CONFIG_KVM))

CONFIG_PLATFORM_BUS=y

CONFIG_ETSEC=y

CONFIG_LIBDECNUMBER=y

default-configs/ppc64-softmmu.mak

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ CONFIG_POWERNV=y 
CONFIG_PREP=y

CONFIG_MAC=y

CONFIG_E500=y

CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))

CONFIG_OPENPIC_KVM=$(call land,$(CONFIG_E500),$(CONFIG_KVM))

CONFIG_PLATFORM_BUS=y

CONFIG_ETSEC=y

CONFIG_LIBDECNUMBER=y
@@ -56,7 +56,7 @@ CONFIG_SM501=y 
# For pSeries

CONFIG_XICS=$(CONFIG_PSERIES)

CONFIG_XICS_SPAPR=$(CONFIG_PSERIES)

CONFIG_XICS_KVM=$(and $(CONFIG_PSERIES),$(CONFIG_KVM))

CONFIG_XICS_KVM=$(call land,$(CONFIG_PSERIES),$(CONFIG_KVM))

# For PReP

CONFIG_SERIAL_ISA=y

CONFIG_MC146818RTC=y

default-configs/s390x-softmmu.mak

+1 −1
Original line number Diff line number Diff line 
CONFIG_PCI=y

CONFIG_VIRTIO_PCI=$(CONFIG_PCI)

CONFIG_VHOST_USER_SCSI=$(and $(CONFIG_VHOST_USER),$(CONFIG_LINUX))

CONFIG_VHOST_USER_SCSI=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))

CONFIG_VIRTIO=y

CONFIG_SCLPCONSOLE=y

CONFIG_TERMINAL3270=y