On Fri, Sep 25, 2015 at 17:39:57 -0400, John Ferlan wrote:
> Commit id '7383b8cc' changed virDomainDef 'virtType' to an enum, that
Sigh. That was the reason we didn't do that yet. Changing stuff to enum
is likely to break many things.
> caused a build failure on some archs due to comparing an unsigned value
> to < 0. Adjust the fetch of 'type' to be into temporary 'int virtType'
> and then assign that virtType to the def->virtType
>
> Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx>
> ---
> Pushed as build breaker
>
> src/conf/domain_conf.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index cdafb14..393ece7 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -14640,7 +14640,7 @@ virDomainDefParseXML(xmlDocPtr xml,
> xmlNodePtr *nodes = NULL, node = NULL;
> char *tmp = NULL;
> size_t i, j;
> - int n;
> + int n, virtType;
Please put them on separate lines.
> long id = -1;
> virDomainDefPtr def;
> bool uuid_generated = false;
> @@ -14678,11 +14678,12 @@ virDomainDefParseXML(xmlDocPtr xml,
> goto error;
> }
>
> - if ((def->virtType = virDomainVirtTypeFromString(tmp)) < 0) {
> + if ((virtType = virDomainVirtTypeFromString(tmp)) < 0) {
> virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> _("invalid domain type %s"), tmp);
> goto error;
> }
> + def->virtType = virtType;
> VIR_FREE(tmp);
>
> def->os.bootloader = virXPathString("string(./bootloader)", ctxt);
ACK with the above change.
Peter
Attachment:
signature.asc
Description: Digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list