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 > 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
