Merge pull request #22952 from poettering/rework-kvm-hyperv

virt: tweak kvm with hyperv enlightenments
2022-04-04 22:53:56 +09:00
parent cc97a3a5e8 0ee2d5b2a9
commit d315b47e2d
9 changed files with 146 additions and 138 deletions
@@ -459,7 +459,8 @@ static int condition_test_group(Condition *c, char **env) {
 }

 static int condition_test_virtualization(Condition *c, char **env) {
-        int b, v;
+        Virtualization v;
+        int b;

        assert(c);
        assert(c->parameter);
@@ -475,7 +476,7 @@ static int condition_test_virtualization(Condition *c, char **env) {
        /* First, compare with yes/no */
        b = parse_boolean(c->parameter);
        if (b >= 0)
-                return b == !!v;
+                return b == (v != VIRTUALIZATION_NONE);

        /* Then, compare categorization */
        if (streq(c->parameter, "vm"))