From patchwork Wed Jun 28 18:49:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 106561 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp246902qge; Wed, 28 Jun 2017 11:49:47 -0700 (PDT) X-Received: by 10.200.47.87 with SMTP id k23mr14800114qta.11.1498675787812; Wed, 28 Jun 2017 11:49:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498675787; cv=none; d=google.com; s=arc-20160816; b=DNWzQ3QlOBxVan1FQO12yA27YXi6GRunf9lAUyvgUYpZ408029rcykNt2+m66aJrrD ZjHXiTRhgrt347xssj1cfHrgEqrD9x3JBORwd24lUPsd9OVEK2TV5NDlzjBCNXhPxNGf en4D911uBSjb5LTYSqA2Hdxu0jWTXsyfPVPWGMLk0C2AJU+9abPJ/5RM+ZydY0ekftum LCtnwAlaonYIe/6BJdhQWTFFXYSFa4y9HgO9ZhUXn0/ZjYK7bCStur0Az1wmMcJi57Ou 4eAFd3umvQfsuHGFCozH6fMOi0KeOqaGcRJoddoA6UYZV6rhcSz6s4kYnHRWE+K8CfaW vqBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:references :in-reply-to:message-id:date:to:from:delivered-to:dkim-filter :dmarc-filter:arc-authentication-results; bh=vHaCIh3fM1SjTixOozX9KEc8q+vo7XNiY5QrVn0Z6v0=; b=omcGuGrjCvjbyv2ogqcKi5oNHxZGqBcO+FocqzO+NiI0K+qmA5zSmW64ptUbHLwbay U8MILbMR4QzOxmNlLTn6rbNt1cb5hPhYJVZPpkyhhWIe/9Yhg7wM/S9xPFc/xNymbZu1 HrnINBZrYBev4h0kvCBgXSqpkLWudBBeb+ZHl42yEdOE99zBA4zniJwuqHrZXFvaZzht WgiMN1ieeVkQUcXZ3sAwd6RHTxfrgU02mVpZHyCZ+lYnFfJ5O590NkZyiqFukKnHgkCY wOqSXY+tv6D1CkJYQsp0AIKYEeA4KkVh8cRYRrGrkhgmogE/Giquo1UKvHWTFPLZHMIj oQwQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id 136si2633942qke.361.2017.06.28.11.49.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jun 2017 11:49:47 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 30D15883B1; Wed, 28 Jun 2017 18:49:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 30D15883B1 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 30D15883B1 Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B1AB6183A8; Wed, 28 Jun 2017 18:49:45 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8CF693FADE; Wed, 28 Jun 2017 18:49:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v5SIngrn031241 for ; Wed, 28 Jun 2017 14:49:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 19F1B173A7; Wed, 28 Jun 2017 18:49:42 +0000 (UTC) Delivered-To: libvir-list@redhat.com Received: from worklaptop.redhat.com (ovpn-116-174.phx2.redhat.com [10.3.116.174]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7237962930; Wed, 28 Jun 2017 18:49:41 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Wed, 28 Jun 2017 14:49:27 -0400 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/8] qemu: parse: drop redundant video config X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 28 Jun 2017 18:49:47 +0000 (UTC) The ram/vram = 0 bits aren't needed, and PostParse will fill in the needed QXL default Signed-off-by: Cole Robinson --- src/qemu/qemu_command.c | 4 ---- src/qemu/qemu_parse_command.c | 11 +---------- 2 files changed, 1 insertion(+), 14 deletions(-) -- 2.13.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: John Ferlan diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c53ab97b9..ebf9c63bc 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7264,10 +7264,6 @@ qemuBuildObsoleteAccelArg(virCommandPtr cmd, } break; - case VIR_DOMAIN_VIRT_XEN: - /* XXX better check for xenner */ - break; - default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("the QEMU binary does not support %s"), diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index af9063c02..60c81f0ca 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -2608,16 +2608,7 @@ qemuParseCommandLine(virCapsPtr caps, virDomainVideoDefPtr vid; if (VIR_ALLOC(vid) < 0) goto error; - if (def->virtType == VIR_DOMAIN_VIRT_XEN) - vid->type = VIR_DOMAIN_VIDEO_TYPE_XEN; - else - vid->type = video; - if (vid->type == VIR_DOMAIN_VIDEO_TYPE_QXL) { - vid->vgamem = QEMU_QXL_VGAMEM_DEFAULT; - } else { - vid->ram = 0; - vid->vgamem = 0; - } + vid->type = video; vid->heads = 1; if (VIR_APPEND_ELEMENT(def->videos, def->nvideos, vid) < 0) {