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

Re: [libvirt] [PATCH 3/3] domain_conf: Process the "rawio" for a hostdev device



On 10.09.2014 01:40, John Ferlan wrote:
Add a "rawio" to the hostdev XML and process it mimicing the
disk XML for a lun which supports/requires rawio

Signed-off-by: John Ferlan <jferlan redhat com>
---
  docs/formatdomain.html.in                          | 12 ++++++--
  docs/schemas/domaincommon.rng                      | 18 +++++++----
  src/conf/domain_conf.c                             | 31 +++++++++++++++++++
  .../qemuxml2argv-hostdev-scsi-rawio.xml            | 35 ++++++++++++++++++++++
  tests/qemuxml2xmltest.c                            |  1 +
  5 files changed, 88 insertions(+), 9 deletions(-)
  create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-rawio.xml

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 94236dd..07640af 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1774,7 +1774,7 @@
            <dt><code>rawio</code> attribute
            <span class="since">since 0.9.10</span></dt>
              <dd>
-            Indicates whether the disk is needs rawio capability; valid
+            Indicates whether the disk needs rawio capability. Valid
              settings are "yes" or "no" (default is "no"). If any one disk
              in a domain has rawio='yes', rawio capability will be enabled
              for all disks in the domain (because, in the case of QEMU, this
@@ -2884,7 +2884,7 @@
  <pre>
    ...
    &lt;devices&gt;
-    &lt;hostdev mode='subsystem' type='scsi'&gt;
+    &lt;hostdev mode='subsystem' type='scsi' sgio='filtered' rawio='yes'&gt;
        &lt;source&gt;
          &lt;adapter name='scsi_host0'/&gt;
          &lt;address type='scsi' bus='0' target='0' unit='0'/&gt;
@@ -2943,7 +2943,13 @@
              (<span class="since">since 1.0.6</span>) attribute indicates
              whether the kernel will filter unprivileged SG_IO commands for
              the disk, valid settings are "filtered" or "unfiltered".
-            The default is "filtered".
+            The default is "filtered". The optional <code>rawio</code>
+            (<span class="since">since 1.2.9</span>) attribute indicates
+            whether the lun needs the rawio capability. Valid settings are
+            "yes" or "no". See the rawio description within the
+            <a href="#elementsDisks">disk</a> section.
+            If a disk lun in the domain already has the rawio capability,
+            then this setting not required.
            </dd>
          </dl>
        </dd>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index cedceae..84f0b28 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1224,12 +1224,7 @@
              </choice>
            </attribute>
            <optional>
-            <attribute name="rawio">
-              <choice>
-                <value>yes</value>
-                <value>no</value>
-              </choice>
-            </attribute>
+            <ref name="rawIO"/>
            </optional>
            <optional>
              <attribute name="sgio">
@@ -3608,6 +3603,9 @@
          </choice>
        </attribute>
      </optional>
+    <optional>
+      <ref name="rawIO"/>
+    </optional>
      <element name="source">
        <choice>
          <group>  <!-- scsi_host adapter -->
@@ -4972,4 +4970,12 @@
        </optional>
      </element>
    </define>
+  <define name="rawIO">
+    <attribute name="rawio">
+      <choice>
+        <value>yes</value>
+        <value>no</value>
+      </choice>

or instead of enumerating the possible values just:
<ref name="virYesNo"/>

+    </attribute>
+  </define>
  </grammar>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index aac78a6..c1f23bc 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4482,6 +4482,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
      xmlNodePtr sourcenode;
      char *managed = NULL;
      char *sgio = NULL;
+    char *rawio = NULL;
      char *backendStr = NULL;
      int backend;
      int ret = -1;
@@ -4499,6 +4500,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
      }

      sgio = virXMLPropString(node, "sgio");
+    rawio = virXMLPropString(node, "rawio");

      /* @type is passed in from the caller rather than read from the
       * xml document, because it is specified in different places for
@@ -4550,6 +4552,26 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
          }
      }

+    if (rawio) {
+        if (def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) {
+            virReportError(VIR_ERR_XML_ERROR, "%s",
+                           _("rawio is only supported for scsi host device"));
+            goto error;
+        }
+
+        scsisrc->rawio_specified = true;
+        if (STREQ(rawio, "yes")) {
+            scsisrc->rawio = 1;
+        } else if (STREQ(rawio, "no")) {
+            scsisrc->rawio = 0;
+        } else {
+            virReportError(VIR_ERR_XML_ERROR,
+                           _("unknown hostdev rawio setting '%s'"),
+                           rawio);
+            goto error;
+        }

You can save a few lines if you use the virTristateBoolTypeFromString().

+    }
+
      switch (def->source.subsys.type) {
      case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
          if (virDomainHostdevSubsysPCIDefParseXML(sourcenode, def, flags) < 0)
@@ -4589,6 +4611,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
   error:
      VIR_FREE(managed);
      VIR_FREE(sgio);
+    VIR_FREE(rawio);
      VIR_FREE(backendStr);
      return ret;
  }
@@ -17639,6 +17662,14 @@ virDomainHostdevDefFormat(virBufferPtr buf,
              scsisrc->sgio)
              virBufferAsprintf(buf, " sgio='%s'",
                                virDomainDeviceSGIOTypeToString(scsisrc->sgio));
+
+        if (def->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI &&
+            scsisrc->rawio_specified) {
+            if (scsisrc->rawio)
+                virBufferAddLit(buf, " rawio='yes'");
+            else
+                virBufferAddLit(buf, " rawio='no'");
+        }

and virTristateBoolFormat()

      }
      virBufferAddLit(buf, ">\n");
      virBufferAdjustIndent(buf, 2);
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-rawio.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-rawio.xml
new file mode 100644
index 0000000..69fdde3
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-rawio.xml
@@ -0,0 +1,35 @@
+<domain type='qemu'>
+  <name>QEMUGuest2</name>
+  <uuid>c7a5fdbd-edaf-9466-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</emulator>
+    <disk type='block' device='disk'>
+      <source dev='/dev/HostVG/QEMUGuest2'/>
+      <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+    </disk>
+    <controller type='scsi' index='0' model='virtio-scsi'/>
+    <controller type='usb' index='0'/>
+    <controller type='ide' index='0'/>
+    <controller type='pci' index='0' model='pci-root'/>
+    <hostdev mode='subsystem' type='scsi' managed='yes' sgio='unfiltered' rawio='yes'>
+      <source>
+        <adapter name='scsi_host0'/>
+        <address bus='0' target='0' unit='0'/>
+      </source>
+      <address type='drive' controller='0' bus='0' target='4' unit='8'/>
+    </hostdev>
+    <memballoon model='virtio'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 03c05da..cca8d0a 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -367,6 +367,7 @@ mymain(void)
      DO_TEST("disk-copy_on_read");
      DO_TEST("hostdev-scsi-shareable");
      DO_TEST("hostdev-scsi-sgio");
+    DO_TEST("hostdev-scsi-rawio");

      DO_TEST_DIFFERENT("hostdev-scsi-autogen-address");



Michal


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