From patchwork Wed Mar 6 23:37:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 159779 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp6774072jad; Wed, 6 Mar 2019 15:37:51 -0800 (PST) X-Google-Smtp-Source: APXvYqwthA46yVSqrBxk7z6L6H9y7nSHo1PAm1mRaEQBiPcuvQooluGLldmRcE61jAQYV339p9U1 X-Received: by 2002:a0c:b00b:: with SMTP id k11mr8362532qvc.237.1551915471388; Wed, 06 Mar 2019 15:37:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551915471; cv=none; d=google.com; s=arc-20160816; b=czwd6mZGHua3gDS6zDgrM6xuRXs3FnLuM2aeuYI/GpsukgYlfh8BAgecjMVYCH387z 6IJLaVgPMqg7km/5haVxAtCnR9Hb2ZUeTlvmeOfd1UbnIGTxISPzjDZ3gIp9gIgpqLM4 WNk5z+D0Sf06EPf8Wy52BaSahNyNCey6XFacUocZ0ZgU7PmwFRxqv+w39ulMOkQnMhZ9 e8X+YqbibrpubWRIIF5iaVu4z4sWb52q1/gH3m9UgC2QCLZsGdj+llaB2cHE1bRvOfgp M3CwZW2BqXZKEytCl5l7rKtXm2pxlRaixagvpUFpGpSamVMJC5bDCpSRj5uJHcuGJhG5 GJxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :delivered-to; bh=hgMipQNzIeBJFdUzESu7mJb29dW0/7itg5iDZERFKS8=; b=vrFWHfh4oA+l4I8e3vO9XVi1hSvOlmLveJnXccYQzwL+W7ncwaEJa4dhYvPSWfZT43 qkJeKw6zUmzAUW1kT4YbQIo6qINMCXNV+YVtAdY+l2JcbTQvWVQwe1dpHF+nZzYsEVG/ U8dJDFDhJVeLvyjDYEuDwAtowA0Z2tNeW/54i7aw0ZVs7LBZSSHd9T+5y5fNAgDXRpBg Lvhe6G8vo1haZvmvzVDO1A0C6KAXs0V9HjZtyJ518byKuWJeB2sg+mBb0JohNGE+FcMd kdG+Ggq5estZuLF3GBkth87nX/iLkqScQiZSo+v8vADWxjc9jaRoA39Tn/Z7O/8gPs+j w9KQ== 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 a2si1907932qkl.29.2019.03.06.15.37.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2019 15:37:51 -0800 (PST) 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-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DBF27C058CAD; Wed, 6 Mar 2019 23:37:49 +0000 (UTC) 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 BB1045ED53; Wed, 6 Mar 2019 23:37:49 +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 8232F3FA4A; Wed, 6 Mar 2019 23:37:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x26NbMgQ005256 for ; Wed, 6 Mar 2019 18:37:22 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8A6991001DF1; Wed, 6 Mar 2019 23:37:22 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-121-104.rdu2.redhat.com [10.10.121.104]) by smtp.corp.redhat.com (Postfix) with ESMTP id 24D4A1001DD9; Wed, 6 Mar 2019 23:37:22 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Wed, 6 Mar 2019 18:37:01 -0500 Message-Id: <417441f598ebbc17b29303af5563225c051ec7e1.1551914794.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 12/16] qemu: fill in virCapsEnum 'report' 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 06 Mar 2019 23:37:50 +0000 (UTC) Set report=true for all enums currently formatted in the XML Signed-off-by: Cole Robinson --- src/qemu/qemu_capabilities.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) -- 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3611fb92d8..c18af5fb44 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4919,6 +4919,8 @@ virQEMUCapsFillDomainLoaderCaps(virDomainCapsLoaderPtr capsLoader, size_t i; capsLoader->supported = VIR_TRISTATE_BOOL_YES; + capsLoader->type.report = true; + capsLoader->readonly.report = true; if (VIR_ALLOC_N(capsLoader->values.values, nfirmwares) < 0) return -1; @@ -5024,6 +5026,10 @@ virQEMUCapsFillDomainDeviceDiskCaps(virQEMUCapsPtr qemuCaps, virDomainCapsDeviceDiskPtr disk) { disk->supported = VIR_TRISTATE_BOOL_YES; + disk->diskDevice.report = true; + disk->bus.report = true; + disk->model.report = true; + /* QEMU supports all of these */ VIR_DOMAIN_CAPS_ENUM_SET(disk->diskDevice, VIR_DOMAIN_DISK_DEVICE_DISK, @@ -5069,6 +5075,7 @@ virQEMUCapsFillDomainDeviceGraphicsCaps(virQEMUCapsPtr qemuCaps, virDomainCapsDeviceGraphicsPtr dev) { dev->supported = VIR_TRISTATE_BOOL_YES; + dev->type.report = true; VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_SDL); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC)) @@ -5085,6 +5092,7 @@ virQEMUCapsFillDomainDeviceVideoCaps(virQEMUCapsPtr qemuCaps, virDomainCapsDeviceVideoPtr dev) { dev->supported = VIR_TRISTATE_BOOL_YES; + dev->modelType.report = true; if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VGA)) VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_VGA); @@ -5109,6 +5117,12 @@ virQEMUCapsFillDomainDeviceHostdevCaps(virQEMUCapsPtr qemuCaps, bool supportsPassthroughVFIO = qemuHostdevHostSupportsPassthroughVFIO(); hostdev->supported = VIR_TRISTATE_BOOL_YES; + hostdev->mode.report = true; + hostdev->startupPolicy.report = true; + hostdev->subsysType.report = true; + hostdev->capsType.report = true; + hostdev->pciBackend.report = true; + /* VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES is for containers only */ VIR_DOMAIN_CAPS_ENUM_SET(hostdev->mode, VIR_DOMAIN_HOSTDEV_MODE_SUBSYS); @@ -5226,6 +5240,7 @@ virQEMUCapsFillDomainFeatureGICCaps(virQEMUCapsPtr qemuCaps, continue; gic->supported = VIR_TRISTATE_BOOL_YES; + gic->version.report = true; VIR_DOMAIN_CAPS_ENUM_SET(gic->version, version); }