On Tue, Mar 01, 2016 at 07:43:10 -0500, John Ferlan wrote: > > > On 02/18/2016 12:50 PM, John Ferlan wrote: > > Add new function to manage adding the channel device options to the > > command line removing that task from the mainline qemuBuildCommandLine. > > > > Signed-off-by: John Ferlan <jferlan redhat com> > > --- > > src/qemu/qemu_command.c | 159 ++++++++++++++++++++++++++---------------------- > > 1 file changed, 87 insertions(+), 72 deletions(-) > > > > I've merged my local branch with the latest upstream taking into account > Martin's commit 'a89f05ba8d' with the following adjustment: > > The rest of the changes merged fine. I can repost (in parts) if > desired... To make it less onerous to review such a large pile. I'd suggest you push it to a repository where it can be fetched without having to deal with conflicts while applying from email.
Description: Digital signature