[PATCH 06/17] libxl: change xenDomainDefAddImplicitInputDevice() to return void

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

 



It can't fail.

Signed-off-by: Laine Stump <laine@xxxxxxxxxx>
---
 src/libxl/libxl_domain.c | 3 +--
 src/libxl/xen_common.c   | 4 +---
 src/libxl/xen_common.h   | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 6805160923..c7ba5636c4 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -266,8 +266,7 @@ libxlDomainDefPostParse(virDomainDef *def,
     }
 
     /* add implicit input devices */
-    if (xenDomainDefAddImplicitInputDevice(def) < 0)
-        return -1;
+    xenDomainDefAddImplicitInputDevice(def);
 
     /* For x86_64 HVM */
     if (def->os.type == VIR_DOMAIN_OSTYPE_HVM &&
diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c
index c9c8ed2fde..d82e33600f 100644
--- a/src/libxl/xen_common.c
+++ b/src/libxl/xen_common.c
@@ -2392,7 +2392,7 @@ xenFormatConfigCommon(virConf *conf,
 }
 
 
-int
+void
 xenDomainDefAddImplicitInputDevice(virDomainDef *def)
 {
     virDomainInputBus implicitInputBus = VIR_DOMAIN_INPUT_BUS_XEN;
@@ -2402,6 +2402,4 @@ xenDomainDefAddImplicitInputDevice(virDomainDef *def)
 
     virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, implicitInputBus);
     virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, implicitInputBus);
-
-    return 0;
 }
diff --git a/src/libxl/xen_common.h b/src/libxl/xen_common.h
index 95408fa896..c52a4f1232 100644
--- a/src/libxl/xen_common.h
+++ b/src/libxl/xen_common.h
@@ -65,4 +65,4 @@ int xenFormatConfigCommon(virConf *conf,
 
 char *xenMakeIPList(virNetDevIPInfo *guestIP);
 
-int xenDomainDefAddImplicitInputDevice(virDomainDef *def);
+void xenDomainDefAddImplicitInputDevice(virDomainDef *def);
-- 
2.47.1




[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