On Tue, Oct 15, 2013 at 02:30:44PM +0200, Peter Krempa wrote:
Reword the error message and change formating to avoid exceeding 80
columns of text.
---
src/qemu/qemu_process.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 354e079..20d8394 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3460,13 +3460,13 @@ qemuValidateCpuMax(virDomainDefPtr def, virQEMUCapsPtr qemuCaps)
{
unsigned int maxCpus;
- maxCpus = virQEMUCapsGetMachineMaxCpus(qemuCaps, def->os.machine);
- if (!maxCpus)
+ if (!(maxCpus = virQEMUCapsGetMachineMaxCpus(qemuCaps, def->os.machine)))
return true;
if (def->maxvcpus > maxCpus) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- "%s", _("Maximum CPUs greater than specified
machine type limit"));
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("Specified maximum VCPU count exceeds machine type "
+ "limit"));
return false;
To be honest I'm not really a fan of making these kind of changes.
IMHO 80 column limit is something that shouldn't be strictly
enforced when it causes splitting of messages which are only
marginally over.
Daniel
--
|:
http://berrange.com -o-
http://www.flickr.com/photos/dberrange/ :|
|:
http://libvirt.org -o-
http://virt-manager.org :|
|:
http://autobuild.org -o-
http://search.cpan.org/~danberr/ :|
|:
http://entangle-photo.org -o-
http://live.gnome.org/gtk-vnc :|