From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9fKN-0000YQ-MV for qemu-devel@nongnu.org; Mon, 19 Mar 2012 12:21:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S9fJp-0008OE-Hn for qemu-devel@nongnu.org; Mon, 19 Mar 2012 12:20:59 -0400 Received: from mail-yw0-f45.google.com ([209.85.213.45]:48974) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9fJp-0008Nu-Ak for qemu-devel@nongnu.org; Mon, 19 Mar 2012 12:20:25 -0400 Received: by yhoo21 with SMTP id o21so6526401yho.4 for ; Mon, 19 Mar 2012 09:20:23 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 19 Mar 2012 17:19:31 +0100 Message-Id: <1332173975-29099-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1332173975-29099-1-git-send-email-pbonzini@redhat.com> References: <1332173975-29099-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 1/5] get rid of CONFIG_VIRTIO_SCSI List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This is useless because we do not have a header file for devices. Setting it to off will cause a link error in virtio-pci.c. Signed-off-by: Paolo Bonzini --- Makefile.target | 2 +- default-configs/pci.mak | 1 - default-configs/s390x-softmmu.mak | 1 - 3 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Makefile.target b/Makefile.target index 37fb7ed..63cf769 100644 --- a/Makefile.target +++ b/Makefile.target @@ -209,7 +209,7 @@ obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o ioport.o # need to fix this properly obj-$(CONFIG_NO_PCI) += pci-stub.o obj-$(CONFIG_VIRTIO) += virtio.o virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o -obj-$(CONFIG_VIRTIO_SCSI) += virtio-scsi.o +obj-$(CONFIG_VIRTIO) += virtio-scsi.o obj-y += vhost_net.o obj-$(CONFIG_VHOST_NET) += vhost.o obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 21e4ccf..9d3e1db 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -1,6 +1,5 @@ CONFIG_PCI=y CONFIG_VIRTIO_PCI=y -CONFIG_VIRTIO_SCSI=y CONFIG_VIRTIO=y CONFIG_USB_UHCI=y CONFIG_USB_OHCI=y diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak index e588803..3005729 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -1,2 +1 @@ CONFIG_VIRTIO=y -CONFIG_VIRTIO_SCSI=y -- 1.7.7.6