Re: [Qemu-devel] [PATCH v3.2 10/31] pc: pass QEMUMachineInitArgs to pc_memory_init

2014-06-08 Thread Hu Tao
On Sun, Jun 08, 2014 at 12:40:40PM +0300, Michael S. Tsirkin wrote: > On Wed, May 14, 2014 at 05:43:14PM +0800, Hu Tao wrote: > > From: Paolo Bonzini > > > > Reviewed-by: Michael S. Tsirkin > > Signed-off-by: Paolo Bonzini > > Signed-off-by: Hu Tao > > This conflicts with > commit 3ef9622182e

Re: [Qemu-devel] [PATCH v3.2 10/31] pc: pass QEMUMachineInitArgs to pc_memory_init

2014-06-08 Thread Michael S. Tsirkin
On Wed, May 14, 2014 at 05:43:14PM +0800, Hu Tao wrote: > From: Paolo Bonzini > > Reviewed-by: Michael S. Tsirkin > Signed-off-by: Paolo Bonzini > Signed-off-by: Hu Tao This conflicts with commit 3ef9622182e598392855931e7a0437d3855cef5e machine: Conversion of QEMUMachineInitArgs to Machin

Re: [Qemu-devel] [PATCH v3.2 10/31] pc: pass QEMUMachineInitArgs to pc_memory_init

2014-05-14 Thread Eduardo Habkost
On Wed, May 14, 2014 at 05:43:14PM +0800, Hu Tao wrote: > From: Paolo Bonzini > > Reviewed-by: Michael S. Tsirkin > Signed-off-by: Paolo Bonzini > Signed-off-by: Hu Tao Reviewed-by: Eduardo Habkost -- Eduardo

[Qemu-devel] [PATCH v3.2 10/31] pc: pass QEMUMachineInitArgs to pc_memory_init

2014-05-14 Thread Hu Tao
From: Paolo Bonzini Reviewed-by: Michael S. Tsirkin Signed-off-by: Paolo Bonzini Signed-off-by: Hu Tao --- hw/i386/pc.c | 11 +-- hw/i386/pc_piix.c| 8 +++- hw/i386/pc_q35.c | 4 +--- include/hw/i386/pc.h | 7 +++ 4 files changed, 12 insertions(+), 18 deleti