q-dev: update qubes.rng and fix tests

Author: piotrbartman

relaxng/qubes.rng

@@ -205,7 +205,7 @@ the parser will complain about missing combine= attribute on the second <start>.
                     <oneOrMore>
                         <element name="device">
                             <doc:description>
-                                One device. It's identified by by a pair of
+                                One device. It's identified by a pair of
                                 backend domain and some identifier (device class
                                 dependant).
                             </doc:description>
@@ -222,6 +222,27 @@ the parser will complain about missing combine= attribute on the second <start>.
                                     <param name="pattern">[0-9a-f]{2}_[0-9a-f]{2}.[0-9a-f]{2}</param>
                                 </data>
                             </attribute>
+                            <zeroOrMore>
+                                <attribute name="identity">
+                                  <doc:description>
+                                      Device presented identity.
+                                  </doc:description>
+                                    <data type="string">
+                                        <param name="pattern">[A-Za-z0-9\*\:\-]+</param>
+                                    </data>
+                                </attribute>
+                            </zeroOrMore>
+                            <zeroOrMore>
+                                <attribute name="mode">
+                                  <doc:description>
+                                      Available values: 'required', 'auto-attach', 'ask-to-attach'.
+                                      If not present: 'required' is assumed.
+                                  </doc:description>
+                                    <data type="string">
+                                        <param name="pattern">[a-z_-]+</param>
+                                    </data>
+                                </attribute>
+                            </zeroOrMore>
                             <zeroOrMore>
                                 <attribute name="required">
                                   <doc:description>