External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Use macro for max and min vnc port instead of number

Browse Source 
* src/qemu/qemu_driver.c (though MACROS QEMU_VNC_PORT_MAX, and
QEMU_VNC_PORT_MIN are defined at the beginning, numbers (65535, 5900)
are still used, replace them)
This commit is contained in:
Osier Yang 2010-12-01 20:35:52 +08:00 committed by Eric Blake
parent ead3c43456
commit 401979a454
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_driver.c
View File

@ -2970,7 +2970,7 @@ static int qemudNextFreePort(struct qemud_driver *driver,
int startPort) { int startPort) {
int i; int i;
for (i = startPort ; i < 65535 ; i++) { for (i = startPort ; i < QEMU_VNC_PORT_MAX; i++) {
int fd; int fd;
int reuse = 1; int reuse = 1;
struct sockaddr_in addr; struct sockaddr_in addr;
@ -3945,7 +3945,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
if (vm->def->ngraphics == 1) { if (vm->def->ngraphics == 1) {
if (vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && if (vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
vm->def->graphics[0]->data.vnc.autoport) { vm->def->graphics[0]->data.vnc.autoport) {
int port = qemudNextFreePort(driver, 5900); int port = qemudNextFreePort(driver, QEMU_VNC_PORT_MIN);
if (port < 0) { if (port < 0) {
qemuReportError(VIR_ERR_INTERNAL_ERROR, qemuReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Unable to find an unused VNC port")); "%s", _("Unable to find an unused VNC port"));
@ -3954,7 +3954,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
vm->def->graphics[0]->data.vnc.port = port; vm->def->graphics[0]->data.vnc.port = port;
} else if (vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE && } else if (vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE &&
vm->def->graphics[0]->data.spice.autoport) { vm->def->graphics[0]->data.spice.autoport) {
int port = qemudNextFreePort(driver, 5900); int port = qemudNextFreePort(driver, QEMU_VNC_PORT_MIN);
int tlsPort = -1; int tlsPort = -1;
if (port < 0) { if (port < 0) {
qemuReportError(VIR_ERR_INTERNAL_ERROR, qemuReportError(VIR_ERR_INTERNAL_ERROR,
@ -7386,7 +7386,7 @@ static char *qemuDomainXMLToNative(virConnectPtr conn,
for (i = 0 ; i < def->ngraphics ; i++) { for (i = 0 ; i < def->ngraphics ; i++) {
if (def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && if (def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
def->graphics[i]->data.vnc.autoport) def->graphics[i]->data.vnc.autoport)
def->graphics[i]->data.vnc.port = 5900; def->graphics[i]->data.vnc.port = QEMU_VNC_PORT_MIN;
} }
emulator = def->emulator; emulator = def->emulator;