From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60101) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkcKC-0003V5-2L for qemu-devel@nongnu.org; Mon, 17 Dec 2012 10:09:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TkcK4-00051T-NS for qemu-devel@nongnu.org; Mon, 17 Dec 2012 10:09:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39808) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkcK4-00050d-Db for qemu-devel@nongnu.org; Mon, 17 Dec 2012 10:09:40 -0500 Date: Mon, 17 Dec 2012 17:12:48 +0200 From: "Michael S. Tsirkin" Message-ID: <20121217151248.GA26834@redhat.com> References: <20121216211137.GA21767@redhat.com> <20121217111210.GA16932@redhat.com> <50CF353B.5080303@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <50CF353B.5080303@redhat.com> Subject: Re: [Qemu-devel] [PULLv2] pci,net,misc infrastructure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: yamahata@valinux.co.jp, jbaron@redhat.com, qemu-devel@nongnu.org, Anthony Liguori On Mon, Dec 17, 2012 at 04:07:39PM +0100, Paolo Bonzini wrote: > Il 17/12/2012 12:12, Michael S. Tsirkin ha scritto: > > On Sun, Dec 16, 2012 at 11:11:37PM +0200, Michael S. Tsirkin wrote: > >> The following changes since commit 1c97e303d4ea80a2691334b0febe87a50660f99d: > >> > >> Merge remote-tracking branch 'afaerber/qom-cpu' into staging (2012-12-10 08:35:15 -0600) > >> > >> are available in the git repository at: > >> > >> > >> git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_anthony > >> > >> for you to fetch changes up to e2911ce3819502edc2d3694c96abf37de43a592a: > > > > Pls note: this has a stale commit id. The correct one is > > 1dd3a74d2ee2d873cde0b390b536e45420b3fe05. > > If it's ok, I'll pull this into my header-renaming tree. Will send the > combined pull request in a hour or two. > > Paolo It's always OK - git resolves two merges of same tree trivially. > >> kvm: do not flush after deleting gsi (2012-12-16 16:49:08 +0200) > >> > >> ---------------------------------------------------------------- > >> pci,net,misc infrastructure > >> > >> This rearranges pci core into hw/pci/ > >> so it's separate from actual devices. > >> Also included are a couple of misc fixes: > >> - a fix for tap bug reported by alex on kvm forum > >> - a couple of misc updates: get_maintainer.pl, > >> and license update for the q35 files > >> - a minor optimization to path updates > >> > >> I've addressed the comments Blue Swirl had > >> for the rename patches - would like to merge ASAP > >> to avoid any conflicts, and we can do code style > >> fixups later - note this is style of existing files. > >> > >> Signed-off-by: Michael S. Tsirkin > >> > >> ---------------------------------------------------------------- > >> Jason Baron (1): > >> Fixup q35/ich9 Licenses > >> > >> Michael S. Tsirkin (12): > >> tap: reset vnet header size on open > >> get_maintainer.pl: update from linix 3.8 > >> pci: prepare makefiles for pci code reorganization > >> MAINTAINERS: add hw/pci/ to list of PCI files > >> pci: move pci core code to hw/pci > >> pci: update all users to look in pci/ > >> pci: fix path for local includes > >> Revert "pci: prepare makefiles for pci code reorganization" > >> pci: rename pci_internals.h pci_bus.h > >> pci_bus: update comment > >> pci_bus.h: tweak include guards > >> kvm: do not flush after deleting gsi > >> > >> MAINTAINERS | 1 + > >> arch_init.c | 2 +- > >> hw/Makefile.objs | 10 ++------- > >> hw/ac97.c | 2 +- > >> hw/acpi_ich9.c | 15 +++++++------ > >> hw/acpi_piix4.c | 2 +- > >> hw/alpha_sys.h | 4 ++-- > >> hw/apb_pci.c | 8 +++---- > >> hw/apic.c | 2 +- > >> hw/apm.c | 2 +- > >> hw/bonito.c | 4 ++-- > >> hw/cirrus_vga.c | 2 +- > >> hw/dec_pci.c | 8 +++---- > >> hw/e1000.c | 2 +- > >> hw/eepro100.c | 2 +- > >> hw/es1370.c | 2 +- > >> hw/esp-pci.c | 2 +- > >> hw/grackle_pci.c | 4 ++-- > >> hw/gt64xxx.c | 4 ++-- > >> hw/hda-audio.c | 2 +- > >> hw/i386/Makefile.objs | 2 +- > >> hw/i82378.c | 2 +- > >> hw/i82801b11.c | 2 +- > >> hw/ich9.h | 8 +++---- > >> hw/ide.h | 2 +- > >> hw/ide/ahci.c | 4 ++-- > >> hw/ide/cmd646.c | 2 +- > >> hw/ide/core.c | 2 +- > >> hw/ide/ich.c | 4 ++-- > >> hw/ide/pci.c | 2 +- > >> hw/ide/piix.c | 2 +- > >> hw/ide/via.c | 2 +- > >> hw/intel-hda.c | 4 ++-- > >> hw/ioh3420.c | 6 +++--- > >> hw/ioh3420.h | 2 +- > >> hw/ivshmem.c | 4 ++-- > >> hw/kvm/apic.c | 2 +- > >> hw/kvm/pci-assign.c | 4 ++-- > >> hw/lpc_ich9.c | 40 +++++++++++------------------------ > >> hw/lsi53c895a.c | 2 +- > >> hw/macio.c | 2 +- > >> hw/megasas.c | 4 ++-- > >> hw/mips_fulong2e.c | 2 +- > >> hw/mips_malta.c | 2 +- > >> hw/ne2000.c | 2 +- > >> hw/openpic.c | 2 +- > >> hw/pc.c | 4 ++-- > >> hw/pc_piix.c | 4 ++-- > >> hw/pci/Makefile.objs | 6 ++++++ > >> hw/{ => pci}/msi.c | 2 +- > >> hw/{ => pci}/msi.h | 2 +- > >> hw/{ => pci}/msix.c | 8 +++---- > >> hw/{ => pci}/msix.h | 2 +- > >> hw/{ => pci}/pci-hotplug.c | 12 +++++------ > >> hw/{ => pci}/pci-stub.c | 2 +- > >> hw/{ => pci}/pci.c | 14 ++++++------ > >> hw/{ => pci}/pci.h | 10 ++++----- > >> hw/{ => pci}/pci_bridge.c | 4 ++-- > >> hw/{ => pci}/pci_bridge.h | 2 +- > >> hw/{pci_internals.h => pci/pci_bus.h} | 16 ++++++-------- > >> hw/{ => pci}/pci_host.c | 4 ++-- > >> hw/{ => pci}/pci_host.h | 2 +- > >> hw/{ => pci}/pci_ids.h | 0 > >> hw/{ => pci}/pci_regs.h | 0 > >> hw/{ => pci}/pcie.c | 12 +++++------ > >> hw/{ => pci}/pcie.h | 8 +++---- > >> hw/{ => pci}/pcie_aer.c | 12 +++++------ > >> hw/{ => pci}/pcie_aer.h | 2 +- > >> hw/{ => pci}/pcie_host.c | 6 +++--- > >> hw/{ => pci}/pcie_host.h | 2 +- > >> hw/{ => pci}/pcie_port.c | 2 +- > >> hw/{ => pci}/pcie_port.h | 4 ++-- > >> hw/{ => pci}/pcie_regs.h | 0 > >> hw/{ => pci}/shpc.c | 8 +++---- > >> hw/{ => pci}/shpc.h | 0 > >> hw/{ => pci}/slotid_cap.c | 4 ++-- > >> hw/{ => pci}/slotid_cap.h | 0 > >> hw/pci_bridge_dev.c | 12 +++++------ > >> hw/pcnet-pci.c | 2 +- > >> hw/piix4.c | 2 +- > >> hw/piix_pci.c | 4 ++-- > >> hw/ppc/Makefile.objs | 2 +- > >> hw/ppc/e500.c | 2 +- > >> hw/ppc440_bamboo.c | 2 +- > >> hw/ppc4xx.h | 2 +- > >> hw/ppc4xx_pci.c | 4 ++-- > >> hw/ppc_newworld.c | 2 +- > >> hw/ppc_oldworld.c | 2 +- > >> hw/ppc_prep.c | 4 ++-- > >> hw/ppce500_pci.c | 4 ++-- > >> hw/prep_pci.c | 4 ++-- > >> hw/q35.h | 4 ++-- > >> hw/qxl.h | 2 +- > >> hw/r2d.c | 2 +- > >> hw/realview.c | 2 +- > >> hw/rtl8139.c | 2 +- > >> hw/serial-pci.c | 2 +- > >> hw/sga.c | 2 +- > >> hw/sh_pci.c | 4 ++-- > >> hw/smbus_ich9.c | 16 ++++++++------ > >> hw/spapr.c | 4 ++-- > >> hw/spapr_pci.c | 10 ++++----- > >> hw/spapr_pci.h | 4 ++-- > >> hw/sun4u.c | 2 +- > >> hw/unin_pci.c | 4 ++-- > >> hw/usb/hcd-ehci-pci.c | 2 +- > >> hw/usb/hcd-ohci.c | 2 +- > >> hw/usb/hcd-uhci.c | 2 +- > >> hw/usb/hcd-xhci.c | 6 +++--- > >> hw/versatile_pci.c | 4 ++-- > >> hw/versatilepb.c | 2 +- > >> hw/vfio_pci.c | 6 +++--- > >> hw/vga-pci.c | 2 +- > >> hw/vga.c | 2 +- > >> hw/virtio-balloon.h | 2 +- > >> hw/virtio-net.h | 2 +- > >> hw/virtio-pci.c | 6 +++--- > >> hw/virtio-scsi.h | 2 +- > >> hw/vmware_vga.c | 2 +- > >> hw/vt82c686.c | 4 ++-- > >> hw/wdt_i6300esb.c | 2 +- > >> hw/xen-host-pci-device.h | 2 +- > >> hw/xen_apic.c | 2 +- > >> hw/xen_platform.c | 2 +- > >> hw/xen_pt.c | 2 +- > >> hw/xen_pt.h | 2 +- > >> hw/xio3130_downstream.c | 6 +++--- > >> hw/xio3130_downstream.h | 2 +- > >> hw/xio3130_upstream.c | 6 +++--- > >> hw/xio3130_upstream.h | 2 +- > >> kvm-all.c | 4 +--- > >> kvm-stub.c | 2 +- > >> monitor.c | 2 +- > >> net/tap-linux.c | 8 +++++++ > >> scripts/get_maintainer.pl | 25 ++++++++++++++-------- > >> target-i386/kvm.c | 2 +- > >> xen-all.c | 2 +- > >> 137 files changed, 285 insertions(+), 288 deletions(-) > >> create mode 100644 hw/pci/Makefile.objs > >> rename hw/{ => pci}/msi.c (99%) > >> rename hw/{ => pci}/msi.h (98%) > >> rename hw/{ => pci}/msix.c (99%) > >> rename hw/{ => pci}/msix.h (98%) > >> rename hw/{ => pci}/pci-hotplug.c (98%) > >> rename hw/{ => pci}/pci-stub.c (98%) > >> rename hw/{ => pci}/pci.c (99%) > >> rename hw/{ => pci}/pci.h (99%) > >> rename hw/{ => pci}/pci_bridge.c (99%) > >> rename hw/{ => pci}/pci_bridge.h (98%) > >> rename hw/{pci_internals.h => pci/pci_bus.h} (79%) > >> rename hw/{ => pci}/pci_host.c (99%) > >> rename hw/{ => pci}/pci_host.h (99%) > >> rename hw/{ => pci}/pci_ids.h (100%) > >> rename hw/{ => pci}/pci_regs.h (100%) > >> rename hw/{ => pci}/pcie.c (99%) > >> rename hw/{ => pci}/pcie.h (98%) > >> rename hw/{ => pci}/pcie_aer.c (99%) > >> rename hw/{ => pci}/pcie_aer.h (99%) > >> rename hw/{ => pci}/pcie_host.c (98%) > >> rename hw/{ => pci}/pcie_host.h (98%) > >> rename hw/{ => pci}/pcie_port.c (99%) > >> rename hw/{ => pci}/pcie_port.h (96%) > >> rename hw/{ => pci}/pcie_regs.h (100%) > >> rename hw/{ => pci}/shpc.c (99%) > >> rename hw/{ => pci}/shpc.h (100%) > >> rename hw/{ => pci}/slotid_cap.c (95%) > >> rename hw/{ => pci}/slotid_cap.h (100%) > > > > >