From f44cea737471542bad4813b68a6334297c5d15a5 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Thu, 3 Oct 2013 14:30:26 +0200 Subject: [PATCH] qemucapabilitiesdata: Add qemu-1.2.2 data Signed-off-by: Michal Privoznik --- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 114 ++ .../qemucapabilitiesdata/caps_1.2.2-1.replies | 1543 +++++++++++++++++ tests/qemucapabilitiestest.c | 1 + 3 files changed, 1658 insertions(+) create mode 100644 tests/qemucapabilitiesdata/caps_1.2.2-1.caps create mode 100644 tests/qemucapabilitiesdata/caps_1.2.2-1.replies diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps new file mode 100644 index 0000000000..c580c0c9f9 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.replies b/tests/qemucapabilitiesdata/caps_1.2.2-1.replies new file mode 100644 index 0000000000..96fe4f2ea7 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.replies @@ -0,0 +1,1543 @@ +{ + "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": [ + { + "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-6" +} + +{ + "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": "xen-platform" + }, + { + "name": "container" + }, + { + "name": "usb-kbd" + }, + { + "name": "isa-vga" + }, + { + "name": "usb-tablet" + }, + { + "name": "kvmvapic" + }, + { + "name": "usb-bt-dongle" + }, + { + "name": "sysbus-fdc" + }, + { + "name": "piix4-ide" + }, + { + "name": "xen-pci-passthrough" + }, + { + "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": "xen-apic" + }, + { + "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-7" +} + +{ + "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-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": "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-9" +} + +{ + "id": "libvirt-10", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-blk-ccw' not found" + } +} + +{ + "id": "libvirt-11", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-net-ccw' not found" + } +} + +{ + "id": "libvirt-12", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-blk-s390' not found" + } +} + +{ + "id": "libvirt-13", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-net-s390' not found" + } +} + +{ + "id": "libvirt-14", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'pci-assign' not found" + } +} + +{ + "id": "libvirt-15", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'kvm-pci-assign' not found" + } +} + +{ + "id": "libvirt-16", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'vfio-pci' 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" +} + +{ + "id": "libvirt-20", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'usb-redir' not found" + } +} + +{ + "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-21" +} + +{ + "return": [ + { + "name": "lun", + "type": "uint32" + }, + { + "name": "scsi-id", + "type": "uint32" + }, + { + "name": "channel", + "type": "uint32" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "drive", + "type": "drive" + } + ], + "id": "libvirt-22" +} + +{ + "return": [ + ], + "id": "libvirt-23" +} + +{ + "id": "libvirt-24", + "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-25" +} + +{ + "return": [ + { + "name": "xenpv" + }, + { + "name": "xenfv" + }, + { + "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-26" +} + +{ + "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-27" +} + +{ + "return": { + "enabled": false, + "present": true + }, + "id": "libvirt-28" +} + +{ + "id": "libvirt-29", + "error": { + "class": "CommandNotFound", + "desc": "The command query-tpm-models has not been found" + } +} + +{ + "id": "libvirt-30", + "error": { + "class": "CommandNotFound", + "desc": "The command query-tpm-types has not been found" + } +} + +{ + "id": "libvirt-31", + "error": { + "class": "CommandNotFound", + "desc": "The command query-command-line-options has not been found" + } +} diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index f6d672f496..ef5bb201b8 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -232,6 +232,7 @@ mymain(void) if (virtTestRun(name, 1, testQemuCaps, &data) < 0) \ ret = -1 + DO_TEST("caps_1.2.2-1"); DO_TEST("caps_1.5.3-1"); virObjectUnref(xmlopt); -- GitLab