From patchwork Tue Apr 2 14:59:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 233043 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 0901D2C00D2 for ; Wed, 3 Apr 2013 02:07:29 +1100 (EST) Received: from localhost ([::1]:49850 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2mG-0005uH-BI for incoming@patchwork.ozlabs.org; Tue, 02 Apr 2013 11:05:36 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2hH-0006Zf-As for qemu-devel@nongnu.org; Tue, 02 Apr 2013 11:00:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UN2hA-0001nt-7Q for qemu-devel@nongnu.org; Tue, 02 Apr 2013 11:00:27 -0400 Received: from mail-ea0-x22a.google.com ([2a00:1450:4013:c01::22a]:63419) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2hA-0001nh-1G for qemu-devel@nongnu.org; Tue, 02 Apr 2013 11:00:20 -0400 Received: by mail-ea0-f170.google.com with SMTP id a15so265433eae.15 for ; Tue, 02 Apr 2013 08:00:19 -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=n0o1uHzFDYc6FGTh9Bb1TMSZ95X8asCv9ooFyTbi3iA=; b=mkQ3Wt4/rYrza4vtN2U2ViW1A6LAbjLHaBtKYR2nVHuz+ro4t0AKOsSYndGo4skwgd uU+OBhseu7xQu6J5SrV4TLu9pc5ThPvt39HA7/rNV7l8pqn+IH4XJM3oZFwb61YuIHbV QQDfrmwNWj9UylcffB7UDXdOus8Dtc7PlPK6g2d/BoYWPUHCutt+TxUPqLz2pG/qwasW 0TGn34YXqgyqzJVBB4O+LbtT0Hei1F8JLiIPGxvHb7QPnGZ8mgFFWSMIK8CcDgVpQ3Kn gGdGxqvVeLKafeR1cvLYtv8ut8qLieP1V0VDq+Jii+Y5U8Df8ZD+7flDIGcHy33zSeQ9 D4NQ== X-Received: by 10.14.194.198 with SMTP id m46mr49686318een.8.1364914819268; Tue, 02 Apr 2013 08:00:19 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id n2sm3179353eeo.10.2013.04.02.08.00.17 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 02 Apr 2013 08:00:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 2 Apr 2013 16:59:05 +0200 Message-Id: <1364914749-11141-32-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1364914749-11141-1-git-send-email-pbonzini@redhat.com> References: <1364914749-11141-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:4013:c01::22a Subject: [Qemu-devel] [PATCH 31/35] hw: move hw/kvm/ to hw/i386/kvm 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 Peter requested the KVM GIC to be in hw/intc. Signed-off-by: Paolo Bonzini --- hw/i386/Makefile.objs | 5 +---- hw/i386/kvm/Makefile.objs | 1 + hw/{ => i386}/kvm/apic.c | 0 hw/{ => i386}/kvm/clock.c | 0 hw/{ => i386}/kvm/i8254.c | 0 hw/{ => i386}/kvm/i8259.c | 0 hw/{ => i386}/kvm/ioapic.c | 0 hw/{ => i386}/kvm/pci-assign.c | 0 hw/kvm/Makefile.objs | 1 - 9 files changed, 2 insertions(+), 5 deletions(-) create mode 100644 hw/i386/kvm/Makefile.objs rename hw/{ => i386}/kvm/apic.c (100%) rename hw/{ => i386}/kvm/clock.c (100%) rename hw/{ => i386}/kvm/i8254.c (100%) rename hw/{ => i386}/kvm/i8259.c (100%) rename hw/{ => i386}/kvm/ioapic.c (100%) rename hw/{ => i386}/kvm/pci-assign.c (100%) delete mode 100644 hw/kvm/Makefile.objs diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index c1d73a8..205d22e 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -1,7 +1,4 @@ -obj-y += kvm/ - -obj-y := $(addprefix ../,$(obj-y)) - +obj-$(CONFIG_KVM) += kvm/ obj-y += multiboot.o smbios.o obj-y += pc.o pc_piix.o pc_q35.o obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o diff --git a/hw/i386/kvm/Makefile.objs b/hw/i386/kvm/Makefile.objs new file mode 100644 index 0000000..d8bce20 --- /dev/null +++ b/hw/i386/kvm/Makefile.objs @@ -0,0 +1 @@ +obj-y += clock.o apic.o i8259.o ioapic.o i8254.o pci-assign.o diff --git a/hw/kvm/apic.c b/hw/i386/kvm/apic.c similarity index 100% rename from hw/kvm/apic.c rename to hw/i386/kvm/apic.c diff --git a/hw/kvm/clock.c b/hw/i386/kvm/clock.c similarity index 100% rename from hw/kvm/clock.c rename to hw/i386/kvm/clock.c diff --git a/hw/kvm/i8254.c b/hw/i386/kvm/i8254.c similarity index 100% rename from hw/kvm/i8254.c rename to hw/i386/kvm/i8254.c diff --git a/hw/kvm/i8259.c b/hw/i386/kvm/i8259.c similarity index 100% rename from hw/kvm/i8259.c rename to hw/i386/kvm/i8259.c diff --git a/hw/kvm/ioapic.c b/hw/i386/kvm/ioapic.c similarity index 100% rename from hw/kvm/ioapic.c rename to hw/i386/kvm/ioapic.c diff --git a/hw/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c similarity index 100% rename from hw/kvm/pci-assign.c rename to hw/i386/kvm/pci-assign.c diff --git a/hw/kvm/Makefile.objs b/hw/kvm/Makefile.objs deleted file mode 100644 index f620d7f..0000000 --- a/hw/kvm/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_KVM) += clock.o apic.o i8259.o ioapic.o i8254.o pci-assign.o