From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSFsd-0001MS-Jv for qemu-devel@nongnu.org; Thu, 29 Nov 2018 01:32:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gSFsY-0004eF-LI for qemu-devel@nongnu.org; Thu, 29 Nov 2018 01:32:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43630) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gSFsY-0004dV-68 for qemu-devel@nongnu.org; Thu, 29 Nov 2018 01:32:50 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6ECF2307D911 for ; Thu, 29 Nov 2018 06:32:49 +0000 (UTC) From: Thomas Huth References: <20181126200009.862-1-quintela@redhat.com> <20181126200009.862-2-quintela@redhat.com> Message-ID: <63ab2448-5e57-6d0a-8218-664e9da86b55@redhat.com> Date: Thu, 29 Nov 2018 07:32:41 +0100 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 01/16] virtio: split vhost vsock bits from virtio-pci List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela , qemu-devel@nongnu.org Cc: lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com, "Michael S . Tsirkin" On 2018-11-29 07:30, Thomas Huth wrote: > On 2018-11-26 20:59, Juan Quintela wrote: >> Signed-off-by: Juan Quintela >> >> --- >> >> Updated copyright info >> Also split virtio-pci.h bits >> --- >> hw/virtio/Makefile.objs | 2 +- >> hw/virtio/vhost-vsock-pci.c | 82 +++++++++++++++++++++++++++++++++++++ >> hw/virtio/virtio-pci.c | 51 ----------------------- >> hw/virtio/virtio-pci.h | 18 -------- >> 4 files changed, 83 insertions(+), 70 deletions(-) >> create mode 100644 hw/virtio/vhost-vsock-pci.c >> >> diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs >> index 1b2799cfd8..4fbf7de84b 100644 >> --- a/hw/virtio/Makefile.objs >> +++ b/hw/virtio/Makefile.objs >> @@ -10,7 +10,7 @@ obj-$(CONFIG_VIRTIO_CRYPTO) += virtio-crypto.o >> obj-$(call land,$(CONFIG_VIRTIO_CRYPTO),$(CONFIG_VIRTIO_PCI)) += virtio-crypto-pci.o >> >> obj-$(CONFIG_LINUX) += vhost.o vhost-backend.o vhost-user.o >> -obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o >> +obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o vhost-vsock-pci.o > > Please change this into: > > obj-$(call land,$(CONFIG_VHOST_VSOCK),$(CONFIG_VIRTIO_PCI)) += vhost-vsock-pci.o ... or alternatively, wrap the new lines in a "ifeq ($(CONFIG_VIRTIO_PCI),y)" block, that's maybe easier. Thomas