|
 |
c1c534 |
From 5b5832decc253ce95535c9a6cf1eee6b5ed475fc Mon Sep 17 00:00:00 2001
|
|
|
c1c534 |
Message-Id: <5b5832decc253ce95535c9a6cf1eee6b5ed475fc@dist-git>
|
|
|
c1c534 |
From: Andrea Bolognani <abologna@redhat.com>
|
|
|
c1c534 |
Date: Wed, 29 Nov 2017 16:23:19 +0100
|
|
|
c1c534 |
Subject: [PATCH] qemu: Add QEMU_CAPS_DEVICE_PL011
|
|
|
c1c534 |
|
|
|
c1c534 |
All serial devices shoule have an associated capability.
|
|
|
c1c534 |
|
|
|
c1c534 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
c1c534 |
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
c1c534 |
(cherry picked from commit a45ecb7bf6b43a863ef0980156e822d414975994)
|
|
|
c1c534 |
|
|
|
c1c534 |
Conflicts:
|
|
|
c1c534 |
tests/qemucapabilitiesdata/caps_2.10.0-gicv2.aarch64.xml
|
|
|
c1c534 |
tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml
|
|
|
c1c534 |
|
|
|
c1c534 |
These caps do not exists in the current version.
|
|
|
c1c534 |
|
|
|
c1c534 |
https://bugzilla.redhat.com/show_bug.cgi?id=1512929
|
|
|
c1c534 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
c1c534 |
---
|
|
|
c1c534 |
src/qemu/qemu_capabilities.c | 4 ++++
|
|
|
c1c534 |
src/qemu/qemu_capabilities.h | 3 +++
|
|
|
c1c534 |
tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml | 1 +
|
|
|
c1c534 |
tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml | 1 +
|
|
|
c1c534 |
4 files changed, 9 insertions(+)
|
|
|
c1c534 |
|
|
|
c1c534 |
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
|
|
|
c1c534 |
index 08c6653424..ae5448eaaa 100644
|
|
|
c1c534 |
--- a/src/qemu/qemu_capabilities.c
|
|
|
c1c534 |
+++ b/src/qemu/qemu_capabilities.c
|
|
|
c1c534 |
@@ -453,6 +453,9 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
|
|
|
c1c534 |
"disk-share-rw",
|
|
|
c1c534 |
|
|
|
c1c534 |
"isa-serial",
|
|
|
c1c534 |
+
|
|
|
c1c534 |
+ /* 280 */
|
|
|
c1c534 |
+ "pl011",
|
|
|
c1c534 |
);
|
|
|
c1c534 |
|
|
|
c1c534 |
|
|
|
c1c534 |
@@ -1684,6 +1687,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
|
|
|
c1c534 |
{ "spapr-vty", QEMU_CAPS_DEVICE_SPAPR_VTY },
|
|
|
c1c534 |
{ "sclplmconsole", QEMU_CAPS_DEVICE_SCLPLMCONSOLE },
|
|
|
c1c534 |
{ "isa-serial", QEMU_CAPS_DEVICE_ISA_SERIAL },
|
|
|
c1c534 |
+ { "pl011", QEMU_CAPS_DEVICE_PL011 },
|
|
|
c1c534 |
};
|
|
|
c1c534 |
|
|
|
c1c534 |
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = {
|
|
|
c1c534 |
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
|
|
|
c1c534 |
index f0bd88f897..c809f83404 100644
|
|
|
c1c534 |
--- a/src/qemu/qemu_capabilities.h
|
|
|
c1c534 |
+++ b/src/qemu/qemu_capabilities.h
|
|
|
c1c534 |
@@ -440,6 +440,9 @@ typedef enum {
|
|
|
c1c534 |
|
|
|
c1c534 |
QEMU_CAPS_DEVICE_ISA_SERIAL, /* -device isa-serial */
|
|
|
c1c534 |
|
|
|
c1c534 |
+ /* 280 */
|
|
|
c1c534 |
+ QEMU_CAPS_DEVICE_PL011, /* -device pl011 (not user-instantiable) */
|
|
|
c1c534 |
+
|
|
|
c1c534 |
QEMU_CAPS_LAST /* this must always be the last item */
|
|
|
c1c534 |
} virQEMUCapsFlags;
|
|
|
c1c534 |
|
|
|
c1c534 |
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
|
|
|
c1c534 |
index e699bdbafd..d3e2e18faa 100644
|
|
|
c1c534 |
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
|
|
|
c1c534 |
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
|
|
|
c1c534 |
@@ -173,6 +173,7 @@
|
|
|
c1c534 |
<flag name='chardev-reconnect'/>
|
|
|
c1c534 |
<flag name='virtio-gpu.max_outputs'/>
|
|
|
c1c534 |
<flag name='isa-serial'/>
|
|
|
c1c534 |
+ <flag name='pl011'/>
|
|
|
c1c534 |
<version>2006000</version>
|
|
|
c1c534 |
<kvmVersion>0</kvmVersion>
|
|
|
c1c534 |
<package></package>
|
|
|
c1c534 |
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
|
|
|
c1c534 |
index f4c1de7e1d..bc86d03537 100644
|
|
|
c1c534 |
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
|
|
|
c1c534 |
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
|
|
|
c1c534 |
@@ -173,6 +173,7 @@
|
|
|
c1c534 |
<flag name='chardev-reconnect'/>
|
|
|
c1c534 |
<flag name='virtio-gpu.max_outputs'/>
|
|
|
c1c534 |
<flag name='isa-serial'/>
|
|
|
c1c534 |
+ <flag name='pl011'/>
|
|
|
c1c534 |
<version>2006000</version>
|
|
|
c1c534 |
<kvmVersion>0</kvmVersion>
|
|
|
c1c534 |
<package></package>
|
|
|
c1c534 |
--
|
|
|
c1c534 |
2.15.1
|
|
|
c1c534 |
|