[libvirt] [PATCH] qemu: Fail if per-device boot is used but deviceboot is not supported
--- src/qemu/qemu_command.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 24acc10..537e537 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2949,6 +2949,13 @@ qemuBuildCommandLine(virConnectPtr conn, } virCommandAddArgBuffer(cmd, &boot_buf); + } else if (!(qemuCmdFlags & QEMUD_CMD_FLAG_BOOTINDEX)) { + /* def->os.nBootDevs is guaranteed to be > 0 unless per-device boot + * configuration is used + */ + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("hypervisor lacks deviceboot feature")); + goto error; } if (def->os.kernel) -- 1.7.4.rc2
On 01/19/2011 07:07 AM, Jiri Denemark wrote:
--- src/qemu/qemu_command.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 24acc10..537e537 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2949,6 +2949,13 @@ qemuBuildCommandLine(virConnectPtr conn, }
virCommandAddArgBuffer(cmd, &boot_buf); + } else if (!(qemuCmdFlags & QEMUD_CMD_FLAG_BOOTINDEX)) { + /* def->os.nBootDevs is guaranteed to be > 0 unless per-device boot + * configuration is used + */ + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("hypervisor lacks deviceboot feature")); + goto error; }
ACK. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
On Wed, Jan 19, 2011 at 07:48:13 -0700, Eric Blake wrote:
On 01/19/2011 07:07 AM, Jiri Denemark wrote:
--- src/qemu/qemu_command.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 24acc10..537e537 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2949,6 +2949,13 @@ qemuBuildCommandLine(virConnectPtr conn, }
virCommandAddArgBuffer(cmd, &boot_buf); + } else if (!(qemuCmdFlags & QEMUD_CMD_FLAG_BOOTINDEX)) { + /* def->os.nBootDevs is guaranteed to be > 0 unless per-device boot + * configuration is used + */ + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("hypervisor lacks deviceboot feature")); + goto error; }
ACK.
Pushed, thanks. Jirka
participants (2)
-
Eric Blake -
Jiri Denemark