| Message ID | 1372174719-6564-1-git-send-email-mst@redhat.com |
|---|---|
| State | New |
| Headers | show |
"Michael S. Tsirkin" <mst@redhat.com> writes: > From: Michael S. Tsirkin <mst@redhat.com> > > The following changes since commit 90a2541b763b31d2b551b07e24aae3de5266d31b: > > target-i386: fix over 80 chars warnings (2013-06-15 17:50:38 +0000) Just as an aside, you should rebase and test before sending pull requests. This conflicts with current tip. Normally, wouldn't be a problem but FYI for the future. There's a trivial conflict with ppc-softmmu.mak that I can resolve but also a conflict with Stefano's pull request that I cannot resolve without rebasing :-/ So please rebase against latest tip and resubmit. Regards, Anthony Liguori > > 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 55cb9714d8a54f2dd82fc9fd7091762408bda531: > > pci: Fold host_buses list into PCIHostState functionality (2013-06-23 14:25:12 +0300) > > ---------------------------------------------------------------- > pci,kvm,misc enhancements > > This includes some pci and kvm-related enhancements: > > Better support for systems with multiple PCI root buses > KVM Speedup for MSI updates on kvm > FW cfg interface for more robust pci programming in BIOS > Minor fixes/cleanups for fw cfg and cross-version migration - > because of dependencies with other patches > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > Changes from v1: > dropped rx filtering patch, it needs more testing > there are no other changes > > ---------------------------------------------------------------- > Andrew Jones (1): > e1000: cleanup process_tx_desc > > David Gibson (10): > pci: Cleanup configuration for pci-hotplug.c > pci: Move pci_read_devaddr to pci-hotplug-old.c > pci: Abolish pci_find_root_bus() > pci: Use helper to find device's root bus in pci_find_domain() > pci: Replace pci_find_domain() with more general pci_root_bus_path() > pci: Add root bus argument to pci_get_bus_devfn() > pci: Add root bus parameter to pci_nic_init() > pci: Simpler implementation of primary PCI bus > pci: Remove domain from PCIHostBus > pci: Fold host_buses list into PCIHostState functionality > > Michael S. Tsirkin (9): > range: add Range structure > pci: store PCI hole ranges in guestinfo structure > pc: pass PCI hole ranges to Guests > pc_piix: cleanup init compat handling > kvm: zero-initialize KVM_SET_GSI_ROUTING input > kvm: skip system call when msi route is unchanged > MAINTAINERS: s/Marcelo/Paolo/ > pvpanic: initialization cleanup > pvpanic: fix fwcfg for big endian hosts > > MAINTAINERS | 2 +- > default-configs/i386-softmmu.mak | 3 +- > default-configs/ppc64-softmmu.mak | 2 - > default-configs/x86_64-softmmu.mak | 3 +- > hmp-commands.hx | 4 +- > hw/alpha/dp264.c | 2 +- > hw/arm/realview.c | 6 +- > hw/arm/versatilepb.c | 2 +- > hw/i386/pc.c | 74 ++++++++++++++- > hw/i386/pc_piix.c | 40 +++++--- > hw/i386/pc_q35.c | 18 +++- > hw/mips/mips_fulong2e.c | 6 +- > hw/mips/mips_malta.c | 6 +- > hw/misc/pvpanic.c | 31 ++++--- > hw/net/e1000.c | 18 ++-- > hw/pci-host/piix.c | 9 ++ > hw/pci-host/q35.c | 17 ++++ > hw/pci/Makefile.objs | 2 +- > hw/pci/{pci-hotplug.c => pci-hotplug-old.c} | 75 ++++++++++++--- > hw/pci/pci.c | 137 ++++++++++++++-------------- > hw/pci/pci_host.c | 1 + > hw/pci/pcie_aer.c | 9 +- > hw/ppc/e500.c | 2 +- > hw/ppc/mac_newworld.c | 2 +- > hw/ppc/mac_oldworld.c | 2 +- > hw/ppc/ppc440_bamboo.c | 2 +- > hw/ppc/prep.c | 2 +- > hw/ppc/spapr.c | 2 +- > hw/ppc/spapr_pci.c | 10 ++ > hw/sh4/r2d.c | 5 +- > hw/sparc64/sun4u.c | 2 +- > include/hw/i386/pc.h | 22 ++++- > include/hw/pci-host/q35.h | 2 + > include/hw/pci/pci.h | 17 ++-- > include/hw/pci/pci_host.h | 12 +++ > include/qemu/range.h | 16 ++++ > include/qemu/typedefs.h | 1 + > kvm-all.c | 23 +++-- > 38 files changed, 415 insertions(+), 174 deletions(-) > rename hw/pci/{pci-hotplug.c => pci-hotplug-old.c} (78%)
On 06/25/2013 03:48 PM, Anthony Liguori wrote: > "Michael S. Tsirkin" <mst@redhat.com> writes: > >> From: Michael S. Tsirkin <mst@redhat.com> >> >> The following changes since commit 90a2541b763b31d2b551b07e24aae3de5266d31b: >> >> target-i386: fix over 80 chars warnings (2013-06-15 17:50:38 +0000) > > Just as an aside, you should rebase and test before sending pull > requests. This conflicts with current tip. Normally, wouldn't be a > problem but FYI for the future. > > There's a trivial conflict with ppc-softmmu.mak that I can resolve but > also a conflict with Stefano's pull request that I cannot resolve > without rebasing :-/ So please rebase against latest tip and resubmit. That, and there are review issues with 21/21 that should be resolved before it gets queued. https://lists.gnu.org/archive/html/qemu-devel/2013-06/msg04741.html
"Michael S. Tsirkin" <mst@redhat.com> writes: > From: Michael S. Tsirkin <mst@redhat.com> > > The following changes since commit 90a2541b763b31d2b551b07e24aae3de5266d31b: > > target-i386: fix over 80 chars warnings (2013-06-15 17:50:38 +0000) > > 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 55cb9714d8a54f2dd82fc9fd7091762408bda531: > > pci: Fold host_buses list into PCIHostState functionality (2013-06-23 14:25:12 +0300) > > ---------------------------------------------------------------- > pci,kvm,misc enhancements > > This includes some pci and kvm-related enhancements: > > Better support for systems with multiple PCI root buses > KVM Speedup for MSI updates on kvm > FW cfg interface for more robust pci programming in BIOS > Minor fixes/cleanups for fw cfg and cross-version migration - > because of dependencies with other patches > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > Changes from v1: > dropped rx filtering patch, it needs more testing > there are no other changes > > ---------------------------------------------------------------- > Andrew Jones (1): > e1000: cleanup process_tx_desc > > David Gibson (10): > pci: Cleanup configuration for pci-hotplug.c > pci: Move pci_read_devaddr to pci-hotplug-old.c > pci: Abolish pci_find_root_bus() > pci: Use helper to find device's root bus in pci_find_domain() > pci: Replace pci_find_domain() with more general pci_root_bus_path() > pci: Add root bus argument to pci_get_bus_devfn() > pci: Add root bus parameter to pci_nic_init() > pci: Simpler implementation of primary PCI bus > pci: Remove domain from PCIHostBus > pci: Fold host_buses list into PCIHostState functionality > > Michael S. Tsirkin (9): > range: add Range structure > pci: store PCI hole ranges in guestinfo structure > pc: pass PCI hole ranges to Guests > pc_piix: cleanup init compat handling > kvm: zero-initialize KVM_SET_GSI_ROUTING input > kvm: skip system call when msi route is unchanged > MAINTAINERS: s/Marcelo/Paolo/ > pvpanic: initialization cleanup > pvpanic: fix fwcfg for big endian hosts Umm, 1+10+9 is 20, but the pull is for 21 patches; what's going on here?
Eric Blake <eblake@redhat.com> writes: > On 06/25/2013 03:48 PM, Anthony Liguori wrote: >> "Michael S. Tsirkin" <mst@redhat.com> writes: >> >>> From: Michael S. Tsirkin <mst@redhat.com> >>> >>> The following changes since commit 90a2541b763b31d2b551b07e24aae3de5266d31b: >>> >>> target-i386: fix over 80 chars warnings (2013-06-15 17:50:38 +0000) >> >> Just as an aside, you should rebase and test before sending pull >> requests. This conflicts with current tip. Normally, wouldn't be a >> problem but FYI for the future. >> >> There's a trivial conflict with ppc-softmmu.mak that I can resolve but >> also a conflict with Stefano's pull request that I cannot resolve >> without rebasing :-/ So please rebase against latest tip and resubmit. > > That, and there are review issues with 21/21 that should be resolved > before it gets queued. > https://lists.gnu.org/archive/html/qemu-devel/2013-06/msg04741.html Yes.
Markus Armbruster <armbru@redhat.com> writes: > "Michael S. Tsirkin" <mst@redhat.com> writes: > >> pvpanic: fix fwcfg for big endian hosts > > Umm, 1+10+9 is 20, but the pull is for 21 patches; what's going on here? Funny :-) Note that the series is missing 2/21. The branch has 20 commits, I suspect Michael did git-format-patch to a directory, deleted one of the files, and never bothered changing the N of M. Regards, Anthony Liguori
On Fri, Jun 28, 2013 at 12:44:17PM -0500, Anthony Liguori wrote: > Markus Armbruster <armbru@redhat.com> writes: > > > "Michael S. Tsirkin" <mst@redhat.com> writes: > > > >> pvpanic: fix fwcfg for big endian hosts > > > > Umm, 1+10+9 is 20, but the pull is for 21 patches; what's going on here? > > Funny :-) > > Note that the series is missing 2/21. > > The branch has 20 commits, I suspect Michael did git-format-patch to a > directory, deleted one of the files, and never bothered changing the N > of M. > > Regards, > > Anthony Liguori Actually no, apparently something went wrong when sending mail.