[PATCHv3 2/5] conf: add debugcon chardev guest interface

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Nikolay Shirokovskiy <nshirokovskiy@xxxxxxxxxxxxx>

This interface can be used for example by firmware to print
debug messages. Here is domain xml example:

    <serial type='pty'>
      <target type='isa-serial' port='0'>
        <model name='debugcon'/>
      </target>
      <address type='isa' iobase='0x402'/>
    </serial>

Add checks to make sure this new serial type won't be reported
as back-compat console.

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@xxxxxxxxxxxxx>
Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx>
---
 docs/formatdomain.html.in                     |  3 +-
 docs/schemas/domaincommon.rng                 |  1 +
 src/conf/domain_conf.c                        |  5 ++++
 src/conf/domain_conf.h                        |  1 +
 src/qemu/qemu_command.c                       |  3 ++
 src/qemu/qemu_domain.c                        |  3 ++
 .../qemuxml2argvdata/isa-serial-debugcon.xml  | 22 ++++++++++++++
 .../isa-serial-debugcon.xml                   | 30 +++++++++++++++++++
 tests/qemuxml2xmltest.c                       |  2 ++
 9 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 tests/qemuxml2argvdata/isa-serial-debugcon.xml
 create mode 100644 tests/qemuxml2xmloutdata/isa-serial-debugcon.xml

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 2ae5006849..a6d5346d46 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -7089,7 +7089,8 @@ qemu-kvm -net nic,model=? /dev/null
       <span class="since">Since 3.10.0</span>, the <code>target</code>
       element can have an optional <code>model</code> subelement;
       valid values for its <code>name</code> attribute are:
-      <code>isa-serial</code> (usable with the <code>isa-serial</code> target
+      <code>isa-serial</code> and <span class="since">since 5.1.0</span>,
+      <code>debugcon</code>(usable with the <code>isa-serial</code> target
       type); <code>usb-serial</code> (usable with the <code>usb-serial</code>
       target type); <code>pci-serial</code>
       (usable with the <code>pci-serial</code> target type);
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index ba80440c72..ca0dd3b7c2 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -3763,6 +3763,7 @@
           <value>16550a</value>
           <value>sclpconsole</value>
           <value>sclplmconsole</value>
+          <value>debugcon</value>
         </choice>
       </attribute>
     </element>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 5d49f4388c..24b002847c 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -516,6 +516,7 @@ VIR_ENUM_IMPL(virDomainChrSerialTargetModel,
               "sclpconsole",
               "sclplmconsole",
               "16550a",
+              "debugcon",
 );
 
 VIR_ENUM_IMPL(virDomainChrDevice, VIR_DOMAIN_CHR_DEVICE_TYPE_LAST,
@@ -4392,6 +4393,10 @@ virDomainDefAddConsoleCompat(virDomainDefPtr def)
 
         switch ((virDomainChrSerialTargetType) def->serials[0]->targetType) {
         case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA:
+            if (def->serials[0]->targetModel == VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_DEBUGCON)
+                break;
+            ATTRIBUTE_FALLTHROUGH;
+
         case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO:
         case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM:
         case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP:
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 2bc3f879f7..9565f065df 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1134,6 +1134,7 @@ typedef enum {
     VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE,
     VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPLMCONSOLE,
     VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_16550A,
+    VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_DEBUGCON,
 
     VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST
 } virDomainChrSerialTargetModel;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 94de6b9061..c28ced6919 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -197,6 +197,7 @@ VIR_ENUM_IMPL(qemuDomainChrSerialTargetModel,
               "sclpconsole",
               "sclplmconsole",
               "", /* 16550a is not user-instantiable */
+              "", /* debugcon */
 );
 
 
@@ -9370,6 +9371,7 @@ qemuChrSerialTargetModelToCaps(virDomainChrSerialTargetModel targetModel)
     case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011:
         return QEMU_CAPS_DEVICE_PL011;
     case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_16550A:
+    case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_DEBUGCON:
     case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE:
     case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST:
         break;
@@ -10801,6 +10803,7 @@ qemuBuildSerialChrDeviceStr(char **deviceStr,
     case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY:
     case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE:
     case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPLMCONSOLE:
+    case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_DEBUGCON:
 
         caps = qemuChrSerialTargetModelToCaps(serial->targetModel);
 
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index ac01e861f7..9c4aedb009 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4375,6 +4375,8 @@ qemuDomainChrSerialTargetModelToTargetType(int targetModel)
     case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE:
     case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPLMCONSOLE:
         return VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP;
+    case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_DEBUGCON:
+        return VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA;
     case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE:
     case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST:
         break;
@@ -4437,6 +4439,7 @@ qemuDomainChrTargetDefValidate(const virDomainChrDef *chr)
         case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE:
         case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPLMCONSOLE:
         case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_16550A:
+        case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_DEBUGCON:
 
             expected = qemuDomainChrSerialTargetModelToTargetType(chr->targetModel);
 
diff --git a/tests/qemuxml2argvdata/isa-serial-debugcon.xml b/tests/qemuxml2argvdata/isa-serial-debugcon.xml
new file mode 100644
index 0000000000..6c5de52585
--- /dev/null
+++ b/tests/qemuxml2argvdata/isa-serial-debugcon.xml
@@ -0,0 +1,22 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219100</memory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+  </os>
+  <devices>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <controller type='usb' model='none'/>
+    <controller type='pci' index='0' model='pci-root'/>
+    <serial type='pipe'>
+      <source path='/tmp/debugcon'/>
+      <target type='isa-serial' port='0'>
+        <model name='debugcon'/>
+      </target>
+      <address type='isa' iobase='0x402'/>
+    </serial>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/isa-serial-debugcon.xml b/tests/qemuxml2xmloutdata/isa-serial-debugcon.xml
new file mode 100644
index 0000000000..6ad7c3917c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/isa-serial-debugcon.xml
@@ -0,0 +1,30 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219100</memory>
+  <currentMemory unit='KiB'>219100</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <controller type='usb' index='0' model='none'/>
+    <controller type='pci' index='0' model='pci-root'/>
+    <serial type='pipe'>
+      <source path='/tmp/debugcon'/>
+      <target type='isa-serial' port='0'>
+        <model name='debugcon'/>
+      </target>
+      <address type='isa' iobase='0x402'/>
+    </serial>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index b38cbd6994..952e98918d 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -477,6 +477,8 @@ mymain(void)
     DO_TEST("pci-rom-disabled-invalid", NONE);
     DO_TEST("pci-serial-dev-chardev", NONE);
 
+    DO_TEST("isa-serial-debugcon", NONE);
+
     DO_TEST("encrypted-disk", QEMU_CAPS_QCOW2_LUKS);
     DO_TEST("encrypted-disk-usage", QEMU_CAPS_QCOW2_LUKS);
     DO_TEST("luks-disks", NONE);
-- 
2.19.2


[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux