mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
qemu: Introduce qemuBuildMonitorCommandLine
Add new function to manage adding the '-mon' or '-monitor' options to the command line removing that task from the mainline qemuBuildCommandLine. Also adjusted qemuBuildChrChardevStr and qemuBuildChrArgStr to use const virDomainChrSourceDef *def rather than virDomainChrSourceDefPtr def. Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
parent
8204234040
commit
c7f0069e8b
@ -3847,7 +3847,8 @@ qemuBuildSCSIHostdevDevStr(virDomainDefPtr def,
|
|||||||
/* This function outputs a -chardev command line option which describes only the
|
/* This function outputs a -chardev command line option which describes only the
|
||||||
* host side of the character device */
|
* host side of the character device */
|
||||||
static char *
|
static char *
|
||||||
qemuBuildChrChardevStr(virDomainChrSourceDefPtr dev, const char *alias,
|
qemuBuildChrChardevStr(const virDomainChrSourceDef *dev,
|
||||||
|
const char *alias,
|
||||||
virQEMUCapsPtr qemuCaps)
|
virQEMUCapsPtr qemuCaps)
|
||||||
{
|
{
|
||||||
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
||||||
@ -3975,7 +3976,8 @@ qemuBuildChrChardevStr(virDomainChrSourceDefPtr dev, const char *alias,
|
|||||||
|
|
||||||
|
|
||||||
static char *
|
static char *
|
||||||
qemuBuildChrArgStr(virDomainChrSourceDefPtr dev, const char *prefix)
|
qemuBuildChrArgStr(const virDomainChrSourceDef *dev,
|
||||||
|
const char *prefix)
|
||||||
{
|
{
|
||||||
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
||||||
|
|
||||||
@ -4068,6 +4070,47 @@ qemuBuildChrArgStr(virDomainChrSourceDefPtr dev, const char *prefix)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static int
|
||||||
|
qemuBuildMonitorCommandLine(virCommandPtr cmd,
|
||||||
|
virQEMUCapsPtr qemuCaps,
|
||||||
|
const virDomainChrSourceDef *monitor_chr,
|
||||||
|
bool monitor_json)
|
||||||
|
{
|
||||||
|
char *chrdev;
|
||||||
|
|
||||||
|
if (!monitor_chr)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
/* Use -chardev if it's available */
|
||||||
|
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV)) {
|
||||||
|
|
||||||
|
virCommandAddArg(cmd, "-chardev");
|
||||||
|
if (!(chrdev = qemuBuildChrChardevStr(monitor_chr, "monitor",
|
||||||
|
qemuCaps)))
|
||||||
|
return -1;
|
||||||
|
virCommandAddArg(cmd, chrdev);
|
||||||
|
VIR_FREE(chrdev);
|
||||||
|
|
||||||
|
virCommandAddArg(cmd, "-mon");
|
||||||
|
virCommandAddArgFormat(cmd,
|
||||||
|
"chardev=charmonitor,id=monitor,mode=%s",
|
||||||
|
monitor_json ? "control" : "readline");
|
||||||
|
} else {
|
||||||
|
const char *prefix = NULL;
|
||||||
|
if (monitor_json)
|
||||||
|
prefix = "control,";
|
||||||
|
|
||||||
|
virCommandAddArg(cmd, "-monitor");
|
||||||
|
if (!(chrdev = qemuBuildChrArgStr(monitor_chr, prefix)))
|
||||||
|
return -1;
|
||||||
|
virCommandAddArg(cmd, chrdev);
|
||||||
|
VIR_FREE(chrdev);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static char *
|
static char *
|
||||||
qemuBuildVirtioSerialPortDevStr(virDomainDefPtr def,
|
qemuBuildVirtioSerialPortDevStr(virDomainDefPtr def,
|
||||||
virDomainChrDefPtr dev,
|
virDomainChrDefPtr dev,
|
||||||
@ -7106,34 +7149,9 @@ qemuBuildCommandLine(virConnectPtr conn,
|
|||||||
if (qemuBuildSgaCommandLine(cmd, def, qemuCaps) < 0)
|
if (qemuBuildSgaCommandLine(cmd, def, qemuCaps) < 0)
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
if (monitor_chr) {
|
if (qemuBuildMonitorCommandLine(cmd, qemuCaps, monitor_chr,
|
||||||
char *chrdev;
|
monitor_json) < 0)
|
||||||
/* Use -chardev if it's available */
|
|
||||||
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV)) {
|
|
||||||
|
|
||||||
virCommandAddArg(cmd, "-chardev");
|
|
||||||
if (!(chrdev = qemuBuildChrChardevStr(monitor_chr, "monitor",
|
|
||||||
qemuCaps)))
|
|
||||||
goto error;
|
goto error;
|
||||||
virCommandAddArg(cmd, chrdev);
|
|
||||||
VIR_FREE(chrdev);
|
|
||||||
|
|
||||||
virCommandAddArg(cmd, "-mon");
|
|
||||||
virCommandAddArgFormat(cmd,
|
|
||||||
"chardev=charmonitor,id=monitor,mode=%s",
|
|
||||||
monitor_json ? "control" : "readline");
|
|
||||||
} else {
|
|
||||||
const char *prefix = NULL;
|
|
||||||
if (monitor_json)
|
|
||||||
prefix = "control,";
|
|
||||||
|
|
||||||
virCommandAddArg(cmd, "-monitor");
|
|
||||||
if (!(chrdev = qemuBuildChrArgStr(monitor_chr, prefix)))
|
|
||||||
goto error;
|
|
||||||
virCommandAddArg(cmd, chrdev);
|
|
||||||
VIR_FREE(chrdev);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_RTC)) {
|
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_RTC)) {
|
||||||
char *rtcopt;
|
char *rtcopt;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user