External/libvirt
1
0
Fork 0
Code

qemu: Add support for reboot-timeout

Browse Source 
This patch adds support for "-boot reboot-timeout=rb_time" that is
added in QEMU.
This commit is contained in:
Martin Kletzander 2012-09-18 12:31:30 +02:00
parent c33a922faa
commit 94827a785d
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_capabilities.c
View File

@ -180,6 +180,8 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST,
"ide-drive.wwn", "ide-drive.wwn",
"scsi-disk.wwn", "scsi-disk.wwn",
"seccomp-sandbox", "seccomp-sandbox",
"reboot-timeout", /* 110 */
); );
struct _qemuCaps { struct _qemuCaps {
@ -1191,6 +1193,8 @@ qemuCapsComputeCmdFlags(const char *help,
qemuCapsSet(caps, QEMU_CAPS_NESTING); qemuCapsSet(caps, QEMU_CAPS_NESTING);
if (strstr(help, ",menu=on")) if (strstr(help, ",menu=on"))
qemuCapsSet(caps, QEMU_CAPS_BOOT_MENU); qemuCapsSet(caps, QEMU_CAPS_BOOT_MENU);
if (strstr(help, ",reboot-timeout=rb_time"))
qemuCapsSet(caps, QEMU_CAPS_REBOOT_TIMEOUT);
if ((fsdev = strstr(help, "-fsdev"))) { if ((fsdev = strstr(help, "-fsdev"))) {
qemuCapsSet(caps, QEMU_CAPS_FSDEV); qemuCapsSet(caps, QEMU_CAPS_FSDEV);
if (strstr(fsdev, "readonly")) if (strstr(fsdev, "readonly"))

1
src/qemu/qemu_capabilities.h
View File

@ -145,6 +145,7 @@ enum qemuCapsFlags {
QEMU_CAPS_IDE_DRIVE_WWN = 107, /* Is ide-drive.wwn available? */ QEMU_CAPS_IDE_DRIVE_WWN = 107, /* Is ide-drive.wwn available? */
QEMU_CAPS_SCSI_DISK_WWN = 108, /* Is scsi-disk.wwn available? */ QEMU_CAPS_SCSI_DISK_WWN = 108, /* Is scsi-disk.wwn available? */
QEMU_CAPS_SECCOMP_SANDBOX = 109, /* -sandbox */ QEMU_CAPS_SECCOMP_SANDBOX = 109, /* -sandbox */
QEMU_CAPS_REBOOT_TIMEOUT = 110, /* -boot reboot-timeout */
QEMU_CAPS_LAST, /* this must always be the last item */ QEMU_CAPS_LAST, /* this must always be the last item */
}; };

31
src/qemu/qemu_command.c
View File

@ -4945,7 +4945,22 @@ qemuBuildCommandLine(virConnectPtr conn,
VIR_WARN("bootmenu is enabled but not " VIR_WARN("bootmenu is enabled but not "
"supported by this QEMU binary"); "supported by this QEMU binary");
} }
}
if (def->os.bios.rt_set) {
if (!qemuCapsGet(caps, QEMU_CAPS_REBOOT_TIMEOUT)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("reboot timeout is not supported "
"by this QEMU binary"));
goto error;
}
if (boot_nparams++)
virBufferAddChar(&boot_buf, ',');
virBufferAsprintf(&boot_buf,
"reboot-timeout=%d",
def->os.bios.rt_delay);
} }
if (boot_nparams > 0) { if (boot_nparams > 0) {
@ -8271,6 +8286,22 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps,
qemuParseCommandLineBootDevs(def, token); qemuParseCommandLineBootDevs(def, token);
} else if (STRPREFIX(token, "menu=on")) { } else if (STRPREFIX(token, "menu=on")) {
def->os.bootmenu = 1; def->os.bootmenu = 1;
} else if (STRPREFIX(token, "reboot-timeout=")) {
int num;
char *endptr;
if (virStrToLong_i(token + strlen("reboot-timeout="),
&endptr, 10, &num) < 0 ||
(*endptr != '\0' && endptr != strchr(token, ','))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("cannot parse reboot-timeout value"));
goto error;
}
if (num > 65535)
num = 65535;
else if (num < -1)
num = -1;
def->os.bios.rt_delay = num;
def->os.bios.rt_set = true;
} }
token = strchr(token, ','); token = strchr(token, ',');
/* This incrementation has to be done here in order to make it /* This incrementation has to be done here in order to make it