openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: caps: introduce QEMU_CAPS_NEC_USB_XHCI_PORTS 

Reports whether we support -device nec-usb-xhci,p3=XXX value,
which has been available since qemu 1.3.0
This commit is contained in:
Cole Robinson 2016-04-24 10:52:38 -04:00
parent 345d2ab488
commit 48e12de51e
21 changed files with 329 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/qemu/qemu_capabilities.c
View File

@ -326,6 +326,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"pxb-pcie", /* 220 */ "pxb-pcie", /* 220 */
"device-tray-moved-event", "device-tray-moved-event",
"nec-usb-xhci-ports",
); );
@ -1685,6 +1686,10 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsICH9[] = {
{ "disable_s4", QEMU_CAPS_ICH9_DISABLE_S4 }, { "disable_s4", QEMU_CAPS_ICH9_DISABLE_S4 },
}; };
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUSBNECXHCI[] = {
{ "p3", QEMU_CAPS_NEC_USB_XHCI_PORTS },
};
struct virQEMUCapsObjectTypeProps { struct virQEMUCapsObjectTypeProps {
const char *type; const char *type;
struct virQEMUCapsStringFlags *props; struct virQEMUCapsStringFlags *props;
@ -1748,6 +1753,8 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon) },
{ "virtio-balloon-device", virQEMUCapsObjectPropsVirtioBalloon, { "virtio-balloon-device", virQEMUCapsObjectPropsVirtioBalloon,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon) },
{ "nec-usb-xhci", virQEMUCapsObjectPropsUSBNECXHCI,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBNECXHCI) },
}; };

1
src/qemu/qemu_capabilities.h
View File

@ -357,6 +357,7 @@ typedef enum {
/* 220 */ /* 220 */
QEMU_CAPS_DEVICE_PXB_PCIE, /* -device pxb-pcie */ QEMU_CAPS_DEVICE_PXB_PCIE, /* -device pxb-pcie */
QEMU_CAPS_DEVICE_TRAY_MOVED, /* DEVICE_TRAY_MOVED event */ QEMU_CAPS_DEVICE_TRAY_MOVED, /* DEVICE_TRAY_MOVED event */
QEMU_CAPS_NEC_USB_XHCI_PORTS, /* -device nec-usb-xhci.p3 ports setting */
QEMU_CAPS_LAST /* this must always be the last item */ QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags; } virQEMUCapsFlags;

11
tests/qemucapabilitiesdata/caps_1.2.2-1.replies
View File

@ -1668,6 +1668,17 @@
} }
} }
{
"return": [
{
"name": "msi",
"type": "uint32"
}
]
}
{ {
"return": [ "return": [
{ {

1
tests/qemucapabilitiesdata/caps_1.3.1-1.caps
View File

@ -129,4 +129,5 @@
<flag name='qxl.vram64_size_mb'/> <flag name='qxl.vram64_size_mb'/>
<flag name='qxl-vga.vram64_size_mb'/> <flag name='qxl-vga.vram64_size_mb'/>
<flag name='device-tray-moved-event'/> <flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
</qemuCaps> </qemuCaps>

29
tests/qemucapabilitiesdata/caps_1.3.1-1.replies
View File

@ -1846,6 +1846,35 @@
} }
} }
{
"return": [
{
"name": "msi",
"type": "on/off"
},
{
"name": "msix",
"type": "on/off"
},
{
"name": "intrs",
"type": "uint32"
},
{
"name": "slots",
"type": "uint32"
},
{
"name": "2",
"type": "uint32"
},
{
"name": "p3",
"type": "uint32"
}
]
}
{ {
"return": [ "return": [
{ {

1
tests/qemucapabilitiesdata/caps_1.4.2-1.caps
View File

@ -130,4 +130,5 @@
<flag name='qxl.vram64_size_mb'/> <flag name='qxl.vram64_size_mb'/>
<flag name='qxl-vga.vram64_size_mb'/> <flag name='qxl-vga.vram64_size_mb'/>
<flag name='device-tray-moved-event'/> <flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
</qemuCaps> </qemuCaps>

29
tests/qemucapabilitiesdata/caps_1.4.2-1.replies
View File

@ -1894,6 +1894,35 @@
} }
} }
{
"return": [
{
"name": "msi",
"type": "on/off"
},
{
"name": "msix",
"type": "on/off"
},
{
"name": "intrs",
"type": "uint32"
},
{
"name": "slots",
"type": "uint32"
},
{
"name": "2",
"type": "uint32"
},
{
"name": "p3",
"type": "uint32"
}
]
}
{ {
"return": [ "return": [
{ {

1
tests/qemucapabilitiesdata/caps_1.5.3-1.caps
View File

@ -139,4 +139,5 @@
<flag name='qxl.vram64_size_mb'/> <flag name='qxl.vram64_size_mb'/>
<flag name='qxl-vga.vram64_size_mb'/> <flag name='qxl-vga.vram64_size_mb'/>
<flag name='device-tray-moved-event'/> <flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
</qemuCaps> </qemuCaps>

29
tests/qemucapabilitiesdata/caps_1.5.3-1.replies
View File

@ -1965,6 +1965,35 @@
"id": "libvirt-36" "id": "libvirt-36"
} }
{
"return": [
{
"name": "msi",
"type": "on/off"
},
{
"name": "msix",
"type": "on/off"
},
{
"name": "intrs",
"type": "uint32"
},
{
"name": "slots",
"type": "uint32"
},
{
"name": "2",
"type": "uint32"
},
{
"name": "p3",
"type": "uint32"
}
]
}
{ {
"return": [ "return": [
{ {

1
tests/qemucapabilitiesdata/caps_1.6.0-1.caps
View File

@ -145,4 +145,5 @@
<flag name='qxl.vram64_size_mb'/> <flag name='qxl.vram64_size_mb'/>
<flag name='qxl-vga.vram64_size_mb'/> <flag name='qxl-vga.vram64_size_mb'/>
<flag name='device-tray-moved-event'/> <flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
</qemuCaps> </qemuCaps>

29
tests/qemucapabilitiesdata/caps_1.6.0-1.replies
View File

@ -2027,6 +2027,35 @@
"id": "libvirt-36" "id": "libvirt-36"
} }
{
"return": [
{
"name": "msi",
"type": "on/off"
},
{
"name": "msix",
"type": "on/off"
},
{
"name": "intrs",
"type": "uint32"
},
{
"name": "slots",
"type": "uint32"
},
{
"name": "2",
"type": "uint32"
},
{
"name": "p3",
"type": "uint32"
}
]
}
{ {
"return": [ "return": [
{ {

1
tests/qemucapabilitiesdata/caps_1.6.50-1.caps
View File

@ -145,4 +145,5 @@
<flag name='qxl.vram64_size_mb'/> <flag name='qxl.vram64_size_mb'/>
<flag name='qxl-vga.vram64_size_mb'/> <flag name='qxl-vga.vram64_size_mb'/>
<flag name='device-tray-moved-event'/> <flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
</qemuCaps> </qemuCaps>

29
tests/qemucapabilitiesdata/caps_1.6.50-1.replies
View File

@ -1991,6 +1991,35 @@
"id": "libvirt-36" "id": "libvirt-36"
} }
{
"return": [
{
"name": "msi",
"type": "on/off"
},
{
"name": "msix",
"type": "on/off"
},
{
"name": "intrs",
"type": "uint32"
},
{
"name": "slots",
"type": "uint32"
},
{
"name": "2",
"type": "uint32"
},
{
"name": "p3",
"type": "uint32"
}
]
}
{ {
"return": [ "return": [
{ {

1
tests/qemucapabilitiesdata/caps_2.1.1-1.caps
View File

@ -163,4 +163,5 @@
<flag name='qxl-vga.vram64_size_mb'/> <flag name='qxl-vga.vram64_size_mb'/>
<flag name='debug-threads'/> <flag name='debug-threads'/>
<flag name='device-tray-moved-event'/> <flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
</qemuCaps> </qemuCaps>

33
tests/qemucapabilitiesdata/caps_2.1.1-1.replies
View File

@ -2449,6 +2449,39 @@
"id": "libvirt-36" "id": "libvirt-36"
} }
{
"return": [
{
"name": "msi",
"type": "on/off"
},
{
"name": "msix",
"type": "on/off"
},
{
"name": "superspeed-ports-first",
"type": "on/off"
},
{
"name": "intrs",
"type": "uint32"
},
{
"name": "slots",
"type": "uint32"
},
{
"name": "2",
"type": "uint32"
},
{
"name": "p3",
"type": "uint32"
}
]
}
{ {
"return": [ "return": [
{ {

1
tests/qemucapabilitiesdata/caps_2.4.0-1.caps
View File

@ -175,4 +175,5 @@
<flag name='debug-threads'/> <flag name='debug-threads'/>
<flag name='pxb'/> <flag name='pxb'/>
<flag name='device-tray-moved-event'/> <flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
</qemuCaps> </qemuCaps>

41
tests/qemucapabilitiesdata/caps_2.4.0-1.replies
View File

@ -2968,6 +2968,47 @@
"id": "libvirt-36" "id": "libvirt-36"
} }
{
"return": [
{
"name": "msi",
"type": "on/off"
},
{
"name": "msix",
"type": "on/off"
},
{
"name": "superspeed-ports-first",
"type": "on/off"
},
{
"name": "force-pcie-endcap",
"type": "on/off"
},
{
"name": "streams",
"type": "on/off"
},
{
"name": "intrs",
"type": "uint32"
},
{
"name": "slots",
"type": "uint32"
},
{
"name": "2",
"type": "uint32"
},
{
"name": "p3",
"type": "uint32"
}
]
}
{ {
"return": [ "return": [
{ {

1
tests/qemucapabilitiesdata/caps_2.5.0-1.caps
View File

@ -176,4 +176,5 @@
<flag name='debug-threads'/> <flag name='debug-threads'/>
<flag name='pxb'/> <flag name='pxb'/>
<flag name='device-tray-moved-event'/> <flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
</qemuCaps> </qemuCaps>

41
tests/qemucapabilitiesdata/caps_2.5.0-1.replies
View File

@ -2988,6 +2988,47 @@
"id": "libvirt-36" "id": "libvirt-36"
} }
{
"return": [
{
"name": "msi",
"type": "on/off"
},
{
"name": "msix",
"type": "on/off"
},
{
"name": "superspeed-ports-first",
"type": "on/off"
},
{
"name": "force-pcie-endcap",
"type": "on/off"
},
{
"name": "streams",
"type": "on/off"
},
{
"name": "intrs",
"type": "uint32"
},
{
"name": "slots",
"type": "uint32"
},
{
"name": "2",
"type": "uint32"
},
{
"name": "p3",
"type": "uint32"
}
]
}
{ {
"return": [ "return": [
{ {

1
tests/qemucapabilitiesdata/caps_2.6.0-1.caps
View File

@ -181,4 +181,5 @@
<flag name='pxb'/> <flag name='pxb'/>
<flag name='pxb-pcie'/> <flag name='pxb-pcie'/>
<flag name='device-tray-moved-event'/> <flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
</qemuCaps> </qemuCaps>

41
tests/qemucapabilitiesdata/caps_2.6.0-1.replies
View File

@ -2994,6 +2994,47 @@
"id": "libvirt-36" "id": "libvirt-36"
} }
{
"return": [
{
"name": "msi",
"type": "on/off"
},
{
"name": "msix",
"type": "on/off"
},
{
"name": "superspeed-ports-first",
"type": "on/off"
},
{
"name": "force-pcie-endcap",
"type": "on/off"
},
{
"name": "streams",
"type": "on/off"
},
{
"name": "intrs",
"type": "uint32"
},
{
"name": "slots",
"type": "uint32"
},
{
"name": "2",
"type": "uint32"
},
{
"name": "p3",
"type": "uint32"
}
]
}
{ {
"return": [ "return": [
{ {