[PATCH 8/9] qemu: remove leftover property probing

[Ján Tomko <jtomko@xxxxxxxxxx>]

Previous commits removed all capabilities from per-device property
probing for:
  pci-assign
  kvm-pci-assign
  usb-host
  scsi-generic

Remove them from the virQEMUCapsDeviceProps list and get rid of the
redundant device-list-properties QMP calls.

Note that 'pci-assign' was already useless, because the QMP version
of the device is called 'kvm-pci-assign', see libvirt commit 7257480
from 2012.

Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx>
---
 src/qemu/qemu_capabilities.c                       |  21 ---
 .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 166 -----------------
 .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 170 ------------------
 .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 170 ------------------
 .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 174 ------------------
 .../caps_2.10.0.aarch64.replies                    | 144 ---------------
 .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 144 ---------------
 .../qemucapabilitiesdata/caps_2.10.0.s390x.replies |  83 ---------
 .../caps_2.10.0.x86_64.replies                     | 198 ---------------------
 .../qemucapabilitiesdata/caps_2.11.0.s390x.replies |  83 ---------
 .../caps_2.11.0.x86_64.replies                     | 144 ---------------
 .../caps_2.12.0.aarch64.replies                    | 148 ---------------
 .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 148 ---------------
 .../qemucapabilitiesdata/caps_2.12.0.s390x.replies |  87 ---------
 .../caps_2.12.0.x86_64.replies                     | 148 ---------------
 .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 184 -------------------
 .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 184 -------------------
 .../caps_2.6.0.aarch64.replies                     | 140 ---------------
 .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies  | 140 ---------------
 .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 184 -------------------
 .../qemucapabilitiesdata/caps_2.7.0.s390x.replies  |  83 ---------
 .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 193 --------------------
 .../qemucapabilitiesdata/caps_2.8.0.s390x.replies  |  83 ---------
 .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 193 --------------------
 .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies  |  83 ---------
 .../qemucapabilitiesdata/caps_2.9.0.s390x.replies  |  83 ---------
 .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 198 ---------------------
 .../qemucapabilitiesdata/caps_3.0.0.ppc64.replies  | 148 ---------------
 .../caps_3.0.0.riscv32.replies                     |  87 ---------
 .../caps_3.0.0.riscv64.replies                     |  87 ---------
 .../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 148 ---------------
 31 files changed, 4246 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 202859abac..08cf822b88 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1191,9 +1191,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioSCSI[] = {
     { "ats", QEMU_CAPS_VIRTIO_PCI_ATS },
 };
 
-static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsPCIAssign[] = {
-};
-
 static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVfioPCI[] = {
     { "display", QEMU_CAPS_VFIO_PCI_DISPLAY },
 };
@@ -1220,12 +1217,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBRedir[] = {
     { "filter", QEMU_CAPS_USB_REDIR_FILTER },
 };
 
-static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBHost[] = {
-};
-
-static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsSCSIGeneric[] = {
-};
-
 static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsI440FXPCIHost[] = {
     { "pci-hole64-size", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE },
 };
@@ -1340,12 +1331,6 @@ static virQEMUCapsObjectTypeProps virQEMUCapsDeviceProps[] = {
     { "virtio-net-s390", virQEMUCapsDevicePropsVirtioNet,
       ARRAY_CARDINALITY(virQEMUCapsDevicePropsVirtioNet),
       QEMU_CAPS_DEVICE_VIRTIO_NET },
-    { "pci-assign", virQEMUCapsDevicePropsPCIAssign,
-      ARRAY_CARDINALITY(virQEMUCapsDevicePropsPCIAssign),
-      -1 },
-    { "kvm-pci-assign", virQEMUCapsDevicePropsPCIAssign,
-      ARRAY_CARDINALITY(virQEMUCapsDevicePropsPCIAssign),
-      -1 },
     { "vfio-pci", virQEMUCapsDevicePropsVfioPCI,
       ARRAY_CARDINALITY(virQEMUCapsDevicePropsVfioPCI),
       QEMU_CAPS_DEVICE_VFIO_PCI },
@@ -1361,12 +1346,6 @@ static virQEMUCapsObjectTypeProps virQEMUCapsDeviceProps[] = {
     { "usb-redir", virQEMUCapsDevicePropsUSBRedir,
       ARRAY_CARDINALITY(virQEMUCapsDevicePropsUSBRedir),
       QEMU_CAPS_USB_REDIR },
-    { "usb-host", virQEMUCapsDevicePropsUSBHost,
-      ARRAY_CARDINALITY(virQEMUCapsDevicePropsUSBHost),
-      -1 },
-    { "scsi-generic", virQEMUCapsDevicePropsSCSIGeneric,
-      ARRAY_CARDINALITY(virQEMUCapsDevicePropsSCSIGeneric),
-      QEMU_CAPS_DEVICE_SCSI_GENERIC },
     { "i440FX-pcihost", virQEMUCapsDevicePropsI440FXPCIHost,
       ARRAY_CARDINALITY(virQEMUCapsDevicePropsI440FXPCIHost),
       -1 },
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
index 600ca5a6f7..7f192374f1 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
@@ -1412,76 +1412,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-16"
-}
-
-{
-  "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": "configfd",
-      "type": "string"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "share_intx",
-      "type": "on/off"
-    },
-    {
-      "name": "prefer_msi",
-      "type": "on/off"
-    },
-    {
-      "name": "host",
-      "type": "pci-host-devaddr"
-    }
-  ],
-  "id": "libvirt-16"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -1764,102 +1694,6 @@
   "id": "libvirt-21"
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-22"
-}
-
-{
-  "return": [
-    {
-      "name": "full-path",
-      "type": "on/off"
-    },
-    {
-      "name": "port",
-      "type": "string"
-    },
-    {
-      "name": "pipeline",
-      "type": "on/off"
-    },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "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-22"
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-23"
-}
-
-{
-  "return": [
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "type": "drive"
-    }
-  ],
-  "id": "libvirt-23"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
index e74ae6b958..59be1efbee 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
@@ -1441,76 +1441,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-16"
-}
-
-{
-  "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": "configfd",
-      "type": "string"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "share_intx",
-      "type": "on/off"
-    },
-    {
-      "name": "prefer_msi",
-      "type": "on/off"
-    },
-    {
-      "name": "host",
-      "type": "pci-host-devaddr"
-    }
-  ],
-  "id": "libvirt-16"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -1797,106 +1727,6 @@
   "id": "libvirt-21"
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-22"
-}
-
-{
-  "return": [
-    {
-      "name": "full-path",
-      "type": "on/off"
-    },
-    {
-      "name": "serial",
-      "type": "string"
-    },
-    {
-      "name": "port",
-      "type": "string"
-    },
-    {
-      "name": "pipeline",
-      "type": "on/off"
-    },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "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-22"
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-23"
-}
-
-{
-  "return": [
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "type": "drive"
-    }
-  ],
-  "id": "libvirt-23"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
index a6c8e1e459..79cfbf7014 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
@@ -1450,76 +1450,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-16"
-}
-
-{
-  "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": "configfd",
-      "type": "string"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "share_intx",
-      "type": "on/off"
-    },
-    {
-      "name": "prefer_msi",
-      "type": "on/off"
-    },
-    {
-      "name": "host",
-      "type": "pci-host-devaddr"
-    }
-  ],
-  "id": "libvirt-16"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -1806,106 +1736,6 @@
   "id": "libvirt-21"
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-22"
-}
-
-{
-  "return": [
-    {
-      "name": "full-path",
-      "type": "on/off"
-    },
-    {
-      "name": "serial",
-      "type": "string"
-    },
-    {
-      "name": "port",
-      "type": "string"
-    },
-    {
-      "name": "pipeline",
-      "type": "on/off"
-    },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "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-22"
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-23"
-}
-
-{
-  "return": [
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "type": "drive"
-    }
-  ],
-  "id": "libvirt-23"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
index 88152e56bd..e3655d6458 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
@@ -1717,76 +1717,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-16"
-}
-
-{
-  "return": [
-    {
-      "name": "command_serr_enable",
-      "type": "on/off"
-    },
-    {
-      "name": "multifunction",
-      "type": "on/off"
-    },
-    {
-      "name": "rombar",
-      "type": "uint32"
-    },
-    {
-      "name": "romfile",
-      "type": "str"
-    },
-    {
-      "name": "addr",
-      "type": "pci-devfn"
-    },
-    {
-      "name": "configfd",
-      "type": "str"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "share_intx",
-      "type": "on/off"
-    },
-    {
-      "name": "prefer_msi",
-      "type": "on/off"
-    },
-    {
-      "name": "host",
-      "type": "pci-host-devaddr"
-    }
-  ],
-  "id": "libvirt-16"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -2097,110 +2027,6 @@
   "id": "libvirt-21"
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-22"
-}
-
-{
-  "return": [
-    {
-      "name": "msos-desc",
-      "type": "on/off"
-    },
-    {
-      "name": "full-path",
-      "type": "on/off"
-    },
-    {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "port",
-      "type": "str"
-    },
-    {
-      "name": "pipeline",
-      "type": "on/off"
-    },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "name": "isobufs",
-      "type": "uint32"
-    },
-    {
-      "name": "productid",
-      "type": "uint32"
-    },
-    {
-      "name": "vendorid",
-      "type": "uint32"
-    },
-    {
-      "name": "hostport",
-      "type": "str"
-    },
-    {
-      "name": "hostaddr",
-      "type": "uint32"
-    },
-    {
-      "name": "hostbus",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-22"
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-23"
-}
-
-{
-  "return": [
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "type": "drive"
-    }
-  ],
-  "id": "libvirt-23"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
index fee785692f..a4c63f8f6c 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
@@ -3948,38 +3948,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-14"
-}
-
-{
-  "id": "libvirt-14",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'kvm-pci-assign' not found"
-  }
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -4317,118 +4285,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-20"
-}
-
-{
-  "return": [
-    {
-      "name": "isobufs",
-      "type": "uint32"
-    },
-    {
-      "name": "hostaddr",
-      "type": "uint32"
-    },
-    {
-      "name": "msos-desc",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "productid",
-      "type": "uint32"
-    },
-    {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "name": "port",
-      "type": "str"
-    },
-    {
-      "name": "vendorid",
-      "type": "uint32"
-    },
-    {
-      "name": "pipeline",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "attached",
-      "type": "bool"
-    },
-    {
-      "name": "hostport",
-      "type": "str"
-    },
-    {
-      "name": "full-path",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "hostbus",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-20"
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-21"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
index e3047f133e..a65617bfd4 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
@@ -4049,38 +4049,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-14"
-}
-
-{
-  "id": "libvirt-14",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'kvm-pci-assign' not found"
-  }
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -4418,118 +4386,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-20"
-}
-
-{
-  "return": [
-    {
-      "name": "isobufs",
-      "type": "uint32"
-    },
-    {
-      "name": "hostaddr",
-      "type": "uint32"
-    },
-    {
-      "name": "msos-desc",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "productid",
-      "type": "uint32"
-    },
-    {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "name": "port",
-      "type": "str"
-    },
-    {
-      "name": "vendorid",
-      "type": "uint32"
-    },
-    {
-      "name": "pipeline",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "attached",
-      "type": "bool"
-    },
-    {
-      "name": "hostport",
-      "type": "str"
-    },
-    {
-      "name": "full-path",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "hostbus",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-20"
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-21"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
index f30a3eaa2b..e5c6142ee3 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
@@ -2695,38 +2695,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-16"
-}
-
-{
-  "id": "libvirt-16",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'kvm-pci-assign' not found"
-  }
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -2996,57 +2964,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "id": "libvirt-21",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'usb-host' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-22"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-22"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
index b3937c1d9c..3ec8b9a492 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
@@ -2926,92 +2926,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-14"
-}
-
-{
-  "id": "libvirt-14",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "return": [
-    {
-      "name": "share_intx",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "rombar",
-      "type": "uint32"
-    },
-    {
-      "name": "x-pcie-lnksta-dllla",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "multifunction",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "host",
-      "description": "Address (bus/device/function) of the host device, example: 04:10.0",
-      "type": "str"
-    },
-    {
-      "name": "romfile",
-      "type": "str"
-    },
-    {
-      "name": "configfd",
-      "type": "str"
-    },
-    {
-      "name": "x-pcie-extcap-init",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "command_serr_enable",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "addr",
-      "description": "Slot and optional function number, example: 06.0 or 06",
-      "type": "int32"
-    },
-    {
-      "name": "prefer_msi",
-      "description": "on/off",
-      "type": "bool"
-    }
-  ],
-  "id": "libvirt-15"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -3461,118 +3375,6 @@
   "id": "libvirt-20"
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "return": [
-    {
-      "name": "isobufs",
-      "type": "uint32"
-    },
-    {
-      "name": "hostaddr",
-      "type": "uint32"
-    },
-    {
-      "name": "msos-desc",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "productid",
-      "type": "uint32"
-    },
-    {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "name": "port",
-      "type": "str"
-    },
-    {
-      "name": "vendorid",
-      "type": "uint32"
-    },
-    {
-      "name": "pipeline",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "attached",
-      "type": "bool"
-    },
-    {
-      "name": "hostport",
-      "type": "str"
-    },
-    {
-      "name": "full-path",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "hostbus",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-21"
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-22"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-22"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
index d47a19130c..61492fb702 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
@@ -2744,38 +2744,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-16"
-}
-
-{
-  "id": "libvirt-16",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'kvm-pci-assign' not found"
-  }
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -3050,57 +3018,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "id": "libvirt-21",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'usb-host' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-22"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-22"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
index a067b70377..ed6c501d28 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
@@ -2923,38 +2923,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-14"
-}
-
-{
-  "id": "libvirt-14",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'kvm-pci-assign' not found"
-  }
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -3409,118 +3377,6 @@
   "id": "libvirt-20"
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "return": [
-    {
-      "name": "isobufs",
-      "type": "uint32"
-    },
-    {
-      "name": "hostaddr",
-      "type": "uint32"
-    },
-    {
-      "name": "msos-desc",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "productid",
-      "type": "uint32"
-    },
-    {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "name": "port",
-      "type": "str"
-    },
-    {
-      "name": "vendorid",
-      "type": "uint32"
-    },
-    {
-      "name": "pipeline",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "attached",
-      "type": "bool"
-    },
-    {
-      "name": "hostport",
-      "type": "str"
-    },
-    {
-      "name": "full-path",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "hostbus",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-21"
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-22"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-22"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
index db5b5140d5..bdc09c1537 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
@@ -4251,38 +4251,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-14"
-}
-
-{
-  "id": "libvirt-14",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'kvm-pci-assign' not found"
-  }
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -4639,122 +4607,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-20"
-}
-
-{
-  "return": [
-    {
-      "name": "isobufs",
-      "type": "uint32"
-    },
-    {
-      "name": "hostaddr",
-      "type": "uint32"
-    },
-    {
-      "name": "msos-desc",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "productid",
-      "type": "uint32"
-    },
-    {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "name": "port",
-      "type": "str"
-    },
-    {
-      "name": "vendorid",
-      "type": "uint32"
-    },
-    {
-      "name": "pipeline",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "attached",
-      "type": "bool"
-    },
-    {
-      "name": "hostport",
-      "type": "str"
-    },
-    {
-      "name": "full-path",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "hostbus",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-20"
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "share-rw",
-      "type": "bool"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-21"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
index 786cb1844a..084d6041cb 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
@@ -4240,38 +4240,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-14"
-}
-
-{
-  "id": "libvirt-14",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'kvm-pci-assign' not found"
-  }
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -4628,122 +4596,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-20"
-}
-
-{
-  "return": [
-    {
-      "name": "isobufs",
-      "type": "uint32"
-    },
-    {
-      "name": "hostaddr",
-      "type": "uint32"
-    },
-    {
-      "name": "msos-desc",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "productid",
-      "type": "uint32"
-    },
-    {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "name": "port",
-      "type": "str"
-    },
-    {
-      "name": "vendorid",
-      "type": "uint32"
-    },
-    {
-      "name": "pipeline",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "attached",
-      "type": "bool"
-    },
-    {
-      "name": "hostport",
-      "type": "str"
-    },
-    {
-      "name": "full-path",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "hostbus",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-20"
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "share-rw",
-      "type": "bool"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-21"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
index 25a005c5cd..62e0554001 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
@@ -2814,38 +2814,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-16"
-}
-
-{
-  "id": "libvirt-16",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'kvm-pci-assign' not found"
-  }
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -3138,61 +3106,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "id": "libvirt-21",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'usb-host' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-22"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "share-rw",
-      "type": "bool"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-22"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
index 9d7e653216..fd0c67844b 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
@@ -3098,38 +3098,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-14"
-}
-
-{
-  "id": "libvirt-14",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'kvm-pci-assign' not found"
-  }
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -3598,122 +3566,6 @@
   "id": "libvirt-20"
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "return": [
-    {
-      "name": "isobufs",
-      "type": "uint32"
-    },
-    {
-      "name": "hostaddr",
-      "type": "uint32"
-    },
-    {
-      "name": "msos-desc",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "productid",
-      "type": "uint32"
-    },
-    {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "name": "port",
-      "type": "str"
-    },
-    {
-      "name": "vendorid",
-      "type": "uint32"
-    },
-    {
-      "name": "pipeline",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "attached",
-      "type": "bool"
-    },
-    {
-      "name": "hostport",
-      "type": "str"
-    },
-    {
-      "name": "full-path",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "hostbus",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-21"
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-22"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "share-rw",
-      "type": "bool"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-22"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
index 32c31f406d..29999f8227 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
@@ -2005,82 +2005,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-16"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "command_serr_enable",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "multifunction",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "rombar",
-      "type": "uint32"
-    },
-    {
-      "name": "romfile",
-      "type": "str"
-    },
-    {
-      "name": "addr",
-      "description": "Slot and optional function number, example: 06.0 or 06",
-      "type": "int32"
-    },
-    {
-      "name": "configfd",
-      "type": "str"
-    },
-    {
-      "name": "share_intx",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "prefer_msi",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "host",
-      "description": "Address (bus/device/function) of the host device, example: 04:10.0",
-      "type": "str"
-    }
-  ],
-  "id": "libvirt-16"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -2423,114 +2347,6 @@
   "id": "libvirt-21"
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-22"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "msos-desc",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "full-path",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "port",
-      "type": "str"
-    },
-    {
-      "name": "pipeline",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "name": "isobufs",
-      "type": "uint32"
-    },
-    {
-      "name": "productid",
-      "type": "uint32"
-    },
-    {
-      "name": "vendorid",
-      "type": "uint32"
-    },
-    {
-      "name": "hostport",
-      "type": "str"
-    },
-    {
-      "name": "hostaddr",
-      "type": "uint32"
-    },
-    {
-      "name": "hostbus",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-22"
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-23"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "drive",
-      "description": "ID of a drive to use as a backend",
-      "type": "str"
-    }
-  ],
-  "id": "libvirt-23"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
index 2e93b116f7..1162c2d36c 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
@@ -2074,82 +2074,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-14"
-}
-
-{
-  "id": "libvirt-14",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "return": [
-    {
-      "name": "share_intx",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "rombar",
-      "type": "uint32"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "multifunction",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "host",
-      "description": "Address (bus/device/function) of the host device, example: 04:10.0",
-      "type": "str"
-    },
-    {
-      "name": "romfile",
-      "type": "str"
-    },
-    {
-      "name": "configfd",
-      "type": "str"
-    },
-    {
-      "name": "command_serr_enable",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "addr",
-      "description": "Slot and optional function number, example: 06.0 or 06",
-      "type": "int32"
-    },
-    {
-      "name": "prefer_msi",
-      "description": "on/off",
-      "type": "bool"
-    }
-  ],
-  "id": "libvirt-15"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -2520,114 +2444,6 @@
   "id": "libvirt-20"
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "return": [
-    {
-      "name": "isobufs",
-      "type": "uint32"
-    },
-    {
-      "name": "hostaddr",
-      "type": "uint32"
-    },
-    {
-      "name": "msos-desc",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "productid",
-      "type": "uint32"
-    },
-    {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "name": "port",
-      "type": "str"
-    },
-    {
-      "name": "vendorid",
-      "type": "uint32"
-    },
-    {
-      "name": "pipeline",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "hostport",
-      "type": "str"
-    },
-    {
-      "name": "full-path",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "hostbus",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-21"
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-22"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "ID of a drive to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-22"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
index 41a2be3a2f..15a54756dc 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
@@ -2833,38 +2833,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-14"
-}
-
-{
-  "id": "libvirt-14",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'kvm-pci-assign' not found"
-  }
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -3145,114 +3113,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-20"
-}
-
-{
-  "return": [
-    {
-      "name": "isobufs",
-      "type": "uint32"
-    },
-    {
-      "name": "hostaddr",
-      "type": "uint32"
-    },
-    {
-      "name": "msos-desc",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "productid",
-      "type": "uint32"
-    },
-    {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "name": "port",
-      "type": "str"
-    },
-    {
-      "name": "vendorid",
-      "type": "uint32"
-    },
-    {
-      "name": "pipeline",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "hostport",
-      "type": "str"
-    },
-    {
-      "name": "full-path",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "hostbus",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-20"
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "ID of a drive to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-21"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
index 4a35fee5ed..82fe8fe01e 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
@@ -2983,38 +2983,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-14"
-}
-
-{
-  "id": "libvirt-14",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'kvm-pci-assign' not found"
-  }
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -3295,114 +3263,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-20"
-}
-
-{
-  "return": [
-    {
-      "name": "isobufs",
-      "type": "uint32"
-    },
-    {
-      "name": "hostaddr",
-      "type": "uint32"
-    },
-    {
-      "name": "msos-desc",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "productid",
-      "type": "uint32"
-    },
-    {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "name": "port",
-      "type": "str"
-    },
-    {
-      "name": "vendorid",
-      "type": "uint32"
-    },
-    {
-      "name": "pipeline",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "hostport",
-      "type": "str"
-    },
-    {
-      "name": "full-path",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "hostbus",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-20"
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "ID of a drive to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-21"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
index 382feee693..e1d1cac40a 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
@@ -2152,82 +2152,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-14"
-}
-
-{
-  "id": "libvirt-14",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "return": [
-    {
-      "name": "share_intx",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "rombar",
-      "type": "uint32"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "multifunction",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "host",
-      "description": "Address (bus/device/function) of the host device, example: 04:10.0",
-      "type": "str"
-    },
-    {
-      "name": "romfile",
-      "type": "str"
-    },
-    {
-      "name": "configfd",
-      "type": "str"
-    },
-    {
-      "name": "command_serr_enable",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "addr",
-      "description": "Slot and optional function number, example: 06.0 or 06",
-      "type": "int32"
-    },
-    {
-      "name": "prefer_msi",
-      "description": "on/off",
-      "type": "bool"
-    }
-  ],
-  "id": "libvirt-15"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -2602,114 +2526,6 @@
   "id": "libvirt-20"
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "return": [
-    {
-      "name": "isobufs",
-      "type": "uint32"
-    },
-    {
-      "name": "hostaddr",
-      "type": "uint32"
-    },
-    {
-      "name": "msos-desc",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "productid",
-      "type": "uint32"
-    },
-    {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "name": "port",
-      "type": "str"
-    },
-    {
-      "name": "vendorid",
-      "type": "uint32"
-    },
-    {
-      "name": "pipeline",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "hostport",
-      "type": "str"
-    },
-    {
-      "name": "full-path",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "hostbus",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-21"
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-22"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "ID of a drive to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-22"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
index 977c591455..8968ea747c 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
@@ -1966,38 +1966,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-16"
-}
-
-{
-  "id": "libvirt-16",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'kvm-pci-assign' not found"
-  }
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -2258,57 +2226,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "id": "libvirt-21",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'usb-host' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-22"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-22"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
index aae2b3f4de..58f5b055ef 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
@@ -2207,87 +2207,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-14"
-}
-
-{
-  "id": "libvirt-14",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "return": [
-    {
-      "name": "share_intx",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "rombar",
-      "type": "uint32"
-    },
-    {
-      "name": "x-pcie-lnksta-dllla",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "multifunction",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "host",
-      "description": "Address (bus/device/function) of the host device, example: 04:10.0",
-      "type": "str"
-    },
-    {
-      "name": "romfile",
-      "type": "str"
-    },
-    {
-      "name": "configfd",
-      "type": "str"
-    },
-    {
-      "name": "command_serr_enable",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "addr",
-      "description": "Slot and optional function number, example: 06.0 or 06",
-      "type": "int32"
-    },
-    {
-      "name": "prefer_msi",
-      "description": "on/off",
-      "type": "bool"
-    }
-  ],
-  "id": "libvirt-15"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -2719,118 +2638,6 @@
   "id": "libvirt-20"
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "return": [
-    {
-      "name": "isobufs",
-      "type": "uint32"
-    },
-    {
-      "name": "hostaddr",
-      "type": "uint32"
-    },
-    {
-      "name": "msos-desc",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "productid",
-      "type": "uint32"
-    },
-    {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "name": "port",
-      "type": "str"
-    },
-    {
-      "name": "vendorid",
-      "type": "uint32"
-    },
-    {
-      "name": "pipeline",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "attached",
-      "type": "bool"
-    },
-    {
-      "name": "hostport",
-      "type": "str"
-    },
-    {
-      "name": "full-path",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "hostbus",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-21"
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-22"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-22"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
index 6eae79342e..6e06a1a484 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
@@ -2229,38 +2229,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-16"
-}
-
-{
-  "id": "libvirt-16",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'kvm-pci-assign' not found"
-  }
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -2521,57 +2489,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "id": "libvirt-21",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'usb-host' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-22"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-22"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
index dcfa7ea056..98b0cc3bb2 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
@@ -2322,87 +2322,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-14"
-}
-
-{
-  "id": "libvirt-14",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "return": [
-    {
-      "name": "share_intx",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "rombar",
-      "type": "uint32"
-    },
-    {
-      "name": "x-pcie-lnksta-dllla",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "multifunction",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "host",
-      "description": "Address (bus/device/function) of the host device, example: 04:10.0",
-      "type": "str"
-    },
-    {
-      "name": "romfile",
-      "type": "str"
-    },
-    {
-      "name": "configfd",
-      "type": "str"
-    },
-    {
-      "name": "command_serr_enable",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "addr",
-      "description": "Slot and optional function number, example: 06.0 or 06",
-      "type": "int32"
-    },
-    {
-      "name": "prefer_msi",
-      "description": "on/off",
-      "type": "bool"
-    }
-  ],
-  "id": "libvirt-15"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -2834,118 +2753,6 @@
   "id": "libvirt-20"
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "return": [
-    {
-      "name": "isobufs",
-      "type": "uint32"
-    },
-    {
-      "name": "hostaddr",
-      "type": "uint32"
-    },
-    {
-      "name": "msos-desc",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "productid",
-      "type": "uint32"
-    },
-    {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "name": "port",
-      "type": "str"
-    },
-    {
-      "name": "vendorid",
-      "type": "uint32"
-    },
-    {
-      "name": "pipeline",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "attached",
-      "type": "bool"
-    },
-    {
-      "name": "hostport",
-      "type": "str"
-    },
-    {
-      "name": "full-path",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "hostbus",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-21"
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-22"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-22"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
index f98ed20a6b..47d4c9ca6b 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
@@ -3308,38 +3308,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-14"
-}
-
-{
-  "id": "libvirt-14",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'kvm-pci-assign' not found"
-  }
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -3677,57 +3645,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-20"
-}
-
-{
-  "id": "libvirt-20",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'usb-host' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-21"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
index d3b60da4bf..cfa099dc10 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
@@ -2410,38 +2410,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-16"
-}
-
-{
-  "id": "libvirt-16",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'kvm-pci-assign' not found"
-  }
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -2711,57 +2679,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "id": "libvirt-21",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'usb-host' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-22"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-22"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
index c3edcc187d..a6ce25bdcb 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
@@ -2498,92 +2498,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-14"
-}
-
-{
-  "id": "libvirt-14",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "return": [
-    {
-      "name": "share_intx",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "rombar",
-      "type": "uint32"
-    },
-    {
-      "name": "x-pcie-lnksta-dllla",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "multifunction",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "host",
-      "description": "Address (bus/device/function) of the host device, example: 04:10.0",
-      "type": "str"
-    },
-    {
-      "name": "romfile",
-      "type": "str"
-    },
-    {
-      "name": "configfd",
-      "type": "str"
-    },
-    {
-      "name": "x-pcie-extcap-init",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "command_serr_enable",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "addr",
-      "description": "Slot and optional function number, example: 06.0 or 06",
-      "type": "int32"
-    },
-    {
-      "name": "prefer_msi",
-      "description": "on/off",
-      "type": "bool"
-    }
-  ],
-  "id": "libvirt-15"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -3033,118 +2947,6 @@
   "id": "libvirt-20"
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "return": [
-    {
-      "name": "isobufs",
-      "type": "uint32"
-    },
-    {
-      "name": "hostaddr",
-      "type": "uint32"
-    },
-    {
-      "name": "msos-desc",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "productid",
-      "type": "uint32"
-    },
-    {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "name": "port",
-      "type": "str"
-    },
-    {
-      "name": "vendorid",
-      "type": "uint32"
-    },
-    {
-      "name": "pipeline",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "attached",
-      "type": "bool"
-    },
-    {
-      "name": "hostport",
-      "type": "str"
-    },
-    {
-      "name": "full-path",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "hostbus",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-21"
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-22"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-22"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
index 932c418f3f..9b8acd0c24 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
@@ -4315,38 +4315,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-14"
-}
-
-{
-  "id": "libvirt-14",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'kvm-pci-assign' not found"
-  }
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -4715,122 +4683,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-20"
-}
-
-{
-  "return": [
-    {
-      "name": "isobufs",
-      "type": "uint32"
-    },
-    {
-      "name": "hostaddr",
-      "type": "uint32"
-    },
-    {
-      "name": "msos-desc",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "productid",
-      "type": "uint32"
-    },
-    {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "name": "port",
-      "type": "str"
-    },
-    {
-      "name": "vendorid",
-      "type": "uint32"
-    },
-    {
-      "name": "pipeline",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "attached",
-      "type": "bool"
-    },
-    {
-      "name": "hostport",
-      "type": "str"
-    },
-    {
-      "name": "full-path",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "hostbus",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-20"
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "share-rw",
-      "type": "bool"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-21"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
index 97eeec3dbc..864ec55ad3 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
@@ -1296,38 +1296,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-14"
-}
-
-{
-  "id": "libvirt-14",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'kvm-pci-assign' not found"
-  }
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -1486,61 +1454,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-19"
-}
-
-{
-  "id": "libvirt-19",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'usb-host' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-20"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "share-rw",
-      "type": "bool"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-20"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
index 23188fffb6..65ebb8e27f 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
@@ -1296,38 +1296,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-14"
-}
-
-{
-  "id": "libvirt-14",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'kvm-pci-assign' not found"
-  }
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -1486,61 +1454,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-19"
-}
-
-{
-  "id": "libvirt-19",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'usb-host' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-20"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "share-rw",
-      "type": "bool"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-20"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
index fdab682f94..6087089962 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
@@ -3160,38 +3160,6 @@
   }
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "pci-assign"
-  },
-  "id": "libvirt-14"
-}
-
-{
-  "id": "libvirt-14",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'pci-assign' not found"
-  }
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "kvm-pci-assign"
-  },
-  "id": "libvirt-15"
-}
-
-{
-  "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'kvm-pci-assign' not found"
-  }
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
@@ -3672,122 +3640,6 @@
   "id": "libvirt-20"
 }
 
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "usb-host"
-  },
-  "id": "libvirt-21"
-}
-
-{
-  "return": [
-    {
-      "name": "isobufs",
-      "type": "uint32"
-    },
-    {
-      "name": "hostaddr",
-      "type": "uint32"
-    },
-    {
-      "name": "msos-desc",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "productid",
-      "type": "uint32"
-    },
-    {
-      "name": "serial",
-      "type": "str"
-    },
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "isobsize",
-      "type": "uint32"
-    },
-    {
-      "name": "port",
-      "type": "str"
-    },
-    {
-      "name": "vendorid",
-      "type": "uint32"
-    },
-    {
-      "name": "pipeline",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "attached",
-      "type": "bool"
-    },
-    {
-      "name": "hostport",
-      "type": "str"
-    },
-    {
-      "name": "full-path",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "loglevel",
-      "type": "uint32"
-    },
-    {
-      "name": "hostbus",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-21"
-}
-
-{
-  "execute": "device-list-properties",
-  "arguments": {
-    "typename": "scsi-generic"
-  },
-  "id": "libvirt-22"
-}
-
-{
-  "return": [
-    {
-      "name": "bootindex",
-      "type": "int32"
-    },
-    {
-      "name": "drive",
-      "description": "Node name or ID of a block device to use as a backend",
-      "type": "str"
-    },
-    {
-      "name": "lun",
-      "type": "uint32"
-    },
-    {
-      "name": "share-rw",
-      "type": "bool"
-    },
-    {
-      "name": "channel",
-      "type": "uint32"
-    },
-    {
-      "name": "scsi-id",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-22"
-}
-
 {
   "execute": "device-list-properties",
   "arguments": {
-- 
2.16.4

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list