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 <[email protected]> > > > > Reviewed-by: Michael S. Tsirkin <[email protected]> > > Signed-off-by: Paolo Bonzini <[email protected]> > > Signed-off-by: Hu Tao <[email protected]> > > This conflicts with > commit 3ef9622182e598392855931e7a0437d3855cef5e > machine: Conversion of QEMUMachineInitArgs to MachineState > > could you please rebase?
Thanks, rebased. Regards, Hu
