From patchwork Thu Apr 4 19:22:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 233910 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 11AB32C00AC for ; Fri, 5 Apr 2013 06:29:06 +1100 (EST) Received: from localhost ([::1]:51602 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNpqK-0008GY-6Y for incoming@patchwork.ozlabs.org; Thu, 04 Apr 2013 15:29:04 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNplV-0001gh-GA for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:24:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNplR-0001ug-Up for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:24:05 -0400 Received: from mail-wi0-x235.google.com ([2a00:1450:400c:c05::235]:62776) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNplR-0001uJ-Lp for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:24:01 -0400 Received: by mail-wi0-f181.google.com with SMTP id hj8so2970028wib.14 for ; Thu, 04 Apr 2013 12:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=LzDKcsqSpiF4C01LqVj9WRxnRKornuWJt+6uVS+sjZc=; b=ekxtsWfo7DbJ8SeR6omLC8ID/7/7oLPaK2b6y/GfOWN66QWzFEPNxC6a8e9+ww1VxM 3/SxrxsQR8zMrW1D6SJYEyl9p5+Ia89k0kFDHRKE5iBvbjlu0sEkRXYW+fannxAYLboG tcUdzJXEGIxQII9/161K+ZCCqsyRaslYA7RG4CimK16nDfkbQnGT1okEWA7I0Ivw2/h/ AXhWkXsqBSZ3DrG1mXCc3S6zZeVLcRyPTrAS/NEnJ3n32SeCwqEBDPHNt9+BtXDUpNg3 QrESMicKSCxmWMAz5AqT+r0oxFO1DJzoiRTzSy3PzbOk1iEL99DlLZDK66ApAo26bv7s XYlA== X-Received: by 10.194.219.162 with SMTP id pp2mr11662794wjc.27.1365103440991; Thu, 04 Apr 2013 12:24:00 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id du2sm33093079wib.0.2013.04.04.12.23.59 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 04 Apr 2013 12:24:00 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 4 Apr 2013 21:22:58 +0200 Message-Id: <1365103395-11547-19-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1365103395-11547-1-git-send-email-pbonzini@redhat.com> References: <1365103395-11547-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::235 Subject: [Qemu-devel] [PATCH 18/35] hw: move SCSI controllers to hw/scsi/, configure via default-configs/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- hw/ppc/Makefile.objs | 2 +- hw/scsi/Makefile.objs | 1 + hw/{ => scsi}/spapr_vscsi.c | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename hw/{ => scsi}/spapr_vscsi.c (100%) diff --git a/hw/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c similarity index 100% rename from hw/spapr_vscsi.c rename to hw/scsi/spapr_vscsi.c diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 42c7d08..2d51ae9 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -1,5 +1,5 @@ # IBM pSeries (sPAPR) -obj-$(CONFIG_PSERIES) += spapr_vty.o spapr_vscsi.o +obj-$(CONFIG_PSERIES) += spapr_vty.o obj-$(CONFIG_PSERIES) += spapr_pci.o obj-$(CONFIG_PSERIES) += spapr_nvram.o # PowerPC 4xx boards diff --git a/hw/scsi/Makefile.objs b/hw/scsi/Makefile.objs index b76b9c3..aab0e9b 100644 --- a/hw/scsi/Makefile.objs +++ b/hw/scsi/Makefile.objs @@ -4,4 +4,5 @@ common-obj-$(CONFIG_LSI_SCSI_PCI) += lsi53c895a.o common-obj-$(CONFIG_MEGASAS_SCSI_PCI) += megasas.o common-obj-$(CONFIG_ESP) += esp.o common-obj-$(CONFIG_ESP_PCI) += esp-pci.o +obj-$(CONFIG_PSERIES) += spapr_vscsi.o obj-$(CONFIG_VIRTIO) += virtio-scsi.o