From nobody Fri May 3 16:21:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1550845926031555.3027069533166; Fri, 22 Feb 2019 06:32:06 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5E1E5C057F48; Fri, 22 Feb 2019 14:32:04 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 229521A92D; Fri, 22 Feb 2019 14:32:04 +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 D75FE181A048; Fri, 22 Feb 2019 14:32:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1LFgau2008261 for ; Thu, 21 Feb 2019 10:42:36 -0500 Received: by smtp.corp.redhat.com (Postfix) id 00B2127CCF; Thu, 21 Feb 2019 15:42:36 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7CD5927BC2 for ; Thu, 21 Feb 2019 15:42:35 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Thu, 21 Feb 2019 16:42:23 +0100 Message-Id: <5eeee88b20f0228654d9feb6f7e7982b3aa16b8d.1550763719.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/8] DO NOT PUSH: allow skipping selected lines in group-qemu-caps.pl 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 22 Feb 2019 14:32:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" After running: tests/group-qemu-caps.pl the capabilities with numbers in the skip function will be dropped from qemu_capabilities.[ch] and printed into qemu_capabilities.[ch].dropped. --- tests/group-qemu-caps.pl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tests/group-qemu-caps.pl b/tests/group-qemu-caps.pl index 514764f47f..6b761520d8 100755 --- a/tests/group-qemu-caps.pl +++ b/tests/group-qemu-caps.pl @@ -55,6 +55,17 @@ if (®roup_caps($prefix . 'src/qemu/qemu_capabilities.= h', =20 exit $ret; =20 +sub skip { + my $num =3D shift; + + return 0; # coverity[dead_error_begin] + + foreach my $i (0 .. 12, 14 .. 32, 34 .. 45, 47 .. 49, 51 .. 53, 56, 57= , 59, 60, 65, 74 .. 76, 79, 81 .. 86, 90, 92 .. 94, 99, 100, 111, 112, 116,= 117, 126, 127, 133, 135 .. 137, 143 .. 145, 147, 150, 151, 164, 166, 221, = 226, 230) { + return 1 if ($i =3D=3D $num); + } + return 0; +} + sub regroup_caps { my $filename =3D shift; my $start_regex =3D shift; @@ -67,6 +78,10 @@ sub regroup_caps { my @original =3D ; close FILE; =20 + my $dropped =3D $filename . ".dropped"; + + open DROPPED, '>', $dropped or die "cannot open $dropped: $!"; + my @fixed; my $game_on =3D 0; my $counter =3D 0; @@ -74,6 +89,11 @@ sub regroup_caps { if ($game_on) { next if ($_ =3D~ '/\* [0-9]+ \*/'); next if (/^\s+$/); + if (skip($counter)) { + print DROPPED "$_"; + $counter++; + next; + } if ($counter % $step =3D=3D 0) { if ($counter !=3D 0) { push @fixed, "\n"; @@ -120,5 +140,6 @@ sub regroup_caps { print FILE $line; } close FILE; + close DROPPED; } } --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 16:21:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1550845929851741.0356051053976; Fri, 22 Feb 2019 06:32:09 -0800 (PST) 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 225973097062; Fri, 22 Feb 2019 14:32:08 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F29655DA2C; Fri, 22 Feb 2019 14:32:07 +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 B15AD181A048; Fri, 22 Feb 2019 14:32:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1LFgajX008284 for ; Thu, 21 Feb 2019 10:42:36 -0500 Received: by smtp.corp.redhat.com (Postfix) id C64E11A837; Thu, 21 Feb 2019 15:42:36 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F38027BC9 for ; Thu, 21 Feb 2019 15:42:36 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Thu, 21 Feb 2019 16:42:24 +0100 Message-Id: <478ca639377ab85413a997620c57b896db049632.1550763719.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/8] Introduce virQEMUCapsDeprecated array 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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.43]); Fri, 22 Feb 2019 14:32:08 +0000 (UTC) To prevent domains started with older libvirtd from disappearing, we need to be able to parse the string representation of QEMU capabilities, even if we no longer use them in the code. Put those in a separate array where we won't bother with enum constants. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 95 ++++++++++++++++++++++++++++++++++++ src/qemu/qemu_capabilities.h | 1 + 2 files changed, 96 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b48bcbebee..7160860ab4 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -524,6 +524,101 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "scsi-disk.device_id", ); =20 +#define VIR_QEMU_CAPS_DEPRECATED_LAST 92 /* chosen by fair dice roll */ +VIR_ENUM_IMPL(virQEMUCapsDeprecated, VIR_QEMU_CAPS_DEPRECATED_LAST, + "kqemu", /* X_QEMU_CAPS_KQEMU, Whether KQEMU is compiled in */ + "vnc-colon", /* X_QEMU_CAPS_VNC_COLON, VNC takes or address + display = */ + "no-reboot", /* X_QEMU_CAPS_NO_REBOOT, Is the -no-reboot flag availabl= e */ + "drive", /* X_QEMU_CAPS_DRIVE, Is the new -drive arg available */ + "drive-boot", /* X_QEMU_CAPS_DRIVE_BOOT, Does -drive support boot=3Don= */ + "name", /* X_QEMU_CAPS_NAME, Is the -name flag available */ + "uuid", /* X_QEMU_CAPS_UUID, Is the -uuid flag available */ + "domid", /* X_QEMU_CAPS_DOMID, Xenner: -domid flag available */ + "vnet-hdr", /* X_QEMU_CAPS_VNET_HDR */ + "migrate-kvm-stdio", /* X_QEMU_CAPS_MIGRATE_KVM_STDIO, avoid kvm tcp m= igration bug */ + "migrate-qemu-tcp", /* X_QEMU_CAPS_MIGRATE_QEMU_TCP, have qemu tcp mig= ration */ + "migrate-qemu-exec", /* X_QEMU_CAPS_MIGRATE_QEMU_EXEC, have qemu exec = migration */ + "drive-cache-v2", /* X_QEMU_CAPS_DRIVE_CACHE_V2, cache=3D flag wanting= new v2 values */ + "drive-format", /* X_QEMU_CAPS_DRIVE_FORMAT, Is -drive format=3D avail= */ + "vga", /* X_QEMU_CAPS_VGA, Is -vga avail */ + "0.10", /* X_QEMU_CAPS_0_10, features added in qemu-0.10.0 or later */ + "pci-device", /* X_QEMU_CAPS_PCIDEVICE, PCI device assignment supporte= d */ + "mem-path", /* X_QEMU_CAPS_MEM_PATH, mmap'ped guest backing supported = */ + "drive-serial", /* X_QEMU_CAPS_DRIVE_SERIAL, -driver serial=3D availa= ble */ + "xen-domid", /* X_QEMU_CAPS_XEN_DOMID, -xen-domid */ + "migrate-qemu-unix", /* X_QEMU_CAPS_MIGRATE_QEMU_UNIX, qemu migration = via unix sockets */ + "chardev", /* X_QEMU_CAPS_CHARDEV, Is the new -chardev arg available */ + "enable-kvm", /* X_QEMU_CAPS_ENABLE_KVM, -enable-kvm flag */ + "monitor-json", /* X_QEMU_CAPS_MONITOR_JSON, JSON mode for monitor */ + "balloon", /* X_QEMU_CAPS_BALLOON, -balloon available */ + "device", /* X_QEMU_CAPS_DEVICE, Is the -device arg available */ + "sdl", /* X_QEMU_CAPS_SDL, Is the new -sdl arg available */ + "smp-topology", /* X_QEMU_CAPS_SMP_TOPOLOGY, -smp has sockets/cores/th= reads */ + "netdev", /* X_QEMU_CAPS_NETDEV, -netdev flag & netdev_add/remove */ + "rtc", /* X_QEMU_CAPS_RTC, The -rtc flag for clock options */ + "vhost-net", /* X_QEMU_CAPS_VHOST_NET, vhost-net support available */ + "rtc-td-hack", /* X_QEMU_CAPS_RTC_TD_HACK, -rtc-td-hack available */ + "no-kvm-pit", /* X_QEMU_CAPS_NO_KVM_PIT, -no-kvm-pit-reinjection suppo= rted */ + "tdf", /* X_QEMU_CAPS_TDF, -tdf flag (user-mode pit catchup) */ + "pci-configfd", /* X_QEMU_CAPS_PCI_CONFIGFD, pci-assign.configfd */ + "nodefconfig", /* X_QEMU_CAPS_NODEFCONFIG, -nodefconfig */ + "boot-menu", /* X_QEMU_CAPS_BOOT_MENU, -boot menu=3Don support */ + "enable-kqemu", /* X_QEMU_CAPS_ENABLE_KQEMU, -enable-kqemu flag */ + "fsdev", /* X_QEMU_CAPS_FSDEV, -fstype filesystem passthrough */ + "nesting", /* X_QEMU_CAPS_NESTING, -enable-nesting (SVM/VMX) */ + "name-process", /* X_QEMU_CAPS_NAME_PROCESS, Is -name process=3D avail= able */ + "drive-readonly", /* X_QEMU_CAPS_DRIVE_READONLY, -drive readonly=3Don|= off */ + "smbios-type", /* X_QEMU_CAPS_SMBIOS_TYPE, Is -smbios type=3D availabl= e */ + "vga-qxl", /* X_QEMU_CAPS_VGA_QXL, The 'qxl' arg for '-vga' */ + "vga-none", /* X_QEMU_CAPS_VGA_NONE, The 'none' arg for '-vga' */ + "migrate-qemu-fd", /* X_QEMU_CAPS_MIGRATE_QEMU_FD, -incoming fd:n */ + "boot-index", /* X_QEMU_CAPS_BOOTINDEX, -device bootindex property */ + "drive-aio", /* X_QEMU_CAPS_DRIVE_AIO, -drive aio=3D supported */ + "pci-multibus", /* X_QEMU_CAPS_PCI_MULTIBUS, bus=3Dpci.0 vs bus=3Dpci = */ + "pci-bootindex", /* X_QEMU_CAPS_PCI_BOOTINDEX, pci-assign.bootindex */ + "chardev-spicevmc", /* X_QEMU_CAPS_CHARDEV_SPICEVMC, newer -chardev sp= icevmc */ + "device-spicevmc", /* X_QEMU_CAPS_DEVICE_SPICEVMC, older -device spice= vmc*/ + "device-qxl-vga", /* X_QEMU_CAPS_DEVICE_QXL_VGA, primary qxl device na= med qxl-vga? */ + "pci-multifunction", /* X_QEMU_CAPS_PCI_MULTIFUNCTION, -device multifu= nction=3Don|off */ + "cache-directsync", /* X_QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC, Is cache=3D= directsync supported? */ + "no-shutdown", /* X_QEMU_CAPS_NO_SHUTDOWN, usable -no-shutdown */ + "cache-unsafe", /* X_QEMU_CAPS_DRIVE_CACHE_UNSAFE, Is cache=3Dunsafe s= upported? */ + "rombar", /* X_QEMU_CAPS_PCI_ROMBAR, -device rombar=3D0|1 */ + "fsdev-readonly", /* X_QEMU_CAPS_FSDEV_READONLY, -fsdev readonly suppo= rted */ + "blk-sg-io", /* X_QEMU_CAPS_VIRTIO_BLK_SG_IO, SG_IO commands */ + "drive-copy-on-read", /* X_QEMU_CAPS_DRIVE_COPY_ON_READ, -drive copy-o= n-read */ + "cpu-host", /* X_QEMU_CAPS_CPU_HOST, support for -cpu host */ + "fsdev-writeout", /* X_QEMU_CAPS_FSDEV_WRITEOUT, -fsdev writeout suppo= rted */ + "drive-iotune", /* X_QEMU_CAPS_DRIVE_IOTUNE, -drive bps=3D and friends= */ + "system_wakeup", /* X_QEMU_CAPS_WAKEUP, system_wakeup monitor command = */ + "block-job-sync", /* X_QEMU_CAPS_BLOCKJOB_SYNC, old block_job_cancel, = block_stream */ + "scsi-cd", /* X_QEMU_CAPS_SCSI_CD, -device scsi-cd */ + "ide-cd", /* X_QEMU_CAPS_IDE_CD, -device ide-cd */ + "no-user-config", /* X_QEMU_CAPS_NO_USER_CONFIG, -no-user-config */ + "balloon-event", /* X_QEMU_CAPS_BALLOON_EVENT, Async event for balloon= changes */ + "bridge", /* X_QEMU_CAPS_NETDEV_BRIDGE, bridge helper support */ + "dump-guest-core", /* X_QEMU_CAPS_DUMP_GUEST_CORE, dump-guest-core-par= ameter */ + "seamless-migration", /* X_QEMU_CAPS_SEAMLESS_MIGRATION, seamless-migr= ation for SPICE */ + "usb-redir.bootindex", /* X_QEMU_CAPS_USB_REDIR_BOOTINDEX, usb-redir.b= ootindex */ + "usb-host.bootindex", /* X_QEMU_CAPS_USB_HOST_BOOTINDEX, usb-host.boot= index */ + "usb-net", /* X_QEMU_CAPS_DEVICE_USB_NET, -device usb-net */ + "add-fd", /* X_QEMU_CAPS_ADD_FD, -add-fd */ + "dtb", /* X_QEMU_CAPS_DTB, -dtb file */ + "ipv6-migration", /* X_QEMU_CAPS_IPV6_MIGRATION, -incoming [::] */ + "machine-opt", /* X_QEMU_CAPS_MACHINE_OPT, -machine xxxx*/ + "machine-usb-opt", /* X_QEMU_CAPS_MACHINE_USB_OPT, -machine xxx,usb=3D= on/off */ + "vfio-pci.bootindex", /* X_QEMU_CAPS_VFIO_PCI_BOOTINDEX, bootindex par= am for vfio-pci device */ + "scsi-generic", /* X_QEMU_CAPS_DEVICE_SCSI_GENERIC, -device scsi-gener= ic */ + "scsi-generic.bootindex", /* X_QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX= , -device scsi-generic.bootindex */ + "vnc-websocket", /* X_QEMU_CAPS_VNC_WEBSOCKET, -vnc x:y,websocket */ + "vnc-share-policy", /* X_QEMU_CAPS_VNC_SHARE_POLICY, set display shari= ng policy */ + "device-del-event", /* X_QEMU_CAPS_DEVICE_DEL_EVENT, DEVICE_DELETED ev= ent */ + "spiceport", /* X_QEMU_CAPS_CHARDEV_SPICEPORT, -chardev spiceport */ + "host-pci-multidomain", /* X_QEMU_CAPS_HOST_PCI_MULTIDOMAIN, support d= omain > 0 in host pci address */ + "device-tray-moved-event", /* X_QEMU_CAPS_DEVICE_TRAY_MOVED, DEVICE_TR= AY_MOVED event */ + "qxl-vga.max_outputs", /* X_QEMU_CAPS_QXL_VGA_MAX_OUTPUTS, -device qxl= -vga,max-outputs=3D */ + "display", /* X_QEMU_CAPS_DISPLAY, -display */ + ); =20 struct virQEMUCapsMachineType { char *name; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ba84052bca..6fa402a846 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -612,6 +612,7 @@ int virQEMUCapsGetDefaultVersion(virCapsPtr caps, unsigned int *version); =20 VIR_ENUM_DECL(virQEMUCaps); +VIR_ENUM_DECL(virQEMUCapsDeprecated); =20 bool virQEMUCapsSupportsGICVersion(virQEMUCapsPtr qemuCaps, virDomainVirtType virtType, --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 16:21:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 155076378781145.18817493721838; Thu, 21 Feb 2019 07:43:07 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E0A67309D2A3; Thu, 21 Feb 2019 15:43:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8F98F6049E; Thu, 21 Feb 2019 15:43:05 +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 2D0D11819AFE; Thu, 21 Feb 2019 15:43:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1LFgbYF008289 for ; Thu, 21 Feb 2019 10:42:37 -0500 Received: by smtp.corp.redhat.com (Postfix) id 97CBC1A837; Thu, 21 Feb 2019 15:42:37 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20AB227CA3 for ; Thu, 21 Feb 2019 15:42:36 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Thu, 21 Feb 2019 16:42:25 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/8] Split out virQEMUCapsSetFromNodes 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 21 Feb 2019 15:43:06 +0000 (UTC) Add a function that will convert the "name" attributes from the passed nodes to QEMU capabilities. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 51 +++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7160860ab4..a355ee2e37 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3442,6 +3442,38 @@ virQEMUCapsParseSEVInfo(virQEMUCapsPtr qemuCaps, xml= XPathContextPtr ctxt) } =20 =20 +static int +virQEMUCapsSetFromNodes(virQEMUCapsPtr qemuCaps, + xmlNodePtr *nodes, + size_t n) +{ + size_t i; + char *str =3D NULL; + int ret =3D -1; + + for (i =3D 0; i < n; i++) { + int flag; + if (!(str =3D virXMLPropString(nodes[i], "name"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("missing flag name in QEMU capabilities cache= ")); + goto cleanup; + } + flag =3D virQEMUCapsTypeFromString(str); + if (flag < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown qemu capabilities flag %s"), str); + goto cleanup; + } + VIR_FREE(str); + virQEMUCapsSet(qemuCaps, flag); + } + ret =3D 0; + cleanup: + VIR_FREE(str); + return ret; +} + + /* * Parsing a doc that looks like * @@ -3515,22 +3547,9 @@ virQEMUCapsLoadCache(virArch hostArch, goto cleanup; } VIR_DEBUG("Got flags %d", n); - for (i =3D 0; i < n; i++) { - int flag; - if (!(str =3D virXMLPropString(nodes[i], "name"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("missing flag name in QEMU capabilities cache= ")); - goto cleanup; - } - flag =3D virQEMUCapsTypeFromString(str); - if (flag < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown qemu capabilities flag %s"), str); - goto cleanup; - } - VIR_FREE(str); - virQEMUCapsSet(qemuCaps, flag); - } + + if (virQEMUCapsSetFromNodes(qemuCaps, nodes, n) < 0) + goto cleanup; VIR_FREE(nodes); =20 if (virXPathUInt("string(./version)", ctxt, &qemuCaps->version) < 0) { --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 16:21:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1550763765034666.1310157816872; Thu, 21 Feb 2019 07:42:45 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 923DA3097061; Thu, 21 Feb 2019 15:42:42 +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 59ACA6015C; Thu, 21 Feb 2019 15:42:42 +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 639AE41F3D; Thu, 21 Feb 2019 15:42:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1LFgciE008307 for ; Thu, 21 Feb 2019 10:42:38 -0500 Received: by smtp.corp.redhat.com (Postfix) id 69D4B282C9; Thu, 21 Feb 2019 15:42:38 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id E5DB51A837 for ; Thu, 21 Feb 2019 15:42:37 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Thu, 21 Feb 2019 16:42:26 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/8] Use virQEMUCapsSetFromNodes where possible 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Thu, 21 Feb 2019 15:42:43 +0000 (UTC) Remove some code duplication. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 4 ++++ src/qemu/qemu_domain.c | 16 ++-------------- tests/qemucaps2xmltest.c | 17 +++-------------- 4 files changed, 10 insertions(+), 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a355ee2e37..b12f5914aa 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3442,7 +3442,7 @@ virQEMUCapsParseSEVInfo(virQEMUCapsPtr qemuCaps, xmlX= PathContextPtr ctxt) } =20 =20 -static int +int virQEMUCapsSetFromNodes(virQEMUCapsPtr qemuCaps, xmlNodePtr *nodes, size_t n) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 6fa402a846..d1303da3cf 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -516,6 +516,10 @@ virQEMUCapsPtr virQEMUCapsNew(void); =20 void virQEMUCapsSet(virQEMUCapsPtr qemuCaps, virQEMUCapsFlags flag) ATTRIBUTE_NONNULL(1); +int virQEMUCapsSetFromNodes(virQEMUCapsPtr qemuCaps, + xmlNodePtr *nodes, + size_t nnodes) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); =20 void virQEMUCapsSetList(virQEMUCapsPtr qemuCaps, ...) ATTRIBUTE_NONNULL(1); =20 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index bbd4a5efe8..ef44252cba 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2995,20 +2995,8 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, if (!(qemuCaps =3D virQEMUCapsNew())) goto error; =20 - for (i =3D 0; i < n; i++) { - char *str =3D virXMLPropString(nodes[i], "name"); - if (str) { - int flag =3D virQEMUCapsTypeFromString(str); - if (flag < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown qemu capabilities flag %s"),= str); - VIR_FREE(str); - goto error; - } - VIR_FREE(str); - virQEMUCapsSet(qemuCaps, flag); - } - } + if (virQEMUCapsSetFromNodes(qemuCaps, nodes, n) < 0) + goto error; =20 VIR_STEAL_PTR(priv->qemuCaps, qemuCaps); } diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 0d9b4e679a..3e96c643da 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -38,7 +38,7 @@ testQemuGetCaps(char *caps) virQEMUCapsPtr qemuCaps =3D NULL; xmlDocPtr xml; xmlXPathContextPtr ctxt =3D NULL; - ssize_t i, n; + ssize_t n; xmlNodePtr *nodes =3D NULL; =20 if (!(xml =3D virXMLParseStringCtxt(caps, "(test caps)", &ctxt))) @@ -52,19 +52,8 @@ testQemuGetCaps(char *caps) if (!(qemuCaps =3D virQEMUCapsNew())) goto error; =20 - for (i =3D 0; i < n; i++) { - char *str =3D virXMLPropString(nodes[i], "name"); - if (str) { - int flag =3D virQEMUCapsTypeFromString(str); - if (flag < 0) { - fprintf(stderr, "Unknown qemu capabilities flag %s", str); - VIR_FREE(str); - goto error; - } - VIR_FREE(str); - virQEMUCapsSet(qemuCaps, flag); - } - } + if (virQEMUCapsSetFromNodes(qemuCaps, nodes, n) < 0) + goto error; =20 VIR_FREE(nodes); xmlFreeDoc(xml); --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 16:21:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1550763792357656.6868646070428; Thu, 21 Feb 2019 07:43:12 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 58CA6308213A; Thu, 21 Feb 2019 15:43:10 +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 2551E22706; Thu, 21 Feb 2019 15:43:10 +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 C4CC03FB13; Thu, 21 Feb 2019 15:43:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1LFgdif008332 for ; Thu, 21 Feb 2019 10:42:39 -0500 Received: by smtp.corp.redhat.com (Postfix) id 62C1D282C9; Thu, 21 Feb 2019 15:42:39 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B8BC71A837 for ; Thu, 21 Feb 2019 15:42:38 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Thu, 21 Feb 2019 16:42:27 +0100 Message-Id: <1f4db2269c5e31f02a7081b633d323999411ac26.1550763719.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 5/8] qemustatusxml2xmltests: remove deprecated qemu capabilities 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 21 Feb 2019 15:43:10 +0000 (UTC) Stop testing whether we format the deprecated capabilities back for the files where the input and output differ. Capabilities with separate output files are left alone, since we will still need to parse files contating them correctly, we just don't have to format them back. Signed-off-by: J=C3=A1n Tomko --- .../blockjob-mirror-in.xml | 1 - .../migration-in-params-in.xml | 53 ------------------- .../migration-out-nbd-tls-in.xml | 51 ------------------ .../migration-out-params-in.xml | 53 ------------------- tests/qemustatusxml2xmldata/modern-in.xml | 51 ------------------ .../qemustatusxml2xmldata/vcpus-multi-in.xml | 1 - 6 files changed, 210 deletions(-) diff --git a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml b/tests/qem= ustatusxml2xmldata/blockjob-mirror-in.xml index 32bde1ba66..6b522f5ae1 100644 --- a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml +++ b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml @@ -5,7 +5,6 @@ - diff --git a/tests/qemustatusxml2xmldata/migration-in-params-in.xml b/tests= /qemustatusxml2xmldata/migration-in-params-in.xml index 03f18b4f3d..b3c6b0758b 100644 --- a/tests/qemustatusxml2xmldata/migration-in-params-in.xml +++ b/tests/qemustatusxml2xmldata/migration-in-params-in.xml @@ -11,37 +11,16 @@ - - - - - - - - - - - - - - - - - - - - - @@ -50,28 +29,16 @@ - - - - - - - - - - - - @@ -82,13 +49,9 @@ - - - - @@ -96,30 +59,18 @@ - - - - - - - - - - - - @@ -131,9 +82,7 @@ - - @@ -184,7 +133,6 @@ - @@ -192,7 +140,6 @@ - diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml b/tes= ts/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml index be1dc7347e..25b5d62b3f 100644 --- a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml @@ -10,35 +10,16 @@ - - - - - - - - - - - - - - - - - - - @@ -47,28 +28,16 @@ - - - - - - - - - - - - @@ -79,13 +48,9 @@ - - - - @@ -93,30 +58,18 @@ - - - - - - - - - - - - @@ -128,9 +81,7 @@ - - @@ -180,7 +131,6 @@ - @@ -188,7 +138,6 @@ - diff --git a/tests/qemustatusxml2xmldata/migration-out-params-in.xml b/test= s/qemustatusxml2xmldata/migration-out-params-in.xml index ae2064830a..daa45e3f88 100644 --- a/tests/qemustatusxml2xmldata/migration-out-params-in.xml +++ b/tests/qemustatusxml2xmldata/migration-out-params-in.xml @@ -11,37 +11,16 @@ - - - - - - - - - - - - - - - - - - - - - @@ -50,28 +29,16 @@ - - - - - - - - - - - - @@ -82,13 +49,9 @@ - - - - @@ -96,30 +59,18 @@ - - - - - - - - - - - - @@ -131,9 +82,7 @@ - - @@ -184,7 +133,6 @@ - @@ -192,7 +140,6 @@ - diff --git a/tests/qemustatusxml2xmldata/modern-in.xml b/tests/qemustatusxm= l2xmldata/modern-in.xml index 08f7f40761..78a91c745f 100644 --- a/tests/qemustatusxml2xmldata/modern-in.xml +++ b/tests/qemustatusxml2xmldata/modern-in.xml @@ -10,35 +10,16 @@ - - - - - - - - - - - - - - - - - - - @@ -47,28 +28,16 @@ - - - - - - - - - - - - @@ -79,13 +48,9 @@ - - - - @@ -93,30 +58,18 @@ - - - - - - - - - - - - @@ -128,9 +81,7 @@ - - @@ -180,7 +131,6 @@ - @@ -188,7 +138,6 @@ - diff --git a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml b/tests/qemusta= tusxml2xmldata/vcpus-multi-in.xml index c99046ce8d..f9108a1e09 100644 --- a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml +++ b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml @@ -292,7 +292,6 @@ - --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 16:21:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1550845933791593.426135829238; Fri, 22 Feb 2019 06:32:13 -0800 (PST) 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 245ABC057F5C; Fri, 22 Feb 2019 14:32:12 +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 ED5A460BFB; Fri, 22 Feb 2019 14:32:11 +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 A4792247E0; Fri, 22 Feb 2019 14:32:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1LFgeLO008352 for ; Thu, 21 Feb 2019 10:42:40 -0500 Received: by smtp.corp.redhat.com (Postfix) id 334851A837; Thu, 21 Feb 2019 15:42:40 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B06D4282E2 for ; Thu, 21 Feb 2019 15:42:39 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Thu, 21 Feb 2019 16:42:28 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 6/8] virQEMUCapsSetFromNodes: Skip setting deprecated flags 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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.32]); Fri, 22 Feb 2019 14:32:12 +0000 (UTC) Prepare for removal of deprecated flags from the capability string array and quietly drop flags present in the deprecated string array if they were not found in the main array. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b12f5914aa..ce50cfdfa5 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3460,9 +3460,15 @@ virQEMUCapsSetFromNodes(virQEMUCapsPtr qemuCaps, } flag =3D virQEMUCapsTypeFromString(str); if (flag < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown qemu capabilities flag %s"), str); - goto cleanup; + flag =3D virQEMUCapsDeprecatedTypeFromString(str); + if (flag < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown qemu capabilities flag %s"), str= ); + goto cleanup; + } else { + VIR_FREE(str); + continue; + } } VIR_FREE(str); virQEMUCapsSet(qemuCaps, flag); --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 16:21:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1550763787952732.5772052687902; Thu, 21 Feb 2019 07:43:07 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3C058305AD40; Thu, 21 Feb 2019 15:43:06 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0AE5167649; Thu, 21 Feb 2019 15:43:06 +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 A9EF0181A00D; Thu, 21 Feb 2019 15:43:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1LFgfMZ008386 for ; Thu, 21 Feb 2019 10:42:41 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2C34927CA3; Thu, 21 Feb 2019 15:42:41 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 822ED1A837 for ; Thu, 21 Feb 2019 15:42:40 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Thu, 21 Feb 2019 16:42:29 +0100 Message-Id: <0e7f19c7bdd4aaeaa39c2f510150e1a3bda97c18.1550763719.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 7/8] Delete deprecated qemu capabilities from the enum 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Thu, 21 Feb 2019 15:43:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The deprecated capabilities are duplicated in the virQEMUCapsDeprecated array. Remove the copies in the current array. --- src/qemu/qemu_capabilities.c | 131 ------------------ src/qemu/qemu_capabilities.h | 131 ------------------ .../disk-secinfo-upgrade-out.xml | 51 ------- .../migration-out-nbd-out.xml | 51 ------- 4 files changed, 364 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ce50cfdfa5..7b760d95b4 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -63,99 +63,21 @@ VIR_LOG_INIT("qemu.qemu_capabilities"); * daemon restarts */ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, - /* 0 */ - "kqemu", - "vnc-colon", - "no-reboot", - "drive", - "drive-boot", - - /* 5 */ - "name", - "uuid", - "domid", - "vnet-hdr", - "migrate-kvm-stdio", - - /* 10 */ - "migrate-qemu-tcp", - "migrate-qemu-exec", - "drive-cache-v2", "kvm", - "drive-format", - - /* 15 */ - "vga", - "0.10", - "pci-device", - "mem-path", - "drive-serial", - - /* 20 */ - "xen-domid", - "migrate-qemu-unix", - "chardev", - "enable-kvm", - "monitor-json", - - /* 25 */ - "balloon", - "device", - "sdl", - "smp-topology", - "netdev", - - /* 30 */ - "rtc", - "vhost-net", - "rtc-td-hack", "no-hpet", - "no-kvm-pit", - - /* 35 */ - "tdf", - "pci-configfd", - "nodefconfig", - "boot-menu", - "enable-kqemu", - - /* 40 */ - "fsdev", - "nesting", - "name-process", - "drive-readonly", - "smbios-type", - - /* 45 */ - "vga-qxl", "spice", - "vga-none", - "migrate-qemu-fd", - "boot-index", =20 /* 50 */ "hda-duplex", - "drive-aio", - "pci-multibus", - "pci-bootindex", "ccid-emulated", =20 /* 55 */ "ccid-passthru", - "chardev-spicevmc", - "device-spicevmc", "virtio-tx-alg", - "device-qxl-vga", - - /* 60 */ - "pci-multifunction", "virtio-blk-pci.ioeventfd", "sga", "virtio-blk-pci.event_idx", "virtio-net-pci.event_idx", - - /* 65 */ - "cache-directsync", "piix3-usb-uhci", "piix4-usb-uhci", "usb-ehci", @@ -166,45 +88,21 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "pci-ohci", "usb-redir", "usb-hub", - "no-shutdown", - - /* 75 */ - "cache-unsafe", - "rombar", "ich9-ahci", "no-acpi", - "fsdev-readonly", =20 /* 80 */ "virtio-blk-pci.scsi", - "blk-sg-io", - "drive-copy-on-read", - "cpu-host", - "fsdev-writeout", - - /* 85 */ - "drive-iotune", - "system_wakeup", "scsi-disk.channel", "scsi-block", "transaction", - - /* 90 */ - "block-job-sync", "block-job-async", - "scsi-cd", - "ide-cd", - "no-user-config", =20 /* 95 */ "hda-micro", "dump-guest-memory", "nec-usb-xhci", "virtio-s390", - "balloon-event", - - /* 100 */ - "bridge", "lsi", "virtio-scsi-pci", "blockio", @@ -219,15 +117,11 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, =20 /* 110 */ "reboot-timeout", - "dump-guest-core", - "seamless-migration", "block-commit", "vnc", =20 /* 115 */ "drive-mirror", - "usb-redir.bootindex", - "usb-host.bootindex", "blockdev-snapshot-sync", "qxl", =20 @@ -240,8 +134,6 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, =20 /* 125 */ "usb-serial", - "usb-net", - "add-fd", "nbd-server", "virtio-rng", =20 @@ -249,13 +141,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "rng-random", "rng-egd", "virtio-ccw", - "dtb", "megasas", - - /* 135 */ - "ipv6-migration", - "machine-opt", - "machine-usb-opt", "tpm-passthrough", "tpm-tis", =20 @@ -263,19 +149,9 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "nvram", "pci-bridge", "vfio-pci", - "vfio-pci.bootindex", - "scsi-generic", - - /* 145 */ - "scsi-generic.bootindex", "mem-merge", - "vnc-websocket", "drive-discard", "mlock", - - /* 150 */ - "vnc-share-policy", - "device-del-event", "dmi-to-pci-bridge", "i440fx-pci-hole64-size", "q35-pci-hole64-size", @@ -292,11 +168,9 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "pvpanic", "enable-fips", "spice-file-xfer-disable", - "spiceport", =20 /* 165 */ "usb-kbd", - "host-pci-multidomain", "msg-timestamp", "active-commit", "change-backing-file", @@ -373,20 +247,15 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, =20 /* 220 */ "pxb-pcie", - "device-tray-moved-event", "nec-usb-xhci-ports", "virtio-scsi-pci.iothread", "name-guest", =20 /* 225 */ "qxl.max_outputs", - "qxl-vga.max_outputs", "spice-unix", "drive-detect-zeroes", "tls-creds-x509", - - /* 230 */ - "display", "intel-iommu", "smm", "virtio-pci-disable-legacy", diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index d1303da3cf..32dc8ccc1e 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -45,99 +45,21 @@ * X_ flags and re-group what's left. */ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ - /* 0 */ - X_QEMU_CAPS_KQEMU, /* Whether KQEMU is compiled in */ - X_QEMU_CAPS_VNC_COLON, /* VNC takes or address + display */ - X_QEMU_CAPS_NO_REBOOT, /* Is the -no-reboot flag available */ - X_QEMU_CAPS_DRIVE, /* Is the new -drive arg available */ - X_QEMU_CAPS_DRIVE_BOOT, /* Does -drive support boot=3Don */ - - /* 5 */ - X_QEMU_CAPS_NAME, /* Is the -name flag available */ - X_QEMU_CAPS_UUID, /* Is the -uuid flag available */ - X_QEMU_CAPS_DOMID, /* Xenner: -domid flag available */ - X_QEMU_CAPS_VNET_HDR, - X_QEMU_CAPS_MIGRATE_KVM_STDIO, /* avoid kvm tcp migration bug */ - - /* 10 */ - X_QEMU_CAPS_MIGRATE_QEMU_TCP, /* have qemu tcp migration */ - X_QEMU_CAPS_MIGRATE_QEMU_EXEC, /* have qemu exec migration */ - X_QEMU_CAPS_DRIVE_CACHE_V2, /* cache=3D flag wanting new v2 values */ QEMU_CAPS_KVM, /* Whether KVM is usable / was used during probing */ - X_QEMU_CAPS_DRIVE_FORMAT, /* Is -drive format=3D avail */ - - /* 15 */ - X_QEMU_CAPS_VGA, /* Is -vga avail */ - X_QEMU_CAPS_0_10, /* features added in qemu-0.10.0 or later */ - X_QEMU_CAPS_PCIDEVICE, /* PCI device assignment supported */ - X_QEMU_CAPS_MEM_PATH, /* mmap'ped guest backing supported */ - X_QEMU_CAPS_DRIVE_SERIAL, /* -driver serial=3D available */ - - /* 20 */ - X_QEMU_CAPS_XEN_DOMID, /* -xen-domid */ - X_QEMU_CAPS_MIGRATE_QEMU_UNIX, /* qemu migration via unix sockets */ - X_QEMU_CAPS_CHARDEV, /* Is the new -chardev arg available */ - X_QEMU_CAPS_ENABLE_KVM, /* -enable-kvm flag */ - X_QEMU_CAPS_MONITOR_JSON, /* JSON mode for monitor */ - - /* 25 */ - X_QEMU_CAPS_BALLOON, /* -balloon available */ - X_QEMU_CAPS_DEVICE, /* Is the -device arg available */ - X_QEMU_CAPS_SDL, /* Is the new -sdl arg available */ - X_QEMU_CAPS_SMP_TOPOLOGY, /* -smp has sockets/cores/threads */ - X_QEMU_CAPS_NETDEV, /* -netdev flag & netdev_add/remove */ - - /* 30 */ - X_QEMU_CAPS_RTC, /* The -rtc flag for clock options */ - X_QEMU_CAPS_VHOST_NET, /* vhost-net support available */ - X_QEMU_CAPS_RTC_TD_HACK, /* -rtc-td-hack available */ QEMU_CAPS_NO_HPET, /* -no-hpet flag is supported */ - X_QEMU_CAPS_NO_KVM_PIT, /* -no-kvm-pit-reinjection supported */ - - /* 35 */ - X_QEMU_CAPS_TDF, /* -tdf flag (user-mode pit catchup) */ - X_QEMU_CAPS_PCI_CONFIGFD, /* pci-assign.configfd */ - X_QEMU_CAPS_NODEFCONFIG, /* -nodefconfig */ - X_QEMU_CAPS_BOOT_MENU, /* -boot menu=3Don support */ - X_QEMU_CAPS_ENABLE_KQEMU, /* -enable-kqemu flag */ - - /* 40 */ - X_QEMU_CAPS_FSDEV, /* -fstype filesystem passthrough */ - X_QEMU_CAPS_NESTING, /* -enable-nesting (SVM/VMX) */ - X_QEMU_CAPS_NAME_PROCESS, /* Is -name process=3D available */ - X_QEMU_CAPS_DRIVE_READONLY, /* -drive readonly=3Don|off */ - X_QEMU_CAPS_SMBIOS_TYPE, /* Is -smbios type=3D available */ - - /* 45 */ - X_QEMU_CAPS_VGA_QXL, /* The 'qxl' arg for '-vga' */ QEMU_CAPS_SPICE, /* Is -spice avail */ - X_QEMU_CAPS_VGA_NONE, /* The 'none' arg for '-vga' */ - X_QEMU_CAPS_MIGRATE_QEMU_FD, /* -incoming fd:n */ - X_QEMU_CAPS_BOOTINDEX, /* -device bootindex property */ =20 /* 50 */ QEMU_CAPS_HDA_DUPLEX, /* -device hda-duplex */ - X_QEMU_CAPS_DRIVE_AIO, /* -drive aio=3D supported */ - X_QEMU_CAPS_PCI_MULTIBUS, /* bus=3Dpci.0 vs bus=3Dpci */ - X_QEMU_CAPS_PCI_BOOTINDEX, /* pci-assign.bootindex */ QEMU_CAPS_CCID_EMULATED, /* -device ccid-card-emulated */ =20 /* 55 */ QEMU_CAPS_CCID_PASSTHRU, /* -device ccid-card-passthru */ - X_QEMU_CAPS_CHARDEV_SPICEVMC, /* newer -chardev spicevmc */ - X_QEMU_CAPS_DEVICE_SPICEVMC, /* older -device spicevmc*/ QEMU_CAPS_VIRTIO_TX_ALG, /* -device virtio-net-pci,tx=3Dstring */ - X_QEMU_CAPS_DEVICE_QXL_VGA, /* primary qxl device named qxl-vga? */ - - /* 60 */ - X_QEMU_CAPS_PCI_MULTIFUNCTION, /* -device multifunction=3Don|off */ QEMU_CAPS_VIRTIO_IOEVENTFD, /* virtio-{net|blk}-pci.ioeventfd=3Don */ QEMU_CAPS_SGA, /* Serial Graphics Adapter */ QEMU_CAPS_VIRTIO_BLK_EVENT_IDX, /* virtio-blk-pci.event_idx */ QEMU_CAPS_VIRTIO_NET_EVENT_IDX, /* virtio-net-pci.event_idx */ - - /* 65 */ - X_QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC, /* Is cache=3Ddirectsync supported= ? */ QEMU_CAPS_PIIX3_USB_UHCI, /* -device piix3-usb-uhci */ QEMU_CAPS_PIIX4_USB_UHCI, /* -device piix4-usb-uhci */ QEMU_CAPS_USB_EHCI, /* -device usb-ehci */ @@ -148,45 +70,21 @@ typedef enum { /* virQEMUCapsFlags grouping marker for= syntax-check */ QEMU_CAPS_PCI_OHCI, /* -device pci-ohci */ QEMU_CAPS_USB_REDIR, /* -device usb-redir */ QEMU_CAPS_USB_HUB, /* -device usb-hub */ - X_QEMU_CAPS_NO_SHUTDOWN, /* usable -no-shutdown */ - - /* 75 */ - X_QEMU_CAPS_DRIVE_CACHE_UNSAFE, /* Is cache=3Dunsafe supported? */ - X_QEMU_CAPS_PCI_ROMBAR, /* -device rombar=3D0|1 */ QEMU_CAPS_ICH9_AHCI, /* -device ich9-ahci */ QEMU_CAPS_NO_ACPI, /* -no-acpi */ - X_QEMU_CAPS_FSDEV_READONLY, /* -fsdev readonly supported */ =20 /* 80 */ QEMU_CAPS_VIRTIO_BLK_SCSI, /* virtio-blk-pci.scsi */ - X_QEMU_CAPS_VIRTIO_BLK_SG_IO, /* SG_IO commands */ - X_QEMU_CAPS_DRIVE_COPY_ON_READ, /* -drive copy-on-read */ - X_QEMU_CAPS_CPU_HOST, /* support for -cpu host */ - X_QEMU_CAPS_FSDEV_WRITEOUT, /* -fsdev writeout supported */ - - /* 85 */ - X_QEMU_CAPS_DRIVE_IOTUNE, /* -drive bps=3D and friends */ - X_QEMU_CAPS_WAKEUP, /* system_wakeup monitor command */ QEMU_CAPS_SCSI_DISK_CHANNEL, /* Is scsi-disk.channel available? */ QEMU_CAPS_SCSI_BLOCK, /* -device scsi-block */ QEMU_CAPS_TRANSACTION, /* transaction monitor command */ - - /* 90 */ - X_QEMU_CAPS_BLOCKJOB_SYNC, /* old block_job_cancel, block_stream */ QEMU_CAPS_BLOCKJOB_ASYNC, /* new block-job-cancel, block-stream */ - X_QEMU_CAPS_SCSI_CD, /* -device scsi-cd */ - X_QEMU_CAPS_IDE_CD, /* -device ide-cd */ - X_QEMU_CAPS_NO_USER_CONFIG, /* -no-user-config */ =20 /* 95 */ QEMU_CAPS_HDA_MICRO, /* -device hda-micro */ QEMU_CAPS_DUMP_GUEST_MEMORY, /* dump-guest-memory command */ QEMU_CAPS_NEC_USB_XHCI, /* -device nec-usb-xhci */ QEMU_CAPS_VIRTIO_S390, /* -device virtio-*-s390 */ - X_QEMU_CAPS_BALLOON_EVENT, /* Async event for balloon changes */ - - /* 100 */ - X_QEMU_CAPS_NETDEV_BRIDGE, /* bridge helper support */ QEMU_CAPS_SCSI_LSI, /* -device lsi */ QEMU_CAPS_VIRTIO_SCSI, /* -device virtio-scsi-* */ QEMU_CAPS_BLOCKIO, /* -device ...logical_block_size & co */ @@ -201,15 +99,11 @@ typedef enum { /* virQEMUCapsFlags grouping marker for= syntax-check */ =20 /* 110 */ QEMU_CAPS_REBOOT_TIMEOUT, /* -boot reboot-timeout */ - X_QEMU_CAPS_DUMP_GUEST_CORE, /* dump-guest-core-parameter */ - X_QEMU_CAPS_SEAMLESS_MIGRATION, /* seamless-migration for SPICE */ QEMU_CAPS_BLOCK_COMMIT, /* block-commit */ QEMU_CAPS_VNC, /* Is -vnc available? */ =20 /* 115 */ QEMU_CAPS_DRIVE_MIRROR, /* drive-mirror monitor command */ - X_QEMU_CAPS_USB_REDIR_BOOTINDEX, /* usb-redir.bootindex */ - X_QEMU_CAPS_USB_HOST_BOOTINDEX, /* usb-host.bootindex */ QEMU_CAPS_DISK_SNAPSHOT, /* blockdev-snapshot-sync command */ QEMU_CAPS_DEVICE_QXL, /* -device qxl */ =20 @@ -222,8 +116,6 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ =20 /* 125 */ QEMU_CAPS_DEVICE_USB_SERIAL, /* -device usb-serial */ - X_QEMU_CAPS_DEVICE_USB_NET, /* -device usb-net */ - X_QEMU_CAPS_ADD_FD, /* -add-fd */ QEMU_CAPS_NBD_SERVER, /* nbd-server-start QMP command */ QEMU_CAPS_DEVICE_VIRTIO_RNG, /* virtio-rng device */ =20 @@ -231,13 +123,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for= syntax-check */ QEMU_CAPS_OBJECT_RNG_RANDOM, /* the rng-random backend for virtio rng = */ QEMU_CAPS_OBJECT_RNG_EGD, /* EGD protocol daemon for rng */ QEMU_CAPS_VIRTIO_CCW, /* -device virtio-*-ccw */ - X_QEMU_CAPS_DTB, /* -dtb file */ QEMU_CAPS_SCSI_MEGASAS, /* -device megasas */ - - /* 135 */ - X_QEMU_CAPS_IPV6_MIGRATION, /* -incoming [::] */ - X_QEMU_CAPS_MACHINE_OPT, /* -machine xxxx*/ - X_QEMU_CAPS_MACHINE_USB_OPT, /* -machine xxx,usb=3Don/off */ QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, /* -tpmdev passthrough */ QEMU_CAPS_DEVICE_TPM_TIS, /* -device tpm_tis */ =20 @@ -245,19 +131,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for= syntax-check */ QEMU_CAPS_DEVICE_NVRAM, /* -global spapr-nvram.reg=3Dxxxx */ QEMU_CAPS_DEVICE_PCI_BRIDGE, /* -device pci-bridge */ QEMU_CAPS_DEVICE_VFIO_PCI, /* -device vfio-pci */ - X_QEMU_CAPS_VFIO_PCI_BOOTINDEX, /* bootindex param for vfio-pci device= */ - X_QEMU_CAPS_DEVICE_SCSI_GENERIC, /* -device scsi-generic */ - - /* 145 */ - X_QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX, /* -device scsi-generic.boo= tindex */ QEMU_CAPS_MEM_MERGE, /* -machine mem-merge */ - X_QEMU_CAPS_VNC_WEBSOCKET, /* -vnc x:y,websocket */ QEMU_CAPS_DRIVE_DISCARD, /* -drive discard=3Doff(ignore)|on(unmap) */ QEMU_CAPS_REALTIME_MLOCK, /* -realtime mlock=3Don|off */ - - /* 150 */ - X_QEMU_CAPS_VNC_SHARE_POLICY, /* set display sharing policy */ - X_QEMU_CAPS_DEVICE_DEL_EVENT, /* DEVICE_DELETED event */ QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, /* -device i82801b11-bridge */ QEMU_CAPS_I440FX_PCI_HOLE64_SIZE, /* i440FX-pcihost.pci-hole64-size */ QEMU_CAPS_Q35_PCI_HOLE64_SIZE, /* q35-pcihost.pci-hole64-size */ @@ -274,11 +150,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for= syntax-check */ QEMU_CAPS_DEVICE_PANIC, /* -device pvpanic */ QEMU_CAPS_ENABLE_FIPS, /* -enable-fips */ QEMU_CAPS_SPICE_FILE_XFER_DISABLE, /* -spice disable-agent-file-xfer */ - X_QEMU_CAPS_CHARDEV_SPICEPORT, /* -chardev spiceport */ =20 /* 165 */ QEMU_CAPS_DEVICE_USB_KBD, /* -device usb-kbd */ - X_QEMU_CAPS_HOST_PCI_MULTIDOMAIN, /* support domain > 0 in host pci ad= dress */ QEMU_CAPS_MSG_TIMESTAMP, /* -msg timestamp */ QEMU_CAPS_ACTIVE_COMMIT, /* block-commit works without 'top' */ QEMU_CAPS_CHANGE_BACKING_FILE, /* change name of backing file in metad= ata */ @@ -356,20 +230,15 @@ typedef enum { /* virQEMUCapsFlags grouping marker fo= r syntax-check */ =20 /* 220 */ QEMU_CAPS_DEVICE_PXB_PCIE, /* -device pxb-pcie */ - X_QEMU_CAPS_DEVICE_TRAY_MOVED, /* DEVICE_TRAY_MOVED event */ QEMU_CAPS_NEC_USB_XHCI_PORTS, /* -device nec-usb-xhci.p3 ports setting= */ QEMU_CAPS_VIRTIO_SCSI_IOTHREAD, /* virtio-scsi-{pci,ccw}.iothread */ QEMU_CAPS_NAME_GUEST, /* -name guest=3D */ =20 /* 225 */ QEMU_CAPS_QXL_MAX_OUTPUTS, /* -device qxl,max-outputs=3D */ - X_QEMU_CAPS_QXL_VGA_MAX_OUTPUTS, /* -device qxl-vga,max-outputs=3D */ QEMU_CAPS_SPICE_UNIX, /* -spice unix */ QEMU_CAPS_DRIVE_DETECT_ZEROES, /* -drive detect-zeroes=3D */ QEMU_CAPS_OBJECT_TLS_CREDS_X509, /* -object tls-creds-x509 */ - - /* 230 */ - X_QEMU_CAPS_DISPLAY, /* -display */ QEMU_CAPS_DEVICE_INTEL_IOMMU, /* -device intel-iommu */ QEMU_CAPS_MACHINE_SMM_OPT, /* -machine xxx,smm=3Don/off/auto */ QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, /* virtio-*pci.disable-legacy */ diff --git a/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml b/tes= ts/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml index 7a26e93aa4..a4912b40de 100644 --- a/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml +++ b/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml @@ -9,35 +9,16 @@ - - - - - - - - - - - - - - - - - - - @@ -46,28 +27,16 @@ - - - - - - - - - - - - @@ -78,13 +47,9 @@ - - - - @@ -92,30 +57,18 @@ - - - - - - - - - - - - @@ -127,9 +80,7 @@ - - @@ -179,7 +130,6 @@ - @@ -187,7 +137,6 @@ - diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml b/tests/= qemustatusxml2xmldata/migration-out-nbd-out.xml index 315d8e4c1a..4ef575eddc 100644 --- a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml @@ -7,35 +7,16 @@ - - - - - - - - - - - - - - - - - - - @@ -44,28 +25,16 @@ - - - - - - - - - - - - @@ -76,13 +45,9 @@ - - - - @@ -90,30 +55,18 @@ - - - - - - - - - - - - @@ -125,9 +78,7 @@ - - @@ -177,7 +128,6 @@ - @@ -185,7 +135,6 @@ - --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 16:21:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1550763793252382.64108168966595; Thu, 21 Feb 2019 07:43:13 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EC1A781105; Thu, 21 Feb 2019 15:43:10 +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 B2D95226FF; Thu, 21 Feb 2019 15:43:10 +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 635083FB15; Thu, 21 Feb 2019 15:43:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1LFggPn008456 for ; Thu, 21 Feb 2019 10:42:42 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0188B1A837; Thu, 21 Feb 2019 15:42:42 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D077282C2 for ; Thu, 21 Feb 2019 15:42:41 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Thu, 21 Feb 2019 16:42:30 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 8/8] DO NOT PUSH: fix capabilities grouping 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 21 Feb 2019 15:43:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" To be squashed into the previous patch. Best viewed with --patience --- src/qemu/qemu_capabilities.c | 177 ++++++++++++++++++----------------- src/qemu/qemu_capabilities.h | 177 ++++++++++++++++++----------------- 2 files changed, 180 insertions(+), 174 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7b760d95b4..3bb4bfbbf2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -63,333 +63,336 @@ VIR_LOG_INIT("qemu.qemu_capabilities"); * daemon restarts */ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, + /* 0 */ "kvm", "no-hpet", "spice", - - /* 50 */ "hda-duplex", "ccid-emulated", =20 - /* 55 */ + /* 5 */ "ccid-passthru", "virtio-tx-alg", "virtio-blk-pci.ioeventfd", "sga", "virtio-blk-pci.event_idx", + + /* 10 */ "virtio-net-pci.event_idx", "piix3-usb-uhci", "piix4-usb-uhci", "usb-ehci", "ich9-usb-ehci1", =20 - /* 70 */ + /* 15 */ "vt82c686b-usb-uhci", "pci-ohci", "usb-redir", "usb-hub", "ich9-ahci", - "no-acpi", =20 - /* 80 */ + /* 20 */ + "no-acpi", "virtio-blk-pci.scsi", "scsi-disk.channel", "scsi-block", "transaction", - "block-job-async", =20 - /* 95 */ + /* 25 */ + "block-job-async", "hda-micro", "dump-guest-memory", "nec-usb-xhci", "virtio-s390", + + /* 30 */ "lsi", "virtio-scsi-pci", "blockio", "disable-s3", - - /* 105 */ "disable-s4", + + /* 35 */ "usb-redir.filter", "ide-drive.wwn", "scsi-disk.wwn", "seccomp-sandbox", - - /* 110 */ "reboot-timeout", + + /* 40 */ "block-commit", "vnc", - - /* 115 */ "drive-mirror", "blockdev-snapshot-sync", "qxl", =20 - /* 120 */ + /* 45 */ "VGA", "cirrus-vga", "vmware-svga", "device-video-primary", "s390-sclp", =20 - /* 125 */ + /* 50 */ "usb-serial", "nbd-server", "virtio-rng", - - /* 130 */ "rng-random", "rng-egd", + + /* 55 */ "virtio-ccw", "megasas", "tpm-passthrough", "tpm-tis", - - /* 140 */ "nvram", + + /* 60 */ "pci-bridge", "vfio-pci", "mem-merge", "drive-discard", "mlock", + + /* 65 */ "dmi-to-pci-bridge", "i440fx-pci-hole64-size", "q35-pci-hole64-size", - - /* 155 */ "usb-storage", "usb-storage.removable", + + /* 70 */ "virtio-mmio", "ich9-intel-hda", "kvm-pit-lost-tick-policy", - - /* 160 */ "boot-strict", "pvpanic", + + /* 75 */ "enable-fips", "spice-file-xfer-disable", - - /* 165 */ "usb-kbd", "msg-timestamp", "active-commit", - "change-backing-file", =20 - /* 170 */ + /* 80 */ + "change-backing-file", "memory-backend-ram", "numa", "memory-backend-file", "usb-audio", - "rtc-reset-reinjection", =20 - /* 175 */ + /* 85 */ + "rtc-reset-reinjection", "splash-timeout", "iothread", "migrate-rdma", "ivshmem", - "drive-iotune-max", =20 - /* 180 */ + /* 90 */ + "drive-iotune-max", "VGA.vgamem_mb", "vmware-svga.vgamem_mb", "qxl.vgamem_mb", "qxl-vga.vgamem_mb", - "pc-dimm", =20 - /* 185 */ + /* 95 */ + "pc-dimm", "machine-vmport-opt", "aes-key-wrap", "dea-key-wrap", "pci-serial", - "aarch64-off", =20 - /* 190 */ + /* 100 */ + "aarch64-off", "vhost-user-multiqueue", "migration-event", "gpex-pcihost", "ioh3420", - "x3130-upstream", =20 - /* 195 */ + /* 105 */ + "x3130-upstream", "xio3130-downstream", "rtl8139", "e1000", "virtio-net", - "gic-version", =20 - /* 200 */ + /* 110 */ + "gic-version", "incoming-defer", "virtio-gpu", "virtio-gpu.virgl", "virtio-keyboard", - "virtio-mouse", =20 - /* 205 */ + /* 115 */ + "virtio-mouse", "virtio-tablet", "virtio-input-host", "chardev-file-append", "ich9-disable-s3", - "ich9-disable-s4", =20 - /* 210 */ + /* 120 */ + "ich9-disable-s4", "vserport-change-event", "virtio-balloon-pci.deflate-on-oom", "mptsas1068", "spice-gl", - "qxl.vram64_size_mb", =20 - /* 215 */ + /* 125 */ + "qxl.vram64_size_mb", "qxl-vga.vram64_size_mb", "chardev-logfile", "debug-threads", "secret", - "pxb", =20 - /* 220 */ + /* 130 */ + "pxb", "pxb-pcie", "nec-usb-xhci-ports", "virtio-scsi-pci.iothread", "name-guest", =20 - /* 225 */ + /* 135 */ "qxl.max_outputs", "spice-unix", "drive-detect-zeroes", "tls-creds-x509", "intel-iommu", + + /* 140 */ "smm", "virtio-pci-disable-legacy", "query-hotpluggable-cpus", - - /* 235 */ "virtio-net.rx_queue_size", "machine-iommu", + + /* 145 */ "virtio-vga", "drive-iotune-max-length", "ivshmem-plain", - - /* 240 */ "ivshmem-doorbell", "query-qmp-schema", + + /* 150 */ "gluster.debug_level", "vhost-scsi", "drive-iotune-group", - - /* 245 */ "query-cpu-model-expansion", "virtio-net.host_mtu", + + /* 155 */ "spice-rendernode", "nvdimm", "pcie-root-port", - - /* 250 */ "query-cpu-definitions", "block-write-threshold", + + /* 160 */ "query-named-block-nodes", "cpu-cache", "qemu-xhci", - - /* 255 */ "kernel-irqchip", "kernel-irqchip.split", + + /* 165 */ "intel-iommu.intremap", "intel-iommu.caching-mode", "intel-iommu.eim", - - /* 260 */ "intel-iommu.device-iotlb", "virtio.iommu_platform", + + /* 170 */ "virtio.ats", "loadparm", "spapr-pci-host-bridge", - - /* 265 */ "spapr-pci-host-bridge.numa_node", "vnc-multi-servers", + + /* 175 */ "virtio-net.tx_queue_size", "chardev-reconnect", "virtio-gpu.max_outputs", - - /* 270 */ "vxhs", "virtio-blk.num-queues", + + /* 180 */ "machine.pseries.resize-hpt", "vmcoreinfo", "spapr-vty", - - /* 275 */ "sclplmconsole", "numa.dist", + + /* 185 */ "disk-share-rw", "iscsi.password-secret", "isa-serial", - - /* 280 */ "pl011", "machine.pseries.max-cpu-compat", + + /* 190 */ "dump-completed", "virtio-gpu-ccw", "virtio-keyboard-ccw", - - /* 285 */ "virtio-mouse-ccw", "virtio-tablet-ccw", + + /* 195 */ "qcow2-luks", "pcie-pci-bridge", "seccomp-blacklist", - - /* 290 */ "query-cpus-fast", "disk-write-cache", + + /* 200 */ "nbd-tls", "tpm-crb", "pr-manager-helper", - - /* 295 */ "qom-list-properties", "memory-backend-file.discard-data", + + /* 205 */ "virtual-css-bridge", "virtual-css-bridge.cssid-unrestricted", "vfio-ccw", - - /* 300 */ "sdl-gl", "screendump_device", + + /* 210 */ "hda-output", "blockdev-del", "vmgenid", - - /* 305 */ "vhost-vsock", "chardev-fd-pass", + + /* 215 */ "tpm-emulator", "mch", "mch.extended-tseg-mbytes", - - /* 310 */ "sev-guest", "machine.pseries.cap-hpt-max-page-size", + + /* 220 */ "machine.pseries.cap-htm", "usb-storage.werror", "egl-headless", - - /* 315 */ "vfio-pci.display", "blockdev", + + /* 225 */ "vfio-ap", "zpci", "memory-backend-memfd", - - /* 320 */ "memory-backend-memfd.hugetlb", "iothread.poll-max-ns", + + /* 230 */ "machine.pseries.cap-nested-hv", "egl-headless.rendernode", "memory-backend-file.align", - - /* 325 */ "memory-backend-file.pmem", "nvdimm.unarmed", + + /* 235 */ "scsi-disk.device_id", ); =20 diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 32dc8ccc1e..7e373f8dcd 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -45,334 +45,337 @@ * X_ flags and re-group what's left. */ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ + /* 0 */ QEMU_CAPS_KVM, /* Whether KVM is usable / was used during probing */ QEMU_CAPS_NO_HPET, /* -no-hpet flag is supported */ QEMU_CAPS_SPICE, /* Is -spice avail */ - - /* 50 */ QEMU_CAPS_HDA_DUPLEX, /* -device hda-duplex */ QEMU_CAPS_CCID_EMULATED, /* -device ccid-card-emulated */ =20 - /* 55 */ + /* 5 */ QEMU_CAPS_CCID_PASSTHRU, /* -device ccid-card-passthru */ QEMU_CAPS_VIRTIO_TX_ALG, /* -device virtio-net-pci,tx=3Dstring */ QEMU_CAPS_VIRTIO_IOEVENTFD, /* virtio-{net|blk}-pci.ioeventfd=3Don */ QEMU_CAPS_SGA, /* Serial Graphics Adapter */ QEMU_CAPS_VIRTIO_BLK_EVENT_IDX, /* virtio-blk-pci.event_idx */ + + /* 10 */ QEMU_CAPS_VIRTIO_NET_EVENT_IDX, /* virtio-net-pci.event_idx */ QEMU_CAPS_PIIX3_USB_UHCI, /* -device piix3-usb-uhci */ QEMU_CAPS_PIIX4_USB_UHCI, /* -device piix4-usb-uhci */ QEMU_CAPS_USB_EHCI, /* -device usb-ehci */ QEMU_CAPS_ICH9_USB_EHCI1, /* -device ich9-usb-ehci1 and friends */ =20 - /* 70 */ + /* 15 */ QEMU_CAPS_VT82C686B_USB_UHCI, /* -device vt82c686b-usb-uhci */ QEMU_CAPS_PCI_OHCI, /* -device pci-ohci */ QEMU_CAPS_USB_REDIR, /* -device usb-redir */ QEMU_CAPS_USB_HUB, /* -device usb-hub */ QEMU_CAPS_ICH9_AHCI, /* -device ich9-ahci */ - QEMU_CAPS_NO_ACPI, /* -no-acpi */ =20 - /* 80 */ + /* 20 */ + QEMU_CAPS_NO_ACPI, /* -no-acpi */ QEMU_CAPS_VIRTIO_BLK_SCSI, /* virtio-blk-pci.scsi */ QEMU_CAPS_SCSI_DISK_CHANNEL, /* Is scsi-disk.channel available? */ QEMU_CAPS_SCSI_BLOCK, /* -device scsi-block */ QEMU_CAPS_TRANSACTION, /* transaction monitor command */ - QEMU_CAPS_BLOCKJOB_ASYNC, /* new block-job-cancel, block-stream */ =20 - /* 95 */ + /* 25 */ + QEMU_CAPS_BLOCKJOB_ASYNC, /* new block-job-cancel, block-stream */ QEMU_CAPS_HDA_MICRO, /* -device hda-micro */ QEMU_CAPS_DUMP_GUEST_MEMORY, /* dump-guest-memory command */ QEMU_CAPS_NEC_USB_XHCI, /* -device nec-usb-xhci */ QEMU_CAPS_VIRTIO_S390, /* -device virtio-*-s390 */ + + /* 30 */ QEMU_CAPS_SCSI_LSI, /* -device lsi */ QEMU_CAPS_VIRTIO_SCSI, /* -device virtio-scsi-* */ QEMU_CAPS_BLOCKIO, /* -device ...logical_block_size & co */ QEMU_CAPS_PIIX_DISABLE_S3, /* -M pc S3 BIOS Advertisement on/off */ - - /* 105 */ QEMU_CAPS_PIIX_DISABLE_S4, /* -M pc S4 BIOS Advertisement on/off */ + + /* 35 */ QEMU_CAPS_USB_REDIR_FILTER, /* usb-redir.filter */ QEMU_CAPS_IDE_DRIVE_WWN, /* Is ide-drive.wwn available? */ QEMU_CAPS_SCSI_DISK_WWN, /* Is scsi-disk.wwn available? */ QEMU_CAPS_SECCOMP_SANDBOX, /* -sandbox */ - - /* 110 */ QEMU_CAPS_REBOOT_TIMEOUT, /* -boot reboot-timeout */ + + /* 40 */ QEMU_CAPS_BLOCK_COMMIT, /* block-commit */ QEMU_CAPS_VNC, /* Is -vnc available? */ - - /* 115 */ QEMU_CAPS_DRIVE_MIRROR, /* drive-mirror monitor command */ QEMU_CAPS_DISK_SNAPSHOT, /* blockdev-snapshot-sync command */ QEMU_CAPS_DEVICE_QXL, /* -device qxl */ =20 - /* 120 */ + /* 45 */ QEMU_CAPS_DEVICE_VGA, /* -device VGA */ QEMU_CAPS_DEVICE_CIRRUS_VGA, /* -device cirrus-vga */ QEMU_CAPS_DEVICE_VMWARE_SVGA, /* -device vmware-svga */ QEMU_CAPS_DEVICE_VIDEO_PRIMARY, /* -device safe for primary video devi= ce */ QEMU_CAPS_DEVICE_SCLPCONSOLE, /* -device sclpconsole */ =20 - /* 125 */ + /* 50 */ QEMU_CAPS_DEVICE_USB_SERIAL, /* -device usb-serial */ QEMU_CAPS_NBD_SERVER, /* nbd-server-start QMP command */ QEMU_CAPS_DEVICE_VIRTIO_RNG, /* virtio-rng device */ - - /* 130 */ QEMU_CAPS_OBJECT_RNG_RANDOM, /* the rng-random backend for virtio rng = */ QEMU_CAPS_OBJECT_RNG_EGD, /* EGD protocol daemon for rng */ + + /* 55 */ QEMU_CAPS_VIRTIO_CCW, /* -device virtio-*-ccw */ QEMU_CAPS_SCSI_MEGASAS, /* -device megasas */ QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, /* -tpmdev passthrough */ QEMU_CAPS_DEVICE_TPM_TIS, /* -device tpm_tis */ - - /* 140 */ QEMU_CAPS_DEVICE_NVRAM, /* -global spapr-nvram.reg=3Dxxxx */ + + /* 60 */ QEMU_CAPS_DEVICE_PCI_BRIDGE, /* -device pci-bridge */ QEMU_CAPS_DEVICE_VFIO_PCI, /* -device vfio-pci */ QEMU_CAPS_MEM_MERGE, /* -machine mem-merge */ QEMU_CAPS_DRIVE_DISCARD, /* -drive discard=3Doff(ignore)|on(unmap) */ QEMU_CAPS_REALTIME_MLOCK, /* -realtime mlock=3Don|off */ + + /* 65 */ QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, /* -device i82801b11-bridge */ QEMU_CAPS_I440FX_PCI_HOLE64_SIZE, /* i440FX-pcihost.pci-hole64-size */ QEMU_CAPS_Q35_PCI_HOLE64_SIZE, /* q35-pcihost.pci-hole64-size */ - - /* 155 */ QEMU_CAPS_DEVICE_USB_STORAGE, /* -device usb-storage */ QEMU_CAPS_USB_STORAGE_REMOVABLE, /* usb-storage.removable */ + + /* 70 */ QEMU_CAPS_DEVICE_VIRTIO_MMIO, /* -device virtio-mmio */ QEMU_CAPS_DEVICE_ICH9_INTEL_HDA, /* -device ich9-intel-hda */ QEMU_CAPS_KVM_PIT_TICK_POLICY, /* kvm-pit.lost_tick_policy */ - - /* 160 */ QEMU_CAPS_BOOT_STRICT, /* -boot strict */ QEMU_CAPS_DEVICE_PANIC, /* -device pvpanic */ + + /* 75 */ QEMU_CAPS_ENABLE_FIPS, /* -enable-fips */ QEMU_CAPS_SPICE_FILE_XFER_DISABLE, /* -spice disable-agent-file-xfer */ - - /* 165 */ QEMU_CAPS_DEVICE_USB_KBD, /* -device usb-kbd */ QEMU_CAPS_MSG_TIMESTAMP, /* -msg timestamp */ QEMU_CAPS_ACTIVE_COMMIT, /* block-commit works without 'top' */ - QEMU_CAPS_CHANGE_BACKING_FILE, /* change name of backing file in metad= ata */ =20 - /* 170 */ + /* 80 */ + QEMU_CAPS_CHANGE_BACKING_FILE, /* change name of backing file in metad= ata */ QEMU_CAPS_OBJECT_MEMORY_RAM, /* -object memory-backend-ram */ QEMU_CAPS_NUMA, /* newer -numa handling with disjoint cpu ranges */ QEMU_CAPS_OBJECT_MEMORY_FILE, /* -object memory-backend-file */ QEMU_CAPS_OBJECT_USB_AUDIO, /* usb-audio device support */ - QEMU_CAPS_RTC_RESET_REINJECTION, /* rtc-reset-reinjection monitor comm= and */ =20 - /* 175 */ + /* 85 */ + QEMU_CAPS_RTC_RESET_REINJECTION, /* rtc-reset-reinjection monitor comm= and */ QEMU_CAPS_SPLASH_TIMEOUT, /* -boot splash-time */ QEMU_CAPS_OBJECT_IOTHREAD, /* -object iothread */ QEMU_CAPS_MIGRATE_RDMA, /* have rdma migration */ QEMU_CAPS_DEVICE_IVSHMEM, /* -device ivshmem */ - QEMU_CAPS_DRIVE_IOTUNE_MAX, /* -drive bps_max=3D and friends */ =20 - /* 180 */ + /* 90 */ + QEMU_CAPS_DRIVE_IOTUNE_MAX, /* -drive bps_max=3D and friends */ QEMU_CAPS_VGA_VGAMEM, /* -device VGA.vgamem_mb */ QEMU_CAPS_VMWARE_SVGA_VGAMEM, /* -device vmware-svga.vgamem_mb */ QEMU_CAPS_QXL_VGAMEM, /* -device qxl.vgamem_mb */ X_QEMU_CAPS_QXL_VGA_VGAMEM, /* -device qxl-vga.vgamem_mb */ - QEMU_CAPS_DEVICE_PC_DIMM, /* pc-dimm device */ =20 - /* 185 */ + /* 95 */ + QEMU_CAPS_DEVICE_PC_DIMM, /* pc-dimm device */ QEMU_CAPS_MACHINE_VMPORT_OPT, /* -machine xxx,vmport=3Don/off/auto */ QEMU_CAPS_AES_KEY_WRAP, /* -machine aes_key_wrap */ QEMU_CAPS_DEA_KEY_WRAP, /* -machine dea_key_wrap */ QEMU_CAPS_DEVICE_PCI_SERIAL, /* -device pci-serial */ - QEMU_CAPS_CPU_AARCH64_OFF, /* -cpu ...,aarch64=3Doff */ =20 - /* 190 */ + /* 100 */ + QEMU_CAPS_CPU_AARCH64_OFF, /* -cpu ...,aarch64=3Doff */ QEMU_CAPS_VHOSTUSER_MULTIQUEUE, /* vhost-user with -netdev queues=3D */ QEMU_CAPS_MIGRATION_EVENT, /* MIGRATION event */ QEMU_CAPS_OBJECT_GPEX, /* have generic PCI host controller */ QEMU_CAPS_DEVICE_IOH3420, /* -device ioh3420 */ - QEMU_CAPS_DEVICE_X3130_UPSTREAM, /* -device x3130-upstream */ =20 - /* 195 */ + /* 105 */ + QEMU_CAPS_DEVICE_X3130_UPSTREAM, /* -device x3130-upstream */ QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, /* -device xio3130-downstream */ QEMU_CAPS_DEVICE_RTL8139, /* -device rtl8139 */ QEMU_CAPS_DEVICE_E1000, /* -device e1000 */ QEMU_CAPS_DEVICE_VIRTIO_NET, /* -device virtio-net-* */ - QEMU_CAPS_MACH_VIRT_GIC_VERSION, /* -machine virt,gic-version */ =20 - /* 200 */ + /* 110 */ + QEMU_CAPS_MACH_VIRT_GIC_VERSION, /* -machine virt,gic-version */ QEMU_CAPS_INCOMING_DEFER, /* -incoming defer and migrate_incoming */ QEMU_CAPS_DEVICE_VIRTIO_GPU, /* -device virtio-gpu-* */ QEMU_CAPS_VIRTIO_GPU_VIRGL, /* -device virtio-gpu-*.virgl */ QEMU_CAPS_VIRTIO_KEYBOARD, /* -device virtio-keyboard-{device,pci} */ - QEMU_CAPS_VIRTIO_MOUSE, /* -device virtio-mouse-{device,pci} */ =20 - /* 205 */ + /* 115 */ + QEMU_CAPS_VIRTIO_MOUSE, /* -device virtio-mouse-{device,pci} */ QEMU_CAPS_VIRTIO_TABLET, /* -device virtio-tablet-{device,pci} */ QEMU_CAPS_VIRTIO_INPUT_HOST, /* -device virtio-input-host-{device,pci}= */ QEMU_CAPS_CHARDEV_FILE_APPEND, /* -chardev file,append=3Don|off */ QEMU_CAPS_ICH9_DISABLE_S3, /* -M q35 S3 BIOS Advertisement on/off */ - QEMU_CAPS_ICH9_DISABLE_S4, /* -M q35 S4 BIOS Advertisement on/off */ =20 - /* 210 */ + /* 120 */ + QEMU_CAPS_ICH9_DISABLE_S4, /* -M q35 S4 BIOS Advertisement on/off */ QEMU_CAPS_VSERPORT_CHANGE, /* VSERPORT_CHANGE event */ QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, /* virtio-balloon-{device,pci,cc= w}. * deflate-on-oom */ QEMU_CAPS_SCSI_MPTSAS1068, /* -device mptsas1068 */ QEMU_CAPS_SPICE_GL, /* -spice gl */ - QEMU_CAPS_QXL_VRAM64, /* -device qxl.vram64_size_mb */ =20 - /* 215 */ + /* 125 */ + QEMU_CAPS_QXL_VRAM64, /* -device qxl.vram64_size_mb */ X_QEMU_CAPS_QXL_VGA_VRAM64, /* -device qxl-vga.vram64_size_mb */ QEMU_CAPS_CHARDEV_LOGFILE, /* -chardev logfile=3Dxxxx */ QEMU_CAPS_NAME_DEBUG_THREADS, /* Is -name debug-threads=3D available */ QEMU_CAPS_OBJECT_SECRET, /* -object secret */ - QEMU_CAPS_DEVICE_PXB, /* -device pxb */ =20 - /* 220 */ + /* 130 */ + QEMU_CAPS_DEVICE_PXB, /* -device pxb */ QEMU_CAPS_DEVICE_PXB_PCIE, /* -device pxb-pcie */ QEMU_CAPS_NEC_USB_XHCI_PORTS, /* -device nec-usb-xhci.p3 ports setting= */ QEMU_CAPS_VIRTIO_SCSI_IOTHREAD, /* virtio-scsi-{pci,ccw}.iothread */ QEMU_CAPS_NAME_GUEST, /* -name guest=3D */ =20 - /* 225 */ + /* 135 */ QEMU_CAPS_QXL_MAX_OUTPUTS, /* -device qxl,max-outputs=3D */ QEMU_CAPS_SPICE_UNIX, /* -spice unix */ QEMU_CAPS_DRIVE_DETECT_ZEROES, /* -drive detect-zeroes=3D */ QEMU_CAPS_OBJECT_TLS_CREDS_X509, /* -object tls-creds-x509 */ QEMU_CAPS_DEVICE_INTEL_IOMMU, /* -device intel-iommu */ + + /* 140 */ QEMU_CAPS_MACHINE_SMM_OPT, /* -machine xxx,smm=3Don/off/auto */ QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, /* virtio-*pci.disable-legacy */ QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS, /* qmp command query-hotpluggable-c= pus */ - - /* 235 */ QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, /* virtio-net-*.rx_queue_size */ QEMU_CAPS_MACHINE_IOMMU, /* -machine iommu=3Don */ + + /* 145 */ QEMU_CAPS_DEVICE_VIRTIO_VGA, /* -device virtio-vga */ QEMU_CAPS_DRIVE_IOTUNE_MAX_LENGTH, /* -drive bps_max_length =3D and fr= iends */ QEMU_CAPS_DEVICE_IVSHMEM_PLAIN, /* -device ivshmem-plain */ - - /* 240 */ QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL, /* -device ivshmem-doorbell */ QEMU_CAPS_QUERY_QMP_SCHEMA, /* query-qmp-schema command */ + + /* 150 */ QEMU_CAPS_GLUSTER_DEBUG_LEVEL, /* -drive gluster.debug_level=3D{0..9} = */ QEMU_CAPS_DEVICE_VHOST_SCSI, /* -device vhost-scsi-{ccw,pci} */ QEMU_CAPS_DRIVE_IOTUNE_GROUP, /* -drive throttling.group=3D */ - - /* 245 */ QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION, /* qmp query-cpu-model-expansion = */ QEMU_CAPS_VIRTIO_NET_HOST_MTU, /* virtio-net-*.host_mtu */ + + /* 155 */ QEMU_CAPS_SPICE_RENDERNODE, /* -spice rendernode */ QEMU_CAPS_DEVICE_NVDIMM, /* -device nvdimm */ QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, /* -device pcie-root-port */ - - /* 250 */ QEMU_CAPS_QUERY_CPU_DEFINITIONS, /* qmp query-cpu-definitions */ QEMU_CAPS_BLOCK_WRITE_THRESHOLD, /* BLOCK_WRITE_THRESHOLD event */ + + /* 160 */ QEMU_CAPS_QUERY_NAMED_BLOCK_NODES, /* qmp query-named-block-nodes */ QEMU_CAPS_CPU_CACHE, /* -cpu supports host-cache-info and l3-cache pro= perties */ QEMU_CAPS_DEVICE_QEMU_XHCI, /* -device qemu-xhci */ - - /* 255 */ QEMU_CAPS_MACHINE_KERNEL_IRQCHIP, /* -machine kernel_irqchip */ QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT, /* -machine kernel_irqchip=3Ds= plit */ + + /* 165 */ QEMU_CAPS_INTEL_IOMMU_INTREMAP, /* intel-iommu.intremap */ QEMU_CAPS_INTEL_IOMMU_CACHING_MODE, /* intel-iommu.caching-mode */ QEMU_CAPS_INTEL_IOMMU_EIM, /* intel-iommu.eim */ - - /* 260 */ QEMU_CAPS_INTEL_IOMMU_DEVICE_IOTLB, /* intel-iommu.device-iotlb */ QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, /* virtio-*-pci.iommu_platform */ + + /* 170 */ QEMU_CAPS_VIRTIO_PCI_ATS, /* virtio-*-pci.ats */ QEMU_CAPS_LOADPARM, /* -machine loadparm */ QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, /* -device spapr-pci-host-brid= ge */ - - /* 265 */ QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE, /* spapr-pci-host-bridge.nu= ma_node=3D */ QEMU_CAPS_VNC_MULTI_SERVERS, /* -vnc vnc=3Dunix:/path */ + + /* 175 */ QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, /* virtio-net-*.tx_queue_size */ QEMU_CAPS_CHARDEV_RECONNECT, /* -chardev reconnect */ QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS, /* -device virtio-(vga|gpu-*),max-ou= tputs=3D */ - - /* 270 */ QEMU_CAPS_VXHS, /* -drive file.driver=3Dvxhs via query-qmp-schema */ QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES, /* virtio-blk-*.num-queues */ + + /* 180 */ QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT, /* -machine pseries,resize-hpt */ QEMU_CAPS_DEVICE_VMCOREINFO, /* -device vmcoreinfo */ QEMU_CAPS_DEVICE_SPAPR_VTY, /* -device spapr-vty */ - - /* 275 */ QEMU_CAPS_DEVICE_SCLPLMCONSOLE, /* -device sclplmconsole */ QEMU_CAPS_NUMA_DIST, /* -numa dist */ + + /* 185 */ QEMU_CAPS_DISK_SHARE_RW, /* share-rw=3Don for concurrent disk access */ QEMU_CAPS_ISCSI_PASSWORD_SECRET, /* -drive file.driver=3Discsi,...,pas= sword-secret=3D */ QEMU_CAPS_DEVICE_ISA_SERIAL, /* -device isa-serial */ - - /* 280 */ QEMU_CAPS_DEVICE_PL011, /* -device pl011 (not user-instantiable) */ QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT, /* -machine pseries,max-cpu-= compat=3D */ + + /* 190 */ QEMU_CAPS_DUMP_COMPLETED, /* DUMP_COMPLETED event */ QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW, /* -device virtio-gpu-ccw */ QEMU_CAPS_DEVICE_VIRTIO_KEYBOARD_CCW, /* -device virtio-keyboard-ccw */ - - /* 285 */ QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW, /* -device virtio-mouse-ccw */ QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW, /* -device virtio-tablet-ccw */ + + /* 195 */ QEMU_CAPS_QCOW2_LUKS, /* qcow2 format support LUKS encryption */ QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE, /* -device pcie-pci-bridge */ QEMU_CAPS_SECCOMP_BLACKLIST, /* -sandbox.elevateprivileges */ - - /* 290 */ QEMU_CAPS_QUERY_CPUS_FAST, /* query-cpus-fast command */ QEMU_CAPS_DISK_WRITE_CACHE, /* qemu block frontends support write-cach= e param */ + + /* 200 */ QEMU_CAPS_NBD_TLS, /* NBD server supports TLS transport */ QEMU_CAPS_DEVICE_TPM_CRB, /* -device tpm-crb */ QEMU_CAPS_PR_MANAGER_HELPER, /* -object pr-manager-helper */ - - /* 295 */ QEMU_CAPS_QOM_LIST_PROPERTIES, /* qom-list-properties monitor command = */ QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD, /* -object memory-backend-file,d= iscard-data */ + + /* 205 */ QEMU_CAPS_CCW, /* -device virtual-css-bridge */ QEMU_CAPS_CCW_CSSID_UNRESTRICTED, /* virtual-css-bridge.cssid-unrestri= cted=3D */ QEMU_CAPS_DEVICE_VFIO_CCW, /* -device vfio-ccw */ - - /* 300 */ QEMU_CAPS_SDL_GL, /* -sdl gl */ QEMU_CAPS_SCREENDUMP_DEVICE, /* screendump command accepts device & he= ad */ + + /* 210 */ QEMU_CAPS_HDA_OUTPUT, /* -device hda-output */ QEMU_CAPS_BLOCKDEV_DEL, /* blockdev-del is supported */ QEMU_CAPS_DEVICE_VMGENID, /* -device vmgenid */ - - /* 305 */ QEMU_CAPS_DEVICE_VHOST_VSOCK, /* -device vhost-vsock-* */ QEMU_CAPS_CHARDEV_FD_PASS, /* Passing pre-opened FDs for chardevs */ + + /* 215 */ QEMU_CAPS_DEVICE_TPM_EMULATOR, /* -tpmdev emulator */ QEMU_CAPS_DEVICE_MCH, /* Northbridge in q35 machine types */ QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES, /* -global mch.extended-tseg-mbyte= s */ - - /* 310 */ QEMU_CAPS_SEV_GUEST, /* -object sev-guest,... */ QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE, /* -machine pseries.c= ap-hpt-max-page-size */ + + /* 220 */ QEMU_CAPS_MACHINE_PSERIES_CAP_HTM, /* -machine pseries.cap-htm */ QEMU_CAPS_USB_STORAGE_WERROR, /* -device usb-storage,werror=3D..,rerro= r=3D.. */ QEMU_CAPS_EGL_HEADLESS, /* -display egl-headless */ - - /* 315 */ QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */ QEMU_CAPS_BLOCKDEV, /* -blockdev and blockdev-add are supported */ + + /* 225 */ QEMU_CAPS_DEVICE_VFIO_AP, /* -device vfio-ap */ QEMU_CAPS_DEVICE_ZPCI, /* -device zpci */ QEMU_CAPS_OBJECT_MEMORY_MEMFD, /* -object memory-backend-memfd */ - - /* 320 */ QEMU_CAPS_OBJECT_MEMORY_MEMFD_HUGETLB, /* -object memory-backend-memfd= .hugetlb */ QEMU_CAPS_IOTHREAD_POLLING, /* -object iothread.poll-max-ns */ + + /* 230 */ QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, /* -machine pseries.cap-neste= d-hv */ QEMU_CAPS_EGL_HEADLESS_RENDERNODE, /* -display egl-headless,rendernode= =3D */ QEMU_CAPS_OBJECT_MEMORY_FILE_ALIGN, /* -object memory-backend-file,ali= gn=3D */ - - /* 325 */ QEMU_CAPS_OBJECT_MEMORY_FILE_PMEM, /* -object memory-backend-file,pmem= =3D */ QEMU_CAPS_DEVICE_NVDIMM_UNARMED, /* -device nvdimm,unarmed=3D */ + + /* 235 */ QEMU_CAPS_SCSI_DISK_DEVICE_ID, /* 'device_id' property of scsi disk */ =20 QEMU_CAPS_LAST /* this must always be the last item */ --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list