qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 2/9] dec.c - move to pci-bridge
Date: Tue, 4 Jun 2013 11:07:43 +0300	[thread overview]
Message-ID: <1370202787-3712-3-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1370202787-3712-1-git-send-email-mst@redhat.com>

Looks like dec.c is in pci-host by mistake.
Moving it over to pci-bridge.

Acked-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/pci-bridge/Makefile.objs       | 2 ++
 hw/{pci-host => pci-bridge}/dec.c | 0
 hw/{pci-host => pci-bridge}/dec.h | 0
 hw/pci-host/Makefile.objs         | 1 -
 4 files changed, 2 insertions(+), 1 deletion(-)
 rename hw/{pci-host => pci-bridge}/dec.c (100%)
 rename hw/{pci-host => pci-bridge}/dec.h (100%)

diff --git a/hw/pci-bridge/Makefile.objs b/hw/pci-bridge/Makefile.objs
index 5dd92d2..968b369 100644
--- a/hw/pci-bridge/Makefile.objs
+++ b/hw/pci-bridge/Makefile.objs
@@ -1,3 +1,5 @@
 common-obj-y += pci_bridge_dev.o
 common-obj-y += ioh3420.o xio3130_upstream.o xio3130_downstream.o
 common-obj-y += i82801b11.o
+# NewWorld PowerMac
+common-obj-$(CONFIG_DEC_PCI) += dec.o
diff --git a/hw/pci-host/dec.c b/hw/pci-bridge/dec.c
similarity index 100%
rename from hw/pci-host/dec.c
rename to hw/pci-bridge/dec.c
diff --git a/hw/pci-host/dec.h b/hw/pci-bridge/dec.h
similarity index 100%
rename from hw/pci-host/dec.h
rename to hw/pci-bridge/dec.h
diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs
index 909e702..bb65f9c 100644
--- a/hw/pci-host/Makefile.objs
+++ b/hw/pci-host/Makefile.objs
@@ -5,7 +5,6 @@ common-obj-$(CONFIG_PREP_PCI) += prep.o
 common-obj-$(CONFIG_GRACKLE_PCI) += grackle.o
 # NewWorld PowerMac
 common-obj-$(CONFIG_UNIN_PCI) += uninorth.o
-common-obj-$(CONFIG_DEC_PCI) += dec.o
 # PowerPC E500 boards
 common-obj-$(CONFIG_PPCE500_PCI) += ppce500.o
 
-- 
MST

  parent reply	other threads:[~2013-06-04  8:07 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-04  8:07 [Qemu-devel] [PULL 0/9] pci: misc cleanups Michael S. Tsirkin
2013-06-04  8:07 ` [Qemu-devel] [PULL 1/9] q35: set fw_name Michael S. Tsirkin
2013-06-04  8:07 ` Michael S. Tsirkin [this message]
2013-06-04  8:07 ` [Qemu-devel] [PULL 3/9] firmware_abi: move to include/hw/nvram/ Michael S. Tsirkin
2013-06-04  8:07 ` [Qemu-devel] [PULL 4/9] apic: rename apic specific bitopts Michael S. Tsirkin
2013-06-04  8:07 ` [Qemu-devel] [PULL 5/9] refer to FWCfgState explicitly Michael S. Tsirkin
2013-06-04  8:07 ` [Qemu-devel] [PULL 6/9] fw_cfg: move typedef to qemu/typedefs.h Michael S. Tsirkin
2013-06-04  8:08 ` [Qemu-devel] [PULL 7/9] fw_cfg: add API to find FW cfg object Michael S. Tsirkin
2013-06-04  8:08 ` [Qemu-devel] [PULL 8/9] fw_cfg: fw_cfg is a singleton Michael S. Tsirkin
2013-06-04  8:08 ` [Qemu-devel] [PULL 9/9] pvpanic: use FWCfgState explicitly Michael S. Tsirkin
2013-06-17 21:17 ` [Qemu-devel] [PULL 0/9] pci: misc cleanups Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1370202787-3712-3-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).