[libvirt] [PATCH 7/7] Remove useless os.machine NULL check

Ján Tomko jtomko at redhat.com
Tue May 3 10:47:27 UTC 2016


In qemuDomainDefAddDefaultDevices we check for a non-NULL
def->os.machine for x86 archs, but not the others.

Moreover, the only caller - qemuDomainDefPostParse
already checks for it and even then it can happen only
if /etc/libvirt contains an XML without a machine type.
---
 src/qemu/qemu_domain.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 53682c1..173f82c 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1734,8 +1734,6 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def,
     switch (def->os.arch) {
     case VIR_ARCH_I686:
     case VIR_ARCH_X86_64:
-        if (!def->os.machine)
-            break;
         if (STREQ(def->os.machine, "isapc")) {
             addDefaultUSB = false;
             break;
-- 
2.7.3




More information about the libvir-list mailing list