From patchwork Thu Aug 16 13:54:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 1332291 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id D905640210 for ; Thu, 16 Aug 2012 13:56:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932584Ab2HPN4S (ORCPT ); Thu, 16 Aug 2012 09:56:18 -0400 Received: from david.siemens.de ([192.35.17.14]:34054 "EHLO david.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756867Ab2HPNyj (ORCPT ); Thu, 16 Aug 2012 09:54:39 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.13.6/8.13.6) with ESMTP id q7GDsZlh007025; Thu, 16 Aug 2012 15:54:35 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id q7GDsYJP012893; Thu, 16 Aug 2012 15:54:35 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, Alex Williamson Subject: [PATCH 15/19] pci-assign: Move and rename source file Date: Thu, 16 Aug 2012 15:54:29 +0200 Message-Id: <3e10268e5f9d26b1ec342d91c854a50324b49778.1345125266.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Move device-assignment.c into hw/kvm, calling it pci-assign.c now, just like its device name. Signed-off-by: Jan Kiszka --- hw/i386/Makefile.objs | 3 --- hw/kvm/Makefile.objs | 2 +- hw/{device-assignment.c => kvm/pci-assign.c} | 10 +++++----- 3 files changed, 6 insertions(+), 9 deletions(-) rename hw/{device-assignment.c => kvm/pci-assign.c} (99%) diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 29f3e6f..523e224 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -14,7 +14,4 @@ obj-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o obj-y += testdev.o obj-y += acpi.o acpi_piix4.o -obj-$(CONFIG_KVM) += device-assignment.o - - obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/kvm/Makefile.objs b/hw/kvm/Makefile.objs index 226497a..f620d7f 100644 --- a/hw/kvm/Makefile.objs +++ b/hw/kvm/Makefile.objs @@ -1 +1 @@ -obj-$(CONFIG_KVM) += clock.o apic.o i8259.o ioapic.o i8254.o +obj-$(CONFIG_KVM) += clock.o apic.o i8259.o ioapic.o i8254.o pci-assign.o diff --git a/hw/device-assignment.c b/hw/kvm/pci-assign.c similarity index 99% rename from hw/device-assignment.c rename to hw/kvm/pci-assign.c index 5ef5629..3611539 100644 --- a/hw/device-assignment.c +++ b/hw/kvm/pci-assign.c @@ -31,16 +31,16 @@ #include #include #include -#include "hw.h" -#include "pc.h" +#include "hw/hw.h" +#include "hw/pc.h" #include "qemu-error.h" #include "console.h" -#include "loader.h" +#include "hw/loader.h" #include "monitor.h" #include "range.h" #include "sysemu.h" -#include "pci.h" -#include "msi.h" +#include "hw/pci.h" +#include "hw/msi.h" #include "kvm_i386.h" #define MSIX_PAGE_SIZE 0x1000