From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 12 Apr 2010 17:20:31 +0000 (+0100)
Subject: Fix QEMU command building errors to reflect unsupported configuration
X-Git-Tag: v0.8.1~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fb992c659c692275a37728f278fdc997b48c40a;p=thirdparty%2Flibvirt.git

Fix QEMU command building errors to reflect unsupported configuration

Instead of reporting VIR_ERR_INTERNAL_ERROR use the more specific
VIR_ERR_CONFIG_UNSUPPORTED

* src/qemu/qemu_conf.c: Report VIR_ERR_CONFIG_UNSUPPORTED for
  unsupported video adapters
---

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 03fc29ad32..e23b322937 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -4407,7 +4407,7 @@ int qemudBuildCommandLine(virConnectPtr conn,
             } else {
                 const char *vgastr = qemuVideoTypeToString(def->videos[0]->type);
                 if (!vgastr || STREQ(vgastr, "")) {
-                    qemuReportError(VIR_ERR_INTERNAL_ERROR,
+                    qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                     _("video type %s is not supported with QEMU"),
                                     virDomainVideoTypeToString(def->videos[0]->type));
                     goto error;
@@ -4433,8 +4433,8 @@ int qemudBuildCommandLine(virConnectPtr conn,
                 break;
 
             default:
-                qemuReportError(VIR_ERR_INTERNAL_ERROR,
-                                _("video type %s is not supported with QEMU"),
+                qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                                _("video type %s is not supported with this QEMU"),
                                 virDomainVideoTypeToString(def->videos[0]->type));
                 goto error;
             }