From nobody Fri May 3 21:17:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 15199564509671011.7014261041905; Thu, 1 Mar 2018 18:07:30 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 31CF9C0587E5; Fri, 2 Mar 2018 02:07:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C338E60BE7; Fri, 2 Mar 2018 02:07:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 863E818033ED; Fri, 2 Mar 2018 02:07:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2227QSW008309 for ; Thu, 1 Mar 2018 21:07:26 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1F69B5F713; Fri, 2 Mar 2018 02:07:26 +0000 (UTC) Received: from mx1.redhat.com (ext-mx06.extmail.prod.ext.phx2.redhat.com [10.5.110.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0CB934AB; Fri, 2 Mar 2018 02:07:23 +0000 (UTC) Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AE86D356E9; Fri, 2 Mar 2018 02:07:21 +0000 (UTC) Received: by mail-lf0-f67.google.com with SMTP id y19so11253428lfd.4; Thu, 01 Mar 2018 18:07:21 -0800 (PST) Received: from localhost.localdomain ([93.175.8.138]) by smtp.gmail.com with ESMTPSA id r13sm1092297ljd.60.2018.03.01.18.07.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Mar 2018 18:07:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=y5uzUlNWNCDUOUIq5MfrcBEquA65DBPmOK+yd/ssER8=; b=jbEFqN4jTzWBmA/GihP4RRxlQDrG7xgLqNppvGAqhhV37e1BcJdhoygtHWSM2rH1dC NiDkL2Xke0nbn24neHA7zJ69l/tDa8pkMzj5SHoq8b4PWn+8aDE2Dum06imdSn5URq09 3SlxSUTogWfcrhM++dfqXD8PlIfOqKO8OkBi8GSXK7YsNGPYI89LxWWpHH024wyFsl40 pT/hU6g0G2tLIw8V8B08DlxqBzC5R2+uFTAYzejXEHDmg3yiOBWDA62LCavNrbzN2U5G CWqFUyMO3TS87esR8kZfQT8CSmLIUjC5P92/++4KUjbj+TCKzzGds5eBhMZxXRgJNg77 DIfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=y5uzUlNWNCDUOUIq5MfrcBEquA65DBPmOK+yd/ssER8=; b=l9Y1/phTK/mNneVS7TRsk8RaqEup/qLcf18bwjxMNSG9yU9yCEPoHTq+oIj9Jkpi+T 5mImnHvgpwqPVgdLgSwBRRfp1dmCBiP8J/piTIUAt7BDbf9OU7+ZWsKOG89cCEiw19Qo LT089GB+RWn+D8v0rBA+Gk6AeSbCphI+r/nWTRPfgLVZHQLrA661ibLCVjRnUcFIWlku rTOUN9/1Mcnr4TA+gw5cj6oU4tN+gfCmoiE6BEKfp7C7IYwfKz510e/Ib7HUdPIfYpZu NnkVc417eXJKXDBI8Fq53Mgi5gFEa+yx1Eq9a7AwK28R+wb7E7AHCh+U6S1euxeKM2Fn 3caQ== X-Gm-Message-State: AElRT7Hnr5sykqH2DUJcqAa0ILnB9mroeIMsYXcVv97Lq4KMQKpdhPsC aOqWaW4PO+/1Z0MEuJXsJxInFQ== X-Google-Smtp-Source: AG47ELs8vNnK5qOOqwegy25670Hx2nqvIEJ6uX/NiKil4dNppfaXAXQBzs1z25xyHf4v/73CKSBLYA== X-Received: by 10.25.81.141 with SMTP id g13mr2659749lfl.19.1519956439770; Thu, 01 Mar 2018 18:07:19 -0800 (PST) From: Klim Kireev To: libvir-list@redhat.com Date: Fri, 2 Mar 2018 05:07:16 +0300 Message-Id: <20180302020716.32379-1-klim.s.kireev@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 02 Mar 2018 02:07:22 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 02 Mar 2018 02:07:22 +0000 (UTC) for IP:'209.85.215.67' DOMAIN:'mail-lf0-f67.google.com' HELO:'mail-lf0-f67.google.com' FROM:'klim.s.kireev@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.13 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 209.85.215.67 mail-lf0-f67.google.com 209.85.215.67 mail-lf0-f67.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.30 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: mprivozn@redhat.com Subject: [libvirt] [PATCH] qemu: remove unused QEMU_CAPS_ENABLE_KVM X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 02 Mar 2018 02:07:29 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" It needs for the -enable-kvm flag. This qemu flag can be compiled out, but we already detect that case with the QEMU_CAPS_KVM check. So this check is redundant and can be removed Signed-off-by: Klim Kireev --- src/qemu/qemu_capabilities.c | 13 +------------ src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 14 ++------------ tests/qemucaps2xmldata/all_1.6.0-1.caps | 2 +- tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps | 2 +- tests/qemuhelptest.c | 8 +++----- tests/qemuxml2argvdata/controller-order.args | 1 - tests/qemuxml2argvdata/cpu-host-kvmclock.args | 1 - tests/qemuxml2argvdata/cpu-kvmclock.args | 1 - tests/qemuxml2argvtest.c | 11 +++++------ 10 files changed, 14 insertions(+), 41 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b5eb8cf46..2a373d3a2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1091,7 +1091,6 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, =20 if (virFileExists("/dev/kvm") && (virQEMUCapsGet(qemubinCaps, QEMU_CAPS_KVM) || - virQEMUCapsGet(qemubinCaps, QEMU_CAPS_ENABLE_KVM) || kvmbin)) haskvm =3D true; =20 @@ -1260,7 +1259,7 @@ virQEMUCapsComputeCmdFlags(const char *help, if (strstr(help, "-no-kvm")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_KVM); if (strstr(help, "-enable-kvm")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_ENABLE_KVM); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_KVM); if (strstr(help, ",process=3D")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME_PROCESS); =20 @@ -3201,7 +3200,6 @@ virQEMUCapsProbeQMPKVMState(virQEMUCapsPtr qemuCaps, virQEMUCapsClear(qemuCaps, QEMU_CAPS_KVM); } else if (!enabled) { virQEMUCapsClear(qemuCaps, QEMU_CAPS_KVM); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_ENABLE_KVM); } =20 return 0; @@ -4388,15 +4386,6 @@ virQEMUCapsIsValid(void *data, kvmUsable =3D virFileAccessibleAs("/dev/kvm", R_OK | W_OK, priv->runUid, priv->runGid) =3D=3D 0; =20 - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_ENABLE_KVM) && - kvmUsable) { - VIR_DEBUG("KVM was not enabled when probing '%s', " - "but it should be usable now", - qemuCaps->binary); - return false; - } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM) && !kvmUsable) { VIR_DEBUG("KVM was enabled when probing '%s', " diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index c2ec2be19..11a10b2f6 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -79,7 +79,7 @@ typedef enum { X_QEMU_CAPS_XEN_DOMID, /* -xen-domid */ X_QEMU_CAPS_MIGRATE_QEMU_UNIX, /* qemu migration via unix sockets */ X_QEMU_CAPS_CHARDEV, /* Is the new -chardev arg available */ - QEMU_CAPS_ENABLE_KVM, /* -enable-kvm flag */ + X_QEMU_CAPS_ENABLE_KVM, /* -enable-kvm flag */ QEMU_CAPS_MONITOR_JSON, /* JSON mode for monitor */ =20 /* 25 */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9b1affd30..a68bf088e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6992,13 +6992,10 @@ qemuBuildObsoleteAccelArg(virCommandPtr cmd, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { - bool disableKVM =3D false; - bool enableKVM =3D false; - switch ((int)def->virtType) { case VIR_DOMAIN_VIRT_QEMU: if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) - disableKVM =3D true; + virCommandAddArg(cmd, "-no-kvm"); break; =20 case VIR_DOMAIN_VIRT_KQEMU: @@ -7007,9 +7004,7 @@ qemuBuildObsoleteAccelArg(virCommandPtr cmd, break; =20 case VIR_DOMAIN_VIRT_KVM: - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ENABLE_KVM)) { - enableKVM =3D true; - } else if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("the QEMU binary does not support kvm")); return -1; @@ -7023,11 +7018,6 @@ qemuBuildObsoleteAccelArg(virCommandPtr cmd, return -1; } =20 - if (disableKVM) - virCommandAddArg(cmd, "-no-kvm"); - if (enableKVM) - virCommandAddArg(cmd, "-enable-kvm"); - return 0; } =20 diff --git a/tests/qemucaps2xmldata/all_1.6.0-1.caps b/tests/qemucaps2xmlda= ta/all_1.6.0-1.caps index d39d0bebb..35b737a40 100644 --- a/tests/qemucaps2xmldata/all_1.6.0-1.caps +++ b/tests/qemucaps2xmldata/all_1.6.0-1.caps @@ -2,7 +2,7 @@ - + diff --git a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps b/tests/qem= ucaps2xmldata/nodisksnapshot_1.6.0-1.caps index 5a0372c91..5e99e7d43 100644 --- a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps +++ b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps @@ -2,7 +2,7 @@ - + diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 1336eeef5..fb1998c84 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -147,7 +147,7 @@ mymain(void) =20 DO_TEST("qemu-0.12.1", 12001, 0, 0, QEMU_CAPS_DRIVE_SERIAL, - QEMU_CAPS_ENABLE_KVM, + QEMU_CAPS_KVM, QEMU_CAPS_SDL, QEMU_CAPS_RTC, QEMU_CAPS_NO_HPET, @@ -182,7 +182,6 @@ mymain(void) QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_MEM_PATH, QEMU_CAPS_SDL, - QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_RTC, QEMU_CAPS_NO_HPET, QEMU_CAPS_NO_KVM_PIT, @@ -220,7 +219,6 @@ mymain(void) QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_MEM_PATH, QEMU_CAPS_SDL, - QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_NETDEV, QEMU_CAPS_RTC, @@ -267,7 +265,7 @@ mymain(void) QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_MEM_PATH, QEMU_CAPS_SDL, - QEMU_CAPS_ENABLE_KVM, + QEMU_CAPS_KVM, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_NETDEV, QEMU_CAPS_RTC, @@ -338,7 +336,7 @@ mymain(void) QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_MEM_PATH, QEMU_CAPS_SDL, - QEMU_CAPS_ENABLE_KVM, + QEMU_CAPS_KVM, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_NETDEV, QEMU_CAPS_RTC, diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2a= rgvdata/controller-order.args index 70a8ba9ce..fea56cc05 100644 --- a/tests/qemuxml2argvdata/controller-order.args +++ b/tests/qemuxml2argvdata/controller-order.args @@ -8,7 +8,6 @@ QEMU_AUDIO_DRV=3Dspice \ -name fdr \ -S \ -M rhel6.1.0 \ --enable-kvm \ -m 4096 \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args b/tests/qemuxml2= argvdata/cpu-host-kvmclock.args index 1e45f0558..b82962b23 100644 --- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args @@ -8,7 +8,6 @@ QEMU_AUDIO_DRV=3Dnone \ -name QEMUGuest1 \ -S \ -M pc \ --enable-kvm \ -cpu host,-kvmclock \ -m 214 \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args b/tests/qemuxml2argvd= ata/cpu-kvmclock.args index 358b9be05..06a96ae4b 100644 --- a/tests/qemuxml2argvdata/cpu-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-kvmclock.args @@ -8,7 +8,6 @@ QEMU_AUDIO_DRV=3Dnone \ -name QEMUGuest1 \ -S \ -M pc \ --enable-kvm \ -cpu core2duo,-kvmclock \ -m 214 \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 688846b9b..67836a936 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -796,16 +796,15 @@ mymain(void) DO_TEST("clock-france", QEMU_CAPS_RTC); DO_TEST("clock-hpet-off", QEMU_CAPS_RTC); DO_TEST("clock-catchup", QEMU_CAPS_RTC); - DO_TEST("cpu-kvmclock", QEMU_CAPS_ENABLE_KVM); - DO_TEST("cpu-host-kvmclock", QEMU_CAPS_ENABLE_KVM); + DO_TEST("cpu-kvmclock", QEMU_CAPS_KVM); + DO_TEST("cpu-host-kvmclock", QEMU_CAPS_KVM); DO_TEST("kvmclock", QEMU_CAPS_KVM); DO_TEST("clock-timer-hyperv-rtc", QEMU_CAPS_KVM); =20 - DO_TEST("cpu-eoi-disabled", QEMU_CAPS_ENABLE_KVM); - DO_TEST("cpu-eoi-enabled", QEMU_CAPS_ENABLE_KVM); + DO_TEST("cpu-eoi-disabled", NONE); + DO_TEST("cpu-eoi-enabled", NONE); DO_TEST("controller-order", QEMU_CAPS_KVM, - QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_BOOT_MENU, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_PCI_MULTIFUNCTION, @@ -821,7 +820,7 @@ mymain(void) DO_TEST("eoi-enabled", NONE); DO_TEST("pv-spinlock-disabled", NONE); DO_TEST("pv-spinlock-enabled", NONE); - DO_TEST("kvmclock+eoi-disabled", QEMU_CAPS_ENABLE_KVM); + DO_TEST("kvmclock+eoi-disabled", NONE); =20 DO_TEST("hyperv", NONE); DO_TEST("hyperv-off", NONE); --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list