[libvirt] [PATCH] qemu: Move PORT definitions to qemu_conf.c

Which is the only user. That was the only reason for including qemu_command.h, though we need to explicitly include qemu_domain.h afterwards. --- Had this sitting in a branch. jferlan: this is in your neck of the woods, not sure if it's going to conflict with any of your reorg patches though... src/qemu/qemu_command.h | 16 ---------------- src/qemu/qemu_conf.c | 18 +++++++++++++++++- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 776954e..fb684d0 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -39,22 +39,6 @@ # define QEMU_DRIVE_HOST_PREFIX "drive-" # define QEMU_FSDEV_HOST_PREFIX "fsdev-" -/* These are only defaults, they can be changed now in qemu.conf and - * explicitly specified port is checked against these two (makes - * sense to limit the values). - * - * This limitation is mentioned in qemu.conf, so bear in mind that the - * configuration file should reflect any changes made to these values. - */ -# define QEMU_REMOTE_PORT_MIN 5900 -# define QEMU_REMOTE_PORT_MAX 65535 - -# define QEMU_WEBSOCKET_PORT_MIN 5700 -# define QEMU_WEBSOCKET_PORT_MAX 65535 - -# define QEMU_MIGRATION_PORT_MIN 49152 -# define QEMU_MIGRATION_PORT_MAX 49215 - VIR_ENUM_DECL(qemuVideo) typedef struct _qemuBuildCommandLineCallbacks qemuBuildCommandLineCallbacks; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 14683f5..fd3055f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -36,8 +36,8 @@ #include "virerror.h" #include "qemu_conf.h" -#include "qemu_command.h" #include "qemu_capabilities.h" +#include "qemu_domain.h" #include "viruuid.h" #include "virbuffer.h" #include "virconf.h" @@ -58,6 +58,22 @@ VIR_LOG_INIT("qemu.qemu_conf"); +/* These are only defaults, they can be changed now in qemu.conf and + * explicitly specified port is checked against these two (makes + * sense to limit the values). + * + * This limitation is mentioned in qemu.conf, so bear in mind that the + * configuration file should reflect any changes made to these values. + */ +#define QEMU_REMOTE_PORT_MIN 5900 +#define QEMU_REMOTE_PORT_MAX 65535 + +#define QEMU_WEBSOCKET_PORT_MIN 5700 +#define QEMU_WEBSOCKET_PORT_MAX 65535 + +#define QEMU_MIGRATION_PORT_MIN 49152 +#define QEMU_MIGRATION_PORT_MAX 49215 + static virClassPtr virQEMUDriverConfigClass; static void virQEMUDriverConfigDispose(void *obj); -- 2.5.0