From patchwork Fri Jul 9 16:33:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 58412 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 A036CB6EEB for ; Sat, 10 Jul 2010 02:34:06 +1000 (EST) Received: from localhost ([127.0.0.1]:35616 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OXGWZ-0007ww-1M for incoming@patchwork.ozlabs.org; Fri, 09 Jul 2010 12:34:03 -0400 Received: from [140.186.70.92] (port=49471 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OXGVy-0007vG-HH for qemu-devel@nongnu.org; Fri, 09 Jul 2010 12:33:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OXGVx-0006sr-9Z for qemu-devel@nongnu.org; Fri, 09 Jul 2010 12:33:26 -0400 Received: from verein.lst.de ([213.95.11.210]:49914) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OXGVx-0006rg-0Z for qemu-devel@nongnu.org; Fri, 09 Jul 2010 12:33:25 -0400 Received: from verein.lst.de (localhost [127.0.0.1]) by verein.lst.de (8.12.3/8.12.3/Debian-7.1) with ESMTP id o69GXHWY012050 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO) for ; Fri, 9 Jul 2010 18:33:17 +0200 Received: (from hch@localhost) by verein.lst.de (8.12.3/8.12.3/Debian-7.2) id o69GXHsd012049 for qemu-devel@nongnu.org; Fri, 9 Jul 2010 18:33:17 +0200 Date: Fri, 9 Jul 2010 18:33:17 +0200 From: Christoph Hellwig To: qemu-devel@nongnu.org Message-ID: <20100709163317.GA11922@lst.de> Mime-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.3.28i X-Scanned-By: MIMEDefang 2.39 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH] scsi-generic: only compile if CONFIG_LINUX is set 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 Signed-off-by: Christoph Hellwig Index: qemu/Makefile.objs =================================================================== --- qemu.orig/Makefile.objs 2010-07-09 09:25:52.856639729 -0700 +++ qemu/Makefile.objs 2010-07-09 09:26:15.562639727 -0700 @@ -70,7 +70,8 @@ common-obj-$(CONFIG_DS1338) += ds1338.o common-obj-y += i2c.o smbus.o smbus_eeprom.o common-obj-y += eeprom93xx.o common-obj-y += scsi-disk.o cdrom.o -common-obj-y += scsi-generic.o scsi-bus.o +common-obj-$(CONFIG_LINUX) += scsi-generic.o +common-obj-y += scsi-bus.o common-obj-y += usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o common-obj-y += usb-serial.o usb-net.o usb-bus.o common-obj-$(CONFIG_SSI) += ssi.o Index: qemu/hw/scsi-generic.c =================================================================== --- qemu.orig/hw/scsi-generic.c 2010-07-09 09:26:18.937639727 -0700 +++ qemu/hw/scsi-generic.c 2010-07-09 09:26:34.216639727 -0700 @@ -15,8 +15,6 @@ #include "qemu-error.h" #include "scsi.h" -#ifdef __linux__ - //#define DEBUG_SCSI #ifdef DEBUG_SCSI @@ -544,5 +542,3 @@ static void scsi_generic_register_device scsi_qdev_register(&scsi_generic_info); } device_init(scsi_generic_register_devices) - -#endif /* __linux__ */