From nobody Mon Feb 9 07:26:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623423129; cv=none; d=zohomail.com; s=zohoarc; b=Dt9Fk+TQoEABtyBWUiOMZcpeqVdLCLypQFWqu8TNIQolYUWoMl+b084iFYtNPP4sZEPLpkv7EEMmrG79231iiLJx5dGnAkZEna76XVrXHGRI4BugpeCiExWZ2aLf++n5QkXQpNAK9rU51HzmcvqDqqa6YAsIRDf1blXq82KdQgE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623423129; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ncoM6p3oPRD60kTuFEfuofF88DOGWZ7pE71zZfOBldw=; b=Oh8JZAZzqw7tUe5ywRT0gMJNNER2JXsqLg36GJpARQdyprhySf/bO+gEgGds1nI9z4nC2NKhGZsyMB88vZAE4y+96109naeFPq4kSOFrjr7Xgx7zRxxG10MHP1Zws7eBB3CTc1V/YEFGUj+xbE0kxb4NHRsXK5kpW9a5AgSoZQ4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1623423129592329.7183425633077; Fri, 11 Jun 2021 07:52:09 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-299-G6mvS5oXNISnkFerRwJuOA-1; Fri, 11 Jun 2021 10:50:48 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id D8F3E1084F4A; Fri, 11 Jun 2021 14:50:42 +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 B981916935; Fri, 11 Jun 2021 14:50:42 +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 83D921809CBD; Fri, 11 Jun 2021 14:50:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15BEnPts007689 for ; Fri, 11 Jun 2021 10:49:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id B466A60FC2; Fri, 11 Jun 2021 14:49:25 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 231A160C05 for ; Fri, 11 Jun 2021 14:49:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623423128; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ncoM6p3oPRD60kTuFEfuofF88DOGWZ7pE71zZfOBldw=; b=CrSF+QfjUBGBykeaCnSvXSbY9u5JYAMOV9aEb8hLFdlHswnZD77q/ftvFa4Mvh3dE52mTG Hree1TzgfefLaIZwQgM7BrNjeUhKbqvPG0dLm/+RHBkpmYCqcv+yRqejursyhcXivXfagw kD6izAXLjh/QDup1Jc3C6crOyuxQn1Y= X-MC-Unique: G6mvS5oXNISnkFerRwJuOA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 10/22] qemu: domain: Remove hack for 's390-virtio' machine Date: Fri, 11 Jun 2021 16:49:01 +0200 Message-Id: <93e00071f9c47e8833c5e70a648b5f53c195c08c.1623422565.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" qemuDomainDefAddDefaultDevices skipped adding the memballoon for the 's390-virtio' machine type, but since it was removed in qemu 2.6 we can remove the hack now. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7f57cae00e..18b5403974 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3883,10 +3883,6 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, def->memballoon =3D memballoon; } - if (STRPREFIX(def->os.machine, "s390-virtio") && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_S390) && def->memballoon) - def->memballoon->model =3D VIR_DOMAIN_MEMBALLOON_MODEL_NONE; - if (addDefaultUSBMouse) { bool hasUSBTablet =3D false; size_t j; --=20 2.31.1