From nobody Mon Dec 15 03:08:41 2025 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1522415783108216.2763350202266; Fri, 30 Mar 2018 06:16:23 -0700 (PDT) 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 6C744368E4; Fri, 30 Mar 2018 13:16:21 +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 29B4B17D57; Fri, 30 Mar 2018 13:16:21 +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 CD7CA180BAD4; Fri, 30 Mar 2018 13:16:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2UDG8So010379 for ; Fri, 30 Mar 2018 09:16:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3E23D1C710; Fri, 30 Mar 2018 13:16:08 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D85696352D for ; Fri, 30 Mar 2018 13:16:07 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Fri, 30 Mar 2018 15:15:20 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 04/44] Require QEMU 1.3.0 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.30]); Fri, 30 Mar 2018 13:16:21 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Released in Dec 2012, the version when the userspace parts of KVM and QEMU fully merged. This lets us drop the -help parsing code and assume lots of capabilities. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 7 +- .../qemucapabilitiesdata/caps_1.2.2.x86_64.replies | 1886 ----------------= ---- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 172 -- tests/qemucapabilitiestest.c | 1 - 4 files changed, 4 insertions(+), 2062 deletions(-) delete mode 100644 tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 031c1734e..177e0a9be 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3783,9 +3783,10 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, VIR_DEBUG("Got version %d.%d.%d (%s)", major, minor, micro, NULLSTR(package)); =20 - if (major < 1 || (major =3D=3D 1 && minor < 2)) { - VIR_DEBUG("Not new enough for QMP capabilities detection"); - ret =3D 0; + if (major < 1 || (major =3D=3D 1 && minor < 3)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("QEMU version >=3D 1.3.0 is required, but %d.%d.%= d found"), + major, minor, micro); goto cleanup; } =20 diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies b/tests/q= emucapabilitiesdata/caps_1.2.2.x86_64.replies deleted file mode 100644 index a3a951051..000000000 --- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies +++ /dev/null @@ -1,1886 +0,0 @@ -{ - "QMP": { - "version": { - "qemu": { - "micro": 2, - "minor": 2, - "major": 1 - }, - "package": "" - }, - "capabilities": [ - ] - } -} - -{ - "return": { - }, - "id": "libvirt-1" -} - -{ - "return": { - "qemu": { - "micro": 2, - "minor": 2, - "major": 1 - }, - "package": "" - }, - "id": "libvirt-2" -} - -{ - "return": { - "arch": "x86_64" - }, - "id": "libvirt-3" -} - -{ - "return": [ - { - "name": "query-target" - }, - { - "name": "query-cpu-definitions" - }, - { - "name": "query-machines" - }, - { - "name": "device-list-properties" - }, - { - "name": "qom-list-types" - }, - { - "name": "change-vnc-password" - }, - { - "name": "qom-get" - }, - { - "name": "qom-set" - }, - { - "name": "qom-list" - }, - { - "name": "query-block-jobs" - }, - { - "name": "query-balloon" - }, - { - "name": "query-migrate-capabilities" - }, - { - "name": "migrate-set-capabilities" - }, - { - "name": "query-migrate" - }, - { - "name": "query-uuid" - }, - { - "name": "query-name" - }, - { - "name": "query-spice" - }, - { - "name": "query-vnc" - }, - { - "name": "query-mice" - }, - { - "name": "query-status" - }, - { - "name": "query-kvm" - }, - { - "name": "query-pci" - }, - { - "name": "query-cpus" - }, - { - "name": "query-blockstats" - }, - { - "name": "query-block" - }, - { - "name": "query-chardev" - }, - { - "name": "query-events" - }, - { - "name": "query-commands" - }, - { - "name": "query-version" - }, - { - "name": "human-monitor-command" - }, - { - "name": "qmp_capabilities" - }, - { - "name": "add_client" - }, - { - "name": "expire_password" - }, - { - "name": "set_password" - }, - { - "name": "block_set_io_throttle" - }, - { - "name": "block_passwd" - }, - { - "name": "query-fdsets" - }, - { - "name": "remove-fd" - }, - { - "name": "add-fd" - }, - { - "name": "closefd" - }, - { - "name": "getfd" - }, - { - "name": "set_link" - }, - { - "name": "balloon" - }, - { - "name": "blockdev-snapshot-sync" - }, - { - "name": "transaction" - }, - { - "name": "block-job-cancel" - }, - { - "name": "block-job-set-speed" - }, - { - "name": "block-stream" - }, - { - "name": "block_resize" - }, - { - "name": "netdev_del" - }, - { - "name": "netdev_add" - }, - { - "name": "dump-guest-memory" - }, - { - "name": "client_migrate_info" - }, - { - "name": "migrate_set_downtime" - }, - { - "name": "migrate_set_speed" - }, - { - "name": "query-migrate-cache-size" - }, - { - "name": "migrate-set-cache-size" - }, - { - "name": "migrate_cancel" - }, - { - "name": "migrate" - }, - { - "name": "xen-save-devices-state" - }, - { - "name": "inject-nmi" - }, - { - "name": "pmemsave" - }, - { - "name": "memsave" - }, - { - "name": "cpu" - }, - { - "name": "device_del" - }, - { - "name": "device_add" - }, - { - "name": "system_powerdown" - }, - { - "name": "system_reset" - }, - { - "name": "system_wakeup" - }, - { - "name": "cont" - }, - { - "name": "stop" - }, - { - "name": "screendump" - }, - { - "name": "change" - }, - { - "name": "eject" - }, - { - "name": "quit" - } - ], - "id": "libvirt-4" -} - -{ - "id": "libvirt-5", - "error": { - "class": "GenericError", - "desc": "Parameter 'fdset-id' expects an existing fdset-id" - } -} - -{ - "return": { - "enabled": true, - "present": true - }, - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "POWERDOWN" - }, - { - "name": "RESET" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-7" -} - -{ - "return": [ - { - "name": "port92" - }, - { - "name": "apic" - }, - { - "name": "virtio-scsi-pci" - }, - { - "name": "i6300esb" - }, - { - "name": "usb-ehci" - }, - { - "name": "vt82c686b-usb-uhci" - }, - { - "name": "ich9-ahci" - }, - { - "name": "usb-host" - }, - { - "name": "isa-ide" - }, - { - "name": "ich9-usb-ehci1" - }, - { - "name": "virtio-balloon-pci" - }, - { - "name": "virtio-net-pci" - }, - { - "name": "i82558b" - }, - { - "name": "i82558a" - }, - { - "name": "isa-fdc" - }, - { - "name": "isabus-bridge" - }, - { - "name": "i2c-bus" - }, - { - "name": "piix3-ide" - }, - { - "name": "ioapic" - }, - { - "name": "pci-bridge" - }, - { - "name": "HDA" - }, - { - "name": "am53c974" - }, - { - "name": "vmmouse" - }, - { - "name": "sb16" - }, - { - "name": "x86_64-cpu" - }, - { - "name": "isa-cirrus-vga" - }, - { - "name": "dc390" - }, - { - "name": "vmware-svga" - }, - { - "name": "smbus-eeprom" - }, - { - "name": "i82801" - }, - { - "name": "ccid-card-passthru" - }, - { - "name": "fw_cfg" - }, - { - "name": "piix4-usb-uhci" - }, - { - "name": "i82557b" - }, - { - "name": "piix3-usb-uhci" - }, - { - "name": "ib700" - }, - { - "name": "usb-audio" - }, - { - "name": "i82557c" - }, - { - "name": "i82557a" - }, - { - "name": "qxl" - }, - { - "name": "rtl8139" - }, - { - "name": "hpet" - }, - { - "name": "isa-applesmc" - }, - { - "name": "container" - }, - { - "name": "usb-kbd" - }, - { - "name": "isa-vga" - }, - { - "name": "usb-tablet" - }, - { - "name": "kvmvapic" - }, - { - "name": "usb-bt-dongle" - }, - { - "name": "sysbus-fdc" - }, - { - "name": "piix4-ide" - }, - { - "name": "e1000" - }, - { - "name": "AC97" - }, - { - "name": "ivshmem" - }, - { - "name": "usb-ccid" - }, - { - "name": "sysbus-ahci" - }, - { - "name": "kvmclock" - }, - { - "name": "i82562" - }, - { - "name": "hda-output" - }, - { - "name": "ccid-bus" - }, - { - "name": "i82559er" - }, - { - "name": "megasas" - }, - { - "name": "i8042" - }, - { - "name": "intel-hda" - }, - { - "name": "vmport" - }, - { - "name": "hda-duplex" - }, - { - "name": "virtio-serial-pci" - }, - { - "name": "ne2k_pci" - }, - { - "name": "mc146818rtc" - }, - { - "name": "virtconsole" - }, - { - "name": "isa-parallel" - }, - { - "name": "ich9-usb-uhci1" - }, - { - "name": "ich9-usb-uhci3" - }, - { - "name": "ich9-usb-uhci2" - }, - { - "name": "PCI" - }, - { - "name": "SUNW,fdtwo" - }, - { - "name": "ide-cd" - }, - { - "name": "isa-debugcon" - }, - { - "name": "i82551" - }, - { - "name": "i82550" - }, - { - "name": "isa-serial" - }, - { - "name": "kvm-ioapic" - }, - { - "name": "System" - }, - { - "name": "kvm-apic" - }, - { - "name": "usb-wacom-tablet" - }, - { - "name": "PIIX4_PM" - }, - { - "name": "kvm-i8259" - }, - { - "name": "scsi-cd" - }, - { - "name": "i440FX" - }, - { - "name": "usb-braille" - }, - { - "name": "virtserialport" - }, - { - "name": "xio3130-downstream" - }, - { - "name": "nec-usb-xhci" - }, - { - "name": "pci-ohci" - }, - { - "name": "hda-micro" - }, - { - "name": "scsi-disk" - }, - { - "name": "lsi53c895a" - }, - { - "name": "SCSI" - }, - { - "name": "pcnet" - }, - { - "name": "scsi-generic" - }, - { - "name": "virtio-serial-bus" - }, - { - "name": "usb-bus" - }, - { - "name": "ne2k_isa" - }, - { - "name": "IDE" - }, - { - "name": "ccid-card-emulated" - }, - { - "name": "i440FX-pcihost" - }, - { - "name": "usb-hub" - }, - { - "name": "usb-net" - }, - { - "name": "usb-mouse" - }, - { - "name": "ISA" - }, - { - "name": "pc-sysfw" - }, - { - "name": "usb-serial" - }, - { - "name": "scsi-block" - }, - { - "name": "sga" - }, - { - "name": "ioh3420" - }, - { - "name": "ES1370" - }, - { - "name": "isa-i8259" - }, - { - "name": "isa-pcspk" - }, - { - "name": "ide-hd" - }, - { - "name": "PIIX3" - }, - { - "name": "cirrus-vga" - }, - { - "name": "virtio-9p-pci" - }, - { - "name": "x3130-upstream" - }, - { - "name": "ide-drive" - }, - { - "name": "qxl-vga" - }, - { - "name": "usb-uas" - }, - { - "name": "kvm-pit" - }, - { - "name": "virtio-blk-pci" - }, - { - "name": "sysbus-ohci" - }, - { - "name": "esp" - }, - { - "name": "piix3-ide-xen" - }, - { - "name": "i82559c" - }, - { - "name": "i82559b" - }, - { - "name": "i82559a" - }, - { - "name": "scsi-hd" - }, - { - "name": "PIIX3-xen" - }, - { - "name": "isa-pit" - }, - { - "name": "usb-storage" - }, - { - "name": "VGA" - } - ], - "id": "libvirt-8" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "config-wce", - "type": "on/off" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - }, - { - "name": "vectors", - "type": "uint32" - }, - { - "name": "ioeventfd", - "type": "on/off" - }, - { - "name": "config-wce", - "type": "on/off" - }, - { - "name": "scsi", - "type": "on/off" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "secs", - "type": "uint32" - }, - { - "name": "heads", - "type": "uint32" - }, - { - "name": "cyls", - "type": "uint32" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - }, - { - "name": "class", - "type": "hex32" - } - ], - "id": "libvirt-9" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "tx", - "type": "string" - }, - { - "name": "x-txburst", - "type": "int32" - }, - { - "name": "x-txtimer", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "netdev", - "type": "netdev" - }, - { - "name": "vlan", - "type": "vlan" - }, - { - "name": "mac", - "type": "macaddr" - }, - { - "name": "ctrl_rx_extra", - "type": "on/off" - }, - { - "name": "ctrl_vlan", - "type": "on/off" - }, - { - "name": "ctrl_rx", - "type": "on/off" - }, - { - "name": "ctrl_vq", - "type": "on/off" - }, - { - "name": "status", - "type": "on/off" - }, - { - "name": "mrg_rxbuf", - "type": "on/off" - }, - { - "name": "host_ufo", - "type": "on/off" - }, - { - "name": "host_ecn", - "type": "on/off" - }, - { - "name": "host_tso6", - "type": "on/off" - }, - { - "name": "host_tso4", - "type": "on/off" - }, - { - "name": "guest_ufo", - "type": "on/off" - }, - { - "name": "guest_ecn", - "type": "on/off" - }, - { - "name": "guest_tso6", - "type": "on/off" - }, - { - "name": "guest_tso4", - "type": "on/off" - }, - { - "name": "gso", - "type": "on/off" - }, - { - "name": "guest_csum", - "type": "on/off" - }, - { - "name": "csum", - "type": "on/off" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - }, - { - "name": "vectors", - "type": "uint32" - }, - { - "name": "ioeventfd", - "type": "on/off" - } - ], - "id": "libvirt-10" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "param_change", - "type": "on/off" - }, - { - "name": "hotplug", - "type": "on/off" - }, - { - "name": "cmd_per_lun", - "type": "uint32" - }, - { - "name": "max_sectors", - "type": "uint32" - }, - { - "name": "num_queues", - "type": "uint32" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - }, - { - "name": "vectors", - "type": "uint32" - }, - { - "name": "ioeventfd", - "type": "on/off" - } - ], - "id": "libvirt-11" -} - -{ - "id": "libvirt-12", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" - } -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" - } -} - -{ - "id": "libvirt-14", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - -{ - "id": "libvirt-15", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'pci-assign' not found" - } -} - -{ - "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'kvm-pci-assign' not found" - } -} - -{ - "return": [ - { - "name": "lun", - "type": "uint32" - }, - { - "name": "scsi-id", - "type": "uint32" - }, - { - "name": "channel", - "type": "uint32" - }, - { - "name": "wwn", - "type": "hex64" - }, - { - "name": "dpofua", - "type": "on/off" - }, - { - "name": "removable", - "type": "on/off" - }, - { - "name": "product", - "type": "string" - }, - { - "name": "vendor", - "type": "string" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "ver", - "type": "string" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-17" -} - -{ - "return": [ - { - "name": "unit", - "type": "uint32" - }, - { - "name": "model", - "type": "string" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "wwn", - "type": "hex64" - }, - { - "name": "ver", - "type": "string" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "s4_val", - "type": "uint8" - }, - { - "name": "disable_s4", - "type": "uint8" - }, - { - "name": "disable_s3", - "type": "uint8" - }, - { - "name": "smb_io_base", - "type": "uint32" - } - ], - "id": "libvirt-19" -} - -{ - "return": [ - { - "name": "full-path", - "type": "on/off" - }, - { - "name": "port", - "type": "string" - }, - { - "name": "pipeline", - "type": "on/off" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "isobufs", - "type": "uint32" - }, - { - "name": "productid", - "type": "hex32" - }, - { - "name": "vendorid", - "type": "hex32" - }, - { - "name": "hostport", - "type": "string" - }, - { - "name": "hostaddr", - "type": "uint32" - }, - { - "name": "hostbus", - "type": "uint32" - } - ], - "id": "libvirt-20" -} - -{ - "return": [ - { - "name": "lun", - "type": "uint32" - }, - { - "name": "scsi-id", - "type": "uint32" - }, - { - "name": "channel", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-21" -} - -{ - "return": [ - ], - "id": "libvirt-22" -} - -{ - "id": "libvirt-23", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'q35-pcihost' not found" - } -} - -{ - "return": [ - { - "name": "full-path", - "type": "on/off" - }, - { - "name": "port", - "type": "string" - }, - { - "name": "removable", - "type": "on/off" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-24" -} - -{ - "return": [ - { - "name": "lost_tick_policy", - "type": "LostTickPolicy" - }, - { - "name": "iobase", - "type": "hex32" - } - ], - "id": "libvirt-25" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "vgamem_mb", - "type": "uint32" - } - ], - "id": "libvirt-26" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "vgamem_mb", - "type": "uint32" - } - ], - "id": "libvirt-27" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "vgamem_mb", - "type": "uint32" - }, - { - "name": "vram64_size_mb", - "type": "uint32" - }, - { - "name": "vram_size_mb", - "type": "uint32" - }, - { - "name": "ram_size_mb", - "type": "uint32" - }, - { - "name": "cmdlog", - "type": "uint32" - }, - { - "name": "guestdebug", - "type": "uint32" - }, - { - "name": "debug", - "type": "uint32" - }, - { - "name": "revision", - "type": "uint32" - }, - { - "name": "vram_size", - "type": "uint32" - }, - { - "name": "ram_size", - "type": "uint32" - } - ], - "id": "libvirt-28" -} - -{ - "id": "libvirt-29", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'ICH9-LPC' not found" - } -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "class", - "type": "hex32" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - } - ], - "id": "libvirt-30" -} - -{ - "id": "libvirt-31", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-balloon-ccw' not found" - } -} - -{ - "id": "libvirt-32", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-balloon-device' not found" - } -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "msi", - "type": "uint32" - } - ], - "id": "libvirt-33" -} - -{ - "return": [ - { - "name": "isapc" - }, - { - "name": "pc-0.10" - }, - { - "name": "pc-0.11" - }, - { - "name": "pc-0.12" - }, - { - "name": "pc-0.13" - }, - { - "name": "pc-0.14" - }, - { - "name": "pc-0.15" - }, - { - "name": "pc-1.0" - }, - { - "name": "pc-1.1" - }, - { - "name": "pc-1.2", - "is-default": true, - "alias": "pc" - }, - { - "name": "none" - } - ], - "id": "libvirt-34" -} - -{ - "return": [ - { - "name": "qemu64" - }, - { - "name": "phenom" - }, - { - "name": "core2duo" - }, - { - "name": "kvm64" - }, - { - "name": "qemu32" - }, - { - "name": "kvm32" - }, - { - "name": "coreduo" - }, - { - "name": "486" - }, - { - "name": "pentium" - }, - { - "name": "pentium2" - }, - { - "name": "pentium3" - }, - { - "name": "athlon" - }, - { - "name": "n270" - }, - { - "name": "Conroe" - }, - { - "name": "Penryn" - }, - { - "name": "Nehalem" - }, - { - "name": "Westmere" - }, - { - "name": "SandyBridge" - }, - { - "name": "Opteron_G1" - }, - { - "name": "Opteron_G2" - }, - { - "name": "Opteron_G3" - }, - { - "name": "Opteron_G4" - } - ], - "id": "libvirt-35" -} - -{ - "id": "libvirt-36", - "error": { - "class": "CommandNotFound", - "desc": "The command query-tpm-models has not been found" - } -} - -{ - "id": "libvirt-37", - "error": { - "class": "CommandNotFound", - "desc": "The command query-tpm-types has not been found" - } -} - -{ - "id": "libvirt-38", - "error": { - "class": "CommandNotFound", - "desc": "The command query-command-line-options has not been found" - } -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - } - ], - "id": "libvirt-39" -} - -{ - "return": { - }, - "id": "libvirt-1" -} - -{ - "return": [ - { - "name": "qemu64" - }, - { - "name": "phenom" - }, - { - "name": "core2duo" - }, - { - "name": "kvm64" - }, - { - "name": "qemu32" - }, - { - "name": "kvm32" - }, - { - "name": "coreduo" - }, - { - "name": "486" - }, - { - "name": "pentium" - }, - { - "name": "pentium2" - }, - { - "name": "pentium3" - }, - { - "name": "athlon" - }, - { - "name": "n270" - }, - { - "name": "Conroe" - }, - { - "name": "Penryn" - }, - { - "name": "Nehalem" - }, - { - "name": "Westmere" - }, - { - "name": "SandyBridge" - }, - { - "name": "Opteron_G1" - }, - { - "name": "Opteron_G2" - }, - { - "name": "Opteron_G3" - }, - { - "name": "Opteron_G4" - } - ], - "id": "libvirt-2" -} diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_1.2.2.x86_64.xml deleted file mode 100644 index f361944a1..000000000 --- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml +++ /dev/null @@ -1,172 +0,0 @@ - - 0 - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1002002 - 0 - 26169 - - x86_64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 0d136cc8b..7a11211ad 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -163,7 +163,6 @@ mymain(void) ret =3D -1; \ } while (0) =20 - DO_TEST("x86_64", "caps_1.2.2"); DO_TEST("x86_64", "caps_1.3.1"); DO_TEST("x86_64", "caps_1.4.2"); DO_TEST("x86_64", "caps_1.5.3"); --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list