On 02/10/2016 08:47 AM, Ján Tomko wrote:
On Wed, Feb 10, 2016 at 08:05:53AM -0500, John Ferlan wrote:
Extract out the qemuParseCommandLine{String|Pid} into their own separate module - taking with it all the various static functions.
Causes a ripple effect with a few other modules to include the new qemu_parse_command.h.
Narrowed down the list of #include's in the split out module to those that are necessary for build.
Signed-off-by: John Ferlan <jferlan@redhat.com> --- po/POTFILES.in | 1 + src/Makefile.am | 1 + src/qemu/qemu_command.c | 2710 ---------------------------------------- src/qemu/qemu_command.h | 28 +- src/qemu/qemu_domain.c | 3 +- src/qemu/qemu_driver.c | 1 + src/qemu/qemu_monitor_json.c | 3 +- src/qemu/qemu_parse_command.c | 2744 +++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_parse_command.h | 53 + tests/qemuargv2xmltest.c | 2 +- 10 files changed, 2807 insertions(+), 2739 deletions(-) create mode 100644 src/qemu/qemu_parse_command.c create mode 100644 src/qemu/qemu_parse_command.h
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 53bfda5..f549aa5 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -1,7 +1,7 @@ /* * qemu_command.h: QEMU command generation * - * Copyright (C) 2006-2015 Red Hat, Inc. + * Copyright (C) 2006-2016 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -54,7 +54,7 @@ # define QEMU_MIGRATION_PORT_MIN 49152 # define QEMU_MIGRATION_PORT_MAX 49215
-# define QEMU_QXL_VGAMEM_DEFAULT 16 * 1024
If you leave this definition here you don't need to include qemu_parse_command.h in qemu_domain.c.
Yeah, but it's not used in qemu_command.c, it's used in qemu_command_parse.c though. That's why I moved it... John