qemu: deprecate QEMU_CAPS_SMBIOS_TYPE

Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index db519ac046fa10a75921d639747563b7fb32cf27..d3fc40076841254c075bc3ee8567b7fef327d352 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3631,7 +3631,6 @@ static qemuMonitorCallbacks callbacks = {
 static void
 virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 {
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMBIOS_TYPE);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_VGA_NONE);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_AIO);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEVMC);

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 02e98b87a13d18da5e5757adf09e7ca2bab05498..737c1d952ffa6e3a3fbe57725a421d319af16490 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -108,7 +108,7 @@ typedef enum {
     QEMU_CAPS_NESTING, /* -enable-nesting (SVM/VMX) */
     X_QEMU_CAPS_NAME_PROCESS, /* Is -name process= available */
     X_QEMU_CAPS_DRIVE_READONLY, /* -drive readonly=on|off */
-    QEMU_CAPS_SMBIOS_TYPE, /* Is -smbios type= available */
+    X_QEMU_CAPS_SMBIOS_TYPE, /* Is -smbios type= available */
 
     /* 45 */
     X_QEMU_CAPS_VGA_QXL, /* The 'qxl' arg for '-vga' */

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 58b8dd8c0c0d9db0fbc1d8f2765d43cac4c81631..c3dd06e2990e00dd70510bfb7cb5f80db6044d62 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5906,8 +5906,7 @@ qemuBuildSmbiosChassisStr(virSysinfoChassisDefPtr def)
 static int
 qemuBuildSmbiosCommandLine(virCommandPtr cmd,
                            virQEMUDriverPtr driver,
-                           const virDomainDef *def,
-                           virQEMUCapsPtr qemuCaps)
+                           const virDomainDef *def)
 {
     size_t i;
     virSysinfoDefPtr source = NULL;
@@ -5917,13 +5916,6 @@ qemuBuildSmbiosCommandLine(virCommandPtr cmd,
         def->os.smbios_mode == VIR_DOMAIN_SMBIOS_EMULATE)
         return 0;
 
-    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMBIOS_TYPE)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("the QEMU binary %s does not support smbios settings"),
-                       def->emulator);
-        return -1;
-    }
-
     /* should we really error out or just warn in those cases ? */
     if (def->os.smbios_mode == VIR_DOMAIN_SMBIOS_HOST) {
         if (driver->hostsysinfo == NULL) {
@@ -9972,7 +9964,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
     virUUIDFormat(def->uuid, uuid);
     virCommandAddArgList(cmd, "-uuid", uuid, NULL);
 
-    if (qemuBuildSmbiosCommandLine(cmd, driver, def, qemuCaps) < 0)
+    if (qemuBuildSmbiosCommandLine(cmd, driver, def) < 0)
         goto error;
 
     /*

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index b03e0db346f0e107b43ba392272de5d61eb1879f..edfd53315bdfdba6fcb77d681168fa36db6613ed 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='smbios-type'/>
   <flag name='spice'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index cc80ca13d2e2cb66ecce62b93e35551e5fc35a5d..bd2d90954cdb1ef2e232279a2d2d93c2c23ecb63 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='smbios-type'/>
   <flag name='spice'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index 5799f1ae3b52d66bd48b2f28fcde0aef24555726..57d4168075537b578151bb4e6444df2118e5cb7b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='smbios-type'/>
   <flag name='spice'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index a8197113c2c06197bc16f83a8b3e6d005033705c..5854333123f048c118f4e3d0feec502d51236f0c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='smbios-type'/>
   <flag name='spice'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index 8137ac7def410d27fe7762b086122154cc0d917d..d69b980bc7c5f5c425a13102adc3a6153976393c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='smbios-type'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index d9d14467136cb3b9d6e9ef4b0337f29a7ca97a47..50e86a62cab5d504bf1a2dfa095539c3704eedd4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='smbios-type'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index fd42fecf4e89b07220b116393fa3a16425e40486..f73ac4923bb165d6081de797a60c6efbb4670b99 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='smbios-type'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='drive-aio'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 394b99dc5439d1160372982e3e577d6b5b498707..841ddbfabe14718ddcb8a4bc42819f60ef286d60 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='smbios-type'/>
   <flag name='spice'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 82a44930de130dc5cfd6820d633624759d938bce..d7255844c0a29bf8984b29f08087b6663ff32b30 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='smbios-type'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='drive-aio'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index f8cd0a72b76739a7269098ca541a7e22722cc6b1..daa07c1cab379e2167d2bd3a6533f9fe7ddfd0ff 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='smbios-type'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index ad61e7bd2f8a01cb6b1aa7dccf28b702aa569f2f..aeabb64f656583bad29b69801dca916ad6abea61 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='smbios-type'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 3137e32bebad78d1e8b4e866795bf32a7534dbe6..9a61cb0ca6e8db751214cfb1bccd0d0644f55b59 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='enable-kvm'/>
-  <flag name='smbios-type'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='drive-aio'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 23f7132fed93e1e1d43605708554fee119603a6d..453cf73716fb0889a2b967f8e59c84f2772e80ad 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
-  <flag name='smbios-type'/>
   <flag name='spice'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index cbf4b358eb5c93d93c1ce645cbf54b8cac664bcf..f1627ab7b194c043d663b0b595cd157b22428200 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='smbios-type'/>
   <flag name='spice'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 9e9c3ddb96244c9cf096ccd7b88d95652dc7ee42..89fef00c4152a2836eb5e83628858c38fc353e8e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='smbios-type'/>
   <flag name='spice'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index 0fe16efcf4d5997dfd82f766aea694964500b5b1..ba050f4bde450658e404e8683c981ca09c7de9ba 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='smbios-type'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index e5db343d063b955736520f83dee9f17811395141..7db11051e6b3019d5d54b81a2efa578942347552 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='smbios-type'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 21a4f51923d083a936cb1ff6d0c72faff141059f..2d841414eb8985cc4109b7a0cc8881557fe37787 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='smbios-type'/>
   <flag name='spice'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index adfc6cb44a13c8bc82f18dda0c5ecc9eb0c5a79f..e5c51082e9f97ef3fd8f14c39268878d50ee27f7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='smbios-type'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='drive-aio'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index f6355a5c462f1dcad41dd0c7afabf54a9b5387d3..3a973588bc3b9d6aef27de50ac746c3eb19a4988 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='smbios-type'/>
   <flag name='spice'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index ecec216da3e72e3ac471651ff21cb5d579d77b46..eb10d11f30983f49f636a9c43e0a624d812e1a02 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='smbios-type'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='drive-aio'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 7f5454d68fabdc4f7c9950835deb7374f0c3978a..18eebf10f9640b6044e1c07fc0ccafafbf78ac3c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='smbios-type'/>
   <flag name='spice'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index c51dc12a36e38242f6c32121ae4402da7d05c1c5..4d61a7768ee8f31a11ac274b5a34e1bb9e852be8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='smbios-type'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index d493a8f504144014561725f92285f8bef40fe4f1..6ab4e980a88c88dda4200a6e92a4e42fa7fc5223 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='smbios-type'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>
   <flag name='drive-aio'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index a9b127967d729cbbcf14dbac9521d13cd4828bfc..fb2ad3e0723885f002ae1ca753fa56a4e3bcfaac 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='smbios-type'/>
   <flag name='spice'/>
   <flag name='vga-none'/>
   <flag name='boot-index'/>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 1fe7175542c86fe22b4ef158a3318a8273009a93..19bb68539c10ec7965d50470444678753eafa691 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1465,9 +1465,9 @@ mymain(void)
     DO_TEST_PARSE_ERROR("usb-controller-qemu-xhci-limit",
                         QEMU_CAPS_DEVICE_QEMU_XHCI);
 
-    DO_TEST("smbios", QEMU_CAPS_SMBIOS_TYPE);
-    DO_TEST_PARSE_ERROR("smbios-date", QEMU_CAPS_SMBIOS_TYPE);
-    DO_TEST_PARSE_ERROR("smbios-uuid-match", QEMU_CAPS_SMBIOS_TYPE);
+    DO_TEST("smbios", NONE);
+    DO_TEST_PARSE_ERROR("smbios-date", NONE);
+    DO_TEST_PARSE_ERROR("smbios-uuid-match", NONE);
 
     DO_TEST("watchdog", NONE);
     DO_TEST("watchdog-device", NONE);