From patchwork Fri Dec 3 11:09:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ronnie sahlberg X-Patchwork-Id: 74121 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A78B3B70DE for ; Fri, 3 Dec 2010 22:45:42 +1100 (EST) Received: from localhost ([127.0.0.1]:43059 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1POTnP-0006iy-OT for incoming@patchwork.ozlabs.org; Fri, 03 Dec 2010 06:27:23 -0500 Received: from [140.186.70.92] (port=59684 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1POTYr-000265-2V for qemu-devel@nongnu.org; Fri, 03 Dec 2010 06:12:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1POTYp-00030Y-Ok for qemu-devel@nongnu.org; Fri, 03 Dec 2010 06:12:20 -0500 Received: from mail-gx0-f173.google.com ([209.85.161.173]:45474) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1POTYp-00030R-Ft for qemu-devel@nongnu.org; Fri, 03 Dec 2010 06:12:19 -0500 Received: by gxk24 with SMTP id 24so5077081gxk.4 for ; Fri, 03 Dec 2010 03:12:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:from:to:cc:subject :date:message-id:x-mailer:in-reply-to:references; bh=JJMP5qju72zHmHkcP8E1PZs4wPzj63nvUxakTSf4l5o=; b=Y/zsYL4F56aCyFrN5j4LBINDW3DNIZNkrGK+g4JtBxqPxa5xidsaZh0t+SqShdPsdu /1va0t45v0WvQaMvpMyYBYtyMqxNIlPDp9LVhQtx3nfCVrMzHRDCwl+YZa6yPlBmWaA7 dtOC9Y8IstrYZN2KjktEi/RgohJ5xN+PRocX0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=RMCGpuWrzGw+nFS3Pp/YaQ1oAIo/9jY0viPuQ3chRbK5wLa9gW+oQTF/3RzyQnPqjX NtZ+APczNmBzEEwzBpogN8KS9dhgSgCD4XWWKBd83vpZeUvCG4otnZA1G/NluaG6ZMg9 miSjhpefXXDfc38Jk1yYgsW++EsX8Op5Zyr1k= Received: by 10.91.24.17 with SMTP id b17mr2952149agj.192.1291374739197; Fri, 03 Dec 2010 03:12:19 -0800 (PST) Received: from ronniesahlberg@gmail.com (CPE-121-216-183-74.lnse2.ken.bigpond.net.au [121.216.183.74]) by mx.google.com with ESMTPS id f10sm1682144anh.25.2010.12.03.03.12.16 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 03 Dec 2010 03:12:18 -0800 (PST) Received: by ronniesahlberg@gmail.com (sSMTP sendmail emulation); Fri, 03 Dec 2010 22:11:51 +1100 From: ronniesahlberg@gmail.com To: qemu-devel@nongnu.org Date: Fri, 3 Dec 2010 22:09:53 +1100 Message-Id: <1291374593-17448-15-git-send-email-ronniesahlberg@gmail.com> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <1291374593-17448-1-git-send-email-ronniesahlberg@gmail.com> References: <1291374593-17448-1-git-send-email-ronniesahlberg@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Ronnie Sahlberg Subject: [Qemu-devel] [PATCH 14/14] iscsi support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Ronnie Sahlberg add iscsi.c and the iscsi library to the makefile sot it gets built Signed-off-by: Ronnie Sahlberg --- Makefile | 2 +- Makefile.objs | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index c80566c..6efdf14 100644 --- a/Makefile +++ b/Makefile @@ -178,7 +178,7 @@ clean: rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h rm -f qemu-options.def rm -f *.o *.d *.a $(TOOLS) TAGS cscope.* *.pod *~ */*~ - rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d + rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d block/iscsi/*.o block/iscsi/*.d net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d rm -f qemu-img-cmds.h rm -f trace.c trace.h trace.c-timestamp trace.h-timestamp rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp diff --git a/Makefile.objs b/Makefile.objs index 04625eb..ae03a7e 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -27,6 +27,15 @@ block-nested-$(CONFIG_CURL) += curl.o block-obj-y += $(addprefix block/, $(block-nested-y)) +block-iscsi-nested-y += connect.o crc32c.o discovery.o init.o login.o nop.o +block-iscsi-nested-y += pdu.o scsi-command.o scsi-lowlevel.o socket.o +block-iscsi-nested-y += sync.o + +block-iscsi-obj-y = iscsi.o +block-iscsi-obj-y += $(addprefix iscsi/, $(block-iscsi-nested-y)) + +block-obj-$(CONFIG_POSIX) += $(addprefix block/, $(block-iscsi-obj-y)) + net-obj-y = net.o net-nested-y = queue.o checksum.o util.o net-nested-y += socket.o