External/libvirt
1
0
Fork 0
Code

qemu_command: create prefixed alias to separate variable

Browse Source 
Instead of typing the prefix every time we want to append parameters
to qemu command line use a variable that contains prefixed alias.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-10-18 15:27:32 +02:00
parent b5459326ec
commit 635b5ec8e8
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/qemu/qemu_command.c
View File

@ -4861,28 +4861,32 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
{ {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
bool telnet; bool telnet;
char *charAlias = NULL;
if (!(charAlias = qemuAliasChardevFromDevAlias(alias)))
goto error;
switch (dev->type) { switch (dev->type) {
case VIR_DOMAIN_CHR_TYPE_NULL: case VIR_DOMAIN_CHR_TYPE_NULL:
virBufferAsprintf(&buf, "null,id=char%s", alias); virBufferAsprintf(&buf, "null,id=%s", charAlias);
break; break;
case VIR_DOMAIN_CHR_TYPE_VC: case VIR_DOMAIN_CHR_TYPE_VC:
virBufferAsprintf(&buf, "vc,id=char%s", alias); virBufferAsprintf(&buf, "vc,id=%s", charAlias);
break; break;
case VIR_DOMAIN_CHR_TYPE_PTY: case VIR_DOMAIN_CHR_TYPE_PTY:
virBufferAsprintf(&buf, "pty,id=char%s", alias); virBufferAsprintf(&buf, "pty,id=%s", charAlias);
break; break;
case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_DEV:
virBufferAsprintf(&buf, "%s,id=char%s,path=%s", virBufferAsprintf(&buf, "%s,id=%s,path=%s",
STRPREFIX(alias, "parallel") ? "parport" : "tty", STRPREFIX(alias, "parallel") ? "parport" : "tty",
alias, dev->data.file.path); charAlias, dev->data.file.path);
break; break;
case VIR_DOMAIN_CHR_TYPE_FILE: case VIR_DOMAIN_CHR_TYPE_FILE:
virBufferAsprintf(&buf, "file,id=char%s", alias); virBufferAsprintf(&buf, "file,id=%s", charAlias);
if (dev->data.file.append != VIR_TRISTATE_SWITCH_ABSENT && if (dev->data.file.append != VIR_TRISTATE_SWITCH_ABSENT &&
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FILE_APPEND)) { !virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_FILE_APPEND)) {
@ -4898,12 +4902,12 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
break; break;
case VIR_DOMAIN_CHR_TYPE_PIPE: case VIR_DOMAIN_CHR_TYPE_PIPE:
virBufferAsprintf(&buf, "pipe,id=char%s,path=%s", alias, virBufferAsprintf(&buf, "pipe,id=%s,path=%s", charAlias,
dev->data.file.path); dev->data.file.path);
break; break;
case VIR_DOMAIN_CHR_TYPE_STDIO: case VIR_DOMAIN_CHR_TYPE_STDIO:
virBufferAsprintf(&buf, "stdio,id=char%s", alias); virBufferAsprintf(&buf, "stdio,id=%s", charAlias);
break; break;
case VIR_DOMAIN_CHR_TYPE_UDP: { case VIR_DOMAIN_CHR_TYPE_UDP: {
@ -4919,9 +4923,9 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
bindService = "0"; bindService = "0";
virBufferAsprintf(&buf, virBufferAsprintf(&buf,
"udp,id=char%s,host=%s,port=%s,localaddr=%s," "udp,id=%s,host=%s,port=%s,localaddr=%s,"
"localport=%s", "localport=%s",
alias, charAlias,
connectHost, connectHost,
dev->data.udp.connectService, dev->data.udp.connectService,
bindHost, bindService); bindHost, bindService);
@ -4930,8 +4934,8 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
case VIR_DOMAIN_CHR_TYPE_TCP: case VIR_DOMAIN_CHR_TYPE_TCP:
telnet = dev->data.tcp.protocol == VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNET; telnet = dev->data.tcp.protocol == VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNET;
virBufferAsprintf(&buf, virBufferAsprintf(&buf,
"socket,id=char%s,host=%s,port=%s%s", "socket,id=%s,host=%s,port=%s%s",
alias, charAlias,
dev->data.tcp.host, dev->data.tcp.host,
dev->data.tcp.service, dev->data.tcp.service,
telnet ? ",telnet" : ""); telnet ? ",telnet" : "");
@ -4956,7 +4960,7 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
break; break;
case VIR_DOMAIN_CHR_TYPE_UNIX: case VIR_DOMAIN_CHR_TYPE_UNIX:
virBufferAsprintf(&buf, "socket,id=char%s,path=", alias); virBufferAsprintf(&buf, "socket,id=%s,path=", charAlias);
virQEMUBuildBufferEscapeComma(&buf, dev->data.nix.path); virQEMUBuildBufferEscapeComma(&buf, dev->data.nix.path);
if (dev->data.nix.listen) if (dev->data.nix.listen)
virBufferAdd(&buf, nowait ? ",server,nowait" : ",server", -1); virBufferAdd(&buf, nowait ? ",server,nowait" : ",server", -1);
@ -4968,7 +4972,7 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
_("spicevmc not supported in this QEMU binary")); _("spicevmc not supported in this QEMU binary"));
goto error; goto error;
} }
virBufferAsprintf(&buf, "spicevmc,id=char%s,name=%s", alias, virBufferAsprintf(&buf, "spicevmc,id=%s,name=%s", charAlias,
virDomainChrSpicevmcTypeToString(dev->data.spicevmc)); virDomainChrSpicevmcTypeToString(dev->data.spicevmc));
break; break;
@ -4978,7 +4982,7 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
_("spiceport not supported in this QEMU binary")); _("spiceport not supported in this QEMU binary"));
goto error; goto error;
} }
virBufferAsprintf(&buf, "spiceport,id=char%s,name=%s", alias, virBufferAsprintf(&buf, "spiceport,id=%s,name=%s", charAlias,
dev->data.spiceport.channel); dev->data.spiceport.channel);
break; break;
@ -5007,6 +5011,7 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
return virBufferContentAndReset(&buf); return virBufferContentAndReset(&buf);
error: error:
VIR_FREE(charAlias);
virBufferFreeAndReset(&buf); virBufferFreeAndReset(&buf);
return NULL; return NULL;
} }