Re: [Qemu-devel] [PATCH 0/6] pc init & compat function cleanup

[Michael S. Tsirkin]

On Wed, Aug 21, 2013 at 09:30:38AM -0300, Eduardo Habkost wrote:
> On Wed, Aug 21, 2013 at 12:20:32AM +0300, Michael S. Tsirkin wrote:
> > On Tue, Aug 20, 2013 at 05:48:59PM -0300, Eduardo Habkost wrote:
> > > This is a follow-up to the patch submitted by Michael (patch 1/6 in this
> > > series), to make the pc compat initialization code simpler and easier to
> > > eventually remove code duplication between pc_piix.c and pc_q35.c.
> > 
> > Eduardo this does not seem to apply to either master or my tree.
> > Could you rebase and make it apply to my tree?
> > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git  pci
> 
> For reference, I have used commit
> f202039811d8746b0586d2fd5f61de6c8cf68056 as base. I could apply the
> series cleanly (copying from my qemu-devel mailbox and not my git tree,
> just in case) on top of current master (commit
> ecfe10c9a6f9bc77d0e4b7eb5d0f5d61e8fbaed8).

Weird, all I have is:
$ git log --oneline ecfe10c9a6f9bc77d0e4b7eb5d0f5d61e8fbaed8..
4b38e98 q35: Add PCIe switch to example q35 configuration
04920fc loader: store FW CFG ROM files in RAM
0851c9f arch_init: align MR size to target page size
c0b4cc1 pc: cleanup 1.4 compat support


> But there are some conflicts with your pci tree, I will make a rebased
> version.

Pls do.

> > 
> > > Eduardo Habkost (5):
> > >   pc: Kill pc_init_pci_1_0()
> > >   pc: Create pc_compat_*() functions
> > >   pc: pc_compat_1_4() now can call pc_compat_1_5()
> > >   pc_piix: Kill pc_init1() memory region args
> > >   pc_piix: Pass QEMUMachineInitArgs to pc_init1()
> > > 
> > > Michael S. Tsirkin (1):
> > >   pc: cleanup 1.4 compat support
> > > 
> > >  hw/i386/pc_piix.c | 117 
> > > ++++++++++++++++++++++++++----------------------------
> > >  hw/i386/pc_q35.c  |  29 +++++++++++---
> > >  2 files changed, 79 insertions(+), 67 deletions(-)
> > > 
> > > -- 
> > > 1.8.3.1
> 
> -- 
> Eduardo