From nobody Sat Feb 7 15:10:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1687438862; cv=none; d=zohomail.com; s=zohoarc; b=jdIxT96OTWb0bOI8BsEss0LiBk2Gaza3hxEfnTHW9gbZJ9SF6nE8MUMbuPMe2UufP/ghVnqRiEmieIQV7fgL8T3SfVaTrcoLfm4JJ5L+jewbFb9BYmy9gVNIZzPl5MC8ODqv/Mcab9XHo6Ja8jjD673XiipNQFO3ZMietbkNQFw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1687438862; 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=wZHixj89RgF2R0VihmWgOW2nIzr3C7QkppVdlpjaTqs=; b=ikt+PZCkv+QluLygGKmDGn8xrkSHzAHyoD0zBnwh4swWW/WaQOXvKOq5vktDV5y71ZZj76HDah7pNolCJgvqFrChtbWkF6A7gXViDvEmnJ34SRttCb7zB0ZpDIBWiKdaHzu0kK2OjB+ApwgyJGiBvX0iKohivfMkDkFdRP9UEhw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1687438862862930.8240192743126; Thu, 22 Jun 2023 06:01:02 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-330-5fYa2mbLN5uCuauZfxJk2Q-1; Thu, 22 Jun 2023 09:00:46 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0DDEC38117E1; Thu, 22 Jun 2023 13:00:19 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D3E3114682F8; Thu, 22 Jun 2023 13:00:18 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 85EA71946588; Thu, 22 Jun 2023 13:00:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 874BC1946588 for ; Thu, 22 Jun 2023 12:58:28 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6E195C1ED97; Thu, 22 Jun 2023 12:58:28 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8AEE1C1ED98 for ; Thu, 22 Jun 2023 12:58:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687438861; 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=wZHixj89RgF2R0VihmWgOW2nIzr3C7QkppVdlpjaTqs=; b=WiRDvl6Y0gzd7wTzUGXx0BUScJO1VOh7f7AED3egMqS2w7q5dMItNVobbxq7YFQmeZ+F04 +MpvA6lagCkJfEzRGIWixEEs3mkL1VEx8Mhf0K5O5GXCCKF1cA3HUvEco0ZtvQ+HHCq9KE txe2z8yv4iaajQ4HJRQ7ToP/VwJqvvc= X-MC-Unique: 5fYa2mbLN5uCuauZfxJk2Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/4] qemu_command: Always use modern syntax of '-m' Date: Thu, 22 Jun 2023 14:58:18 +0200 Message-Id: <745872e4951c2dd8d7ab87c7f3c4ad86d74789ef.1687436914.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1687438864936100001 Content-Type: text/plain; charset="utf-8" Specify the memory size by using '-m size=3D2048k' instead of just '-m 2'. The new syntax is used when memory hotplug is enabled. To preserve memory sizing, if memory hotplug is disabled the size is rounded down to the nearest mebibyte. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 24 ++++++++++++------- ...ch64-aavmf-virtio-mmio.aarch64-latest.args | 2 +- ...arch64-cpu-passthrough.aarch64-latest.args | 2 +- ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 2 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 2 +- .../aarch64-features-sve.aarch64-latest.args | 2 +- .../aarch64-gic-default-both.args | 2 +- .../aarch64-gic-default-v2.args | 2 +- .../aarch64-gic-default-v3.args | 2 +- .../aarch64-gic-default.aarch64-4.2.0.args | 2 +- .../aarch64-gic-default.aarch64-latest.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-host.args | 2 +- .../aarch64-gic-none-both.args | 2 +- .../aarch64-gic-none-tcg.args | 2 +- .../qemuxml2argvdata/aarch64-gic-none-v2.args | 2 +- .../qemuxml2argvdata/aarch64-gic-none-v3.args | 2 +- .../aarch64-gic-none.aarch64-4.2.0.args | 2 +- .../aarch64-gic-none.aarch64-latest.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-v2.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-v3.args | 2 +- .../aarch64-kvm-32-on-64.aarch64-latest.args | 2 +- .../aarch64-pci-serial.aarch64-latest.args | 2 +- .../aarch64-tpm.aarch64-latest.args | 2 +- ...arch64-traditional-pci.aarch64-latest.args | 2 +- ...aarch64-usb-controller.aarch64-latest.args | 2 +- .../aarch64-video-default.aarch64-latest.args | 2 +- ...4-video-virtio-gpu-pci.aarch64-latest.args | 2 +- ...rch64-virt-default-nic.aarch64-latest.args | 2 +- .../aarch64-virt-graphics.aarch64-latest.args | 2 +- .../aarch64-virt-headless.aarch64-latest.args | 2 +- ...rch64-virt-virtio-MMIO.aarch64.latest.args | 2 +- .../aarch64-virt-virtio.aarch64-4.2.0.args | 2 +- .../aarch64-virt-virtio.aarch64-latest.args | 2 +- ...ch64-virtio-pci-default.aarch64-4.2.0.args | 2 +- ...h64-virtio-pci-default.aarch64-latest.args | 2 +- ...o-pci-manual-addresses.aarch64-latest.args | 2 +- tests/qemuxml2argvdata/acpi-table.args | 2 +- .../arm-vexpressa9-basic.aarch64-latest.args | 2 +- .../arm-vexpressa9-nodevs.aarch64-latest.args | 2 +- .../arm-vexpressa9-virtio.aarch64-latest.args | 2 +- .../arm-virt-virtio.aarch64-latest.args | 2 +- .../audio-alsa-best.x86_64-latest.args | 2 +- .../audio-alsa-full.x86_64-latest.args | 2 +- .../audio-alsa-minimal.x86_64-latest.args | 2 +- .../audio-coreaudio-best.x86_64-latest.args | 2 +- .../audio-coreaudio-full.x86_64-latest.args | 2 +- ...audio-coreaudio-minimal.x86_64-latest.args | 2 +- ...udio-default-nographics.x86_64-latest.args | 2 +- .../audio-default-sdl.x86_64-4.2.0.args | 2 +- .../audio-default-sdl.x86_64-latest.args | 2 +- .../audio-default-spice.x86_64-4.2.0.args | 2 +- .../audio-default-spice.x86_64-latest.args | 2 +- .../audio-default-vnc.x86_64-4.2.0.args | 2 +- .../audio-default-vnc.x86_64-latest.args | 2 +- .../audio-file-best.x86_64-latest.args | 2 +- .../audio-file-full.x86_64-latest.args | 2 +- .../audio-file-minimal.x86_64-latest.args | 2 +- .../audio-jack-full.x86_64-latest.args | 2 +- .../audio-jack-minimal.x86_64-latest.args | 2 +- .../audio-many-backends.x86_64-latest.args | 2 +- .../audio-none-best.x86_64-latest.args | 2 +- .../audio-none-full.x86_64-latest.args | 2 +- .../audio-none-minimal.x86_64-latest.args | 2 +- .../audio-oss-best.x86_64-latest.args | 2 +- .../audio-oss-full.x86_64-latest.args | 2 +- .../audio-oss-minimal.x86_64-latest.args | 2 +- .../audio-pulseaudio-best.x86_64-latest.args | 2 +- .../audio-pulseaudio-full.x86_64-latest.args | 2 +- ...udio-pulseaudio-minimal.x86_64-latest.args | 2 +- .../audio-sdl-best.x86_64-latest.args | 2 +- .../audio-sdl-full.x86_64-latest.args | 2 +- .../audio-sdl-minimal.x86_64-latest.args | 2 +- .../audio-spice-best.x86_64-latest.args | 2 +- .../audio-spice-full.x86_64-latest.args | 2 +- .../audio-spice-minimal.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/autoindex.args | 2 +- .../balloon-ccw-deflate.s390x-latest.args | 2 +- .../qemuxml2argvdata/balloon-device-auto.args | 2 +- .../balloon-device-deflate-off.args | 2 +- .../balloon-device-deflate.args | 2 +- .../balloon-device-period.args | 2 +- tests/qemuxml2argvdata/balloon-device.args | 2 +- .../balloon-mmio-deflate.aarch64-latest.args | 2 +- .../blkdeviotune-group-num.x86_64-latest.args | 2 +- ...blkdeviotune-max-length.x86_64-latest.args | 2 +- .../blkdeviotune-max.x86_64-latest.args | 2 +- .../blkdeviotune.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/blkiotune-device.args | 2 +- tests/qemuxml2argvdata/blkiotune.args | 2 +- .../boot-cdrom.x86_64-latest.args | 2 +- .../boot-complex.x86_64-latest.args | 2 +- .../boot-floppy-q35.x86_64-latest.args | 2 +- .../boot-floppy.x86_64-latest.args | 2 +- ...boot-menu-disable-drive.x86_64-latest.args | 2 +- .../boot-menu-disable.x86_64-latest.args | 2 +- ...enu-enable-with-timeout.x86_64-latest.args | 2 +- .../boot-menu-enable.x86_64-latest.args | 2 +- .../boot-multi.x86_64-latest.args | 2 +- .../boot-network.x86_64-latest.args | 2 +- .../boot-order.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/channel-guestfwd.args | 2 +- ...l-qemu-vdagent-features.x86_64-latest.args | 2 +- .../channel-qemu-vdagent.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/channel-spicevmc.args | 2 +- .../channel-unix-guestfwd.x86_64-latest.args | 2 +- .../qemuxml2argvdata/channel-virtio-auto.args | 2 +- .../channel-virtio-autoadd.args | 2 +- .../channel-virtio-autoassign.args | 2 +- .../channel-virtio-default.args | 2 +- .../channel-virtio-state.args | 2 +- .../qemuxml2argvdata/channel-virtio-unix.args | 2 +- tests/qemuxml2argvdata/channel-virtio.args | 2 +- tests/qemuxml2argvdata/chardev-reconnect.args | 2 +- .../clock-absolute.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/clock-catchup.args | 2 +- tests/qemuxml2argvdata/clock-france.args | 2 +- tests/qemuxml2argvdata/clock-hpet-off.args | 2 +- .../clock-localtime-basis-localtime.args | 2 +- tests/qemuxml2argvdata/clock-localtime.args | 2 +- tests/qemuxml2argvdata/clock-realtime.args | 2 +- .../clock-timer-armvtimer.aarch64-latest.args | 2 +- .../clock-timer-hyperv-rtc.args | 2 +- tests/qemuxml2argvdata/clock-utc.args | 2 +- tests/qemuxml2argvdata/clock-variable.args | 2 +- .../qemuxml2argvdata/console-compat-auto.args | 2 +- .../console-compat-auto.x86_64-latest.args | 2 +- .../console-compat-chardev.args | 2 +- .../console-compat-chardev.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/console-compat.args | 2 +- .../console-compat.x86_64-latest.args | 2 +- .../console-sclp.s390x-latest.args | 2 +- .../console-virtio-ccw.s390x-latest.args | 2 +- .../qemuxml2argvdata/console-virtio-many.args | 2 +- .../console-virtio-unix.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/console-virtio.args | 2 +- tests/qemuxml2argvdata/controller-order.args | 2 +- .../controller-usb-order.x86_64-latest.args | 2 +- .../controller-virtio-scsi.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell2.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell3.args | 2 +- ...-Icelake-Server-pconfig.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-cache-disable.args | 2 +- .../qemuxml2argvdata/cpu-cache-disable2.args | 2 +- .../qemuxml2argvdata/cpu-cache-disable3.args | 2 +- .../cpu-cache-emulate-l3.args | 2 +- .../cpu-cache-passthrough.args | 2 +- .../cpu-cache-passthrough2.args | 2 +- .../cpu-check-default-none.args | 2 +- .../cpu-check-default-none2.args | 2 +- .../cpu-check-default-partial.args | 2 +- .../cpu-check-default-partial2.args | 2 +- tests/qemuxml2argvdata/cpu-check-none.args | 2 +- .../cpu-eoi-disabled.x86_64-latest.args | 2 +- .../cpu-eoi-enabled.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-exact1.args | 2 +- .../cpu-exact2-nofallback.args | 2 +- tests/qemuxml2argvdata/cpu-exact2.args | 2 +- tests/qemuxml2argvdata/cpu-fallback.args | 2 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +- .../qemuxml2argvdata/cpu-host-model-cmt.args | 2 +- .../cpu-host-model-fallback.args | 2 +- .../cpu-host-model-vendor.args | 2 +- tests/qemuxml2argvdata/cpu-host-model.args | 2 +- .../cpu-host-model.x86_64-4.2.0.args | 2 +- .../cpu-host-model.x86_64-5.0.0.args | 2 +- .../cpu-host-model.x86_64-5.1.0.args | 2 +- .../cpu-host-model.x86_64-5.2.0.args | 2 +- .../cpu-host-model.x86_64-6.0.0.args | 2 +- .../cpu-host-model.x86_64-6.1.0.args | 2 +- .../cpu-host-model.x86_64-latest.args | 2 +- .../cpu-host-passthrough-features.args | 2 +- .../cpu-host-passthrough.args | 2 +- .../qemuxml2argvdata/cpu-hotplug-startup.args | 2 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +- tests/qemuxml2argvdata/cpu-minimum1.args | 2 +- tests/qemuxml2argvdata/cpu-minimum2.args | 2 +- .../cpu-no-removed-features.args | 2 +- tests/qemuxml2argvdata/cpu-numa-disjoint.args | 2 +- .../qemuxml2argvdata/cpu-numa-memshared.args | 2 +- .../cpu-numa-no-memory-element.args | 2 +- tests/qemuxml2argvdata/cpu-numa1.args | 2 +- tests/qemuxml2argvdata/cpu-numa2.args | 2 +- ...-phys-bits-emulate-bare.x86_64-latest.args | 2 +- .../cpu-phys-bits-emulate.args | 2 +- .../cpu-phys-bits-emulate2.args | 2 +- .../cpu-phys-bits-limit.x86_64-latest.args | 2 +- .../cpu-phys-bits-passthrough.args | 2 +- .../cpu-s390-features.s390x-latest.args | 2 +- .../cpu-s390-zEC12.s390x-latest.args | 2 +- tests/qemuxml2argvdata/cpu-strict1.args | 2 +- tests/qemuxml2argvdata/cpu-topology1.args | 2 +- tests/qemuxml2argvdata/cpu-topology2.args | 2 +- tests/qemuxml2argvdata/cpu-topology3.args | 2 +- .../cpu-translation.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +- .../cputune-cpuset-big-id.x86_64-latest.args | 2 +- .../cputune-numatune.x86_64-latest.args | 2 +- .../cputune-zero-shares.x86_64-latest.args | 2 +- .../cputune.x86_64-latest.args | 2 +- .../default-kvm-host-arch.args | 2 +- .../default-qemu-host-arch.args | 2 +- ...ult-video-type-aarch64.aarch64-latest.args | 2 +- ...default-video-type-ppc64.ppc64-latest.args | 2 +- ...ult-video-type-riscv64.riscv64-latest.args | 2 +- ...default-video-type-s390x.s390x-latest.args | 2 +- .../devices-acpi-index.x86_64-latest.args | 2 +- .../disk-aio-io_uring.x86_64-latest.args | 2 +- .../disk-aio.x86_64-latest.args | 2 +- .../disk-arm-virtio-sd.aarch64-latest.args | 2 +- ...-backing-chains-noindex.x86_64-latest.args | 2 +- .../disk-blockio.x86_64-latest.args | 2 +- .../disk-boot-cdrom.x86_64-latest.args | 2 +- .../disk-boot-disk.x86_64-latest.args | 2 +- .../disk-cache.x86_64-latest.args | 2 +- .../disk-cdrom-bus-other.x86_64-latest.args | 2 +- ...m-empty-network-invalid.x86_64-latest.args | 2 +- .../disk-cdrom-network.x86_64-latest.args | 2 +- .../disk-cdrom-tray.x86_64-latest.args | 2 +- .../disk-cdrom.x86_64-latest.args | 2 +- .../disk-copy_on_read.x86_64-latest.args | 2 +- .../disk-detect-zeroes.x86_64-latest.args | 2 +- .../disk-discard.x86_64-latest.args | 2 +- .../disk-error-policy-s390x.s390x-latest.args | 2 +- .../disk-error-policy.x86_64-latest.args | 2 +- .../disk-floppy-q35.x86_64-latest.args | 2 +- .../disk-floppy-tray.x86_64-latest.args | 2 +- .../disk-floppy.x86_64-latest.args | 2 +- .../disk-fmt-qcow.x86_64-latest.args | 2 +- .../disk-geometry.x86_64-latest.args | 2 +- .../disk-ide-split.x86_64-latest.args | 2 +- .../disk-ide-wwn.x86_64-latest.args | 2 +- .../disk-ioeventfd.x86_64-latest.args | 2 +- .../disk-metadata-cache.x86_64-latest.args | 2 +- .../disk-network-gluster.x86_64-latest.args | 2 +- .../disk-network-http.x86_64-latest.args | 2 +- .../disk-network-iscsi.x86_64-latest.args | 2 +- .../disk-network-nbd.x86_64-latest.args | 2 +- .../disk-network-nfs.x86_64-latest.args | 2 +- ...rbd-encryption-layering.x86_64-latest.args | 2 +- ...rbd-encryption-luks-any.x86_64-latest.args | 2 +- ...-network-rbd-encryption.x86_64-latest.args | 2 +- ...sk-network-rbd-no-colon.x86_64-latest.args | 2 +- .../disk-network-rbd.x86_64-latest.args | 2 +- .../disk-network-sheepdog.x86_64-6.0.0.args | 2 +- ...isk-network-source-auth.x86_64-latest.args | 2 +- ...rk-tlsx509-nbd-hostname.x86_64-latest.args | 2 +- ...disk-network-tlsx509-nbd.x86_64-5.2.0.args | 2 +- ...isk-network-tlsx509-nbd.x86_64-latest.args | 2 +- ...isk-network-tlsx509-vxhs.x86_64-5.0.0.args | 2 +- .../disk-no-boot.x86_64-latest.args | 2 +- .../disk-nvme.x86_64-latest.args | 2 +- .../disk-order.x86_64-latest.args | 2 +- .../disk-readonly-disk.x86_64-latest.args | 2 +- .../disk-rotation.x86_64-latest.args | 2 +- .../disk-sata-device.x86_64-latest.args | 2 +- .../disk-scsi-device-auto.x86_64-latest.args | 2 +- .../disk-scsi-disk-split.x86_64-latest.args | 2 +- .../disk-scsi-disk-vpd.x86_64-latest.args | 2 +- .../disk-scsi-disk-wwn.x86_64-latest.args | 2 +- ...sk-scsi-lun-passthrough.x86_64-latest.args | 2 +- .../disk-scsi.x86_64-latest.args | 2 +- .../disk-serial.x86_64-latest.args | 2 +- .../disk-shared.x86_64-latest.args | 2 +- .../disk-slices.x86_64-latest.args | 2 +- .../disk-snapshot.x86_64-latest.args | 2 +- .../disk-source-fd.x86_64-latest.args | 2 +- .../disk-source-pool-mode.x86_64-latest.args | 2 +- .../disk-source-pool.x86_64-latest.args | 2 +- .../disk-transient.x86_64-latest.args | 2 +- ...sk-usb-device-removable.x86_64-latest.args | 2 +- .../disk-usb-device.x86_64-latest.args | 2 +- .../disk-vhostuser-numa.x86_64-4.2.0.args | 2 +- .../disk-vhostuser-numa.x86_64-latest.args | 2 +- .../disk-vhostuser.x86_64-latest.args | 2 +- .../disk-virtio-ccw-many.s390x-latest.args | 2 +- .../disk-virtio-ccw.s390x-latest.args | 2 +- .../disk-virtio-queues.x86_64-latest.args | 2 +- .../disk-virtio-s390-zpci.s390x-latest.args | 2 +- ...virtio-scsi-reservations.x86_64-5.2.0.args | 2 +- ...irtio-scsi-reservations.x86_64-latest.args | 2 +- .../disk-virtio.x86_64-latest.args | 2 +- .../encrypted-disk-usage.x86_64-latest.args | 2 +- .../encrypted-disk.x86_64-latest.args | 2 +- .../eoi-disabled.x86_64-latest.args | 2 +- .../eoi-enabled.x86_64-latest.args | 2 +- .../event_idx.x86_64-latest.args | 2 +- .../fd-memory-no-numa-topology.args | 2 +- .../fd-memory-numa-topology.args | 2 +- .../fd-memory-numa-topology2.args | 2 +- .../fd-memory-numa-topology3.args | 2 +- ...d-memory-numa-topology4.x86_64-latest.args | 2 +- .../fips-enabled.x86_64-5.1.0.args | 2 +- .../fips-enabled.x86_64-latest.args | 2 +- ...are-auto-bios-stateless.x86_64-latest.args | 2 +- .../firmware-auto-bios.x86_64-latest.args | 2 +- ...mware-auto-efi-aarch64.aarch64-latest.args | 2 +- ...efi-abi-update-aarch64.aarch64-latest.args | 2 +- ...-auto-efi-enrolled-keys.x86_64-latest.args | 2 +- ...efi-format-loader-qcow2.x86_64-latest.args | 2 +- ...-efi-format-loader-raw.aarch64-latest.args | 2 +- ...nvram-qcow2-network-nbd.x86_64-latest.args | 2 +- ...format-nvram-qcow2-path.x86_64-latest.args | 2 +- ...-efi-format-nvram-qcow2.x86_64-latest.args | 2 +- ...uto-efi-loader-insecure.x86_64-latest.args | 2 +- ...re-auto-efi-loader-path.x86_64-latest.args | 2 +- ...-auto-efi-loader-secure.x86_64-latest.args | 2 +- ...to-efi-no-enrolled-keys.x86_64-latest.args | 2 +- ...are-auto-efi-no-secboot.x86_64-latest.args | 2 +- ...are-auto-efi-nvram-file.x86_64-latest.args | 2 +- ...efi-nvram-network-iscsi.x86_64-latest.args | 2 +- ...o-efi-nvram-network-nbd.x86_64-latest.args | 2 +- ...firmware-auto-efi-nvram.x86_64-latest.args | 2 +- ...rmware-auto-efi-secboot.x86_64-latest.args | 2 +- ...rmware-auto-efi-smm-off.x86_64-latest.args | 2 +- ...ware-auto-efi-stateless.x86_64-latest.args | 2 +- .../firmware-auto-efi.x86_64-latest.args | 2 +- ...e-manual-bios-stateless.x86_64-latest.args | 2 +- .../firmware-manual-bios.x86_64-latest.args | 2 +- ...anual-efi-acpi-aarch64.aarch64-latest.args | 2 +- ...are-manual-efi-acpi-q35.x86_64-latest.args | 2 +- ...are-manual-efi-features.x86_64-latest.args | 2 +- ...anual-efi-loader-secure.x86_64-latest.args | 2 +- ...al-efi-no-enrolled-keys.x86_64-latest.args | 2 +- ...e-manual-efi-no-secboot.x86_64-latest.args | 2 +- ...ual-efi-noacpi-aarch64.aarch64-latest.args | 2 +- ...e-manual-efi-nvram-file.x86_64-latest.args | 2 +- ...efi-nvram-network-iscsi.x86_64-latest.args | 2 +- ...l-efi-nvram-network-nbd.x86_64-latest.args | 2 +- ...nual-efi-nvram-template.x86_64-latest.args | 2 +- ...-manual-efi-rw-implicit.x86_64-latest.args | 2 +- .../firmware-manual-efi-rw.x86_64-latest.args | 2 +- ...ware-manual-efi-secboot.x86_64-latest.args | 2 +- ...re-manual-efi-stateless.x86_64-latest.args | 2 +- .../firmware-manual-efi.x86_64-latest.args | 2 +- ...e-manual-noefi-acpi-q35.x86_64-latest.args | 2 +- ...l-noefi-noacpi-aarch64.aarch64-latest.args | 2 +- ...manual-noefi-noacpi-q35.x86_64-latest.args | 2 +- .../floppy-drive-fat.x86_64-latest.args | 2 +- .../fs9p-ccw.s390x-latest.args | 2 +- .../qemuxml2argvdata/fs9p.x86_64-latest.args | 2 +- .../genid-auto.x86_64-latest.args | 2 +- .../qemuxml2argvdata/genid.x86_64-latest.args | 2 +- .../graphics-dbus-address.args | 2 +- .../qemuxml2argvdata/graphics-dbus-audio.args | 2 +- .../graphics-dbus-chardev.args | 2 +- tests/qemuxml2argvdata/graphics-dbus-p2p.args | 2 +- .../graphics-dbus-usbredir.args | 2 +- tests/qemuxml2argvdata/graphics-dbus.args | 2 +- ...egl-headless-rendernode.x86_64-latest.args | 2 +- .../graphics-egl-headless.args | 2 +- .../graphics-egl-headless.x86_64-latest.args | 2 +- .../graphics-sdl-fullscreen.args | 2 +- tests/qemuxml2argvdata/graphics-sdl.args | 2 +- ...s-spice-agent-file-xfer.x86_64-latest.args | 2 +- ...aphics-spice-agentmouse.x86_64-latest.args | 2 +- ...s-spice-auto-socket-cfg.x86_64-latest.args | 2 +- ...phics-spice-auto-socket.x86_64-latest.args | 2 +- ...phics-spice-compression.x86_64-latest.args | 2 +- ...hics-spice-egl-headless.x86_64-latest.args | 2 +- ...pice-gl-auto-rendernode.x86_64-latest.args | 2 +- .../graphics-spice-no-args.x86_64-latest.args | 2 +- .../graphics-spice-qxl-vga.x86_64-latest.args | 2 +- .../graphics-spice-sasl.x86_64-latest.args | 2 +- .../graphics-spice-socket.x86_64-latest.args | 2 +- .../graphics-spice-timeout.x86_64-latest.args | 2 +- ...raphics-spice-usb-redir.x86_64-latest.args | 2 +- .../graphics-spice.x86_64-latest.args | 2 +- ...ics-vnc-auto-socket-cfg.x86_64-latest.args | 2 +- ...raphics-vnc-auto-socket.x86_64-latest.args | 2 +- ...aphics-vnc-egl-headless.x86_64-latest.args | 2 +- ...hics-vnc-no-listen-attr.x86_64-latest.args | 2 +- .../graphics-vnc-none.x86_64-latest.args | 2 +- .../graphics-vnc-policy.x86_64-latest.args | 2 +- .../graphics-vnc-power.x86_64-latest.args | 2 +- ...remove-generated-socket.x86_64-latest.args | 2 +- .../graphics-vnc-sasl.x86_64-latest.args | 2 +- ...-vnc-socket-new-cmdline.x86_64-latest.args | 2 +- .../graphics-vnc-socket.x86_64-latest.args | 2 +- .../graphics-vnc-tls-secret.x86_64-5.2.0.args | 2 +- ...graphics-vnc-tls-secret.x86_64-latest.args | 2 +- .../graphics-vnc-tls.x86_64-latest.args | 2 +- .../graphics-vnc-websocket.x86_64-latest.args | 2 +- .../graphics-vnc.x86_64-latest.args | 2 +- ...tdev-mdev-display-ramfb.x86_64-latest.args | 2 +- ...play-spice-egl-headless.x86_64-latest.args | 2 +- ...ev-display-spice-opengl.x86_64-latest.args | 2 +- ...isplay-vnc-egl-headless.x86_64-latest.args | 2 +- ...ostdev-mdev-display-vnc.x86_64-latest.args | 2 +- .../hostdev-mdev-precreated.args | 2 +- ...tdev-pci-address-device.x86_64-latest.args | 2 +- .../hostdev-pci-address-unassigned.args | 2 +- .../hostdev-pci-address.x86_64-latest.args | 2 +- .../hostdev-pci-multifunction.args | 2 +- .../hostdev-scsi-lsi.x86_64-latest.args | 2 +- ...tdev-scsi-vhost-scsi-ccw.s390x-latest.args | 2 +- .../hostdev-scsi-vhost-scsi-pci.args | 2 +- ...dev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args | 2 +- ...ev-scsi-vhost-scsi-pcie.x86_64-latest.args | 2 +- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 2 +- ...tdev-subsys-mdev-vfio-ap.s390x-latest.args | 2 +- ...ubsys-mdev-vfio-ccw-boot.s390x-latest.args | 2 +- ...dev-subsys-mdev-vfio-ccw.s390x-latest.args | 2 +- ...usb-address-device-boot.x86_64-latest.args | 2 +- ...tdev-usb-address-device.x86_64-latest.args | 2 +- .../hostdev-usb-address.x86_64-latest.args | 2 +- .../hostdev-vfio-multidomain.args | 2 +- ...o-zpci-autogenerate-fids.s390x-latest.args | 2 +- ...o-zpci-autogenerate-uids.s390x-latest.args | 2 +- ...v-vfio-zpci-autogenerate.s390x-latest.args | 2 +- ...dev-vfio-zpci-boundaries.s390x-latest.args | 2 +- ...vfio-zpci-ccw-memballoon.s390x-latest.args | 2 +- ...io-zpci-multidomain-many.s390x-latest.args | 2 +- .../hostdev-vfio-zpci.s390x-latest.args | 2 +- tests/qemuxml2argvdata/hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/hotplug-base.args | 2 +- .../hugepages-default-2M.x86_64-latest.args | 2 +- ...ges-default-system-size.x86_64-latest.args | 2 +- .../hugepages-default.x86_64-latest.args | 2 +- .../hugepages-memaccess3.x86_64-latest.args | 2 +- .../hugepages-nodeset.x86_64-latest.args | 2 +- ...gepages-numa-default-2M.x86_64-latest.args | 2 +- .../hugepages-numa-default.x86_64-latest.args | 2 +- ...pages-numa-nodeset-part.x86_64-latest.args | 2 +- .../hugepages-numa-nodeset.x86_64-latest.args | 2 +- .../hugepages-shared.x86_64-latest.args | 2 +- ...-aarch64-virt-headless.aarch64-latest.args | 2 +- ...hvf-x86_64-q35-headless.x86_64-latest.args | 2 +- .../hyperv-off.x86_64-latest.args | 2 +- .../hyperv-panic.x86_64-latest.args | 2 +- .../hyperv-passthrough.x86_64-6.1.0.args | 2 +- .../hyperv-passthrough.x86_64-latest.args | 2 +- .../hyperv-stimer-direct.x86_64-latest.args | 2 +- .../hyperv.x86_64-latest.args | 2 +- .../input-linux.x86_64-latest.args | 2 +- .../qemuxml2argvdata/input-usbmouse-addr.args | 2 +- tests/qemuxml2argvdata/input-usbmouse.args | 2 +- tests/qemuxml2argvdata/input-usbtablet.args | 2 +- .../input-virtio-ccw.s390x-latest.args | 2 +- .../intel-iommu-aw-bits.x86_64-latest.args | 2 +- ...ntel-iommu-caching-mode.x86_64-latest.args | 2 +- ...ntel-iommu-device-iotlb.x86_64-latest.args | 2 +- .../intel-iommu-eim.x86_64-latest.args | 2 +- .../intel-iommu.x86_64-latest.args | 2 +- .../iommu-smmuv3.aarch64-latest.args | 2 +- ...iothreads-disk-virtio-ccw.s390x-4.2.0.args | 2 +- .../iothreads-disk.x86_64-latest.args | 2 +- .../iothreads-ids-partial.x86_64-latest.args | 2 +- ...othreads-ids-pool-sizes.x86_64-latest.args | 2 +- .../iothreads-ids.x86_64-latest.args | 2 +- ...othreads-virtio-scsi-ccw.s390x-latest.args | 2 +- ...othreads-virtio-scsi-pci.x86_64-5.2.0.args | 2 +- ...threads-virtio-scsi-pci.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/kvm-features-off.args | 2 +- tests/qemuxml2argvdata/kvm-features.args | 2 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 2 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 2 +- .../kvmclock+eoi-disabled.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/kvmclock.args | 2 +- .../launch-security-s390-pv.s390x-latest.args | 2 +- ...nch-security-sev-direct.x86_64-latest.args | 2 +- ...ev-missing-platform-info.x86_64-6.0.0.args | 2 +- .../launch-security-sev.x86_64-6.0.0.args | 2 +- .../luks-disks-source-qcow2.x86_64-5.2.0.args | 2 +- ...luks-disks-source-qcow2.x86_64-latest.args | 2 +- .../luks-disks-source.x86_64-latest.args | 2 +- .../luks-disks.x86_64-latest.args | 2 +- ...ch-virt-console-native.aarch64-latest.args | 2 +- ...ch-virt-console-virtio.aarch64-latest.args | 2 +- ...-serial+console-native.aarch64-latest.args | 2 +- ...ach-virt-serial-compat.aarch64-latest.args | 2 +- ...ach-virt-serial-native.aarch64-latest.args | 2 +- .../mach-virt-serial-pci.aarch64-latest.args | 2 +- .../mach-virt-serial-usb.aarch64-latest.args | 2 +- ...chine-aeskeywrap-off-cap.s390x-latest.args | 2 +- ...hine-aeskeywrap-off-caps.s390x-latest.args | 2 +- ...achine-aeskeywrap-on-cap.s390x-latest.args | 2 +- ...chine-aeskeywrap-on-caps.s390x-latest.args | 2 +- tests/qemuxml2argvdata/machine-aliases1.args | 2 +- tests/qemuxml2argvdata/machine-aliases2.args | 2 +- tests/qemuxml2argvdata/machine-core-off.args | 2 +- tests/qemuxml2argvdata/machine-core-on.args | 2 +- ...chine-deakeywrap-off-cap.s390x-latest.args | 2 +- ...hine-deakeywrap-off-caps.s390x-latest.args | 2 +- ...achine-deakeywrap-on-cap.s390x-latest.args | 2 +- ...chine-deakeywrap-on-caps.s390x-latest.args | 2 +- ...achine-keywrap-none-caps.s390x-latest.args | 2 +- .../machine-keywrap-none.s390x-latest.args | 2 +- ...machine-loadparm-hostdev.s390x-latest.args | 2 +- ...multiple-disks-nets-s390.s390x-latest.args | 2 +- ...achine-loadparm-net-s390.s390x-latest.args | 2 +- .../machine-loadparm-s390.s390x-latest.args | 2 +- .../machine-smm-off.x86_64-latest.args | 2 +- .../machine-smm-on.x86_64-latest.args | 2 +- .../qemuxml2argvdata/machine-vmport-opt.args | 2 +- tests/qemuxml2argvdata/master-key.args | 2 +- ...memory-default-hugepage.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/memtune-unlimited.args | 2 +- tests/qemuxml2argvdata/memtune.args | 2 +- .../migrate-numa-unaligned.args | 2 +- tests/qemuxml2argvdata/migrate.args | 2 +- tests/qemuxml2argvdata/minimal.args | 2 +- tests/qemuxml2argvdata/misc-acpi.args | 2 +- tests/qemuxml2argvdata/misc-disable-s3.args | 2 +- .../misc-disable-suspends.args | 2 +- tests/qemuxml2argvdata/misc-enable-s4.args | 2 +- .../misc-no-reboot.x86_64-5.2.0.args | 2 +- .../misc-no-reboot.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/misc-uuid.args | 2 +- .../mlock-off.x86_64-latest.args | 2 +- .../mlock-on.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/monitor-json.args | 2 +- .../multifunction-pci-device.args | 2 +- .../name-escape.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/net-client.args | 2 +- tests/qemuxml2argvdata/net-eth-hostip.args | 2 +- tests/qemuxml2argvdata/net-eth-ifname.args | 2 +- tests/qemuxml2argvdata/net-eth-names.args | 2 +- .../net-eth-unmanaged-tap.args | 2 +- tests/qemuxml2argvdata/net-eth.args | 2 +- .../net-hostdev-bootorder.args | 2 +- .../net-hostdev-multidomain.args | 2 +- .../net-hostdev-vfio-multidomain.args | 2 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/net-hostdev.args | 2 +- tests/qemuxml2argvdata/net-many-models.args | 2 +- tests/qemuxml2argvdata/net-mcast.args | 2 +- tests/qemuxml2argvdata/net-server.args | 2 +- tests/qemuxml2argvdata/net-udp.args | 2 +- tests/qemuxml2argvdata/net-user-addr.args | 2 +- .../net-user-passt.x86_64-7.2.0.args | 2 +- .../net-user-passt.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/net-user.args | 2 +- .../net-user.x86_64-latest.args | 2 +- .../net-vdpa-multiqueue.x86_64-latest.args | 2 +- .../net-vdpa.x86_64-latest.args | 2 +- .../net-vhostuser-multiq.args | 2 +- tests/qemuxml2argvdata/net-vhostuser.args | 2 +- .../net-vhostuser.x86_64-latest.args | 2 +- .../net-virtio-ccw.s390x-latest.args | 2 +- tests/qemuxml2argvdata/net-virtio-device.args | 2 +- .../net-virtio-disable-offloads.args | 2 +- tests/qemuxml2argvdata/net-virtio-netdev.args | 2 +- .../net-virtio-rss.x86_64-latest.args | 2 +- .../net-virtio-rxtxqueuesize.args | 2 +- .../net-virtio-teaming-hostdev.args | 2 +- .../qemuxml2argvdata/net-virtio-teaming.args | 2 +- tests/qemuxml2argvdata/net-virtio.args | 2 +- tests/qemuxml2argvdata/nosharepages.args | 2 +- .../numad-auto-memory-vcpu-cpuset.args | 2 +- ...o-memory-vcpu-no-cpuset-and-placement.args | 2 +- .../numad-auto-vcpu-static-numatune.args | 2 +- .../numad-static-memory-auto-vcpu.args | 2 +- tests/qemuxml2argvdata/numad.args | 2 +- .../numatune-auto-nodeset-invalid.args | 2 +- .../numatune-auto-prefer.args | 2 +- .../qemuxml2argvdata/numatune-distances.args | 2 +- .../numatune-hmat-none.x86_64-latest.args | 2 +- .../numatune-hmat.x86_64-latest.args | 2 +- .../numatune-memnode-no-memory.args | 2 +- ...emnode-restrictive-mode.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/numatune-memnode.args | 2 +- .../numatune-memnode.x86_64-5.2.0.args | 2 +- .../numatune-memnode.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/numatune-memory.args | 2 +- tests/qemuxml2argvdata/numatune-no-vcpu.args | 2 +- .../numatune-system-memory.x86_64-latest.args | 2 +- ...pages-discard-hugepages.x86_64-latest.args | 2 +- .../pages-discard.x86_64-latest.args | 2 +- .../panic-double.x86_64-latest.args | 2 +- .../panic-no-address.x86_64-latest.args | 2 +- .../qemuxml2argvdata/panic.x86_64-latest.args | 2 +- .../parallel-parport-chardev.args | 2 +- ...arallel-parport-chardev.x86_64-latest.args | 2 +- .../parallel-tcp-chardev.args | 2 +- .../parallel-tcp-chardev.x86_64-latest.args | 2 +- .../parallel-unix-chardev.x86_64-latest.args | 2 +- ...pi-root-hotplug-disable.x86_64-latest.args | 2 +- ...cpi-root-hotplug-enable.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 2 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 2 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 2 +- .../pci-bridge-many-disks.args | 2 +- tests/qemuxml2argvdata/pci-bridge.args | 2 +- tests/qemuxml2argvdata/pci-expander-bus.args | 2 +- tests/qemuxml2argvdata/pci-many.args | 2 +- tests/qemuxml2argvdata/pci-rom-disabled.args | 2 +- tests/qemuxml2argvdata/pci-rom.args | 2 +- .../pci-serial-dev-chardev.args | 2 +- .../pci-serial-dev-chardev.x86_64-latest.args | 2 +- ...e-expander-bus-aarch64.aarch64-latest.args | 2 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 2 +- .../pcie-root-port-model-generic.args | 2 +- .../pcie-root-port-model-ioh3420.args | 2 +- ...cie-root-port-nohotplug.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/pcie-root-port.args | 2 +- tests/qemuxml2argvdata/pcie-root.args | 2 +- .../pcie-switch-downstream-port.args | 2 +- .../pcie-switch-upstream-port.args | 2 +- tests/qemuxml2argvdata/pcihole64-q35.args | 2 +- tests/qemuxml2argvdata/pcihole64.args | 2 +- tests/qemuxml2argvdata/pmu-feature-off.args | 2 +- tests/qemuxml2argvdata/pmu-feature.args | 2 +- .../qemuxml2argvdata/ppc-dtb.ppc-latest.args | 2 +- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 2 +- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 2 +- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 2 +- .../ppc64-pseries-graphics.ppc64-latest.args | 2 +- .../ppc64-pseries-headless.ppc64-latest.args | 2 +- .../ppc64-tpmproxy-single.ppc64-latest.args | 2 +- .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 2 +- ...64-usb-controller-legacy.ppc64-latest.args | 2 +- .../ppc64-usb-controller-qemu-xhci.args | 2 +- .../ppc64-usb-controller.ppc64-latest.args | 2 +- .../ppce500-serial.ppc-latest.args | 2 +- .../pseries-basic.ppc64-latest.args | 2 +- .../pseries-console-virtio.ppc64-latest.args | 2 +- ...eries-cpu-compat-power10.ppc64-latest.args | 2 +- ...series-cpu-compat-power9.ppc64-latest.args | 2 +- .../pseries-cpu-compat.ppc64-latest.args | 2 +- .../pseries-cpu-exact.ppc64-latest.args | 2 +- .../pseries-cpu-le.ppc64-latest.args | 2 +- .../pseries-features.ppc64-4.2.0.args | 2 +- .../pseries-features.ppc64-latest.args | 2 +- .../pseries-hostdevs-1.ppc64-latest.args | 2 +- .../pseries-hostdevs-2.ppc64-latest.args | 2 +- .../pseries-hostdevs-3.ppc64-latest.args | 2 +- .../pseries-many-buses-1.ppc64-latest.args | 2 +- .../pseries-many-buses-2.ppc64-latest.args | 2 +- .../pseries-many-devices.ppc64-latest.args | 2 +- .../pseries-nvram.ppc64-latest.args | 2 +- .../pseries-panic-missing.ppc64-latest.args | 2 +- ...pseries-panic-no-address.ppc64-latest.args | 2 +- ...ries-phb-default-missing.ppc64-latest.args | 2 +- .../pseries-phb-numa-node.ppc64-latest.args | 2 +- .../pseries-phb-simple.ppc64-latest.args | 2 +- .../pseries-serial-native.ppc64-latest.args | 2 +- .../pseries-serial-pci.ppc64-latest.args | 2 +- .../pseries-serial-usb.ppc64-latest.args | 2 +- .../pseries-usb-default.ppc64-latest.args | 2 +- .../pseries-usb-kbd.ppc64-latest.args | 2 +- .../pseries-usb-multi.ppc64-latest.args | 2 +- ...series-vio-user-assigned.ppc64-latest.args | 2 +- .../pseries-vio.ppc64-latest.args | 2 +- .../pv-spinlock-disabled.x86_64-latest.args | 2 +- .../pv-spinlock-enabled.x86_64-latest.args | 2 +- .../pvpanic-pci-aarch64.aarch64-latest.args | 2 +- ...pci-no-address-aarch64.aarch64-latest.args | 2 +- .../pvpanic-pci-x86_64.x86_64-latest.args | 2 +- ...q35-default-devices-only.x86_64-4.2.0.args | 2 +- ...35-default-devices-only.x86_64-latest.args | 2 +- .../q35-multifunction.x86_64-4.2.0.args | 2 +- .../q35-multifunction.x86_64-latest.args | 2 +- .../q35-pci-force-address.args | 2 +- .../q35-pcie-autoadd.x86_64-4.2.0.args | 2 +- .../q35-pcie-autoadd.x86_64-latest.args | 2 +- .../q35-pcie.x86_64-4.2.0.args | 2 +- .../q35-pcie.x86_64-latest.args | 2 +- .../q35-pm-disable-fallback.args | 2 +- tests/qemuxml2argvdata/q35-pm-disable.args | 2 +- tests/qemuxml2argvdata/q35-usb2-multi.args | 2 +- tests/qemuxml2argvdata/q35-usb2-reorder.args | 2 +- tests/qemuxml2argvdata/q35-usb2.args | 2 +- .../q35-virt-manager-basic.x86_64-4.2.0.args | 2 +- .../q35-virt-manager-basic.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/q35.args | 2 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 2 +- .../qemu-ns-commandline-ns0.args | 2 +- .../qemu-ns-commandline-ns1.args | 2 +- .../qemuxml2argvdata/qemu-ns-commandline.args | 2 +- .../qemu-ns-domain-commandline-ns0.args | 2 +- .../qemu-ns-domain-commandline.args | 2 +- .../qemuxml2argvdata/qemu-ns-domain-ns0.args | 2 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 2 +- .../qemu-ns.x86_64-latest.args | 2 +- .../reboot-timeout-disabled.args | 2 +- .../reboot-timeout-enabled.args | 2 +- tests/qemuxml2argvdata/restore-v2-fd.args | 2 +- tests/qemuxml2argvdata/restore-v2.args | 2 +- .../riscv64-virt-graphics.riscv64-latest.args | 2 +- .../riscv64-virt-headless.riscv64-latest.args | 2 +- .../riscv64-virt-pci.riscv64-latest.args | 2 +- .../riscv64-virt.riscv64-latest.args | 2 +- ...low-bogus-usb-controller.s390x-latest.args | 2 +- ...390-allow-bogus-usb-none.s390x-latest.args | 2 +- ...t-cpu-kvm-ccw-virtio-2.7.s390x-latest.args | 2 +- ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 2 +- ...t-cpu-tcg-ccw-virtio-2.7.s390x-latest.args | 2 +- ...t-cpu-tcg-ccw-virtio-4.2.s390x-latest.args | 2 +- .../s390-panic-missing.s390x-latest.args | 2 +- .../s390-panic-no-address.s390x-latest.args | 2 +- .../s390-serial-2.s390x-latest.args | 2 +- .../s390-serial-console.s390x-latest.args | 2 +- .../s390-serial.s390x-latest.args | 2 +- .../s390x-ccw-graphics.s390x-latest.args | 2 +- .../s390x-ccw-headless.s390x-latest.args | 2 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 2 +- .../seclabel-dynamic-baselabel.args | 2 +- .../seclabel-dynamic-labelskip.args | 2 +- .../seclabel-dynamic-override.args | 2 +- .../seclabel-dynamic-relabel.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 2 +- tests/qemuxml2argvdata/seclabel-none.args | 2 +- .../seclabel-static-labelskip.args | 2 +- .../seclabel-static-relabel.args | 2 +- tests/qemuxml2argvdata/seclabel-static.args | 2 +- .../serial-debugcon.x86_64-latest.args | 2 +- .../serial-dev-chardev-iobase.args | 2 +- ...rial-dev-chardev-iobase.x86_64-latest.args | 2 +- .../qemuxml2argvdata/serial-dev-chardev.args | 2 +- .../serial-dev-chardev.x86_64-latest.args | 2 +- .../qemuxml2argvdata/serial-file-chardev.args | 2 +- .../serial-file-chardev.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/serial-file-log.args | 2 +- .../serial-file-log.x86_64-latest.args | 2 +- .../qemuxml2argvdata/serial-many-chardev.args | 2 +- .../serial-many-chardev.x86_64-latest.args | 2 +- .../qemuxml2argvdata/serial-pty-chardev.args | 2 +- .../serial-pty-chardev.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/serial-spiceport.args | 2 +- .../serial-spiceport.x86_64-latest.args | 2 +- .../qemuxml2argvdata/serial-tcp-chardev.args | 2 +- .../serial-tcp-chardev.x86_64-latest.args | 2 +- .../serial-tcp-telnet-chardev.args | 2 +- ...rial-tcp-telnet-chardev.x86_64-latest.args | 2 +- .../serial-tcp-tlsx509-chardev-notls.args | 2 +- ...p-tlsx509-chardev-notls.x86_64-latest.args | 2 +- .../serial-tcp-tlsx509-chardev-verify.args | 2 +- ...-tlsx509-chardev-verify.x86_64-latest.args | 2 +- .../serial-tcp-tlsx509-chardev.args | 2 +- ...ial-tcp-tlsx509-chardev.x86_64-latest.args | 2 +- .../serial-tcp-tlsx509-secret-chardev.args | 2 +- ...-tlsx509-secret-chardev.x86_64-latest.args | 2 +- .../qemuxml2argvdata/serial-udp-chardev.args | 2 +- .../serial-udp-chardev.x86_64-latest.args | 2 +- .../qemuxml2argvdata/serial-unix-chardev.args | 2 +- .../serial-unix-chardev.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/serial-vc-chardev.args | 2 +- .../serial-vc-chardev.x86_64-latest.args | 2 +- .../shmem-plain-doorbell.args | 2 +- tests/qemuxml2argvdata/shmem.args | 2 +- .../smartcard-controller.args | 2 +- .../smartcard-host-certificates-database.args | 2 +- .../smartcard-host-certificates.args | 2 +- tests/qemuxml2argvdata/smartcard-host.args | 2 +- .../smartcard-passthrough-spicevmc.args | 2 +- .../smartcard-passthrough-tcp.args | 2 +- ...rtcard-passthrough-unix.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/smbios-type-fwcfg.args | 2 +- tests/qemuxml2argvdata/smbios.args | 2 +- tests/qemuxml2argvdata/smp-dies.args | 2 +- tests/qemuxml2argvdata/smp.args | 2 +- .../sound-device.x86_64-4.2.0.args | 2 +- .../sound-device.x86_64-latest.args | 2 +- .../sparc-minimal.sparc-latest.args | 2 +- .../tpm-emulator-spapr.ppc64-latest.args | 2 +- .../tpm-emulator-tpm2-enc.x86_64-latest.args | 2 +- ...pm-emulator-tpm2-pstate.x86_64-latest.args | 2 +- .../tpm-emulator-tpm2.x86_64-latest.args | 2 +- .../tpm-emulator.x86_64-latest.args | 2 +- .../tpm-external.x86_64-latest.args | 2 +- .../tpm-passthrough-crb.x86_64-latest.args | 2 +- .../tpm-passthrough.x86_64-latest.args | 2 +- .../tseg-explicit-size.x86_64-latest.args | 2 +- .../usb-controller-default-q35.args | 2 +- .../usb-controller-explicit-q35.args | 2 +- .../usb-controller-qemu-xhci.args | 2 +- .../qemuxml2argvdata/usb-controller-xhci.args | 2 +- tests/qemuxml2argvdata/usb-controller.args | 2 +- .../usb-hub-autoadd-deluxe.args | 2 +- tests/qemuxml2argvdata/usb-hub-autoadd.args | 2 +- tests/qemuxml2argvdata/usb-hub.args | 2 +- .../qemuxml2argvdata/usb-ich9-autoassign.args | 2 +- .../qemuxml2argvdata/usb-ich9-companion.args | 2 +- .../qemuxml2argvdata/usb-ich9-ehci-addr.args | 2 +- .../qemuxml2argvdata/usb-long-port-path.args | 2 +- tests/qemuxml2argvdata/usb-none.args | 2 +- .../usb-piix3-controller.args | 2 +- .../qemuxml2argvdata/usb-port-autoassign.args | 2 +- tests/qemuxml2argvdata/usb-port-missing.args | 2 +- tests/qemuxml2argvdata/usb-ports.args | 2 +- tests/qemuxml2argvdata/usb-redir-boot.args | 2 +- .../usb-redir-filter-version.args | 2 +- tests/qemuxml2argvdata/usb-redir-filter.args | 2 +- .../usb-redir-unix.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/usb-redir.args | 2 +- .../qemuxml2argvdata/usb-xhci-autoassign.args | 2 +- tests/qemuxml2argvdata/usb1-usb2.args | 2 +- .../user-aliases-usb.x86_64-latest.args | 2 +- .../user-aliases.x86_64-latest.args | 2 +- .../user-aliases2.x86_64-latest.args | 2 +- .../vcpu-placement-static.x86_64-latest.args | 2 +- ...vhost-user-fs-fd-memory.x86_64-latest.args | 2 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 2 +- ...host-user-gpu-secondary.x86_64-latest.args | 2 +- .../vhost-user-vga.x86_64-latest.args | 2 +- .../vhost-vsock-auto.x86_64-latest.args | 2 +- .../vhost-vsock-ccw-auto.s390x-latest.args | 2 +- .../vhost-vsock-ccw-iommu.s390x-latest.args | 2 +- .../vhost-vsock-ccw.s390x-latest.args | 2 +- .../vhost-vsock.x86_64-latest.args | 2 +- ...eo-bochs-display-device.x86_64-latest.args | 2 +- .../video-device-pciaddr-default.args | 2 +- tests/qemuxml2argvdata/video-none-device.args | 2 +- .../video-qxl-device-vgamem.args | 2 +- ...video-qxl-device-vram64.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/video-qxl-device.args | 2 +- tests/qemuxml2argvdata/video-qxl-heads.args | 2 +- tests/qemuxml2argvdata/video-qxl-noheads.args | 2 +- .../video-qxl-resolution.args | 2 +- .../video-qxl-sec-device-vgamem.args | 2 +- ...o-qxl-sec-device-vram64.x86_64-latest.args | 2 +- .../video-qxl-sec-device.args | 2 +- ...eo-ramfb-display-device.x86_64-latest.args | 2 +- .../video-vga-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-vga-device.args | 2 +- .../qemuxml2argvdata/video-vga-qxl-heads.args | 2 +- .../video-virtio-blob-off.x86_64-latest.args | 2 +- .../video-virtio-blob-on.x86_64-latest.args | 2 +- .../video-virtio-gpu-ccw.s390x-latest.args | 2 +- .../video-virtio-gpu-device.args | 2 +- .../video-virtio-gpu-sdl-gl.args | 2 +- .../video-virtio-gpu-secondary.args | 2 +- .../video-virtio-gpu-spice-gl.args | 2 +- .../video-virtio-gpu-virgl.args | 2 +- ...video-virtio-vga-gpu-gl.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/video-virtio-vga.args | 2 +- .../virtio-9p-createmode.x86_64-latest.args | 2 +- .../virtio-9p-multidevs.x86_64-latest.args | 2 +- .../virtio-input-passthrough.args | 2 +- tests/qemuxml2argvdata/virtio-input.args | 2 +- .../virtio-iommu-aarch64.aarch64-latest.args | 2 +- .../virtio-iommu-x86_64.x86_64-latest.args | 2 +- .../virtio-lun.x86_64-latest.args | 2 +- ...virtio-non-transitional.x86_64-latest.args | 2 +- ...-options-controller-ats.x86_64-latest.args | 2 +- ...ptions-controller-iommu.x86_64-latest.args | 2 +- ...tions-controller-packed.x86_64-latest.args | 2 +- ...virtio-options-disk-ats.x86_64-latest.args | 2 +- ...rtio-options-disk-iommu.x86_64-latest.args | 2 +- ...tio-options-disk-packed.x86_64-latest.args | 2 +- .../virtio-options-fs-ats.x86_64-latest.args | 2 +- ...virtio-options-fs-iommu.x86_64-latest.args | 2 +- ...irtio-options-fs-packed.x86_64-latest.args | 2 +- ...irtio-options-input-ats.x86_64-latest.args | 2 +- ...tio-options-input-iommu.x86_64-latest.args | 2 +- ...io-options-input-packed.x86_64-latest.args | 2 +- ...-options-memballoon-ats.x86_64-latest.args | 2 +- ...loon-freepage-reporting.x86_64-latest.args | 2 +- ...ptions-memballoon-iommu.x86_64-latest.args | 2 +- ...tions-memballoon-packed.x86_64-latest.args | 2 +- .../virtio-options-net-ats.x86_64-latest.args | 2 +- ...irtio-options-net-iommu.x86_64-latest.args | 2 +- ...rtio-options-net-packed.x86_64-latest.args | 2 +- .../virtio-options-rng-ats.x86_64-latest.args | 2 +- ...irtio-options-rng-iommu.x86_64-latest.args | 2 +- ...rtio-options-rng-packed.x86_64-latest.args | 2 +- ...irtio-options-video-ats.x86_64-latest.args | 2 +- ...tio-options-video-iommu.x86_64-latest.args | 2 +- ...io-options-video-packed.x86_64-latest.args | 2 +- .../virtio-options.x86_64-latest.args | 2 +- .../virtio-rng-builtin.x86_64-5.2.0.args | 2 +- .../virtio-rng-builtin.x86_64-latest.args | 2 +- .../virtio-rng-ccw.s390x-latest.args | 2 +- .../qemuxml2argvdata/virtio-rng-default.args | 2 +- .../virtio-rng-egd-unix.x86_64-5.2.0.args | 2 +- .../virtio-rng-egd-unix.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/virtio-rng-egd.args | 2 +- .../qemuxml2argvdata/virtio-rng-multiple.args | 2 +- tests/qemuxml2argvdata/virtio-rng-random.args | 2 +- .../virtio-transitional.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/vmcoreinfo.args | 2 +- .../watchdog-device.x86_64-latest.args | 2 +- .../watchdog-diag288.s390x-latest.args | 2 +- .../watchdog-dump.x86_64-latest.args | 2 +- .../watchdog-injectnmi.x86_64-latest.args | 2 +- .../watchdog-q35-multiple.x86_64-latest.args | 2 +- .../watchdog.x86_64-latest.args | 2 +- .../x86-kvm-32-on-64.x86_64-latest.args | 2 +- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 2 +- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 2 +- ...efault-cpu-tcg-features.x86_64-latest.args | 2 +- ...-default-cpu-tcg-pc-4.2.x86_64-latest.args | 2 +- ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 2 +- .../x86_64-pc-graphics.x86_64-latest.args | 2 +- .../x86_64-pc-headless.x86_64-latest.args | 2 +- .../x86_64-q35-graphics.x86_64-latest.args | 2 +- .../x86_64-q35-headless.x86_64-latest.args | 2 +- 892 files changed, 907 insertions(+), 899 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a19902988c..85c5973339 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7244,21 +7244,29 @@ qemuBuildMemCommandLine(virCommand *cmd, qemuDomainObjPrivate *priv) { const char *defaultRAMid =3D NULL; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + unsigned long long memsize =3D virDomainDefGetMemoryInitial(def); virCommandAddArg(cmd, "-m"); + /* Without memory hotplug we've historically supplied the memory size = in + * mebibytes to qemu. Since the code will now use kibibytes we need to= round + * it here too. */ + if (!virDomainDefHasMemoryHotplug(def)) + memsize &=3D ~0x1FF; + + virBufferAsprintf(&buf, "size=3D%lluk", memsize); + if (virDomainDefHasMemoryHotplug(def)) { - /* Use the 'k' suffix to let qemu handle the units */ - virCommandAddArgFormat(cmd, "size=3D%lluk,slots=3D%u,maxmem=3D%llu= k", - virDomainDefGetMemoryInitial(def), - def->mem.memory_slots, - def->mem.max_memory); + if (def->mem.memory_slots > 0) + virBufferAsprintf(&buf, ",slots=3D%u", def->mem.memory_slots); - } else { - virCommandAddArgFormat(cmd, "%llu", - virDomainDefGetMemoryInitial(def) / 1024); + if (def->mem.max_memory > 0) + virBufferAsprintf(&buf, ",maxmem=3D%lluk", def->mem.max_memory= ); } + virCommandAddArgBuffer(cmd, &buf); + defaultRAMid =3D virQEMUCapsGetMachineDefaultRAMid(qemuCaps, def->virtType, def->os.machine); diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.aarch64-lates= t.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.aarch64-latest.ar= gs index 220ed0213a..b2dcead15a 100644 --- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a53 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.aarch64-latest.= args b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.aarch64-latest.args index 09e85ae107..914b59dfc5 100644 --- a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch6= 4-latest.args b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aar= ch64-latest.args index 6da4760303..b8a1e975a8 100644 --- a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-lates= t.args +++ b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-lates= t.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -machine virt-4.2,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram \ -accel kvm \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294= 967296}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch6= 4-latest.args b/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aar= ch64-latest.args index 1942819830..be01dd988e 100644 --- a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-lates= t.args +++ b/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-lates= t.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt-4.2,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a15 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294= 967296}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.arg= s b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args index bd7aa93954..036d0a86be 100644 --- a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host,sve512=3Don,sve384=3Doff,sve256=3Don,sve128=3Don,sve=3Don \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-both.args b/tests/q= emuxml2argvdata/aarch64-gic-default-both.args index 0d7a1c259a..aa469cd6e3 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-default-both.args +++ b/tests/qemuxml2argvdata/aarch64-gic-default-both.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args b/tests/qem= uxml2argvdata/aarch64-gic-default-v2.args index fe06bd19ac..5661dc9cf2 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args +++ b/tests/qemuxml2argvdata/aarch64-gic-default-v2.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args b/tests/qem= uxml2argvdata/aarch64-gic-default-v3.args index 0d7a1c259a..aa469cd6e3 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args +++ b/tests/qemuxml2argvdata/aarch64-gic-default-v3.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-gic-default.aarch64-4.2.0.args = b/tests/qemuxml2argvdata/aarch64-gic-default.aarch64-4.2.0.args index 34c9f79ea1..df401b979d 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-default.aarch64-4.2.0.args +++ b/tests/qemuxml2argvdata/aarch64-gic-default.aarch64-4.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt-4.2,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff \ -accel kvm \ -cpu host \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ diff --git a/tests/qemuxml2argvdata/aarch64-gic-default.aarch64-latest.args= b/tests/qemuxml2argvdata/aarch64-gic-default.aarch64-latest.args index 0d7a1c259a..aa469cd6e3 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-default.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-gic-default.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.args b/tests/qemuxml2a= rgvdata/aarch64-gic-host.args index 9f9799917d..b81144bb81 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-host.args +++ b/tests/qemuxml2argvdata/aarch64-gic-host.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt,usb=3Doff,gic-version=3Dhost,dump-guest-core=3Doff,memory-ba= ckend=3Dmach-virt.ram \ -accel kvm \ -cpu host \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-both.args b/tests/qemu= xml2argvdata/aarch64-gic-none-both.args index 0d7a1c259a..aa469cd6e3 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-none-both.args +++ b/tests/qemuxml2argvdata/aarch64-gic-none-both.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args b/tests/qemux= ml2argvdata/aarch64-gic-none-tcg.args index 029ef5230d..e67ae34061 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args +++ b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a57 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args b/tests/qemuxm= l2argvdata/aarch64-gic-none-v2.args index fe06bd19ac..5661dc9cf2 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args +++ b/tests/qemuxml2argvdata/aarch64-gic-none-v2.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args b/tests/qemuxm= l2argvdata/aarch64-gic-none-v3.args index 0d7a1c259a..aa469cd6e3 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args +++ b/tests/qemuxml2argvdata/aarch64-gic-none-v3.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-gic-none.aarch64-4.2.0.args b/t= ests/qemuxml2argvdata/aarch64-gic-none.aarch64-4.2.0.args index 34c9f79ea1..df401b979d 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-none.aarch64-4.2.0.args +++ b/tests/qemuxml2argvdata/aarch64-gic-none.aarch64-4.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt-4.2,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff \ -accel kvm \ -cpu host \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ diff --git a/tests/qemuxml2argvdata/aarch64-gic-none.aarch64-latest.args b/= tests/qemuxml2argvdata/aarch64-gic-none.aarch64-latest.args index 0d7a1c259a..aa469cd6e3 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-none.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-gic-none.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.args b/tests/qemuxml2arg= vdata/aarch64-gic-v2.args index fe06bd19ac..5661dc9cf2 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-v2.args +++ b/tests/qemuxml2argvdata/aarch64-gic-v2.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.args b/tests/qemuxml2arg= vdata/aarch64-gic-v3.args index 0d7a1c259a..aa469cd6e3 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-v3.args +++ b/tests/qemuxml2argvdata/aarch64-gic-v3.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.aarch64-latest.arg= s b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.aarch64-latest.args index b04ebf79cc..c54acd3846 100644 --- a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-armtest= /.config \ -machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host,aarch64=3Doff \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-pci-serial.aarch64-latest.args = b/tests/qemuxml2argvdata/aarch64-pci-serial.aarch64-latest.args index 703462ce11..1886ceced5 100644 --- a/tests/qemuxml2argvdata/aarch64-pci-serial.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-pci-serial.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a15 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args b/tests= /qemuxml2argvdata/aarch64-tpm.aarch64-latest.args index 494dc8539e..f9c7cb1869 100644 --- a/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a15 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-traditional-pci.aarch64-latest.= args b/tests/qemuxml2argvdata/aarch64-traditional-pci.aarch64-latest.args index 4a5c94d951..f7da812145 100644 --- a/tests/qemuxml2argvdata/aarch64-traditional-pci.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-traditional-pci.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a15 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller.aarch64-latest.a= rgs b/tests/qemuxml2argvdata/aarch64-usb-controller.aarch64-latest.args index 0879a1fb91..15d8a158e6 100644 --- a/tests/qemuxml2argvdata/aarch64-usb-controller.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-usb-controller.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a15 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":2243= 95264}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-video-default.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/aarch64-video-default.aarch64-latest.args index e3135fc2e6..80c2e34012 100644 --- a/tests/qemuxml2argvdata/aarch64-video-default.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-video-default.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= -vgpu/.config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a57 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.aarch64-la= test.args b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.aarch64-lat= est.args index ca31701d94..1719054a34 100644 --- a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.aarch64-latest.ar= gs +++ b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.aarch64-latest.ar= gs @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= -vgpu/.config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a57 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-default-nic.aarch64-latest= .args b/tests/qemuxml2argvdata/aarch64-virt-default-nic.aarch64-latest.args index 3628a9b65b..9262cadd21 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-default-nic.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-default-nic.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= -virt-default/.config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a53 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args index fbeb90cba2..2c07824346 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflas= h1-format \ -accel tcg \ -cpu cortex-a15 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294= 967296}' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args index 36203346dd..734e62ed53 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflas= h1-format \ -accel tcg \ -cpu cortex-a15 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294= 967296}' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio-MMIO.aarch64.latest= .args b/tests/qemuxml2argvdata/aarch64-virt-virtio-MMIO.aarch64.latest.args index cfc3195d0f..7cd69cbe0d 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-virtio-MMIO.aarch64.latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-virtio-MMIO.aarch64.latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a53 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.aarch64-4.2.0.args = b/tests/qemuxml2argvdata/aarch64-virt-virtio.aarch64-4.2.0.args index a2804668da..3ee2bcd93b 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-virtio.aarch64-4.2.0.args +++ b/tests/qemuxml2argvdata/aarch64-virt-virtio.aarch64-4.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt-4.2,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ -accel tcg \ -cpu cortex-a53 \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.aarch64-latest.args= b/tests/qemuxml2argvdata/aarch64-virt-virtio.aarch64-latest.args index 296c0c2f3a..8a91bb56bd 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-virtio.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-virtio.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a53 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-4.2.= 0.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-4.2.0.ar= gs index a2804668da..3ee2bcd93b 100644 --- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-4.2.0.args +++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-4.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt-4.2,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ -accel tcg \ -cpu cortex-a53 \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-late= st.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-latest.= args index 296c0c2f3a..8a91bb56bd 100644 --- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a53 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.aar= ch64-latest.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-address= es.aarch64-latest.args index dcf5d187fa..fc5639c889 100644 --- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.aarch64-la= test.args +++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.aarch64-la= test.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a53 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/acpi-table.args b/tests/qemuxml2argvdat= a/acpi-table.args index a1c515e08e..6819a8573b 100644 --- a/tests/qemuxml2argvdata/acpi-table.args +++ b/tests/qemuxml2argvdata/acpi-table.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-basic.aarch64-latest.arg= s b/tests/qemuxml2argvdata/arm-vexpressa9-basic.aarch64-latest.args index 043c714ffa..d79c29fd0f 100644 --- a/tests/qemuxml2argvdata/arm-vexpressa9-basic.aarch64-latest.args +++ b/tests/qemuxml2argvdata/arm-vexpressa9-basic.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-armtest= /.config \ -machine vexpress-a9,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dvexp= ress.highmem \ -accel tcg \ -cpu cortex-a9 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"vexpress.highmem","size":1= 073741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.aarch64-latest.args index 9036b03b00..86c0d47849 100644 --- a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.aarch64-latest.args +++ b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-armtest= /.config \ -machine vexpress-a9,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dvexp= ress.highmem \ -accel tcg \ -cpu cortex-a9 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"vexpress.highmem","size":1= 073741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.aarch64-latest.args index 0bd6145edf..3f859f192e 100644 --- a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.aarch64-latest.args +++ b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-armtest= /.config \ -machine vexpress-a9,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dvexp= ress.highmem \ -accel tcg \ -cpu cortex-a9 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"vexpress.highmem","size":1= 073741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args b/t= ests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args index 31fc9bb22b..3ced92a421 100644 --- a/tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args +++ b/tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-armtest= /.config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a15 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args index ec406bab63..2cb964d70e 100644 --- a/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args index f9a6a1876d..b3592ec0c4 100644 --- a/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args b= /tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args index 9f693f7f90..d0c07fa3b0 100644 --- a/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args= b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args index a530fe3d7e..ed450cba46 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args= b/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args index 5e8c8f29a2..48e838a3d5 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args index 65707b43d6..babd5620e6 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.= args b/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args index 9f693f7f90..d0c07fa3b0 100644 --- a/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-default-sdl.x86_64-4.2.0.args b/t= ests/qemuxml2argvdata/audio-default-sdl.x86_64-4.2.0.args index 7a45ba182f..682b813d4f 100644 --- a/tests/qemuxml2argvdata/audio-default-sdl.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/audio-default-sdl.x86_64-4.2.0.args @@ -14,7 +14,7 @@ SDL_AUDIODRIVER=3Desd \ -machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args b/= tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args index c922342e98..acee10ba84 100644 --- a/tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args @@ -14,7 +14,7 @@ SDL_AUDIODRIVER=3Desd \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-default-spice.x86_64-4.2.0.args b= /tests/qemuxml2argvdata/audio-default-spice.x86_64-4.2.0.args index 9f344cef42..659138d7e8 100644 --- a/tests/qemuxml2argvdata/audio-default-spice.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/audio-default-spice.x86_64-4.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args = b/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args index 8a84f3532d..000b7496ff 100644 --- a/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-default-vnc.x86_64-4.2.0.args b/t= ests/qemuxml2argvdata/audio-default-vnc.x86_64-4.2.0.args index 5aa7e82954..5aea227060 100644 --- a/tests/qemuxml2argvdata/audio-default-vnc.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/audio-default-vnc.x86_64-4.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args b/= tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args index 4e5b66a884..bdaead9f7f 100644 --- a/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-file-best.x86_64-latest.args index 82d4f6aefe..5eba814a4d 100644 --- a/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-file-full.x86_64-latest.args index 7ea0b7d565..8ef2fb5bb4 100644 --- a/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args b= /tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args index 8816b48e8a..73eea94863 100644 --- a/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-jack-full.x86_64-latest.args index b186ce951c..8906e1c8bc 100644 --- a/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args b= /tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args index 5d9f1081f0..dcf4cd3e2b 100644 --- a/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args = b/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args index 9caf591daf..4c6c925ccd 100644 --- a/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-none-best.x86_64-latest.args index db643332d1..34aba833fb 100644 --- a/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-none-full.x86_64-latest.args index 1611c6aa65..bede8ff152 100644 --- a/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args b= /tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args index 534bef6749..f42d868627 100644 --- a/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args b/tes= ts/qemuxml2argvdata/audio-oss-best.x86_64-latest.args index 67cc6e9dff..ac4e9c24ec 100644 --- a/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args b/tes= ts/qemuxml2argvdata/audio-oss-full.x86_64-latest.args index de9625ac2e..bac5bed56b 100644 --- a/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args b/= tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args index ec8bd81f27..0ad8999b88 100644 --- a/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.arg= s b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args index 42542b8dcd..ace202ac13 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.arg= s b/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args index aee5a22f4a..32b870128c 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.= args b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args index c7abb738f5..c2f9c81843 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args b/tes= ts/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args index f1a902fc5f..d8850ba71a 100644 --- a/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args @@ -14,7 +14,7 @@ SDL_AUDIODRIVER=3Dpulseaudio \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args b/tes= ts/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args index f81ddfedf7..2ea427e293 100644 --- a/tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args @@ -14,7 +14,7 @@ SDL_AUDIODRIVER=3Dpulseaudio \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args b/= tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args index 5bc81a05d2..3f3a4d843f 100644 --- a/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args b/t= ests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args index 5b13bca4ce..98ad1a31a4 100644 --- a/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args b/t= ests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args index a033a4f6fe..1bc37f63e3 100644 --- a/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args = b/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args index 8a84f3532d..000b7496ff 100644 --- a/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata= /autoindex.args index 64e12ed885..87d98012e4 100644 --- a/tests/qemuxml2argvdata/autoindex.args +++ b/tests/qemuxml2argvdata/autoindex.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.s390x-latest.args b= /tests/qemuxml2argvdata/balloon-ccw-deflate.s390x-latest.args index 37990ae5e0..a9a6cd934e 100644 --- a/tests/qemuxml2argvdata/balloon-ccw-deflate.s390x-latest.args +++ b/tests/qemuxml2argvdata/balloon-ccw-deflate.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxm= l2argvdata/balloon-device-auto.args index 6ce75d589d..f16464092e 100644 --- a/tests/qemuxml2argvdata/balloon-device-auto.args +++ b/tests/qemuxml2argvdata/balloon-device-auto.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args b/tests= /qemuxml2argvdata/balloon-device-deflate-off.args index 3f1d5151f0..cdd928cea8 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args b/tests/qem= uxml2argvdata/balloon-device-deflate.args index d2d57d32a5..88ef85351f 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/balloon-device-period.args b/tests/qemu= xml2argvdata/balloon-device-period.args index f6a726f0ba..dc8e9c2fe2 100644 --- a/tests/qemuxml2argvdata/balloon-device-period.args +++ b/tests/qemuxml2argvdata/balloon-device-period.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/balloon-device.args b/tests/qemuxml2arg= vdata/balloon-device.args index f6a726f0ba..dc8e9c2fe2 100644 --- a/tests/qemuxml2argvdata/balloon-device.args +++ b/tests/qemuxml2argvdata/balloon-device.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.aarch64-latest.arg= s b/tests/qemuxml2argvdata/balloon-mmio-deflate.aarch64-latest.args index c26a05bf81..18375eee80 100644 --- a/tests/qemuxml2argvdata/balloon-mmio-deflate.aarch64-latest.args +++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a53 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args index e8e5eda7db..925c393d4b 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args index e8e5eda7db..925c393d4b 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args b/t= ests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args index e8e5eda7db..925c393d4b 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/blkdeviotune.x86_64-latest.args b/tests= /qemuxml2argvdata/blkdeviotune.x86_64-latest.args index d24b6a8cc6..1300201889 100644 --- a/tests/qemuxml2argvdata/blkdeviotune.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2a= rgvdata/blkiotune-device.args index 6ce75d589d..f16464092e 100644 --- a/tests/qemuxml2argvdata/blkiotune-device.args +++ b/tests/qemuxml2argvdata/blkiotune-device.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata= /blkiotune.args index 6ce75d589d..f16464092e 100644 --- a/tests/qemuxml2argvdata/blkiotune.args +++ b/tests/qemuxml2argvdata/blkiotune.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/boot-cdrom.x86_64-latest.args b/tests/q= emuxml2argvdata/boot-cdrom.x86_64-latest.args index 534bef6749..f42d868627 100644 --- a/tests/qemuxml2argvdata/boot-cdrom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-cdrom.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/boot-complex.x86_64-latest.args b/tests= /qemuxml2argvdata/boot-complex.x86_64-latest.args index 5e268659e2..277bd0029f 100644 --- a/tests/qemuxml2argvdata/boot-complex.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-complex.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.x86_64-latest.args b/te= sts/qemuxml2argvdata/boot-floppy-q35.x86_64-latest.args index 30cbe6d735..4f015c4c28 100644 --- a/tests/qemuxml2argvdata/boot-floppy-q35.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-floppy-q35.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/boot-floppy.x86_64-latest.args b/tests/= qemuxml2argvdata/boot-floppy.x86_64-latest.args index b3581295f1..4900408e8c 100644 --- a/tests/qemuxml2argvdata/boot-floppy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-floppy.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/boot-menu-disable-drive.x86_64-latest.args index 76cae3253d..0831ef754c 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable-drive.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/boot-menu-disable.x86_64-latest.args b/= tests/qemuxml2argvdata/boot-menu-disable.x86_64-latest.args index 76cae3253d..0831ef754c 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-menu-disable.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.x86_64-la= test.args b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.x86_64-lat= est.args index 094310ac56..7f022efde1 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.x86_64-latest.ar= gs @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/boot-menu-enable.x86_64-latest.args b/t= ests/qemuxml2argvdata/boot-menu-enable.x86_64-latest.args index 9f3f204b91..00e095b286 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-menu-enable.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/boot-multi.x86_64-latest.args b/tests/q= emuxml2argvdata/boot-multi.x86_64-latest.args index 9f3f204b91..00e095b286 100644 --- a/tests/qemuxml2argvdata/boot-multi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-multi.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/boot-network.x86_64-latest.args b/tests= /qemuxml2argvdata/boot-network.x86_64-latest.args index e1e55455ae..c2d266bddd 100644 --- a/tests/qemuxml2argvdata/boot-network.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-network.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/boot-order.x86_64-latest.args b/tests/q= emuxml2argvdata/boot-order.x86_64-latest.args index 8fcb9a1836..be2af49b34 100644 --- a/tests/qemuxml2argvdata/boot-order.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-order.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2a= rgvdata/channel-guestfwd.args index 0779d4ae1f..3c744dad44 100644 --- a/tests/qemuxml2argvdata/channel-guestfwd.args +++ b/tests/qemuxml2argvdata/channel-guestfwd.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/channel-qemu-vdagent-features.x86_64-la= test.args b/tests/qemuxml2argvdata/channel-qemu-vdagent-features.x86_64-lat= est.args index 2a87884d17..45061da7e6 100644 --- a/tests/qemuxml2argvdata/channel-qemu-vdagent-features.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/channel-qemu-vdagent-features.x86_64-latest.ar= gs @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/channel-qemu-vdagent.x86_64-latest.args= b/tests/qemuxml2argvdata/channel-qemu-vdagent.x86_64-latest.args index a3ded22fc3..3e62f30248 100644 --- a/tests/qemuxml2argvdata/channel-qemu-vdagent.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-qemu-vdagent.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2a= rgvdata/channel-spicevmc.args index 8058f296ae..7365d77b98 100644 --- a/tests/qemuxml2argvdata/channel-spicevmc.args +++ b/tests/qemuxml2argvdata/channel-spicevmc.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.arg= s b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args index 9ba7b94e56..cec97c4e66 100644 --- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxm= l2argvdata/channel-virtio-auto.args index 8592f18159..434a686216 100644 --- a/tests/qemuxml2argvdata/channel-virtio-auto.args +++ b/tests/qemuxml2argvdata/channel-virtio-auto.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qem= uxml2argvdata/channel-virtio-autoadd.args index 0a56384c91..6ff23fdcf7 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/= qemuxml2argvdata/channel-virtio-autoassign.args index cd35052002..89cc541683 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qem= uxml2argvdata/channel-virtio-default.args index f13b43f405..3a1b3bb0f0 100644 --- a/tests/qemuxml2argvdata/channel-virtio-default.args +++ b/tests/qemuxml2argvdata/channel-virtio-default.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemux= ml2argvdata/channel-virtio-state.args index 3b8f96693f..23642de1cd 100644 --- a/tests/qemuxml2argvdata/channel-virtio-state.args +++ b/tests/qemuxml2argvdata/channel-virtio-state.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxm= l2argvdata/channel-virtio-unix.args index 2de33a706c..7627b530fa 100644 --- a/tests/qemuxml2argvdata/channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/channel-virtio-unix.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2arg= vdata/channel-virtio.args index 17c5c455fc..7cf82b7941 100644 --- a/tests/qemuxml2argvdata/channel-virtio.args +++ b/tests/qemuxml2argvdata/channel-virtio.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args b/tests/qemuxml2= argvdata/chardev-reconnect.args index b5c686281f..5c9be9b00e 100644 --- a/tests/qemuxml2argvdata/chardev-reconnect.args +++ b/tests/qemuxml2argvdata/chardev-reconnect.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/clock-absolute.x86_64-latest.args b/tes= ts/qemuxml2argvdata/clock-absolute.x86_64-latest.args index a57bf5a7d2..fca1ad7385 100644 --- a/tests/qemuxml2argvdata/clock-absolute.x86_64-latest.args +++ b/tests/qemuxml2argvdata/clock-absolute.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argv= data/clock-catchup.args index 92984dc26a..1c917fc91d 100644 --- a/tests/qemuxml2argvdata/clock-catchup.args +++ b/tests/qemuxml2argvdata/clock-catchup.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvd= ata/clock-france.args index f5f73a1250..50cee14245 100644 --- a/tests/qemuxml2argvdata/clock-france.args +++ b/tests/qemuxml2argvdata/clock-france.args @@ -13,7 +13,7 @@ TZ=3DEurope/Paris \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2arg= vdata/clock-hpet-off.args index 443f2d04d2..ba9047a585 100644 --- a/tests/qemuxml2argvdata/clock-hpet-off.args +++ b/tests/qemuxml2argvdata/clock-hpet-off.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/= tests/qemuxml2argvdata/clock-localtime-basis-localtime.args index 8196321733..1c8c07c6a3 100644 --- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1c15a1f6-f4f0-4d3c-9002-667ddb458736 \ diff --git a/tests/qemuxml2argvdata/clock-localtime.args b/tests/qemuxml2ar= gvdata/clock-localtime.args index d371e632a4..58378cc2b8 100644 --- a/tests/qemuxml2argvdata/clock-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/clock-realtime.args b/tests/qemuxml2arg= vdata/clock-realtime.args index 07157e5c09..45690e5351 100644 --- a/tests/qemuxml2argvdata/clock-realtime.args +++ b/tests/qemuxml2argvdata/clock-realtime.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args index a259ecb200..6289673053 100644 --- a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args +++ b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host,kvm-no-adjvtime=3Don \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294= 967296}' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qem= uxml2argvdata/clock-timer-hyperv-rtc.args index 853e421e86..0399fdc4a1 100644 --- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args +++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu qemu32,hv-time=3Don \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/clock-utc.args b/tests/qemuxml2argvdata= /clock-utc.args index d051a79e53..c4d5239df5 100644 --- a/tests/qemuxml2argvdata/clock-utc.args +++ b/tests/qemuxml2argvdata/clock-utc.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2arg= vdata/clock-variable.args index afbd5104c9..aa815b052b 100644 --- a/tests/qemuxml2argvdata/clock-variable.args +++ b/tests/qemuxml2argvdata/clock-variable.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/console-compat-auto.args b/tests/qemuxm= l2argvdata/console-compat-auto.args index 9963813704..12159aca7d 100644 --- a/tests/qemuxml2argvdata/console-compat-auto.args +++ b/tests/qemuxml2argvdata/console-compat-auto.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args = b/tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args index 2c6ddcb722..e2853ca15f 100644 --- a/tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args b/tests/qem= uxml2argvdata/console-compat-chardev.args index 9963813704..12159aca7d 100644 --- a/tests/qemuxml2argvdata/console-compat-chardev.args +++ b/tests/qemuxml2argvdata/console-compat-chardev.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/console-compat-chardev.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/console-compat-chardev.x86_64-latest.args index 2c6ddcb722..e2853ca15f 100644 --- a/tests/qemuxml2argvdata/console-compat-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-compat-chardev.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/console-compat.args b/tests/qemuxml2arg= vdata/console-compat.args index 8ff44c616a..69439cba46 100644 --- a/tests/qemuxml2argvdata/console-compat.args +++ b/tests/qemuxml2argvdata/console-compat.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/console-compat.x86_64-latest.args b/tes= ts/qemuxml2argvdata/console-compat.x86_64-latest.args index a6395b590b..848cf478f5 100644 --- a/tests/qemuxml2argvdata/console-compat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-compat.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/console-sclp.s390x-latest.args b/tests/= qemuxml2argvdata/console-sclp.s390x-latest.args index 484ddeaad6..18c6409f38 100644 --- a/tests/qemuxml2argvdata/console-sclp.s390x-latest.args +++ b/tests/qemuxml2argvdata/console-sclp.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.s390x-latest.args b/= tests/qemuxml2argvdata/console-virtio-ccw.s390x-latest.args index 3692196070..4d6b6bbdab 100644 --- a/tests/qemuxml2argvdata/console-virtio-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/console-virtio-ccw.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxm= l2argvdata/console-virtio-many.args index 064f73d02e..1f2ac43cde 100644 --- a/tests/qemuxml2argvdata/console-virtio-many.args +++ b/tests/qemuxml2argvdata/console-virtio-many.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args = b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args index 3cce6390b7..cd91e93e8d 100644 --- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2arg= vdata/console-virtio.args index dbd5c0ae3f..90abc51ad1 100644 --- a/tests/qemuxml2argvdata/console-virtio.args +++ b/tests/qemuxml2argvdata/console-virtio.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2a= rgvdata/controller-order.args index 4df65db250..27a0e01153 100644 --- a/tests/qemuxml2argvdata/controller-order.args +++ b/tests/qemuxml2argvdata/controller-order.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr/.co= nfig \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-fdr/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ --m 4096 \ +-m size=3D4194304k \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ diff --git a/tests/qemuxml2argvdata/controller-usb-order.x86_64-latest.args= b/tests/qemuxml2argvdata/controller-usb-order.x86_64-latest.args index beef9d97e5..d07006fe64 100644 --- a/tests/qemuxml2argvdata/controller-usb-order.x86_64-latest.args +++ b/tests/qemuxml2argvdata/controller-usb-order.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-rhel7/.= config \ -machine pc-i440fx-2.3,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ -accel kvm \ -cpu qemu64 \ --m 2048 \ +-m size=3D2097152k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args index 66485ba9c1..a33be05e8b 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 8,sockets=3D8,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args b/tests/qemuxml2= argvdata/cpu-Haswell-noTSX.args index 45856c1b7d..dc35ed4a7e 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args +++ b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu Haswell-noTSX \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args b/tests/qemuxml2argvda= ta/cpu-Haswell.args index 4786780474..97eeed5804 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell.args +++ b/tests/qemuxml2argvdata/cpu-Haswell.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu Haswell \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args b/tests/qemuxml2argvd= ata/cpu-Haswell2.args index 282f8c1e08..c816510613 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell2.args +++ b/tests/qemuxml2argvdata/cpu-Haswell2.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu Haswell,hle=3Doff,rtm=3Doff \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args b/tests/qemuxml2argvd= ata/cpu-Haswell3.args index 15b630c789..9d692e3c6c 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell3.args +++ b/tests/qemuxml2argvdata/cpu-Haswell3.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu Haswell,rtm=3Don,hle=3Don \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-lates= t.args b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.ar= gs index 21e556c543..c841bb80c8 100644 --- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu Icelake-Server,intel-pt=3Doff \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args b/tests/qemuxml2= argvdata/cpu-cache-disable.args index 2cb70ca8af..7b5d95270d 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host,host-cache-info=3Doff,l3-cache=3Doff \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-cache-disable2.args b/tests/qemuxml= 2argvdata/cpu-cache-disable2.args index c28c9d726a..adfad725aa 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable2.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable2.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.args b/tests/qemuxml= 2argvdata/cpu-cache-disable3.args index 5f6c243cac..e4ccdad41c 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable3.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds-cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-lm=3Don,l3-cache=3Do= ff \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args b/tests/qemux= ml2argvdata/cpu-cache-emulate-l3.args index ef126f50e0..bcb354433b 100644 --- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args +++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host,l3-cache=3Don,host-cache-info=3Doff \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args b/tests/qemu= xml2argvdata/cpu-cache-passthrough.args index bd5930ffc8..cf90428952 100644 --- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host,host-cache-info=3Don,l3-cache=3Doff \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args b/tests/qem= uxml2argvdata/cpu-cache-passthrough2.args index bd36d109e2..37b27e450a 100644 --- a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args +++ b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host,host-cache-info=3Don \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args b/tests/qem= uxml2argvdata/cpu-check-default-none.args index 1eaea533d4..4ca878576d 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-none.args +++ b/tests/qemuxml2argvdata/cpu-check-default-none.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.args b/tests/qe= muxml2argvdata/cpu-check-default-none2.args index b4b7fed78d..bd056383f6 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-none2.args +++ b/tests/qemuxml2argvdata/cpu-check-default-none2.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu core2duo \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.args b/tests/= qemuxml2argvdata/cpu-check-default-partial.args index 5b96747ee5..fff3d02cfc 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-partial.args +++ b/tests/qemuxml2argvdata/cpu-check-default-partial.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds-cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-lm=3Don \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.args b/tests= /qemuxml2argvdata/cpu-check-default-partial2.args index 91c2757576..de46ed5ae7 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-partial2.args +++ b/tests/qemuxml2argvdata/cpu-check-default-partial2.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-check-none.args b/tests/qemuxml2arg= vdata/cpu-check-none.args index 91c2757576..de46ed5ae7 100644 --- a/tests/qemuxml2argvdata/cpu-check-none.args +++ b/tests/qemuxml2argvdata/cpu-check-none.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.x86_64-latest.args b/t= ests/qemuxml2argvdata/cpu-eoi-disabled.x86_64-latest.args index bb36f31748..34d81afdf7 100644 --- a/tests/qemuxml2argvdata/cpu-eoi-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ -cpu qemu32,kvm-pv-eoi=3Doff \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.x86_64-latest.args b/te= sts/qemuxml2argvdata/cpu-eoi-enabled.x86_64-latest.args index ad29521795..5a9313be11 100644 --- a/tests/qemuxml2argvdata/cpu-eoi-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ -cpu qemu32,kvm-pv-eoi=3Don \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-exact1.args b/tests/qemuxml2argvdat= a/cpu-exact1.args index 72135798ea..b6dc380ddb 100644 --- a/tests/qemuxml2argvdata/cpu-exact1.args +++ b/tests/qemuxml2argvdata/cpu-exact1.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu qemu64,mca=3Doff,pse36=3Doff,clflush=3Doff,syscall=3Doff,nx=3Doff,lm= =3Doff,svm=3Doff \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args b/tests/qemu= xml2argvdata/cpu-exact2-nofallback.args index 29d25ef23b..844da9ef3d 100644 --- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args +++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,ht=3Don,tm=3Don,ds-cpl=3Don,xtpr=3Don,3dnowext=3Don,= lahf-lm=3Don,nx=3Doff,cx16=3Doff,tm2=3Doff,pbe=3Doff,ss=3Doff,sse4a=3Doff,w= dt=3Doff \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-exact2.args b/tests/qemuxml2argvdat= a/cpu-exact2.args index 29d25ef23b..844da9ef3d 100644 --- a/tests/qemuxml2argvdata/cpu-exact2.args +++ b/tests/qemuxml2argvdata/cpu-exact2.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,ht=3Don,tm=3Don,ds-cpl=3Don,xtpr=3Don,3dnowext=3Don,= lahf-lm=3Don,nx=3Doff,cx16=3Doff,tm2=3Doff,pbe=3Doff,ss=3Doff,sse4a=3Doff,w= dt=3Doff \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-fallback.args b/tests/qemuxml2argvd= ata/cpu-fallback.args index 7c6e49fb8e..341e649ce6 100644 --- a/tests/qemuxml2argvdata/cpu-fallback.args +++ b/tests/qemuxml2argvdata/cpu-fallback.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu Conroe,cx16=3Don,sse4.1=3Doff,sse4.2=3Doff,popcnt=3Doff,aes=3Doff \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args b/tests/qemuxml2= argvdata/cpu-host-kvmclock.args index a2dafc6eec..1e5a3af103 100644 --- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host,kvmclock=3Doff \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args b/tests/qemuxml= 2argvdata/cpu-host-model-cmt.args index fefe713b23..d891dcd73b 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args +++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu Haswell,vme=3Don,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,d= tes64=3Don,monitor=3Don,ds-cpl=3Don,vmx=3Don,smx=3Don,est=3Don,tm2=3Don,xtp= r=3Don,pdcm=3Don,f16c=3Don,rdrand=3Don,pdpe1gb=3Don,abm=3Don,lahf-lm=3Don \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.args b/tests/qe= muxml2argvdata/cpu-host-model-fallback.args index 5f5454a4a4..3d09b039f3 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-fallback.args +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu Conroe,vme=3Don,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,mo= nitor=3Don,ds-cpl=3Don,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-= lm=3Don \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.args b/tests/qemu= xml2argvdata/cpu-host-model-vendor.args index 42c776ed7d..c043bba085 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args +++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu 'core2duo,vendor=3DLibvirt QEMU,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm= =3Don,pbe=3Don,ds-cpl=3Don,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,l= ahf-lm=3Don' \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.args b/tests/qemuxml2arg= vdata/cpu-host-model.args index e5598131e5..a35822ada3 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.args +++ b/tests/qemuxml2argvdata/cpu-host-model.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds-cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-lm=3Don \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args index 0b765cc583..945163795d 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,= clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabilities=3Don,s= sbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange-mc-no=3D= on \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args index 4e75444fd1..95c88f1ace 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-q35-5.0,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,= clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabilities=3Don,s= sbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange-mc-no=3D= on \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args index c5454dc8b7..0d2eea3e62 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-q35-5.1,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D= on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,= amd-ssbd=3Don,virt-ssbd=3Don,rdctl-no=3Don,skip-l1dfl-vmentry=3Don,mds-no= =3Don,pschange-mc-no=3Don \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args index 7d66bb2ef5..93c6a576e9 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-q35-5.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m \ -accel kvm \ -cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D= on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,= amd-ssbd=3Don,virt-ssbd=3Don,rdctl-no=3Don,skip-l1dfl-vmentry=3Don,mds-no= =3Don,pschange-mc-no=3Don \ --m 214 \ +-m size=3D219136k \ -object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args index 8b048cec14..5f24227b8e 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-q35-6.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m \ -accel kvm \ -cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D= on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,= amd-ssbd=3Don,virt-ssbd=3Don,rdctl-no=3Don,skip-l1dfl-vmentry=3Don,mds-no= =3Don,pschange-mc-no=3Don \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args index 33410a92f5..2678b334d9 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-q35-6.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m \ -accel kvm \ -cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D= on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,= amd-ssbd=3Don,virt-ssbd=3Don,svme-addr-chk=3Don,rdctl-no=3Don,skip-l1dfl-vm= entry=3Don,mds-no=3Don,pschange-mc-no=3Don \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args b/tes= ts/qemuxml2argvdata/cpu-host-model.x86_64-latest.args index 92c260c0e6..312754277c 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D= on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,= amd-ssbd=3Don,virt-ssbd=3Don,lbrv=3Don,tsc-scale=3Don,vmcb-clean=3Don,pause= -filter=3Don,pfthreshold=3Don,v-vmsave-vmload=3Don,vgif=3Don,svme-addr-chk= =3Don,lfence-always-serializing=3Don,null-sel-clr-base=3Don,rdctl-no=3Don,s= kip-l1dfl-vmentry=3Don,mds-no=3Don,pschange-mc-no=3Don \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/te= sts/qemuxml2argvdata/cpu-host-passthrough-features.args index da4063c13a..663b1a29ad 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host,abm=3Don,ds=3Don,invtsc=3Doff \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args b/tests/qemux= ml2argvdata/cpu-host-passthrough.args index 1eaea533d4..4ca878576d 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-hotplug-startup.args b/tests/qemuxm= l2argvdata/cpu-hotplug-startup.args index a084059525..a870d56792 100644 --- a/tests/qemuxml2argvdata/cpu-hotplug-startup.args +++ b/tests/qemuxml2argvdata/cpu-hotplug-startup.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,maxcpus=3D6,sockets=3D3,cores=3D2,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args b/tests/qemuxml2argvd= ata/cpu-kvmclock.args index ca18ab288f..3f9396da4b 100644 --- a/tests/qemuxml2argvdata/cpu-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-kvmclock.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo,kvmclock=3Doff \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args b/tests/qemuxml2argvd= ata/cpu-minimum1.args index 313ad10eb6..cd5d39af20 100644 --- a/tests/qemuxml2argvdata/cpu-minimum1.args +++ b/tests/qemuxml2argvdata/cpu-minimum1.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds-cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-lm=3Don \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args b/tests/qemuxml2argvd= ata/cpu-minimum2.args index 488db2ad22..632f76f7dd 100644 --- a/tests/qemuxml2argvdata/cpu-minimum2.args +++ b/tests/qemuxml2argvdata/cpu-minimum2.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds-cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-lm=3Don,syscall=3Dof= f,nx=3Doff,lm=3Doff,svm=3Doff \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.args b/tests/qe= muxml2argvdata/cpu-no-removed-features.args index 91c2757576..de46ed5ae7 100644 --- a/tests/qemuxml2argvdata/cpu-no-removed-features.args +++ b/tests/qemuxml2argvdata/cpu-no-removed-features.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args b/tests/qemuxml2= argvdata/cpu-numa-disjoint.args index ec6366160c..7ef84e0b2c 100644 --- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args +++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 16,sockets=3D2,cores=3D4,threads=3D2 \ -numa node,nodeid=3D0,cpus=3D0-3,cpus=3D8-11,mem=3D107 \ diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args b/tests/qemuxml= 2argvdata/cpu-numa-memshared.args index 701e533e50..47341169d5 100644 --- a/tests/qemuxml2argvdata/cpu-numa-memshared.args +++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 16,sockets=3D2,cores=3D4,threads=3D2 \ -object memory-backend-file,id=3Dram-node0,mem-path=3D/var/lib/libvirt/qem= u/ram/-1-QEMUGuest1/ram-node0,share=3Don,size=3D112197632 \ diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args b/tests= /qemuxml2argvdata/cpu-numa-no-memory-element.args index 85206a196f..741edc4c1c 100644 --- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args +++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 16,sockets=3D2,cores=3D4,threads=3D2 \ -numa node,nodeid=3D0,cpus=3D0-7,mem=3D107 \ diff --git a/tests/qemuxml2argvdata/cpu-numa1.args b/tests/qemuxml2argvdata= /cpu-numa1.args index 85206a196f..741edc4c1c 100644 --- a/tests/qemuxml2argvdata/cpu-numa1.args +++ b/tests/qemuxml2argvdata/cpu-numa1.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 16,sockets=3D2,cores=3D4,threads=3D2 \ -numa node,nodeid=3D0,cpus=3D0-7,mem=3D107 \ diff --git a/tests/qemuxml2argvdata/cpu-numa2.args b/tests/qemuxml2argvdata= /cpu-numa2.args index 85206a196f..741edc4c1c 100644 --- a/tests/qemuxml2argvdata/cpu-numa2.args +++ b/tests/qemuxml2argvdata/cpu-numa2.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 16,sockets=3D2,cores=3D4,threads=3D2 \ -numa node,nodeid=3D0,cpus=3D0-7,mem=3D107 \ diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate-bare.x86_64-lates= t.args b/tests/qemuxml2argvdata/cpu-phys-bits-emulate-bare.x86_64-latest.ar= gs index 28578fac20..801b75b317 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate-bare.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate-bare.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu host,migratable=3Don,host-phys-bits=3Doff \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args b/tests/qemu= xml2argvdata/cpu-phys-bits-emulate.args index 5eb8e3dd46..e1823727ae 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host,phys-bits=3D42 \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args b/tests/qem= uxml2argvdata/cpu-phys-bits-emulate2.args index 52013d95c7..d8add83283 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds-cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf-lm=3Don,phys-bits=3D= 42 \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-limit.x86_64-latest.args = b/tests/qemuxml2argvdata/cpu-phys-bits-limit.x86_64-latest.args index 1c20243050..16f96b1c63 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-limit.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-limit.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu host,migratable=3Don,host-phys-bits=3Don,host-phys-bits-limit=3D39 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args b/tests/= qemuxml2argvdata/cpu-phys-bits-passthrough.args index bae9b7d6c5..7af943c451 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host,host-phys-bits=3Don \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-s390-features.s390x-latest.args b/t= ests/qemuxml2argvdata/cpu-s390-features.s390x-latest.args index d6c1d6e278..6a95997ff5 100644 --- a/tests/qemuxml2argvdata/cpu-s390-features.s390x-latest.args +++ b/tests/qemuxml2argvdata/cpu-s390-features.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest1/= .config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel kvm \ -cpu zEC12,dfppc=3Don,stckf=3Doff \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-s390-zEC12.s390x-latest.args b/test= s/qemuxml2argvdata/cpu-s390-zEC12.s390x-latest.args index 8ad4fd90ce..c47ad9e17c 100644 --- a/tests/qemuxml2argvdata/cpu-s390-zEC12.s390x-latest.args +++ b/tests/qemuxml2argvdata/cpu-s390-zEC12.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest1/= .config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel kvm \ -cpu zEC12 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-strict1.args b/tests/qemuxml2argvda= ta/cpu-strict1.args index 311264db0a..69a1405f92 100644 --- a/tests/qemuxml2argvdata/cpu-strict1.args +++ b/tests/qemuxml2argvdata/cpu-strict1.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu core2duo,ds=3Don,acpi=3Don,ht=3Don,tm=3Don,ds-cpl=3Don,vmx=3Don,est= =3Don,xtpr=3Don,3dnowext=3Don,lahf-lm=3Don,nx=3Doff,cx16=3Doff,tm2=3Doff,pb= e=3Doff,ss=3Doff,sse4a=3Doff,wdt=3Doff \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-topology1.args b/tests/qemuxml2argv= data/cpu-topology1.args index ab46b1dfa0..6482bacaf1 100644 --- a/tests/qemuxml2argvdata/cpu-topology1.args +++ b/tests/qemuxml2argvdata/cpu-topology1.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D3,cores=3D2,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-topology2.args b/tests/qemuxml2argv= data/cpu-topology2.args index 9c50d4cf04..ff4c85c800 100644 --- a/tests/qemuxml2argvdata/cpu-topology2.args +++ b/tests/qemuxml2argvdata/cpu-topology2.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu core2duo \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D1,cores=3D2,threads=3D3 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-topology3.args b/tests/qemuxml2argv= data/cpu-topology3.args index ab46b1dfa0..6482bacaf1 100644 --- a/tests/qemuxml2argvdata/cpu-topology3.args +++ b/tests/qemuxml2argvdata/cpu-topology3.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D3,cores=3D2,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args b/te= sts/qemuxml2argvdata/cpu-translation.x86_64-latest.args index 4b0d9df896..49e1b590dd 100644 --- a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu Haswell,pclmulqdq=3Don,ds-cpl=3Don,tsc-adjust=3Don,fxsr-opt=3Don,lahf= -lm=3Don,cmp-legacy=3Don,nodeid-msr=3Don,perfctr-core=3Don,perfctr-nb=3Don,= kvm-pv-eoi=3Don,kvm-pv-unhalt=3Don \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args b/tests/qemuxml2= argvdata/cpu-tsc-frequency.args index 62ed3ae656..f4b7a70ba2 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args +++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu Haswell,vme=3Don,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,d= tes64=3Don,monitor=3Don,ds-cpl=3Don,vmx=3Don,smx=3Don,est=3Don,tm2=3Don,xtp= r=3Don,pdcm=3Don,f16c=3Don,rdrand=3Don,pdpe1gb=3Don,abm=3Don,lahf-lm=3Don,i= nvtsc=3Don,tsc-frequency=3D4567890000 \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.arg= s b/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args index cca4ff4ce9..1b8182a82a 100644 --- a/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cputune-numatune.x86_64-latest.args b/t= ests/qemuxml2argvdata/cputune-numatune.x86_64-latest.args index 25f1497a22..a0e4815d6a 100644 --- a/tests/qemuxml2argvdata/cputune-numatune.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cputune-numatune.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-dummy2/= .config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu qemu64 \ --m 128 \ +-m size=3D131072k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":134217728,"= host-nodes":[0,1,2,3],"policy":"bind"}' \ -overcommit mem-lock=3Doff \ -smp 2,maxcpus=3D6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.x86_64-latest.args = b/tests/qemuxml2argvdata/cputune-zero-shares.x86_64-latest.args index cca4ff4ce9..1b8182a82a 100644 --- a/tests/qemuxml2argvdata/cputune-zero-shares.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cputune-zero-shares.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cputune.x86_64-latest.args b/tests/qemu= xml2argvdata/cputune.x86_64-latest.args index 4e22bab0b5..cb05f8c2a5 100644 --- a/tests/qemuxml2argvdata/cputune.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cputune.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args b/tests/qemu= xml2argvdata/default-kvm-host-arch.args index 0629572909..7ae1c7eef1 100644 --- a/tests/qemuxml2argvdata/default-kvm-host-arch.args +++ b/tests/qemuxml2argvdata/default-kvm-host-arch.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-kvm/.co= nfig \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-kvm/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ --m 4096 \ +-m size=3D4194304k \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args b/tests/qem= uxml2argvdata/default-qemu-host-arch.args index ca3f2ec2b9..cc37778373 100644 --- a/tests/qemuxml2argvdata/default-qemu-host-arch.args +++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-qemu-ho= st/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-qemu-host/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 4096 \ +-m size=3D4194304k \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ diff --git a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-late= st.args b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.= args index ac526bc426..5bfb874cca 100644 --- a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-default= -video-type-a/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-default-video-type-a/master-key.aes"}' \ -machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.a= rgs b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args index 7ee2b50f99..bb0b5a31b1 100644 --- a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-default= -video-type-p/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel kvm \ -cpu host \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-late= st.args b/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.= args index 8ac811ade9..0d1fed57ec 100644 --- a/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-default= -video-type-r/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-default-video-type-r/master-key.aes"}' \ -machine virt,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Driscv_virt_= board.ram \ -accel tcg \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"riscv_virt_board.ram","siz= e":1073741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.a= rgs b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args index dcafe655ce..03472ab281 100644 --- a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-default= -video-type-s/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel kvm \ -cpu gen15a-base,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag318=3Don,c= sske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa5=3Don,msa= 4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Don,deflate= =3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,mepochptff=3Don,ap=3Don,vxe= h=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2=3Don,esort=3Don,apqi=3Don,= apft=3Don,els=3Don,iep=3Don,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,gs=3Don,p= pa15=3Don,zpci=3Don,sea_esop2=3Don,te=3Don,cmm=3Don \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":107374182= 4}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args b= /tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args index e79b846f45..cdbcd1755c 100644 --- a/tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args +++ b/tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/= .config \ -machine pc-i440fx-5.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Don \ -accel tcg \ -cpu qemu64 \ --m 2048 \ +-m size=3D2097152k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args index 43e4e50af7..b4f1c25b65 100644 --- a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args b/tests/qem= uxml2argvdata/disk-aio.x86_64-latest.args index c5648e1a64..6e40786047 100644 --- a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args = b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args index 2f7b63c8b7..5d841604fb 100644 --- a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args +++ b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-armtest= /.config \ -machine vexpress-a9,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dvexp= ress.highmem \ -accel tcg \ -cpu cortex-a9 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"vexpress.highmem","size":1= 073741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-late= st.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.= args index 9fc7dc7669..98d261f272 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args b/tests= /qemuxml2argvdata/disk-blockio.x86_64-latest.args index f43714c8c8..7270613573 100644 --- a/tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args b/te= sts/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args index 19f93c540d..d3d888f4a4 100644 --- a/tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args index 5292fcd724..eddd3d5474 100644 --- a/tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args b/tests/q= emuxml2argvdata/disk-cache.x86_64-latest.args index 17bebd6e9f..f094c6c7fb 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args index 0e0ee62c4e..de5fa083d8 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64= -latest.args b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_= 64-latest.args index d690f985b9..034dead422 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest= .args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args index 4cba8ac50e..26a233f3d4 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel kvm \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args b/te= sts/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args index 9d60e1d748..d20d9c0f8c 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args b/tests/q= emuxml2argvdata/disk-cdrom.x86_64-latest.args index 93ce584c72..59a8ef1b75 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args index f4ca3db14e..e6dcdd7fcc 100644 --- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args index f90f7f064e..c62b077d81 100644 --- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args b/tests= /qemuxml2argvdata/disk-discard.x86_64-latest.args index 5072ad315e..7f0e92f1d1 100644 --- a/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.ar= gs b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args index 4c002375f1..2031aae067 100644 --- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args index 4bca592283..4599ddbae1 100644 --- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args b/te= sts/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args index 3c1e08f880..b5daffdb5c 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args index f003fdad47..24f8f7d77d 100644 --- a/tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-floppy.x86_64-latest.args index 4bd4b96525..fc5f693a8e 100644 --- a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args b/test= s/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args index d322116074..90f633752f 100644 --- a/tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args b/test= s/qemuxml2argvdata/disk-geometry.x86_64-latest.args index f65a875a13..535a5cd5e8 100644 --- a/tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-ide-split.x86_64-latest.args index e5651c3683..29e00d1fa2 100644 --- a/tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args b/tests= /qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args index a64b18543e..ef7edcce8b 100644 --- a/tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args index a3dff414f5..9ce8bf97b0 100644 --- a/tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args = b/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args index d1f00d8d47..acac58ca1c 100644 --- a/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args index 9812d75ca6..4d3c184806 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args index 9c5ecf938f..47eee61a78 100644 --- a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args index 1147e1e605..ef772b045e 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args index 8b5a0bfb9b..0eab774035 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args index ac8bffff57..b4fbfcee8f 100644 --- a/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-network-rbd-encryption-layering.x8= 6_64-latest.args b/tests/qemuxml2argvdata/disk-network-rbd-encryption-layer= ing.x86_64-latest.args index c9e1a0cc72..f53ba18187 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd-encryption-layering.x86_64-la= test.args +++ b/tests/qemuxml2argvdata/disk-network-rbd-encryption-layering.x86_64-la= test.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -machine pc-i440fx-2.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-network-rbd-encryption-luks-any.x8= 6_64-latest.args b/tests/qemuxml2argvdata/disk-network-rbd-encryption-luks-= any.x86_64-latest.args index 5dedfc5f6b..18c2c66074 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd-encryption-luks-any.x86_64-la= test.args +++ b/tests/qemuxml2argvdata/disk-network-rbd-encryption-luks-any.x86_64-la= test.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -machine pc-i440fx-2.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-late= st.args b/tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-latest.= args index d69080f00c..737918f0e9 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -machine pc-i440fx-2.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest= .args b/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args index 991f1fe692..2c30671514 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args index 06207a514c..735e6dcf3c 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-6.0.0.args= b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-6.0.0.args index 0112dd8e95..664c47acf7 100644 --- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-6.0.0.args +++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-6.0.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-i440fx-6.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.= args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args index 7fe494aeb9..1e9eeb2ac8 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_6= 4-latest.args b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x8= 6_64-latest.args index 4aaa6b06e1..5f5c412e22 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-lates= t.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-5.2.0.a= rgs b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-5.2.0.args index 82110ecfb0..2863f78a4c 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-5.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-i440fx-5.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.= args b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args index e257f5203b..f499dac90f 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.= args b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args index 3e069eb934..c96d105362 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-i440fx-5.0,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args b/tests= /qemuxml2argvdata/disk-no-boot.x86_64-latest.args index ffaf095aa6..1d1375910f 100644 --- a/tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args b/tests/qe= muxml2argvdata/disk-nvme.x86_64-latest.args index d6902ca6d9..8dccaebf11 100644 --- a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-order.x86_64-latest.args b/tests/q= emuxml2argvdata/disk-order.x86_64-latest.args index 76e293025c..c7da90fb5d 100644 --- a/tests/qemuxml2argvdata/disk-order.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-order.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args index f7fab9af97..d952469bff 100644 --- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-rotation.x86_64-latest.args b/test= s/qemuxml2argvdata/disk-rotation.x86_64-latest.args index c1ad81ac11..5245491e23 100644 --- a/tests/qemuxml2argvdata/disk-rotation.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-rotation.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 8,sockets=3D8,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args index e8d7029555..b60d9b16d4 100644 --- a/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.arg= s b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args index 14444ccdb7..2fb582630f 100644 --- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args index a90c171aad..de25fffade 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args index 1a489bfc1e..8cee3f6b83 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args index 452b412ebb..77c63b72cc 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest= .args b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args index c39d251155..fe17ce224f 100644 --- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args b/tests/qe= muxml2argvdata/disk-scsi.x86_64-latest.args index bf6c367238..b9f485ff09 100644 --- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-serial.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-serial.x86_64-latest.args index d353c6f614..f0f03b5ff2 100644 --- a/tests/qemuxml2argvdata/disk-serial.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-serial.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-shared.x86_64-latest.args index d4997fb628..9059d3c369 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-slices.x86_64-latest.args index d52332681a..25ee975619 100644 --- a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args b/test= s/qemuxml2argvdata/disk-snapshot.x86_64-latest.args index 71e2b7a840..f8830e3ae4 100644 --- a/tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-source-fd.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-source-fd.x86_64-latest.args index 4f201c755b..9d8109a8f4 100644 --- a/tests/qemuxml2argvdata/disk-source-fd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-source-fd.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.arg= s b/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.args index dcb468dd82..24c6d68e2f 100644 --- a/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args index cd79f6a43e..35106d86e7 100644 --- a/tests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-transient.x86_64-latest.args index 090bf60585..d586cdafd9 100644 --- a/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest= .args b/tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args index c5bfd8e8e0..d8895aec40 100644 --- a/tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args b/te= sts/qemuxml2argvdata/disk-usb-device.x86_64-latest.args index 53f08e2054..a7e42e9e93 100644 --- a/tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-4.2.0.args b= /tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-4.2.0.args index 3ca1490a14..7522be4582 100644 --- a/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-4.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu64 \ --m 14336 \ +-m size=3D14680064k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -object memory-backend-file,id=3Dram-node0,mem-path=3D/var/lib/libvirt/qem= u/ram/-1-QEMUGuest1/ram-node0,share=3Don,size=3D15032385536 \ diff --git a/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-latest.args = b/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-latest.args index acbfb28308..cbe9f9ef48 100644 --- a/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 14336 \ +-m size=3D14680064k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/v= ar/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0","share":true,"size":150323= 85536}' \ diff --git a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args index 99f38368cd..d5c159e5d1 100644 --- a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-memfd","id":"pc.ram","share":true,"x-= use-canonical-path-for-ramblock-id":false,"size":224395264}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args = b/tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args index eadf12b071..9bc1524095 100644 --- a/tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args b/tes= ts/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args index 52f67f80f2..ae7dcde48a 100644 --- a/tests/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args index a97beb200f..35e76658e2 100644 --- a/tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args= b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args index 74cab23527..44b14d06f9 100644 --- a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-5.= 2.0.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-5.2.= 0.args index 24b86f3e01..8358520642 100644 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-5.2.0.args @@ -14,7 +14,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-i440fx-5.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ -overcommit mem-lock=3Doff \ -smp 8,sockets=3D8,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-la= test.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-lat= est.args index 5ce9aeda45..2d8ed07e8c 100644 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.ar= gs @@ -14,7 +14,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 8,sockets=3D8,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-virtio.x86_64-latest.args index 999c7633e2..fb4f81a6a5 100644 --- a/tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args= b/tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args index 2d07d6665a..b53f3741d9 100644 --- a/tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args +++ b/tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/encrypted-disk.x86_64-latest.args b/tes= ts/qemuxml2argvdata/encrypted-disk.x86_64-latest.args index b5af3b03bb..460e5508cd 100644 --- a/tests/qemuxml2argvdata/encrypted-disk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/encrypted-disk.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args b/tests= /qemuxml2argvdata/eoi-disabled.x86_64-latest.args index 464e73397f..8550c8a85d 100644 --- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ -cpu qemu64,kvm-pv-eoi=3Doff \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args b/tests/= qemuxml2argvdata/eoi-enabled.x86_64-latest.args index 947891ce47..f39c4e01b3 100644 --- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ -cpu qemu64,kvm-pv-eoi=3Don \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/event_idx.x86_64-latest.args b/tests/qe= muxml2argvdata/event_idx.x86_64-latest.args index 4934b14bc9..1ee5c22628 100644 --- a/tests/qemuxml2argvdata/event_idx.x86_64-latest.args +++ b/tests/qemuxml2argvdata/event_idx.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args b/tests= /qemuxml2argvdata/fd-memory-no-numa-topology.args index 250d0b813f..eaaf82c3f9 100644 --- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args +++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-instanc= e-00000092/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-instance-00000092/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ --m 14336 \ +-m size=3D14680064k \ -mem-prealloc \ -mem-path /var/lib/libvirt/qemu/ram/-1-instance-00000092/ram \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.args b/tests/qe= muxml2argvdata/fd-memory-numa-topology.args index e8a7ed1120..b60f1dbf7d 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-instanc= e-00000092/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-instance-00000092/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ --m 14336 \ +-m size=3D14680064k \ -overcommit mem-lock=3Doff \ -smp 8,sockets=3D1,cores=3D8,threads=3D1 \ -object memory-backend-file,id=3Dram-node0,mem-path=3D/var/lib/libvirt/qem= u/ram/-1-instance-00000092/ram-node0,share=3Don,prealloc=3Don,size=3D150323= 85536 \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args b/tests/q= emuxml2argvdata/fd-memory-numa-topology2.args index c639270ef0..eb88b27e16 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-instanc= e-00000092/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-instance-00000092/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ --m 28672 \ +-m size=3D29360128k \ -overcommit mem-lock=3Doff \ -smp 20,sockets=3D1,cores=3D8,threads=3D1 \ -object memory-backend-file,id=3Dram-node0,mem-path=3D/var/lib/libvirt/qem= u/ram/-1-instance-00000092/ram-node0,share=3Doff,prealloc=3Don,size=3D15032= 385536 \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args b/tests/q= emuxml2argvdata/fd-memory-numa-topology3.args index 0dddf843e7..c10140a55d 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-instanc= e-00000092/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-instance-00000092/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ --m 43008 \ +-m size=3D44040192k \ -overcommit mem-lock=3Doff \ -smp 32,sockets=3D1,cores=3D24,threads=3D1 \ -object memory-backend-file,id=3Dram-node0,mem-path=3D/var/lib/libvirt/qem= u/ram/-1-instance-00000092/ram-node0,share=3Don,prealloc=3Don,size=3D150323= 85536 \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology4.x86_64-latest.= args b/tests/qemuxml2argvdata/fd-memory-numa-topology4.x86_64-latest.args index b7c135895d..3cc67fb138 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology4.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology4.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-pc/.con= fig \ -machine pc-i440fx-5.0,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel kvm \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -mem-prealloc \ diff --git a/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args b/tests/= qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args index df1c254cd1..2c8a273f74 100644 --- a/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args +++ b/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args @@ -14,7 +14,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-i440fx-5.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args b/tests= /qemuxml2argvdata/fips-enabled.x86_64-latest.args index b7c77049b1..486a07b157 100644 --- a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-lat= est.args b/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-lates= t.args index eed322b7cc..0efb878bb2 100644 --- a/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args @@ -14,7 +14,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -accel kvm \ -cpu qemu64 \ -bios /usr/share/seabios/bios-256k.bin \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args b= /tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args index eed322b7cc..0efb878bb2 100644 --- a/tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args @@ -14,7 +14,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -accel kvm \ -cpu qemu64 \ -bios /usr/share/seabios/bios-256k.bin \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-lates= t.args b/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.ar= gs index a8b9cae35f..7f8b5e7797 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt-4.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-p= flash1-format \ -accel tcg \ -cpu cortex-a15 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-abi-update-aarch64.aa= rch64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-abi-update-aar= ch64.aarch64-latest.args index 81dbf9cf1b..267f197ca3 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-abi-update-aarch64.aarch64-l= atest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-abi-update-aarch64.aarch64-l= atest.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt-4.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-p= flash1-format \ -accel tcg \ -cpu cortex-a15 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-= latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64= -latest.args index b412af644c..29f76cd20d 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.= args @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-loader-qcow2.x= 86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-format-loader-= qcow2.x86_64-latest.args index ab08330764..8d609e4ac4 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-format-loader-qcow2.x86_64-l= atest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-format-loader-qcow2.x86_64-l= atest.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi=3D= on \ -accel kvm \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-loader-raw.aar= ch64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-format-loader-r= aw.aarch64-latest.args index a8b9cae35f..7f8b5e7797 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-format-loader-raw.aarch64-la= test.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-format-loader-raw.aarch64-la= test.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt-4.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-p= flash1-format \ -accel tcg \ -cpu cortex-a15 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qcow2-ne= twork-nbd.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-for= mat-nvram-qcow2-network-nbd.x86_64-latest.args index 4c77dd2318..3dff5c6153 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qcow2-network-n= bd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qcow2-network-n= bd.x86_64-latest.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qcow2-pa= th.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-format-nvr= am-qcow2-path.x86_64-latest.args index ff73283c2f..2857335df4 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qcow2-path.x86_= 64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qcow2-path.x86_= 64-latest.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi=3D= on \ -accel kvm \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qcow2.x8= 6_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qc= ow2.x86_64-latest.args index ab08330764..8d609e4ac4 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qcow2.x86_64-la= test.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qcow2.x86_64-la= test.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi=3D= on \ -accel kvm \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.x86_6= 4-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.x8= 6_64-latest.args index 9326bfe305..6d388346a8 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.x86_64-lates= t.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi=3D= on \ -accel kvm \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.x86_64-la= test.args b/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.x86_64-lat= est.args index 9326bfe305..6d388346a8 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.x86_64-latest.ar= gs @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi=3D= on \ -accel kvm \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-= latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64= -latest.args index b412af644c..29f76cd20d 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.= args @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_= 64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.= x86_64-latest.args index b412af644c..29f76cd20d 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-late= st.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-late= st.args @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-lat= est.args b/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-lates= t.args index 9326bfe305..6d388346a8 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi=3D= on \ -accel kvm \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-file.x86_64-lat= est.args b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-file.x86_64-lates= t.args index 61cfb90d73..d5f69b0d76 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-file.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-file.x86_64-latest.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-iscsi.x= 86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-= iscsi.x86_64-latest.args index 88eb054a5b..c2b6b33d78 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-iscsi.x86_64-l= atest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-iscsi.x86_64-l= atest.args @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-nbd.x86= _64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-nb= d.x86_64-latest.args index c1221bef30..e6f029cd50 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-nbd.x86_64-lat= est.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-nbd.x86_64-lat= est.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args index c8fdfd60d6..5287ab0251 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest= .args b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args index b412af644c..29f76cd20d 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-smm-off.x86_64-latest= .args b/tests/qemuxml2argvdata/firmware-auto-efi-smm-off.x86_64-latest.args index ccad52c3a9..e8f8a57acb 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-smm-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-smm-off.x86_64-latest.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-q35-4.0,usb=3Doff,smm=3Doff,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-form= at,acpi=3Don \ -accel kvm \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-late= st.args b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.= args index 27281a441a..5b3ab2eb6b 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,acpi=3Don \ -accel kvm \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args b/= tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args index b412af644c..29f76cd20d 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -accel kvm \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-l= atest.args b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-l= atest.args index 8a27ec474f..effbdbe769 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-latest.a= rgs @@ -14,7 +14,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -accel tcg \ -cpu qemu64 \ -bios /usr/share/seabios/bios.bin \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args= b/tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args index 8a27ec474f..effbdbe769 100644 --- a/tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args @@ -14,7 +14,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -accel tcg \ -cpu qemu64 \ -bios /usr/share/seabios/bios.bin \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch6= 4-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aar= ch64-latest.args index 46b675cf30..089deeb65a 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch64-lates= t.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch64-lates= t.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt-4.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-p= flash1-format \ -accel tcg \ -cpu cortex-a15 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-lat= est.args b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-lates= t.args index 5e5359ab71..20c5eda2ec 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi=3D= on \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-features.x86_64-lat= est.args b/tests/qemuxml2argvdata/firmware-manual-efi-features.x86_64-lates= t.args index 57c71542cd..f587e262fe 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-features.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-features.x86_64-latest.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-loader-secure.x86_6= 4-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-loader-secure.x8= 6_64-latest.args index a1481d834f..35f7f0238a 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-loader-secure.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-loader-secure.x86_64-lates= t.args @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -accel tcg \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys.x8= 6_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-k= eys.x86_64-latest.args index a1481d834f..35f7f0238a 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys.x86_64-la= test.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys.x86_64-la= test.args @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -accel tcg \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot.x86_64-l= atest.args b/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot.x86_64-l= atest.args index 5e5359ab71..20c5eda2ec 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot.x86_64-latest.a= rgs @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi=3D= on \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarc= h64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64= .aarch64-latest.args index d27db06235..893b7b1d03 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarch64-lat= est.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarch64-lat= est.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt-4.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-p= flash1-format \ -accel tcg \ -cpu cortex-a15 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-l= atest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-l= atest.args index 61cfb90d73..d5f69b0d76 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.a= rgs @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi= .x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-netw= ork-iscsi.x86_64-latest.args index 88eb054a5b..c2b6b33d78 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64= -latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64= -latest.args @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x= 86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-networ= k-nbd.x86_64-latest.args index c1221bef30..e6f029cd50 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-l= atest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-l= atest.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_= 64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.= x86_64-latest.args index 57c71542cd..f587e262fe 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-late= st.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-late= st.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.x86_64-= latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.x86_64= -latest.args index de9438e561..f1e136dda0 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.x86_64-latest.= args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,acpi=3Don \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-rw.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/firmware-manual-efi-rw.x86_64-latest.args index de9438e561..f1e136dda0 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-rw.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-rw.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,acpi=3Don \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secboot.x86_64-late= st.args b/tests/qemuxml2argvdata/firmware-manual-efi-secboot.x86_64-latest.= args index a1481d834f..35f7f0238a 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-secboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-secboot.x86_64-latest.args @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -accel tcg \ -cpu qemu64 \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-la= test.args b/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-lat= est.args index 82643f563d..a27264e403 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.ar= gs @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,acpi=3Don \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args = b/tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args index 61cfb90d73..d5f69b0d76 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-i440fx-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-l= atest.args b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-l= atest.args index aebe279225..4dbf350abc 100644 --- a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-latest.a= rgs @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,acpi=3Don \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aa= rch64-latest.args b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aar= ch64.aarch64-latest.args index 95cea641d8..92adfaa3a7 100644 --- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aarch64-l= atest.args +++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aarch64-l= atest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt-4.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a15 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64= -latest.args b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_= 64-latest.args index fa232b2b94..4112106540 100644 --- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64-latest= .args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-q35-4.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args b/t= ests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args index 381aacbaf8..e63ddfeb16 100644 --- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args b/tests/qemu= xml2argvdata/fs9p-ccw.s390x-latest.args index f87c460054..98114baed7 100644 --- a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args b/tests/qemuxml= 2argvdata/fs9p.x86_64-latest.args index 4bf96a7801..6baa45a828 100644 --- a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fs9p.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args b/tests/q= emuxml2argvdata/genid-auto.x86_64-latest.args index 38f310a3b5..e3aa0d5b10 100644 --- a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/genid.x86_64-latest.args b/tests/qemuxm= l2argvdata/genid.x86_64-latest.args index 96d5749426..c1fb2cee78 100644 --- a/tests/qemuxml2argvdata/genid.x86_64-latest.args +++ b/tests/qemuxml2argvdata/genid.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-dbus-address.args b/tests/qemu= xml2argvdata/graphics-dbus-address.args index ebe62a1c67..e9fd771527 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-address.args +++ b/tests/qemuxml2argvdata/graphics-dbus-address.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/graphics-dbus-audio.args b/tests/qemuxm= l2argvdata/graphics-dbus-audio.args index 08eeea780d..9e07c26134 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-audio.args +++ b/tests/qemuxml2argvdata/graphics-dbus-audio.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/graphics-dbus-chardev.args b/tests/qemu= xml2argvdata/graphics-dbus-chardev.args index 995fb023fa..dac48ae5cd 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-chardev.args +++ b/tests/qemuxml2argvdata/graphics-dbus-chardev.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/graphics-dbus-p2p.args b/tests/qemuxml2= argvdata/graphics-dbus-p2p.args index c96b3c689b..3a41f089d5 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-p2p.args +++ b/tests/qemuxml2argvdata/graphics-dbus-p2p.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/graphics-dbus-usbredir.args b/tests/qem= uxml2argvdata/graphics-dbus-usbredir.args index f2bc4b702d..9a480b978f 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-usbredir.args +++ b/tests/qemuxml2argvdata/graphics-dbus-usbredir.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/graphics-dbus.args b/tests/qemuxml2argv= data/graphics-dbus.args index 9629a510c4..a6cae8b8d8 100644 --- a/tests/qemuxml2argvdata/graphics-dbus.args +++ b/tests/qemuxml2argvdata/graphics-dbus.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64= -latest.args b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_= 64-latest.args index 66dd035be5..9ec5d8c688 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest= .args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args b/tests/qemu= xml2argvdata/graphics-egl-headless.args index efb8d9af57..e5ea7bcf2b 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless.args +++ b/tests/qemuxml2argvdata/graphics-egl-headless.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.arg= s b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args index 66dd035be5..9ec5d8c688 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args b/tests/qe= muxml2argvdata/graphics-sdl-fullscreen.args index dad6c9a710..a4718718d0 100644 --- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args +++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args @@ -14,7 +14,7 @@ DISPLAY=3D:0.1 \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/graphics-sdl.args b/tests/qemuxml2argvd= ata/graphics-sdl.args index 1ef30567bc..9cdaf2a652 100644 --- a/tests/qemuxml2argvdata/graphics-sdl.args +++ b/tests/qemuxml2argvdata/graphics-sdl.args @@ -14,7 +14,7 @@ DISPLAY=3D:0.1 \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-l= atest.args b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-l= atest.args index 7f1d2f79e4..3ffe09e6f6 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-latest.a= rgs @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest= .args b/tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest.args index 19252cb917..c044c77105 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-l= atest.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-l= atest.args index 92ce0db43b..a50ca802ae 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.a= rgs @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-lates= t.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.ar= gs index 92ce0db43b..a50ca802ae 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-lates= t.args b/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.ar= gs index 4c766401ad..39eee130c1 100644 --- a/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-late= st.args b/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.= args index ea22395405..e905aad710 100644 --- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_6= 4-latest.args b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x8= 6_64-latest.args index f76479a401..6fe49ca5ca 100644 --- a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-lates= t.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.args index ed4af54e50..512f17c5eb 100644 --- a/tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args index 7e7cff75f2..0f3a9a3def 100644 --- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args = b/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args index eb1830e6d9..4c0d998a47 100644 --- a/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args @@ -14,7 +14,7 @@ SASL_CONF_PATH=3D/etc/sasl2 \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.arg= s b/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args index fac85f3305..634176a6c3 100644 --- a/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args index 534b752d3d..40506328d4 100644 --- a/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-f14/.co= nfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel kvm \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.= args b/tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.args index a90a33a061..b5f695063c 100644 --- a/tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args b/tes= ts/qemuxml2argvdata/graphics-spice.x86_64-latest.args index 234fd688b4..55df7945d0 100644 --- a/tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-lat= est.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-lates= t.args index 98350d41f9..5afa817191 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.= args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.args index c8bea1ba24..db2f7b5930 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest= .args b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args index 4bb24b3ea3..8b93bd98db 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-late= st.args b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-latest.= args index 88115ec517..65e440ab21 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args b/= tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args index 3bca2fbbad..19372db9bc 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args = b/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args index 3777a9610f..1c333bac5e 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args b= /tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args index 6ecab452ab..36dbc2b973 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x8= 6_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-soc= ket.x86_64-latest.args index 7645968bc3..c0126848db 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-la= test.args +++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-la= test.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args b/= tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args index 39ec25faf4..27477365d5 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args @@ -14,7 +14,7 @@ SASL_CONF_PATH=3D/etc/sasl2 \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-= latest.args b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64= -latest.args index d6c2107283..dec43c1596 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-latest.= args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args = b/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args index e8e4c3bc46..ef36ca7291 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.ar= gs b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args index aa9b3aae17..11f8b3f4f0 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args @@ -14,7 +14,7 @@ SASL_CONF_PATH=3D/etc/sasl2 \ -machine pc-i440fx-5.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args index 4bba736ba2..50cc8532d1 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args @@ -14,7 +14,7 @@ SASL_CONF_PATH=3D/etc/sasl2 \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args b/t= ests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args index 5c6b452770..2e2e1ef6c3 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args @@ -14,7 +14,7 @@ SASL_CONF_PATH=3D/etc/sasl2 \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.args index 84fc949f90..7728d69da2 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args b/tests= /qemuxml2argvdata/graphics-vnc.x86_64-latest.args index 88115ec517..65e440ab21 100644 --- a/tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-lates= t.args b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.ar= gs index 24a88d62cd..d881c56af0 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless= .x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl= -headless.x86_64-latest.args index 69f566ae30..cd74de7b73 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64= -latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64= -latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_6= 4-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x8= 6_64-latest.args index 2b3660deb0..1b8b48b742 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-lates= t.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x= 86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-hea= dless.x86_64-latest.args index bf7734db99..be678cb85b 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-l= atest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-l= atest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.= args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args index 98fd0715da..b3e9d12f4e 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qe= muxml2argvdata/hostdev-mdev-precreated.args index c8f835cc78..c0133bff9d 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest2/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-lates= t.args b/tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-latest.ar= gs index 0bcfb8061e..f87ab084de 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args b/t= ests/qemuxml2argvdata/hostdev-pci-address-unassigned.args index cbf1a59652..61fe727996 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args +++ b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-delete/= .config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-delete/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ --m 256 \ +-m size=3D262144k \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid 583a8e8e-f0ce-4f53-89ab-092862148b25 \ diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args = b/tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args index eee0a89e4d..36eed8731a 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args b/tests/= qemuxml2argvdata/hostdev-pci-multifunction.args index 4113ac1a9e..50d6010429 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args +++ b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-delete/= .config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-delete/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ --m 256 \ +-m size=3D262144k \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid 583a8e8e-f0ce-4f53-89ab-092862148b25 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args b/t= ests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args index 592ba7f992..6c3e73d6d6 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.s390x-lates= t.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.ar= gs index 83b71ed272..9a0b4ec879 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args b/test= s/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args index c8b7fd8bf9..ebf1484ee0 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest2/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2= .0.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.= args index 0c58d4fccd..087091545d 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-lat= est.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-lates= t.args index 8a36bee6ca..f2b39694ee 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.= args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args index 1ac52a4d78..414496c712 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-lates= t.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.ar= gs index 514bf7c674..4a7126ae1b 100644 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args +++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":536870912= }' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x= -latest.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s39= 0x-latest.args index 906adbf5e9..b83ec2c697 100644 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest= .args +++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest= .args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":536870912= }' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.s390x-late= st.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.= args index 790b085bf8..ddd603af1a 100644 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":536870912= }' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64-= latest.args b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64= -latest.args index 4d6ff8c0e3..56f9743bec 100644 --- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64-latest.= args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-lates= t.args b/tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-latest.ar= gs index d8b3ba24f2..f44a7c9cb0 100644 --- a/tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args = b/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args index 23572c30af..cab9a4f258 100644 --- a/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args b/tests/q= emuxml2argvdata/hostdev-vfio-multidomain.args index bc2dd4e586..abcc42989e 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest2/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.s39= 0x-latest.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids= .s390x-latest.args index d5d9d9a7b2..1344b838dc 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.s390x-late= st.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.s390x-late= st.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.s39= 0x-latest.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids= .s390x-latest.args index 79ce11cc25..61a6d7e5ca 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.s390x-late= st.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.s390x-late= st.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.s390x-la= test.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.s390x-lat= est.args index c8fd8aa1e2..aa84126db6 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.s390x-latest.ar= gs +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.s390x-latest.ar= gs @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.s390x-late= st.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.s390x-latest.= args index c4af2edd9e..40f21166ee 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.s390x-latest.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.s390x-= latest.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.s390x= -latest.args index 43f9b5416e..f84dee963d 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.= args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.= args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-KVMGues= t1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel kvm \ -cpu gen15a-base,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag318=3Don,c= sske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa5=3Don,msa= 4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Don,deflate= =3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,mepochptff=3Don,ap=3Don,vxe= h=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2=3Don,esort=3Don,apqi=3Don,= apft=3Don,els=3Don,iep=3Don,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,gs=3Don,p= pa15=3Don,zpci=3Don,sea_esop2=3Don,te=3Don,cmm=3Don \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.s390= x-latest.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.s= 390x-latest.args index a7820442cf..5c88094ecd 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.s390x-lates= t.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.s390x-lates= t.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.s390x-latest.args b/t= ests/qemuxml2argvdata/hostdev-vfio-zpci.s390x-latest.args index 4ba14c181e..9574139829 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci.s390x-latest.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args b/tests/qemuxml2argvd= ata/hostdev-vfio.args index aab60f86fc..7741f637c6 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio.args +++ b/tests/qemuxml2argvdata/hostdev-vfio.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest2/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/hotplug-base.args b/tests/qemuxml2argvd= ata/hotplug-base.args index ac2d28ee7e..fd1ff8f36d 100644 --- a/tests/qemuxml2argvdata/hotplug-base.args +++ b/tests/qemuxml2argvdata/hotplug-base.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-hotplug= /.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-hotplug/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ --m 4096 \ +-m size=3D4194304k \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.x86_64-latest.args= b/tests/qemuxml2argvdata/hugepages-default-2M.x86_64-latest.args index eae6b4e955..dd95b296ba 100644 --- a/tests/qemuxml2argvdata/hugepages-default-2M.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-default-2M.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-SomeDum= myHugepagesGu/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/dev/= hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu","x-use-canonical-path-for= -ramblock-id":false,"prealloc":true,"size":1073741824}' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.x86_64-la= test.args b/tests/qemuxml2argvdata/hugepages-default-system-size.x86_64-lat= est.args index 228ecdd574..11b4b700ae 100644 --- a/tests/qemuxml2argvdata/hugepages-default-system-size.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/hugepages-default-system-size.x86_64-latest.ar= gs @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-SomeDum= myHugepagesGu/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hugepages-default.x86_64-latest.args b/= tests/qemuxml2argvdata/hugepages-default.x86_64-latest.args index 7523684d88..310cd1f79a 100644 --- a/tests/qemuxml2argvdata/hugepages-default.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-default.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/dev/= hugepages2M/libvirt/qemu/-1-QEMUGuest1","x-use-canonical-path-for-ramblock-= id":false,"prealloc":true,"size":224395264}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args= b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args index 99fadc5b38..9c5d1671ea 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fedora/= .config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu qemu64 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/dev/= hugepages2M/libvirt/qemu/-1-fedora","share":true,"x-use-canonical-path-for-= ramblock-id":false,"prealloc":true,"size":4294967296}' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.x86_64-latest.args b/= tests/qemuxml2argvdata/hugepages-nodeset.x86_64-latest.args index eae6b4e955..dd95b296ba 100644 --- a/tests/qemuxml2argvdata/hugepages-nodeset.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-nodeset.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-SomeDum= myHugepagesGu/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/dev/= hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu","x-use-canonical-path-for= -ramblock-id":false,"prealloc":true,"size":1073741824}' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.x86_64-latest= .args b/tests/qemuxml2argvdata/hugepages-numa-default-2M.x86_64-latest.args index a6e3e7f142..320910db61 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-default-2M.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-SomeDum= myHugepagesGu/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/d= ev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu","prealloc":true,"size"= :268435456}' \ diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/hugepages-numa-default.x86_64-latest.args index deddff9666..677122eba2 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-default.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-numa-default.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fedora/= .config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/d= ev/hugepages2M/libvirt/qemu/-1-fedora","prealloc":true,"size":1073741824}' \ diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.x86_64-late= st.args b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.x86_64-latest.= args index 277e517321..a86697048c 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-SomeDum= myHugepagesGu/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":26843545= 6}' \ diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/hugepages-numa-nodeset.x86_64-latest.args index b8257a8a68..23198ba24e 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 4096 \ +-m size=3D4194304k \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/d= ev/hugepages1G/libvirt/qemu/-1-QEMUGuest1","prealloc":true,"size":107374182= 4}' \ diff --git a/tests/qemuxml2argvdata/hugepages-shared.x86_64-latest.args b/t= ests/qemuxml2argvdata/hugepages-shared.x86_64-latest.args index ad28cd7551..2267ec2911 100644 --- a/tests/qemuxml2argvdata/hugepages-shared.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-shared.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 4096 \ +-m size=3D4194304k \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -object '{"qom-type":"thread-context","id":"tc-ram-node0","node-affinity":= [0,1,2,3]}' \ diff --git a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.aarch64-lates= t.args b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.aarch64-latest.ar= gs index a5055cbec3..8fae9ebfa6 100644 --- a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.aarch64-latest.args +++ b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.aarch64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflas= h1-format \ -accel hvf \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294= 967296}' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.x86_64-latest.args index be43b61adf..92fbcffd57 100644 --- a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel hvf \ -cpu qemu64 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args b/tests/q= emuxml2argvdata/hyperv-off.x86_64-latest.args index 627890f599..81b67778be 100644 --- a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args b/tests= /qemuxml2argvdata/hyperv-panic.x86_64-latest.args index 243f2d1d9c..11b165ea47 100644 --- a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ -cpu qemu64,hv-crash \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hyperv-passthrough.x86_64-6.1.0.args b/= tests/qemuxml2argvdata/hyperv-passthrough.x86_64-6.1.0.args index ab6388e87a..58f7b9c3a9 100644 --- a/tests/qemuxml2argvdata/hyperv-passthrough.x86_64-6.1.0.args +++ b/tests/qemuxml2argvdata/hyperv-passthrough.x86_64-6.1.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-i440fx-6.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ -accel tcg \ -cpu qemu64,hv-passthrough=3Don \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hyperv-passthrough.x86_64-latest.args b= /tests/qemuxml2argvdata/hyperv-passthrough.x86_64-latest.args index 9ebbfb5599..c2c29f7a52 100644 --- a/tests/qemuxml2argvdata/hyperv-passthrough.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-passthrough.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ -cpu qemu64,hv-passthrough=3Don \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args= b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args index e9eb7d0a98..b665e5365d 100644 --- a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ -cpu qemu64,hv-vpindex=3Don,hv-synic=3Don,hv-stimer=3Don,hv-stimer-direct= =3Don \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args b/tests/qemux= ml2argvdata/hyperv.x86_64-latest.args index e41ed3dcf6..8f0a02230c 100644 --- a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ -cpu 'qemu64,hv-relaxed=3Don,hv-vapic=3Don,hv-spinlocks=3D0x2fff,hv-vpinde= x=3Don,hv-runtime=3Don,hv-synic=3Don,hv-stimer=3Don,hv-reset=3Don,hv-vendor= -id=3DKVM Hv,hv-frequencies=3Don,hv-reenlightenment=3Don,hv-tlbflush=3Don,h= v-ipi=3Don,hv-evmcs=3Don,hv-avic=3Don' \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/input-linux.x86_64-latest.args b/tests/= qemuxml2argvdata/input-linux.x86_64-latest.args index ce7f0ab8ea..2794b49968 100644 --- a/tests/qemuxml2argvdata/input-linux.x86_64-latest.args +++ b/tests/qemuxml2argvdata/input-linux.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxm= l2argvdata/input-usbmouse-addr.args index 9df1ed5831..605d88223c 100644 --- a/tests/qemuxml2argvdata/input-usbmouse-addr.args +++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/input-usbmouse.args b/tests/qemuxml2arg= vdata/input-usbmouse.args index 3c7ef16258..5e780f30d5 100644 --- a/tests/qemuxml2argvdata/input-usbmouse.args +++ b/tests/qemuxml2argvdata/input-usbmouse.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/input-usbtablet.args b/tests/qemuxml2ar= gvdata/input-usbtablet.args index f74bfddac9..1db1c47965 100644 --- a/tests/qemuxml2argvdata/input-usbtablet.args +++ b/tests/qemuxml2argvdata/input-usbtablet.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/input-virtio-ccw.s390x-latest.args b/te= sts/qemuxml2argvdata/input-virtio-ccw.s390x-latest.args index 013d2128ee..c171fe507c 100644 --- a/tests/qemuxml2argvdata/input-virtio-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/input-virtio-ccw.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args = b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args index 34079d4e22..9216ee6b9a 100644 --- a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine q35,usb=3Doff,kernel_irqchip=3Dsplit,dump-guest-core=3Doff,memory= -backend=3Dpc.ram,acpi=3Doff \ -accel kvm \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.= args b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args index 71eec03134..b3a1dcfd7b 100644 --- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine q35,usb=3Doff,kernel_irqchip=3Dsplit,dump-guest-core=3Doff,memory= -backend=3Dpc.ram,acpi=3Doff \ -accel kvm \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.= args b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args index e0753cd49a..920b703243 100644 --- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine q35,usb=3Doff,kernel_irqchip=3Dsplit,dump-guest-core=3Doff,memory= -backend=3Dpc.ram,acpi=3Doff \ -accel kvm \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args b/te= sts/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args index d345bd437e..07fa1191b7 100644 --- a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine q35,usb=3Doff,kernel_irqchip=3Dsplit,dump-guest-core=3Doff,memory= -backend=3Dpc.ram,acpi=3Doff \ -accel kvm \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 288,sockets=3D288,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args b/tests/= qemuxml2argvdata/intel-iommu.x86_64-latest.args index 663dd6b81e..983d74383c 100644 --- a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args b/test= s/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args index 734767f820..9c48d1f5b5 100644 --- a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args +++ b/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt,usb=3Doff,gic-version=3D2,iommu=3Dsmmuv3,dump-guest-core=3Do= ff,memory-backend=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a15 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.s390x-4.2.0.a= rgs b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.s390x-4.2.0.args index d0d9275b23..c274dc09c3 100644 --- a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.s390x-4.2.0.args +++ b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.s390x-4.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -object iothread,id=3Diothread1 \ diff --git a/tests/qemuxml2argvdata/iothreads-disk.x86_64-latest.args b/tes= ts/qemuxml2argvdata/iothreads-disk.x86_64-latest.args index beb896c111..fb732129d1 100644 --- a/tests/qemuxml2argvdata/iothreads-disk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/iothreads-disk.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.x86_64-latest.arg= s b/tests/qemuxml2argvdata/iothreads-ids-partial.x86_64-latest.args index af03cfc800..403001e7df 100644 --- a/tests/qemuxml2argvdata/iothreads-ids-partial.x86_64-latest.args +++ b/tests/qemuxml2argvdata/iothreads-ids-partial.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/iothreads-ids-pool-sizes.x86_64-latest.= args b/tests/qemuxml2argvdata/iothreads-ids-pool-sizes.x86_64-latest.args index 1422e94e35..cec62acdd8 100644 --- a/tests/qemuxml2argvdata/iothreads-ids-pool-sizes.x86_64-latest.args +++ b/tests/qemuxml2argvdata/iothreads-ids-pool-sizes.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/iothreads-ids.x86_64-latest.args b/test= s/qemuxml2argvdata/iothreads-ids.x86_64-latest.args index 26edb2286d..0e847fe655 100644 --- a/tests/qemuxml2argvdata/iothreads-ids.x86_64-latest.args +++ b/tests/qemuxml2argvdata/iothreads-ids.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.= args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args index 8eb3b383fd..cc9d0a4f16 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.= args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.args index 4dfc1166ea..53c52efb13 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-i440fx-5.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest= .args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args index 29a4d8212c..b64b67e7d2 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/kvm-features-off.args b/tests/qemuxml2a= rgvdata/kvm-features-off.args index c86efbd9c3..49d5e81ebe 100644 --- a/tests/qemuxml2argvdata/kvm-features-off.args +++ b/tests/qemuxml2argvdata/kvm-features-off.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host,kvm-pv-ipi=3Doff \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/kvm-features.args b/tests/qemuxml2argvd= ata/kvm-features.args index 985d406ad7..9c8236c210 100644 --- a/tests/qemuxml2argvdata/kvm-features.args +++ b/tests/qemuxml2argvdata/kvm-features.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm,dirty-ring-size=3D4096 \ -cpu host,kvm=3Doff,kvm-hint-dedicated=3Don,kvm-poll-control=3Don \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argv= data/kvm-pit-delay.args index ff1c5f82f1..a2fa824303 100644 --- a/tests/qemuxml2argvdata/kvm-pit-delay.args +++ b/tests/qemuxml2argvdata/kvm-pit-delay.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args b/tests/qemuxml2ar= gvdata/kvm-pit-discard.args index f99018300f..c50b3351f9 100644 --- a/tests/qemuxml2argvdata/kvm-pit-discard.args +++ b/tests/qemuxml2argvdata/kvm-pit-discard.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.arg= s b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args index e89fe0fbd8..99b62a8c41 100644 --- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ -cpu qemu64,kvmclock=3Doff,kvm-pv-eoi=3Doff \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/= kvmclock.args index 04f76167d4..6d7527252c 100644 --- a/tests/qemuxml2argvdata/kvmclock.args +++ b/tests/qemuxml2argvdata/kvmclock.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu qemu32,kvmclock=3Doff \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.ar= gs b/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args index bf07def6fd..423b16a497 100644 --- a/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args +++ b/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram,confidential-guest-support=3Dlsec0 \ -accel kvm \ -cpu gen15a-base,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag318=3Don,c= sske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa5=3Don,msa= 4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Don,deflate= =3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,mepochptff=3Don,ap=3Don,vxe= h=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2=3Don,esort=3Don,apqi=3Don,= apft=3Don,els=3Don,iep=3Don,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,gs=3Don,p= pa15=3Don,zpci=3Don,sea_esop2=3Don,te=3Don,cmm=3Don \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/launch-security-sev-direct.x86_64-lates= t.args b/tests/qemuxml2argvdata/launch-security-sev-direct.x86_64-latest.ar= gs index 856303c359..25a22b2682 100644 --- a/tests/qemuxml2argvdata/launch-security-sev-direct.x86_64-latest.args +++ b/tests/qemuxml2argvdata/launch-security-sev-direct.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,confid= ential-guest-support=3Dlsec0,acpi=3Doff \ -accel kvm \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-in= fo.x86_64-6.0.0.args b/tests/qemuxml2argvdata/launch-security-sev-missing-p= latform-info.x86_64-6.0.0.args index bee69a52f5..261c0fcbc7 100644 --- a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_= 64-6.0.0.args +++ b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_= 64-6.0.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-i440fx-6.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,confidential-guest-support=3Dlsec0 \ -accel kvm \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/launch-security-sev.x86_64-6.0.0.args b= /tests/qemuxml2argvdata/launch-security-sev.x86_64-6.0.0.args index bee69a52f5..261c0fcbc7 100644 --- a/tests/qemuxml2argvdata/launch-security-sev.x86_64-6.0.0.args +++ b/tests/qemuxml2argvdata/launch-security-sev.x86_64-6.0.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-i440fx-6.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,confidential-guest-support=3Dlsec0 \ -accel kvm \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-5.2.0.ar= gs b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-5.2.0.args index e069804632..fabb04dc25 100644 --- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-5.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -machine pc-i440fx-5.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object memory-backend-ram,id=3Dpc.ram,size=3D1073741824 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args index 1f4d83aeae..0d68d835f2 100644 --- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/luks-disks-source.x86_64-latest.args b/= tests/qemuxml2argvdata/luks-disks-source.x86_64-latest.args index be4c7c9822..a4de92bb31 100644 --- a/tests/qemuxml2argvdata/luks-disks-source.x86_64-latest.args +++ b/tests/qemuxml2argvdata/luks-disks-source.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -machine pc-i440fx-2.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/luks-disks.x86_64-latest.args b/tests/q= emuxml2argvdata/luks-disks.x86_64-latest.args index c7c38e62e5..2788fe4fc1 100644 --- a/tests/qemuxml2argvdata/luks-disks.x86_64-latest.args +++ b/tests/qemuxml2argvdata/luks-disks.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -machine pc-i440fx-2.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/mach-virt-console-native.aarch64-latest= .args b/tests/qemuxml2argvdata/mach-virt-console-native.aarch64-latest.args index 7324c37696..3020d7cb0b 100644 --- a/tests/qemuxml2argvdata/mach-virt-console-native.aarch64-latest.args +++ b/tests/qemuxml2argvdata/mach-virt-console-native.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a15 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/mach-virt-console-virtio.aarch64-latest= .args b/tests/qemuxml2argvdata/mach-virt-console-virtio.aarch64-latest.args index 926ca90ba1..cab335945c 100644 --- a/tests/qemuxml2argvdata/mach-virt-console-virtio.aarch64-latest.args +++ b/tests/qemuxml2argvdata/mach-virt-console-virtio.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a15 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/mach-virt-serial+console-native.aarch64= -latest.args b/tests/qemuxml2argvdata/mach-virt-serial+console-native.aarch= 64-latest.args index 7324c37696..3020d7cb0b 100644 --- a/tests/qemuxml2argvdata/mach-virt-serial+console-native.aarch64-latest= .args +++ b/tests/qemuxml2argvdata/mach-virt-serial+console-native.aarch64-latest= .args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a15 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/mach-virt-serial-compat.aarch64-latest.= args b/tests/qemuxml2argvdata/mach-virt-serial-compat.aarch64-latest.args index 7324c37696..3020d7cb0b 100644 --- a/tests/qemuxml2argvdata/mach-virt-serial-compat.aarch64-latest.args +++ b/tests/qemuxml2argvdata/mach-virt-serial-compat.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a15 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/mach-virt-serial-native.aarch64-latest.= args b/tests/qemuxml2argvdata/mach-virt-serial-native.aarch64-latest.args index 7324c37696..3020d7cb0b 100644 --- a/tests/qemuxml2argvdata/mach-virt-serial-native.aarch64-latest.args +++ b/tests/qemuxml2argvdata/mach-virt-serial-native.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a15 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/mach-virt-serial-pci.aarch64-latest.arg= s b/tests/qemuxml2argvdata/mach-virt-serial-pci.aarch64-latest.args index 8654cb2f6a..06dfc4d6d4 100644 --- a/tests/qemuxml2argvdata/mach-virt-serial-pci.aarch64-latest.args +++ b/tests/qemuxml2argvdata/mach-virt-serial-pci.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a15 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/mach-virt-serial-usb.aarch64-latest.arg= s b/tests/qemuxml2argvdata/mach-virt-serial-usb.aarch64-latest.args index e672cb1a1e..be13ab085b 100644 --- a/tests/qemuxml2argvdata/mach-virt-serial-usb.aarch64-latest.args +++ b/tests/qemuxml2argvdata/mach-virt-serial-usb.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a15 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.s390x-latest= .args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.s390x-latest.args index 9fb612a69d..5a2c5435e8 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,aes-key-wrap=3Doff,dump-guest-core=3Dof= f,memory-backend=3Ds390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.s390x-lates= t.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.s390x-latest.ar= gs index 9fb612a69d..5a2c5435e8 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,aes-key-wrap=3Doff,dump-guest-core=3Dof= f,memory-backend=3Ds390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.s390x-latest.= args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.s390x-latest.args index 9d75fc8a57..edd03099fc 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,aes-key-wrap=3Don,dump-guest-core=3Doff= ,memory-backend=3Ds390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.s390x-latest= .args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.s390x-latest.args index 9d75fc8a57..edd03099fc 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,aes-key-wrap=3Don,dump-guest-core=3Doff= ,memory-backend=3Ds390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/machine-aliases1.args b/tests/qemuxml2a= rgvdata/machine-aliases1.args index 3efc2b7c86..5078429e1b 100644 --- a/tests/qemuxml2argvdata/machine-aliases1.args +++ b/tests/qemuxml2argvdata/machine-aliases1.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/machine-aliases2.args b/tests/qemuxml2a= rgvdata/machine-aliases2.args index 98e513611b..290a762e91 100644 --- a/tests/qemuxml2argvdata/machine-aliases2.args +++ b/tests/qemuxml2argvdata/machine-aliases2.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/machine-core-off.args b/tests/qemuxml2a= rgvdata/machine-core-off.args index d051a79e53..c4d5239df5 100644 --- a/tests/qemuxml2argvdata/machine-core-off.args +++ b/tests/qemuxml2argvdata/machine-core-off.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/machine-core-on.args b/tests/qemuxml2ar= gvdata/machine-core-on.args index 088b82b627..218aee51dc 100644 --- a/tests/qemuxml2argvdata/machine-core-on.args +++ b/tests/qemuxml2argvdata/machine-core-on.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Don \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.s390x-latest= .args b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.s390x-latest.args index fe8a1a2545..0ab3672f52 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dea-key-wrap=3Doff,dump-guest-core=3Dof= f,memory-backend=3Ds390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.s390x-lates= t.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.s390x-latest.ar= gs index fe8a1a2545..0ab3672f52 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dea-key-wrap=3Doff,dump-guest-core=3Dof= f,memory-backend=3Ds390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.s390x-latest.= args b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.s390x-latest.args index b40a7fd10d..2e2a2332f2 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dea-key-wrap=3Don,dump-guest-core=3Doff= ,memory-backend=3Ds390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.s390x-latest= .args b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.s390x-latest.args index b40a7fd10d..2e2a2332f2 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dea-key-wrap=3Don,dump-guest-core=3Doff= ,memory-backend=3Ds390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-caps.s390x-latest.= args b/tests/qemuxml2argvdata/machine-keywrap-none-caps.s390x-latest.args index c23e11cb28..ad3c83fdd2 100644 --- a/tests/qemuxml2argvdata/machine-keywrap-none-caps.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-keywrap-none-caps.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/machine-keywrap-none.s390x-latest.args = b/tests/qemuxml2argvdata/machine-keywrap-none.s390x-latest.args index c23e11cb28..ad3c83fdd2 100644 --- a/tests/qemuxml2argvdata/machine-keywrap-none.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-keywrap-none.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/machine-loadparm-hostdev.s390x-latest.a= rgs b/tests/qemuxml2argvdata/machine-loadparm-hostdev.s390x-latest.args index 0b59d67ea1..b3f41de0ab 100644 --- a/tests/qemuxml2argvdata/machine-loadparm-hostdev.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-loadparm-hostdev.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram,loadparm=3D2 \ -accel tcg \ -cpu qemu \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":536870912= }' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s3= 90.s390x-latest.args b/tests/qemuxml2argvdata/machine-loadparm-multiple-dis= ks-nets-s390.s390x-latest.args index 04c79bdb69..68fc4c0b52 100644 --- a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.s390= x-latest.args +++ b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.s390= x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram,loadparm=3DSYSTEM1 \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/machine-loadparm-net-s390.s390x-latest.= args b/tests/qemuxml2argvdata/machine-loadparm-net-s390.s390x-latest.args index aeff83148f..31e0fc1283 100644 --- a/tests/qemuxml2argvdata/machine-loadparm-net-s390.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-loadparm-net-s390.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram,loadparm=3D2 \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390.s390x-latest.args= b/tests/qemuxml2argvdata/machine-loadparm-s390.s390x-latest.args index acd7ab845a..cd328bf1e9 100644 --- a/tests/qemuxml2argvdata/machine-loadparm-s390.s390x-latest.args +++ b/tests/qemuxml2argvdata/machine-loadparm-s390.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram,loadparm=3D2 \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args b/te= sts/qemuxml2argvdata/machine-smm-off.x86_64-latest.args index d8ee1dd675..3a8c486df6 100644 --- a/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine q35,usb=3Doff,smm=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args b/tes= ts/qemuxml2argvdata/machine-smm-on.x86_64-latest.args index 5f95913fa1..e873488433 100644 --- a/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args +++ b/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine q35,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backend=3Dpc.= ram,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml= 2argvdata/machine-vmport-opt.args index 062be951fc..d9361967ba 100644 --- a/tests/qemuxml2argvdata/machine-vmport-opt.args +++ b/tests/qemuxml2argvdata/machine-vmport-opt.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,vmport=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/master-key.args b/tests/qemuxml2argvdat= a/master-key.args index d7b79952ac..986804c79b 100644 --- a/tests/qemuxml2argvdata/master-key.args +++ b/tests/qemuxml2argvdata/master-key.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-la= test.args b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-lat= est.args index 52985b47d1..55969eb2fd 100644 --- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.ar= gs @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-instanc= e-00000092/.config \ -machine pc-i440fx-2.3,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel kvm \ -cpu qemu64 \ --m 14336 \ +-m size=3D14680064k \ -overcommit mem-lock=3Doff \ -smp 8,sockets=3D1,dies=3D1,cores=3D8,threads=3D1 \ -object '{"qom-type":"thread-context","id":"tc-ram-node0","node-affinity":= [3]}' \ diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2= argvdata/memtune-unlimited.args index 6ce75d589d..f16464092e 100644 --- a/tests/qemuxml2argvdata/memtune-unlimited.args +++ b/tests/qemuxml2argvdata/memtune-unlimited.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/m= emtune.args index 6ce75d589d..f16464092e 100644 --- a/tests/qemuxml2argvdata/memtune.args +++ b/tests/qemuxml2argvdata/memtune.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/migrate-numa-unaligned.args b/tests/qem= uxml2argvdata/migrate-numa-unaligned.args index 04d4903065..35d665f20b 100644 --- a/tests/qemuxml2argvdata/migrate-numa-unaligned.args +++ b/tests/qemuxml2argvdata/migrate-numa-unaligned.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 14338 \ +-m size=3D14682112k \ -overcommit mem-lock=3Doff \ -smp 32,sockets=3D32,cores=3D1,threads=3D1 \ -object memory-backend-ram,id=3Dram-node0,size=3D20482048,host-nodes=3D3,p= olicy=3Dpreferred \ diff --git a/tests/qemuxml2argvdata/migrate.args b/tests/qemuxml2argvdata/m= igrate.args index 992ad02474..0aa2f2a780 100644 --- a/tests/qemuxml2argvdata/migrate.args +++ b/tests/qemuxml2argvdata/migrate.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/m= inimal.args index 6ce75d589d..f16464092e 100644 --- a/tests/qemuxml2argvdata/minimal.args +++ b/tests/qemuxml2argvdata/minimal.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/misc-acpi.args b/tests/qemuxml2argvdata= /misc-acpi.args index 0f3125c976..01b0c81f6f 100644 --- a/tests/qemuxml2argvdata/misc-acpi.args +++ b/tests/qemuxml2argvdata/misc-acpi.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args b/tests/qemuxml2ar= gvdata/misc-disable-s3.args index a2a189ada3..fcc5cd7795 100644 --- a/tests/qemuxml2argvdata/misc-disable-s3.args +++ b/tests/qemuxml2argvdata/misc-disable-s3.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \ diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args b/tests/qemu= xml2argvdata/misc-disable-suspends.args index 3b5fcfc94e..d1c3183dac 100644 --- a/tests/qemuxml2argvdata/misc-disable-suspends.args +++ b/tests/qemuxml2argvdata/misc-disable-suspends.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \ diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args b/tests/qemuxml2arg= vdata/misc-enable-s4.args index 800f993a3b..0af59b3260 100644 --- a/tests/qemuxml2argvdata/misc-enable-s4.args +++ b/tests/qemuxml2argvdata/misc-enable-s4.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \ diff --git a/tests/qemuxml2argvdata/misc-no-reboot.x86_64-5.2.0.args b/test= s/qemuxml2argvdata/misc-no-reboot.x86_64-5.2.0.args index 71e7d5b024..094d067556 100644 --- a/tests/qemuxml2argvdata/misc-no-reboot.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/misc-no-reboot.x86_64-5.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-i440fx-5.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args b/tes= ts/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args index cb0cb21401..38145b85d2 100644 --- a/tests/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/misc-uuid.args b/tests/qemuxml2argvdata= /misc-uuid.args index 0f3125c976..01b0c81f6f 100644 --- a/tests/qemuxml2argvdata/misc-uuid.args +++ b/tests/qemuxml2argvdata/misc-uuid.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args b/tests/qe= muxml2argvdata/mlock-off.x86_64-latest.args index 78f1866925..e4be4266bb 100644 --- a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args b/tests/qem= uxml2argvdata/mlock-on.x86_64-latest.args index 4542d9e240..8b48a05883 100644 --- a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args +++ b/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Don \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/monitor-json.args b/tests/qemuxml2argvd= ata/monitor-json.args index c47865c351..3fe4db5a94 100644 --- a/tests/qemuxml2argvdata/monitor-json.args +++ b/tests/qemuxml2argvdata/monitor-json.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-encryptdisk/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \ diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/q= emuxml2argvdata/multifunction-pci-device.args index 2c1e3f4551..36c0353f19 100644 --- a/tests/qemuxml2argvdata/multifunction-pci-device.args +++ b/tests/qemuxml2argvdata/multifunction-pci-device.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/name-escape.x86_64-latest.args b/tests/= qemuxml2argvdata/name-escape.x86_64-latest.args index 557fa4a7bb..7ccea7d740 100644 --- a/tests/qemuxml2argvdata/name-escape.x86_64-latest.args +++ b/tests/qemuxml2argvdata/name-escape.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo=3D1= ,bar=3D2/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/net-client.args b/tests/qemuxml2argvdat= a/net-client.args index d2bcb3eecb..ebefd3341a 100644 --- a/tests/qemuxml2argvdata/net-client.args +++ b/tests/qemuxml2argvdata/net-client.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-eth-hostip.args b/tests/qemuxml2arg= vdata/net-eth-hostip.args index aee1f19ff7..05aab251e6 100644 --- a/tests/qemuxml2argvdata/net-eth-hostip.args +++ b/tests/qemuxml2argvdata/net-eth-hostip.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-eth-ifname.args b/tests/qemuxml2arg= vdata/net-eth-ifname.args index aee1f19ff7..05aab251e6 100644 --- a/tests/qemuxml2argvdata/net-eth-ifname.args +++ b/tests/qemuxml2argvdata/net-eth-ifname.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-eth-names.args b/tests/qemuxml2argv= data/net-eth-names.args index bb1122d28f..1a4a32cc7c 100644 --- a/tests/qemuxml2argvdata/net-eth-names.args +++ b/tests/qemuxml2argvdata/net-eth-names.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args b/tests/qemu= xml2argvdata/net-eth-unmanaged-tap.args index 436158aae8..6668a279db 100644 --- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args +++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-eth.args b/tests/qemuxml2argvdata/n= et-eth.args index aee1f19ff7..05aab251e6 100644 --- a/tests/qemuxml2argvdata/net-eth.args +++ b/tests/qemuxml2argvdata/net-eth.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.args b/tests/qemu= xml2argvdata/net-hostdev-bootorder.args index 5136192ebb..9714cb899b 100644 --- a/tests/qemuxml2argvdata/net-hostdev-bootorder.args +++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.args b/tests/qe= muxml2argvdata/net-hostdev-multidomain.args index 6b1b6af0a8..60e19a2f0b 100644 --- a/tests/qemuxml2argvdata/net-hostdev-multidomain.args +++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args b/tes= ts/qemuxml2argvdata/net-hostdev-vfio-multidomain.args index 6639109838..de1a9dba44 100644 --- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.args b/tests/qemuxml2a= rgvdata/net-hostdev-vfio.args index 987d349787..6aad28d828 100644 --- a/tests/qemuxml2argvdata/net-hostdev-vfio.args +++ b/tests/qemuxml2argvdata/net-hostdev-vfio.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-hostdev.args b/tests/qemuxml2argvda= ta/net-hostdev.args index 4b657d4049..8bf52c2b6f 100644 --- a/tests/qemuxml2argvdata/net-hostdev.args +++ b/tests/qemuxml2argvdata/net-hostdev.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-many-models.args b/tests/qemuxml2ar= gvdata/net-many-models.args index 4ac76f5761..4b7c1799c2 100644 --- a/tests/qemuxml2argvdata/net-many-models.args +++ b/tests/qemuxml2argvdata/net-many-models.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-mcast.args b/tests/qemuxml2argvdata= /net-mcast.args index eee5a05657..1fbd375998 100644 --- a/tests/qemuxml2argvdata/net-mcast.args +++ b/tests/qemuxml2argvdata/net-mcast.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-server.args b/tests/qemuxml2argvdat= a/net-server.args index 04bbcbbd7c..fe3d03f5ef 100644 --- a/tests/qemuxml2argvdata/net-server.args +++ b/tests/qemuxml2argvdata/net-server.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-udp.args b/tests/qemuxml2argvdata/n= et-udp.args index 583c07f068..7a40bf070e 100644 --- a/tests/qemuxml2argvdata/net-udp.args +++ b/tests/qemuxml2argvdata/net-udp.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-user-addr.args b/tests/qemuxml2argv= data/net-user-addr.args index ec6792ea8e..fd6cc0ec59 100644 --- a/tests/qemuxml2argvdata/net-user-addr.args +++ b/tests/qemuxml2argvdata/net-user-addr.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-user-passt.x86_64-7.2.0.args b/test= s/qemuxml2argvdata/net-user-passt.x86_64-7.2.0.args index f582c4e09e..d9a81ad2a5 100644 --- a/tests/qemuxml2argvdata/net-user-passt.x86_64-7.2.0.args +++ b/tests/qemuxml2argvdata/net-user-passt.x86_64-7.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-i440fx-7.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/net-user-passt.x86_64-latest.args b/tes= ts/qemuxml2argvdata/net-user-passt.x86_64-latest.args index 44f362327a..59e1dfbfa0 100644 --- a/tests/qemuxml2argvdata/net-user-passt.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-user-passt.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/net-user.args b/tests/qemuxml2argvdata/= net-user.args index 2f447ff6d9..12823aa1c8 100644 --- a/tests/qemuxml2argvdata/net-user.args +++ b/tests/qemuxml2argvdata/net-user.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-user.x86_64-latest.args b/tests/qem= uxml2argvdata/net-user.x86_64-latest.args index c3fb5c0171..c81d582b97 100644 --- a/tests/qemuxml2argvdata/net-user.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-user.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args = b/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args index ec24346bbd..e3aee785bf 100644 --- a/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args b/tests/qem= uxml2argvdata/net-vdpa.x86_64-latest.args index af85bce210..1fccd80199 100644 --- a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.args b/tests/qemux= ml2argvdata/net-vhostuser-multiq.args index bf8efa4e64..2abd05a437 100644 --- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args +++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-vhostuser.args b/tests/qemuxml2argv= data/net-vhostuser.args index 98aede8478..3f144d0132 100644 --- a/tests/qemuxml2argvdata/net-vhostuser.args +++ b/tests/qemuxml2argvdata/net-vhostuser.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args b/test= s/qemuxml2argvdata/net-vhostuser.x86_64-latest.args index 50f33195c0..bc1de8c8ed 100644 --- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.s390x-latest.args b/test= s/qemuxml2argvdata/net-virtio-ccw.s390x-latest.args index 7638033977..85bc116732 100644 --- a/tests/qemuxml2argvdata/net-virtio-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/net-virtio-ccw.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/net-virtio-device.args b/tests/qemuxml2= argvdata/net-virtio-device.args index 2443dba01e..d9303a4d14 100644 --- a/tests/qemuxml2argvdata/net-virtio-device.args +++ b/tests/qemuxml2argvdata/net-virtio-device.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args b/test= s/qemuxml2argvdata/net-virtio-disable-offloads.args index 7e827d3482..3be0fa4625 100644 --- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args +++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.args b/tests/qemuxml2= argvdata/net-virtio-netdev.args index 63ebc8e4d5..fe5b7fb021 100644 --- a/tests/qemuxml2argvdata/net-virtio-netdev.args +++ b/tests/qemuxml2argvdata/net-virtio-netdev.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-virtio-rss.x86_64-latest.args b/tes= ts/qemuxml2argvdata/net-virtio-rss.x86_64-latest.args index 1cfec46cc8..9c61aeb44c 100644 --- a/tests/qemuxml2argvdata/net-virtio-rss.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-virtio-rss.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args b/tests/q= emuxml2argvdata/net-virtio-rxtxqueuesize.args index 5f67e6fa06..77837b74a4 100644 --- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args +++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args b/tests= /qemuxml2argvdata/net-virtio-teaming-hostdev.args index 8095958bd7..72f9b42d35 100644 --- a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args +++ b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.args b/tests/qemuxml= 2argvdata/net-virtio-teaming.args index 46960e16cb..83e46ecbd1 100644 --- a/tests/qemuxml2argvdata/net-virtio-teaming.args +++ b/tests/qemuxml2argvdata/net-virtio-teaming.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/net-virtio.args b/tests/qemuxml2argvdat= a/net-virtio.args index 359cd1abcb..8ac6d7bc0b 100644 --- a/tests/qemuxml2argvdata/net-virtio.args +++ b/tests/qemuxml2argvdata/net-virtio.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/nosharepages.args b/tests/qemuxml2argvd= ata/nosharepages.args index c5d6451c6d..366973f7c5 100644 --- a/tests/qemuxml2argvdata/nosharepages.args +++ b/tests/qemuxml2argvdata/nosharepages.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff,mem-merge=3Doff \ -accel tcg \ --m 215 \ +-m size=3D220160k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/te= sts/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args index ecd6603136..69f613e482 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-pl= acement.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-= placement.args index ecd6603136..69f613e482 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement= .args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement= .args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/= tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args index ecd6603136..69f613e482 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/te= sts/qemuxml2argvdata/numad-static-memory-auto-vcpu.args index ecd6603136..69f613e482 100644 --- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args +++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/num= ad.args index ecd6603136..69f613e482 100644 --- a/tests/qemuxml2argvdata/numad.args +++ b/tests/qemuxml2argvdata/numad.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args b/te= sts/qemuxml2argvdata/numatune-auto-nodeset-invalid.args index ecd6603136..69f613e482 100644 --- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args +++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/numatune-auto-prefer.args b/tests/qemux= ml2argvdata/numatune-auto-prefer.args index 01966cf96e..fd9b839404 100644 --- a/tests/qemuxml2argvdata/numatune-auto-prefer.args +++ b/tests/qemuxml2argvdata/numatune-auto-prefer.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 64 \ +-m size=3D65536k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -numa node,nodeid=3D0,cpus=3D0,mem=3D64 \ diff --git a/tests/qemuxml2argvdata/numatune-distances.args b/tests/qemuxml= 2argvdata/numatune-distances.args index 8ceafd7f05..d2f240dd96 100644 --- a/tests/qemuxml2argvdata/numatune-distances.args +++ b/tests/qemuxml2argvdata/numatune-distances.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 12288 \ +-m size=3D12582912k \ -overcommit mem-lock=3Doff \ -smp 12,sockets=3D12,cores=3D1,threads=3D1 \ -numa node,nodeid=3D0,cpus=3D0,cpus=3D11,mem=3D2048 \ diff --git a/tests/qemuxml2argvdata/numatune-hmat-none.x86_64-latest.args b= /tests/qemuxml2argvdata/numatune-hmat-none.x86_64-latest.args index d61fa1fc70..0f0791a501 100644 --- a/tests/qemuxml2argvdata/numatune-hmat-none.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-hmat-none.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,hmat=3Don,acpi=3Don \ -accel tcg \ -cpu qemu64 \ --m 12288 \ +-m size=3D12582912k \ -overcommit mem-lock=3Doff \ -smp 12,sockets=3D12,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":21474836= 48}' \ diff --git a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args b/test= s/qemuxml2argvdata/numatune-hmat.x86_64-latest.args index 45592dbc7f..a80c21d11e 100644 --- a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,hmat=3Don,acpi=3Don \ -accel tcg \ -cpu qemu64 \ --m 12288 \ +-m size=3D12582912k \ -overcommit mem-lock=3Doff \ -smp 12,sockets=3D12,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":21474836= 48}' \ diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args b/tests= /qemuxml2argvdata/numatune-memnode-no-memory.args index 01f45e3d35..b8098cd5a5 100644 --- a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args +++ b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 64 \ +-m size=3D65536k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -object memory-backend-ram,id=3Dram-node0,size=3D33554432,host-nodes=3D3,p= olicy=3Dpreferred \ diff --git a/tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.x86_6= 4-latest.args b/tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.x8= 6_64-latest.args index 55c80531d1..fec41d92cf 100644 --- a/tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.x86_64-lates= t.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 24105 \ +-m size=3D24683520k \ -overcommit mem-lock=3Doff \ -smp 32,sockets=3D32,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":20971520= }' \ diff --git a/tests/qemuxml2argvdata/numatune-memnode.args b/tests/qemuxml2a= rgvdata/numatune-memnode.args index 917746a523..f5f6e727a1 100644 --- a/tests/qemuxml2argvdata/numatune-memnode.args +++ b/tests/qemuxml2argvdata/numatune-memnode.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 24105 \ +-m size=3D24683520k \ -overcommit mem-lock=3Doff \ -smp 32,sockets=3D32,cores=3D1,threads=3D1 \ -object memory-backend-ram,id=3Dram-node0,size=3D20971520,host-nodes=3D3,p= olicy=3Dpreferred \ diff --git a/tests/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.args b/te= sts/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.args index 982df0b569..f398aaa67d 100644 --- a/tests/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -machine pc-i440fx-5.2,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu64 \ --m 24105 \ +-m size=3D24683520k \ -overcommit mem-lock=3Doff \ -smp 32,sockets=3D32,cores=3D1,threads=3D1 \ -object memory-backend-ram,id=3Dram-node0,size=3D20971520,host-nodes=3D3,p= olicy=3Dpreferred \ diff --git a/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args b/t= ests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args index 087ddf8629..45b9585822 100644 --- a/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 24105 \ +-m size=3D24683520k \ -overcommit mem-lock=3Doff \ -smp 32,sockets=3D32,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":20971520= ,"host-nodes":[3],"policy":"preferred"}' \ diff --git a/tests/qemuxml2argvdata/numatune-memory.args b/tests/qemuxml2ar= gvdata/numatune-memory.args index ecd6603136..69f613e482 100644 --- a/tests/qemuxml2argvdata/numatune-memory.args +++ b/tests/qemuxml2argvdata/numatune-memory.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/numatune-no-vcpu.args b/tests/qemuxml2a= rgvdata/numatune-no-vcpu.args index cf61260d30..4a64ce4e22 100644 --- a/tests/qemuxml2argvdata/numatune-no-vcpu.args +++ b/tests/qemuxml2argvdata/numatune-no-vcpu.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 12288 \ +-m size=3D12582912k \ -overcommit mem-lock=3Doff \ -smp 12,sockets=3D12,cores=3D1,threads=3D1 \ -numa node,nodeid=3D0,cpus=3D0-3,mem=3D2048 \ diff --git a/tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.args index 744aca3932..d4746c4599 100644 --- a/tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"= host-nodes":[0],"policy":"bind"}' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/pages-discard-hugepages.x86_64-latest.args index e8408bfe7f..d1b3c45379 100644 --- a/tests/qemuxml2argvdata/pages-discard-hugepages.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pages-discard-hugepages.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-SomeDum= myHugepagesGu/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/d= ev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu","discard-data":false,"= prealloc":true,"size":268435456}' \ diff --git a/tests/qemuxml2argvdata/pages-discard.x86_64-latest.args b/test= s/qemuxml2argvdata/pages-discard.x86_64-latest.args index ec90befe92..9bdf10d8d0 100644 --- a/tests/qemuxml2argvdata/pages-discard.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pages-discard.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 4096 \ +-m size=3D4194304k \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":10737418= 24}' \ diff --git a/tests/qemuxml2argvdata/panic-double.x86_64-latest.args b/tests= /qemuxml2argvdata/panic-double.x86_64-latest.args index 1e6deacf79..b76b28e877 100644 --- a/tests/qemuxml2argvdata/panic-double.x86_64-latest.args +++ b/tests/qemuxml2argvdata/panic-double.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ -cpu qemu64,hv-crash \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/panic-no-address.x86_64-latest.args b/t= ests/qemuxml2argvdata/panic-no-address.x86_64-latest.args index c4416fd2cf..81eb59e4c0 100644 --- a/tests/qemuxml2argvdata/panic-no-address.x86_64-latest.args +++ b/tests/qemuxml2argvdata/panic-no-address.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/panic.x86_64-latest.args b/tests/qemuxm= l2argvdata/panic.x86_64-latest.args index 49b743a409..61f84391e5 100644 --- a/tests/qemuxml2argvdata/panic.x86_64-latest.args +++ b/tests/qemuxml2argvdata/panic.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args b/tests/q= emuxml2argvdata/parallel-parport-chardev.args index 756fb2612a..0ced8a58ac 100644 --- a/tests/qemuxml2argvdata/parallel-parport-chardev.args +++ b/tests/qemuxml2argvdata/parallel-parport-chardev.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.= args b/tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.args index 9f0ccecfd6..c77e7e5b38 100644 --- a/tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.args b/tests/qemux= ml2argvdata/parallel-tcp-chardev.args index b3c0a86794..6ffc4cbf10 100644 --- a/tests/qemuxml2argvdata/parallel-tcp-chardev.args +++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.x86_64-latest.args= b/tests/qemuxml2argvdata/parallel-tcp-chardev.x86_64-latest.args index 034af1edb4..747b64c8f3 100644 --- a/tests/qemuxml2argvdata/parallel-tcp-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.arg= s b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args index 4816c1a927..d727c44bfc 100644 --- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86= _64-latest.args b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disabl= e.x86_64-latest.args index 044a3019f6..17d71aee80 100644 --- a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-lat= est.args +++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-lat= est.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-i440fx/= .config \ -machine pc-i440fx-2.5,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_= 64-latest.args b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.= x86_64-latest.args index 4cff831ba6..c2016a254a 100644 --- a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-late= st.args +++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-late= st.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-i440fx/= .config \ -machine pc-i440fx-2.5,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2a= rgvdata/pci-autoadd-addr.args index 7a1d2af8ac..f1a49702ef 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-addr.args +++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/= .config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-fdr-br/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2ar= gvdata/pci-autoadd-idx.args index f419e09402..aed802a501 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-idx.args +++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/= .config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-fdr-br/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2= argvdata/pci-autofill-addr.args index 9f630b9988..0b9866d00e 100644 --- a/tests/qemuxml2argvdata/pci-autofill-addr.args +++ b/tests/qemuxml2argvdata/pci-autofill-addr.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/= .config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-fdr-br/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args b/tests/qemu= xml2argvdata/pci-bridge-many-disks.args index 06545d8e1b..6868de7344 100644 --- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args +++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-lots-of= -disks/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu64,kvmclock=3Doff \ --m 3907 \ +-m size=3D4000768k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 04872dc1-e1de-434b-ab21-e3e80e416349 \ diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdat= a/pci-bridge.args index 263b11f1ce..0740a887ba 100644 --- a/tests/qemuxml2argvdata/pci-bridge.args +++ b/tests/qemuxml2argvdata/pci-bridge.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/= .config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-fdr-br/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args b/tests/qemuxml2a= rgvdata/pci-expander-bus.args index a5d7aa3a49..16622b8b83 100644 --- a/tests/qemuxml2argvdata/pci-expander-bus.args +++ b/tests/qemuxml2argvdata/pci-expander-bus.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-expande= r-test/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-expander-test/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 16,sockets=3D2,cores=3D4,threads=3D2 \ -numa node,nodeid=3D0,cpus=3D0-7,mem=3D107 \ diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/= pci-many.args index dbbe15a6ad..494451423d 100644 --- a/tests/qemuxml2argvdata/pci-many.args +++ b/tests/qemuxml2argvdata/pci-many.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/= .config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-fdr-br/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args b/tests/qemuxml2a= rgvdata/pci-rom-disabled.args index d5886a4ff1..ecf638e182 100644 --- a/tests/qemuxml2argvdata/pci-rom-disabled.args +++ b/tests/qemuxml2argvdata/pci-rom-disabled.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-guest/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/p= ci-rom.args index 85a06fe6fc..2934cfcae6 100644 --- a/tests/qemuxml2argvdata/pci-rom.args +++ b/tests/qemuxml2argvdata/pci-rom.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest2/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args b/tests/qem= uxml2argvdata/pci-serial-dev-chardev.args index 4079d0e6d1..7dbba6985d 100644 --- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/pci-serial-dev-chardev.x86_64-latest.args index dfaafd920e..67d85ab279 100644 --- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-lates= t.args b/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.ar= gs index ff29968878..6d5c5a4da5 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-pcie-ex= pander-bus-te/.config \ -machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a15 \ --m 2048 \ +-m size=3D2097152k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":2147= 483648}' \ -overcommit mem-lock=3Doff \ -smp 16,sockets=3D16,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2= argvdata/pcie-expander-bus.args index bc9d4c4b1b..e8f4dc1292 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-pcie-ex= pander-bus-te/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-pcie-expander-bus-te/master-key.aes \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 16,sockets=3D2,cores=3D4,threads=3D2 \ -numa node,nodeid=3D0,cpus=3D0-7,mem=3D107 \ diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args b/tes= ts/qemuxml2argvdata/pcie-root-port-model-generic.args index c73e41faf5..bd90434aaa 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args +++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-guest/master-key.aes \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args b/tes= ts/qemuxml2argvdata/pcie-root-port-model-ioh3420.args index 845054ef39..3a353dc59a 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args +++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-guest/master-key.aes \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ diff --git a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.= args b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args index 7d60c77274..f9c2ad4f6d 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 2048 \ +-m size=3D2097152k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2arg= vdata/pcie-root-port.args index d40413559e..b8f1de42a1 100644 --- a/tests/qemuxml2argvdata/pcie-root-port.args +++ b/tests/qemuxml2argvdata/pcie-root-port.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ diff --git a/tests/qemuxml2argvdata/pcie-root.args b/tests/qemuxml2argvdata= /pcie-root.args index 0bb9e9b9fb..5a27ae86b0 100644 --- a/tests/qemuxml2argvdata/pcie-root.args +++ b/tests/qemuxml2argvdata/pcie-root.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/test= s/qemuxml2argvdata/pcie-switch-downstream-port.args index 12477701d1..f2f22c155b 100644 --- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/= qemuxml2argvdata/pcie-switch-upstream-port.args index 0b53ccf936..6bdfba9fb5 100644 --- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argv= data/pcihole64-q35.args index b3ce10845b..e9d84d935e 100644 --- a/tests/qemuxml2argvdata/pcihole64-q35.args +++ b/tests/qemuxml2argvdata/pcihole64-q35.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ diff --git a/tests/qemuxml2argvdata/pcihole64.args b/tests/qemuxml2argvdata= /pcihole64.args index baea6e158a..224363f81d 100644 --- a/tests/qemuxml2argvdata/pcihole64.args +++ b/tests/qemuxml2argvdata/pcihole64.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-foo/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 3c7c30b5-7866-4b05-8a29-efebccba52a0 \ diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args b/tests/qemuxml2ar= gvdata/pmu-feature-off.args index 76e91f5d0e..866d9b892f 100644 --- a/tests/qemuxml2argvdata/pmu-feature-off.args +++ b/tests/qemuxml2argvdata/pmu-feature-off.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu32,pmu=3Doff \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/pmu-feature.args b/tests/qemuxml2argvda= ta/pmu-feature.args index a04e6ab8ed..67b0c87540 100644 --- a/tests/qemuxml2argvdata/pmu-feature.args +++ b/tests/qemuxml2argvdata/pmu-feature.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu32,pmu=3Don \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/ppc-dtb.ppc-latest.args b/tests/qemuxml= 2argvdata/ppc-dtb.ppc-latest.args index 217406aa28..8032ad7f0e 100644 --- a/tests/qemuxml2argvdata/ppc-dtb.ppc-latest.args +++ b/tests/qemuxml2argvdata/ppc-dtb.ppc-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine ppce500,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dmpc8544d= s.ram \ -accel tcg \ --m 256 \ +-m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"mpc8544ds.ram","size":2684= 35456}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc= 64-latest.args index 45004f07d8..1f20137d0e 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest= .args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pseries-2.7,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_= spapr.ram \ -accel kvm \ -cpu POWER9 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":4294= 967296}' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc= 64-latest.args index 2ae59cf903..1c61105efc 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest= .args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pseries-3.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_= spapr.ram \ -accel kvm \ -cpu POWER9 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":4294= 967296}' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc= 64-latest.args index c96749aa65..b22cdd2d37 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest= .args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pseries-4.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_= spapr.ram \ -accel kvm \ -cpu POWER9 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":4294= 967296}' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc= 64-latest.args index 21b8367429..a4d46e38bf 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest= .args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pseries-2.7,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_= spapr.ram \ -accel tcg \ -cpu POWER7 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":4294= 967296}' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc= 64-latest.args index 994f790aea..e1e7277596 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest= .args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pseries-3.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_= spapr.ram \ -accel tcg \ -cpu POWER8 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":4294= 967296}' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc= 64-latest.args index affa7c35be..c15cbadf26 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest= .args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pseries-4.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_= spapr.ram \ -accel tcg \ -cpu POWER9 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":4294= 967296}' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.arg= s b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args index ba1a5fe202..10bc312ae6 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":4294= 967296}' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.arg= s b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args index a9fdd89c48..4947ebc565 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":4294= 967296}' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args= b/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args index 9a6a353937..81e54fecfb 100644 --- a/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 256 \ +-m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":2684= 35456}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.ar= gs b/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args index 47aef80658..1f30ccd3fc 100644 --- a/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 256 \ +-m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":2684= 35456}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.ppc64-lates= t.args b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.ppc64-latest.ar= gs index 1ce5bd8b71..0b0b2a1986 100644 --- a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 256 \ +-m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":2684= 35456}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args b/t= ests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args index 7e5dd0925c..ddc3249e50 100644 --- a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args +++ b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 256 \ +-m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":2684= 35456}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller.ppc64-latest.args = b/tests/qemuxml2argvdata/ppc64-usb-controller.ppc64-latest.args index 1ce5bd8b71..0b0b2a1986 100644 --- a/tests/qemuxml2argvdata/ppc64-usb-controller.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-usb-controller.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 256 \ +-m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":2684= 35456}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/ppce500-serial.ppc-latest.args b/tests/= qemuxml2argvdata/ppce500-serial.ppc-latest.args index b51e915a1a..84abffdc26 100644 --- a/tests/qemuxml2argvdata/ppce500-serial.ppc-latest.args +++ b/tests/qemuxml2argvdata/ppce500-serial.ppc-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine ppce500,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dmpc8544d= s.ram \ -accel tcg \ --m 256 \ +-m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"mpc8544ds.ram","size":2684= 35456}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-basic.ppc64-latest.args b/tests= /qemuxml2argvdata/pseries-basic.ppc64-latest.args index 209b62147f..980307568c 100644 --- a/tests/qemuxml2argvdata/pseries-basic.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-basic.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-console-virtio.ppc64-latest.arg= s b/tests/qemuxml2argvdata/pseries-console-virtio.ppc64-latest.args index e0041ad0c9..886d75e834 100644 --- a/tests/qemuxml2argvdata/pseries-console-virtio.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-console-virtio.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat-power10.ppc64-latest= .args b/tests/qemuxml2argvdata/pseries-cpu-compat-power10.ppc64-latest.args index a7d57d6abe..7978fcd5eb 100644 --- a/tests/qemuxml2argvdata/pseries-cpu-compat-power10.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-cpu-compat-power10.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram,max-cpu-compat=3Dpower10 \ -accel kvm \ -cpu host \ --m 256 \ +-m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":2684= 35456}' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.ppc64-latest.= args b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.ppc64-latest.args index 499991a185..c78663468d 100644 --- a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram,max-cpu-compat=3Dpower9 \ -accel kvm \ -cpu host \ --m 256 \ +-m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":2684= 35456}' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat.ppc64-latest.args b/= tests/qemuxml2argvdata/pseries-cpu-compat.ppc64-latest.args index 8b14fd2b27..df4c9a257f 100644 --- a/tests/qemuxml2argvdata/pseries-cpu-compat.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-cpu-compat.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram,max-cpu-compat=3Dpower7 \ -accel kvm \ -cpu host \ --m 256 \ +-m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":2684= 35456}' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-cpu-exact.ppc64-latest.args b/t= ests/qemuxml2argvdata/pseries-cpu-exact.ppc64-latest.args index d2743a0a90..4f966d5079 100644 --- a/tests/qemuxml2argvdata/pseries-cpu-exact.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-cpu-exact.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER7 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-cpu-le.ppc64-latest.args b/test= s/qemuxml2argvdata/pseries-cpu-le.ppc64-latest.args index 4334009f9e..6b33ad6179 100644 --- a/tests/qemuxml2argvdata/pseries-cpu-le.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-cpu-le.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel kvm \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-features.ppc64-4.2.0.args b/tes= ts/qemuxml2argvdata/pseries-features.ppc64-4.2.0.args index 7decaba057..f4d0ed556e 100644 --- a/tests/qemuxml2argvdata/pseries-features.ppc64-4.2.0.args +++ b/tests/qemuxml2argvdata/pseries-features.ppc64-4.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pseries-4.2,usb=3Doff,resize-hpt=3Drequired,cap-hpt-max-page-size= =3D1048576k,cap-htm=3Don,cap-nested-hv=3Doff,cap-ccf-assist=3Don,cap-cfpc= =3Dfixed,cap-sbbc=3Dbroken,cap-ibs=3Dfixed-ccd,dump-guest-core=3Doff \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ diff --git a/tests/qemuxml2argvdata/pseries-features.ppc64-latest.args b/te= sts/qemuxml2argvdata/pseries-features.ppc64-latest.args index 9116e5d8d6..9408e45ba2 100644 --- a/tests/qemuxml2argvdata/pseries-features.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-features.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pseries,usb=3Doff,resize-hpt=3Drequired,cap-hpt-max-page-size=3D1= 048576k,cap-htm=3Don,cap-nested-hv=3Doff,cap-ccf-assist=3Don,cap-cfpc=3Dfix= ed,cap-sbbc=3Dbroken,cap-ibs=3Dfixed-ccd,dump-guest-core=3Doff,memory-backe= nd=3Dppc_spapr.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-1.ppc64-latest.args b/= tests/qemuxml2argvdata/pseries-hostdevs-1.ppc64-latest.args index 5c5a21949d..645ad9c34b 100644 --- a/tests/qemuxml2argvdata/pseries-hostdevs-1.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-hostdevs-1.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-2.ppc64-latest.args b/= tests/qemuxml2argvdata/pseries-hostdevs-2.ppc64-latest.args index e508d5dd94..9cce4a7ffd 100644 --- a/tests/qemuxml2argvdata/pseries-hostdevs-2.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-hostdevs-2.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-3.ppc64-latest.args b/= tests/qemuxml2argvdata/pseries-hostdevs-3.ppc64-latest.args index 0b45d10f5d..eff34560f4 100644 --- a/tests/qemuxml2argvdata/pseries-hostdevs-3.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-hostdevs-3.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-many-buses-1.ppc64-latest.args = b/tests/qemuxml2argvdata/pseries-many-buses-1.ppc64-latest.args index 9ed693b2d2..f0a9af71e9 100644 --- a/tests/qemuxml2argvdata/pseries-many-buses-1.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-many-buses-1.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-many-buses-2.ppc64-latest.args = b/tests/qemuxml2argvdata/pseries-many-buses-2.ppc64-latest.args index c9d3914bb9..624b34b250 100644 --- a/tests/qemuxml2argvdata/pseries-many-buses-2.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-many-buses-2.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-many-devices.ppc64-latest.args = b/tests/qemuxml2argvdata/pseries-many-devices.ppc64-latest.args index 9f95bf056a..cbbaa9c9c5 100644 --- a/tests/qemuxml2argvdata/pseries-many-devices.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-many-devices.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-nvram.ppc64-latest.args b/tests= /qemuxml2argvdata/pseries-nvram.ppc64-latest.args index 5abf3f807d..626e0a0166 100644 --- a/tests/qemuxml2argvdata/pseries-nvram.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-nvram.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-panic-missing.ppc64-latest.args= b/tests/qemuxml2argvdata/pseries-panic-missing.ppc64-latest.args index 209b62147f..980307568c 100644 --- a/tests/qemuxml2argvdata/pseries-panic-missing.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-panic-missing.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-panic-no-address.ppc64-latest.a= rgs b/tests/qemuxml2argvdata/pseries-panic-no-address.ppc64-latest.args index 209b62147f..980307568c 100644 --- a/tests/qemuxml2argvdata/pseries-panic-no-address.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-panic-no-address.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-phb-default-missing.ppc64-lates= t.args b/tests/qemuxml2argvdata/pseries-phb-default-missing.ppc64-latest.ar= gs index 3eeb55d831..c2c28bd198 100644 --- a/tests/qemuxml2argvdata/pseries-phb-default-missing.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-phb-default-missing.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args= b/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args index 97f17b7915..7ffcb1d8c5 100644 --- a/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu POWER9 \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 8,sockets=3D2,dies=3D1,cores=3D1,threads=3D4 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":10737418= 24,"host-nodes":[1],"policy":"bind"}' \ diff --git a/tests/qemuxml2argvdata/pseries-phb-simple.ppc64-latest.args b/= tests/qemuxml2argvdata/pseries-phb-simple.ppc64-latest.args index 3eeb55d831..c2c28bd198 100644 --- a/tests/qemuxml2argvdata/pseries-phb-simple.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-phb-simple.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-serial-native.ppc64-latest.args= b/tests/qemuxml2argvdata/pseries-serial-native.ppc64-latest.args index a0f5a31ccf..4f493958bd 100644 --- a/tests/qemuxml2argvdata/pseries-serial-native.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-serial-native.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-serial-pci.ppc64-latest.args b/= tests/qemuxml2argvdata/pseries-serial-pci.ppc64-latest.args index 5bef6a88ed..a91a821499 100644 --- a/tests/qemuxml2argvdata/pseries-serial-pci.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-serial-pci.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-serial-usb.ppc64-latest.args b/= tests/qemuxml2argvdata/pseries-serial-usb.ppc64-latest.args index b744d79597..aa3c098363 100644 --- a/tests/qemuxml2argvdata/pseries-serial-usb.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-serial-usb.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-usb-default.ppc64-latest.args b= /tests/qemuxml2argvdata/pseries-usb-default.ppc64-latest.args index 209b62147f..980307568c 100644 --- a/tests/qemuxml2argvdata/pseries-usb-default.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-usb-default.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-usb-kbd.ppc64-latest.args b/tes= ts/qemuxml2argvdata/pseries-usb-kbd.ppc64-latest.args index cf8ecf3b21..1310433e63 100644 --- a/tests/qemuxml2argvdata/pseries-usb-kbd.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-usb-kbd.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-usb-multi.ppc64-latest.args b/t= ests/qemuxml2argvdata/pseries-usb-multi.ppc64-latest.args index c2ee165dd9..603e939b51 100644 --- a/tests/qemuxml2argvdata/pseries-usb-multi.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-usb-multi.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-vio-user-assigned.ppc64-latest.= args b/tests/qemuxml2argvdata/pseries-vio-user-assigned.ppc64-latest.args index b6b4097a0e..d522d1e226 100644 --- a/tests/qemuxml2argvdata/pseries-vio-user-assigned.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-vio-user-assigned.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pseries-vio.ppc64-latest.args b/tests/q= emuxml2argvdata/pseries-vio.ppc64-latest.args index 6b193b175d..c0175293d6 100644 --- a/tests/qemuxml2argvdata/pseries-vio.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-vio.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER9 \ --m 512 \ +-m size=3D524288k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args= b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args index d8733974db..46d3c94f87 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ -cpu qemu64,kvm-pv-unhalt=3Doff \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args = b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args index 58bff1dc43..8e0007be7c 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ -cpu qemu64,kvm-pv-unhalt=3Don \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pvpanic-pci-aarch64.aarch64-latest.args= b/tests/qemuxml2argvdata/pvpanic-pci-aarch64.aarch64-latest.args index 32cfa998c2..5bb5df19fd 100644 --- a/tests/qemuxml2argvdata/pvpanic-pci-aarch64.aarch64-latest.args +++ b/tests/qemuxml2argvdata/pvpanic-pci-aarch64.aarch64-latest.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt-6.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-p= flash1-format \ -accel tcg \ -cpu cortex-a15 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pvpanic-pci-no-address-aarch64.aarch64-= latest.args b/tests/qemuxml2argvdata/pvpanic-pci-no-address-aarch64.aarch64= -latest.args index 4e78e03ec4..cc3dfc3159 100644 --- a/tests/qemuxml2argvdata/pvpanic-pci-no-address-aarch64.aarch64-latest.= args +++ b/tests/qemuxml2argvdata/pvpanic-pci-no-address-aarch64.aarch64-latest.= args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt-6.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-p= flash1-format \ -accel tcg \ -cpu cortex-a15 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pvpanic-pci-x86_64.x86_64-latest.args b= /tests/qemuxml2argvdata/pvpanic-pci-x86_64.x86_64-latest.args index c0dd386083..b80ab56e25 100644 --- a/tests/qemuxml2argvdata/pvpanic-pci-x86_64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pvpanic-pci-x86_64.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-4.2.0.a= rgs b/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-4.2.0.args index 1cd63a22e6..1babfe212f 100644 --- a/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-4.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu64 \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ diff --git a/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-latest.= args b/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-latest.args index 449473d34f..fa3b7dc0cb 100644 --- a/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-latest.args +++ b/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 2048 \ +-m size=3D2097152k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/q35-multifunction.x86_64-4.2.0.args b/t= ests/qemuxml2argvdata/q35-multifunction.x86_64-4.2.0.args index 17c7766d71..acef32f256 100644 --- a/tests/qemuxml2argvdata/q35-multifunction.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/q35-multifunction.x86_64-4.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu64 \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ diff --git a/tests/qemuxml2argvdata/q35-multifunction.x86_64-latest.args b/= tests/qemuxml2argvdata/q35-multifunction.x86_64-latest.args index e279633243..d8bc6d8478 100644 --- a/tests/qemuxml2argvdata/q35-multifunction.x86_64-latest.args +++ b/tests/qemuxml2argvdata/q35-multifunction.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 2048 \ +-m size=3D2097152k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args b/tests/qemu= xml2argvdata/q35-pci-force-address.args index 3f97324e11..d3d04b1467 100644 --- a/tests/qemuxml2argvdata/q35-pci-force-address.args +++ b/tests/qemuxml2argvdata/q35-pci-force-address.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-4.2.0.args b/te= sts/qemuxml2argvdata/q35-pcie-autoadd.x86_64-4.2.0.args index f1a773e298..d236463b16 100644 --- a/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-4.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu64 \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args b/t= ests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args index 1a025f30fe..55a222b7ac 100644 --- a/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 2048 \ +-m size=3D2097152k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/q35-pcie.x86_64-4.2.0.args b/tests/qemu= xml2argvdata/q35-pcie.x86_64-4.2.0.args index 0e56f6e669..1a79afdc7f 100644 --- a/tests/qemuxml2argvdata/q35-pcie.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/q35-pcie.x86_64-4.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu64 \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ diff --git a/tests/qemuxml2argvdata/q35-pcie.x86_64-latest.args b/tests/qem= uxml2argvdata/q35-pcie.x86_64-latest.args index e09657c587..a0a68b12e8 100644 --- a/tests/qemuxml2argvdata/q35-pcie.x86_64-latest.args +++ b/tests/qemuxml2argvdata/q35-pcie.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 2048 \ +-m size=3D2097152k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args b/tests/qe= muxml2argvdata/q35-pm-disable-fallback.args index f702ed5df6..924e3087fb 100644 --- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args +++ b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35/.co= nfig \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35/master-key.aes \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \ diff --git a/tests/qemuxml2argvdata/q35-pm-disable.args b/tests/qemuxml2arg= vdata/q35-pm-disable.args index 6b255e0688..f50ddcc118 100644 --- a/tests/qemuxml2argvdata/q35-pm-disable.args +++ b/tests/qemuxml2argvdata/q35-pm-disable.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35/.co= nfig \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35/master-key.aes \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \ diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2arg= vdata/q35-usb2-multi.args index f1689abb40..bcaf3236f0 100644 --- a/tests/qemuxml2argvdata/q35-usb2-multi.args +++ b/tests/qemuxml2argvdata/q35-usb2-multi.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2a= rgvdata/q35-usb2-reorder.args index a21c7fa592..6236cb8a98 100644 --- a/tests/qemuxml2argvdata/q35-usb2-reorder.args +++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/= q35-usb2.args index eb8952fc20..3e24c0760d 100644 --- a/tests/qemuxml2argvdata/q35-usb2.args +++ b/tests/qemuxml2argvdata/q35-usb2.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-4.2.0.arg= s b/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-4.2.0.args index b59f713101..556db0a8cb 100644 --- a/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-4.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-virt-ma= nager-basic/.config \ -machine pc-q35-4.2,usb=3Doff,vmport=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu qemu64 \ --m 4096 \ +-m size=3D4194304k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 1b826c23-8767-47ad-a6b5-c83a88277f71 \ diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-latest.args index 5a7b5d7629..d06a25ef10 100644 --- a/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-latest.args +++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-virt-ma= nager-basic/.config \ -machine q35,usb=3Doff,vmport=3Doff,dump-guest-core=3Doff,memory-backend= =3Dpc.ram,hpet=3Don,acpi=3Don \ -accel kvm \ -cpu qemu64 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.a= rgs index 0aa71341a1..e4cb36b1d0 100644 --- a/tests/qemuxml2argvdata/q35.args +++ b/tests/qemuxml2argvdata/q35.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvda= ta/qemu-ns-alt.args index a24c9d4c96..dd495e83eb 100644 --- a/tests/qemuxml2argvdata/qemu-ns-alt.args +++ b/tests/qemuxml2argvdata/qemu-ns-alt.args @@ -14,7 +14,7 @@ BAR=3D'' \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args b/tests/qe= muxml2argvdata/qemu-ns-commandline-ns0.args index 7cff70fa58..81b146977b 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args b/tests/qe= muxml2argvdata/qemu-ns-commandline-ns1.args index 7cff70fa58..81b146977b 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args b/tests/qemuxm= l2argvdata/qemu-ns-commandline.args index 7cff70fa58..81b146977b 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args b/t= ests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args index 7cff70fa58..81b146977b 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args b/tests= /qemuxml2argvdata/qemu-ns-domain-commandline.args index 7cff70fa58..81b146977b 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args b/tests/qemuxml= 2argvdata/qemu-ns-domain-ns0.args index 7cff70fa58..81b146977b 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args b/tests/qemuxml2arg= vdata/qemu-ns-no-env.args index e71155f5ec..b4505826d8 100644 --- a/tests/qemuxml2argvdata/qemu-ns-no-env.args +++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args b/tests/qemu= xml2argvdata/qemu-ns.x86_64-latest.args index 2a99a899d1..d35bae0f32 100644 --- a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args +++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args @@ -16,7 +16,7 @@ BAR=3D'' \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args b/tests/qe= muxml2argvdata/reboot-timeout-disabled.args index d4682d1448..fd69ea14fc 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args b/tests/qem= uxml2argvdata/reboot-timeout-enabled.args index efa9a329dd..f7ab6fb345 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args b/tests/qemuxml2argv= data/restore-v2-fd.args index d1c9bc59a4..d00eb8542e 100644 --- a/tests/qemuxml2argvdata/restore-v2-fd.args +++ b/tests/qemuxml2argvdata/restore-v2-fd.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/restore-v2.args b/tests/qemuxml2argvdat= a/restore-v2.args index 545b31b59f..eec598e1af 100644 --- a/tests/qemuxml2argvdata/restore-v2.args +++ b/tests/qemuxml2argvdata/restore-v2.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.ar= gs b/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args index 53f5929e31..4673fc8668 100644 --- a/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args +++ b/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -machine virt,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Driscv_virt_= board.ram \ -accel tcg \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"riscv_virt_board.ram","siz= e":4294967296}' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.ar= gs b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args index 818d104cad..cafccfd7cc 100644 --- a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args +++ b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ -machine virt,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Driscv_virt_= board.ram \ -accel tcg \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"riscv_virt_board.ram","siz= e":4294967296}' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/riscv64-virt-pci.riscv64-latest.args b/= tests/qemuxml2argvdata/riscv64-virt-pci.riscv64-latest.args index c729959f53..ff52cba889 100644 --- a/tests/qemuxml2argvdata/riscv64-virt-pci.riscv64-latest.args +++ b/tests/qemuxml2argvdata/riscv64-virt-pci.riscv64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-riscv64= /.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-riscv64/master-key.aes"}' \ -machine virt,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Driscv_virt_= board.ram \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -object '{"qom-type":"memory-backend-ram","id":"riscv_virt_board.ram","siz= e":2147483648}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/riscv64-virt.riscv64-latest.args b/test= s/qemuxml2argvdata/riscv64-virt.riscv64-latest.args index 4e8011845e..b3a34272fe 100644 --- a/tests/qemuxml2argvdata/riscv64-virt.riscv64-latest.args +++ b/tests/qemuxml2argvdata/riscv64-virt.riscv64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-riscv64= /.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-riscv64/master-key.aes"}' \ -machine virt,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Driscv_virt_= board.ram \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -object '{"qom-type":"memory-backend-ram","id":"riscv_virt_board.ram","siz= e":2147483648}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.s390x-l= atest.args b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.s390x-l= atest.args index dcb3299ae7..c2c7dcd1c4 100644 --- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.s390x-latest.a= rgs +++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.s390x-latest.a= rgs @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.= args b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args index dcb3299ae7..c2c7dcd1c4 100644 --- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s39= 0x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7= .s390x-latest.args index d902ba2a86..45b60a49ca 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-late= st.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-late= st.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -machine s390-ccw-virtio-2.7,usb=3Doff,dump-guest-core=3Doff,memory-backen= d=3Ds390.ram \ -accel kvm \ -cpu host \ --m 256 \ +-m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s39= 0x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2= .s390x-latest.args index 516a610ef6..f6604fd2f5 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-late= st.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-late= st.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -machine s390-ccw-virtio-4.2,usb=3Doff,dump-guest-core=3Doff,memory-backen= d=3Ds390.ram \ -accel kvm \ -cpu gen15a-base,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag318=3Don,c= sske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa5=3Don,msa= 4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Don,deflate= =3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,mepochptff=3Don,ap=3Don,vxe= h=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2=3Don,esort=3Don,apqi=3Don,= apft=3Don,els=3Don,iep=3Don,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,gs=3Don,p= pa15=3Don,zpci=3Don,sea_esop2=3Don,te=3Don,cmm=3Don \ --m 256 \ +-m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s39= 0x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7= .s390x-latest.args index 7f7738ef66..cdd8239128 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-late= st.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-late= st.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -machine s390-ccw-virtio-2.7,usb=3Doff,dump-guest-core=3Doff,memory-backen= d=3Ds390.ram \ -accel tcg \ -cpu qemu \ --m 256 \ +-m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s39= 0x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2= .s390x-latest.args index 6ddb220eab..1640add570 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-late= st.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-late= st.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -machine s390-ccw-virtio-4.2,usb=3Doff,dump-guest-core=3Doff,memory-backen= d=3Ds390.ram \ -accel tcg \ -cpu qemu \ --m 256 \ +-m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/s390-panic-missing.s390x-latest.args b/= tests/qemuxml2argvdata/s390-panic-missing.s390x-latest.args index 7ea849c458..cb227bd9a6 100644 --- a/tests/qemuxml2argvdata/s390-panic-missing.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-panic-missing.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 256 \ +-m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/s390-panic-no-address.s390x-latest.args= b/tests/qemuxml2argvdata/s390-panic-no-address.s390x-latest.args index 11ab53aaa1..a3941e8b6c 100644 --- a/tests/qemuxml2argvdata/s390-panic-no-address.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-panic-no-address.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 256 \ +-m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/s390-serial-2.s390x-latest.args b/tests= /qemuxml2argvdata/s390-serial-2.s390x-latest.args index 45ee168022..15406fc8a3 100644 --- a/tests/qemuxml2argvdata/s390-serial-2.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-serial-2.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/s390-serial-console.s390x-latest.args b= /tests/qemuxml2argvdata/s390-serial-console.s390x-latest.args index 6ddeea60d9..fa29cf380a 100644 --- a/tests/qemuxml2argvdata/s390-serial-console.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-serial-console.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/s390-serial.s390x-latest.args b/tests/q= emuxml2argvdata/s390-serial.s390x-latest.args index 6ddeea60d9..fa29cf380a 100644 --- a/tests/qemuxml2argvdata/s390-serial.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-serial.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args b/= tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args index 50136b25f1..8ea00c9f58 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":429496729= 6}' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args b/= tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args index f43d10a0b1..594bed926f 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":429496729= 6}' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2= argvdata/seclabel-dac-none.args index 6ce75d589d..f16464092e 100644 --- a/tests/qemuxml2argvdata/seclabel-dac-none.args +++ b/tests/qemuxml2argvdata/seclabel-dac-none.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests= /qemuxml2argvdata/seclabel-dynamic-baselabel.args index 6ce75d589d..f16464092e 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args b/tests= /qemuxml2argvdata/seclabel-dynamic-labelskip.args index 6ce75d589d..f16464092e 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args b/tests/= qemuxml2argvdata/seclabel-dynamic-override.args index 44f47aff9c..e20206ef0b 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args b/tests/q= emuxml2argvdata/seclabel-dynamic-relabel.args index 6ce75d589d..f16464092e 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args b/tests/qemuxml2a= rgvdata/seclabel-dynamic.args index 6ce75d589d..f16464092e 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/seclabel-none.args b/tests/qemuxml2argv= data/seclabel-none.args index 6ce75d589d..f16464092e 100644 --- a/tests/qemuxml2argvdata/seclabel-none.args +++ b/tests/qemuxml2argvdata/seclabel-none.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args b/tests/= qemuxml2argvdata/seclabel-static-labelskip.args index 6ce75d589d..f16464092e 100644 --- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args b/tests/qe= muxml2argvdata/seclabel-static-relabel.args index 6ce75d589d..f16464092e 100644 --- a/tests/qemuxml2argvdata/seclabel-static-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/seclabel-static.args b/tests/qemuxml2ar= gvdata/seclabel-static.args index 6ce75d589d..f16464092e 100644 --- a/tests/qemuxml2argvdata/seclabel-static.args +++ b/tests/qemuxml2argvdata/seclabel-static.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/serial-debugcon.x86_64-latest.args b/te= sts/qemuxml2argvdata/serial-debugcon.x86_64-latest.args index 45ab268e12..d14c874772 100644 --- a/tests/qemuxml2argvdata/serial-debugcon.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-debugcon.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args b/tests/= qemuxml2argvdata/serial-dev-chardev-iobase.args index c3a9eacb42..d118e5a204 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest= .args b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args index 57e7e2365e..a6e7260f1b 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args b/tests/qemuxml= 2argvdata/serial-dev-chardev.args index 346b1ed87d..67e965d648 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args b= /tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args index a5dc9e1bee..fe0631dbe9 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args b/tests/qemuxm= l2argvdata/serial-file-chardev.args index da03703ec2..5e0f9baab8 100644 --- a/tests/qemuxml2argvdata/serial-file-chardev.args +++ b/tests/qemuxml2argvdata/serial-file-chardev.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/serial-file-chardev.x86_64-latest.args = b/tests/qemuxml2argvdata/serial-file-chardev.x86_64-latest.args index f139e9543a..a28e54095e 100644 --- a/tests/qemuxml2argvdata/serial-file-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-file-chardev.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/serial-file-log.args b/tests/qemuxml2ar= gvdata/serial-file-log.args index 587b7df320..0068cf98ce 100644 --- a/tests/qemuxml2argvdata/serial-file-log.args +++ b/tests/qemuxml2argvdata/serial-file-log.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/serial-file-log.x86_64-latest.args b/te= sts/qemuxml2argvdata/serial-file-log.x86_64-latest.args index c3fb8e8656..b6c93aae9b 100644 --- a/tests/qemuxml2argvdata/serial-file-log.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-file-log.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args b/tests/qemuxm= l2argvdata/serial-many-chardev.args index 9c3ea6be63..540a97ad65 100644 --- a/tests/qemuxml2argvdata/serial-many-chardev.args +++ b/tests/qemuxml2argvdata/serial-many-chardev.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/serial-many-chardev.x86_64-latest.args = b/tests/qemuxml2argvdata/serial-many-chardev.x86_64-latest.args index 1314bd71d5..75576bd85d 100644 --- a/tests/qemuxml2argvdata/serial-many-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-many-chardev.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args b/tests/qemuxml= 2argvdata/serial-pty-chardev.args index 9963813704..12159aca7d 100644 --- a/tests/qemuxml2argvdata/serial-pty-chardev.args +++ b/tests/qemuxml2argvdata/serial-pty-chardev.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.x86_64-latest.args b= /tests/qemuxml2argvdata/serial-pty-chardev.x86_64-latest.args index 2c6ddcb722..e2853ca15f 100644 --- a/tests/qemuxml2argvdata/serial-pty-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-pty-chardev.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/serial-spiceport.args b/tests/qemuxml2a= rgvdata/serial-spiceport.args index 2cf71e2c64..ce8356ae48 100644 --- a/tests/qemuxml2argvdata/serial-spiceport.args +++ b/tests/qemuxml2argvdata/serial-spiceport.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args b/t= ests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args index 213b935ed6..2a9062f935 100644 --- a/tests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args b/tests/qemuxml= 2argvdata/serial-tcp-chardev.args index 35970fb584..b204fcc650 100644 --- a/tests/qemuxml2argvdata/serial-tcp-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-chardev.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.x86_64-latest.args b= /tests/qemuxml2argvdata/serial-tcp-chardev.x86_64-latest.args index 09c3b5d02c..c2ca0c616b 100644 --- a/tests/qemuxml2argvdata/serial-tcp-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-tcp-chardev.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args b/tests/= qemuxml2argvdata/serial-tcp-telnet-chardev.args index 1f4e99feef..e8df25bd92 100644 --- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.x86_64-latest= .args b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.x86_64-latest.args index c7e9fed5f4..722d74f86c 100644 --- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args b= /tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args index 6416d2b626..d159e4d3a4 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.x86_64= -latest.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.x86_= 64-latest.args index ec37f69721..3683fe3fed 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest= .args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args = b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args index f35da76177..bbc4b83808 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.x86_6= 4-latest.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.x8= 6_64-latest.args index 55929102ca..cf936f0fc0 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.x86_64-lates= t.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args b/tests= /qemuxml2argvdata/serial-tcp-tlsx509-chardev.args index f35da76177..bbc4b83808 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.x86_64-lates= t.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.x86_64-latest.ar= gs index 55929102ca..cf936f0fc0 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args = b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args index 4241b8a5b8..292953e184 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.x86_6= 4-latest.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.x8= 6_64-latest.args index 51f73f2806..2e161704dc 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.x86_64-lates= t.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args b/tests/qemuxml= 2argvdata/serial-udp-chardev.args index ec5986c2b2..0bf4f1c7af 100644 --- a/tests/qemuxml2argvdata/serial-udp-chardev.args +++ b/tests/qemuxml2argvdata/serial-udp-chardev.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.x86_64-latest.args b= /tests/qemuxml2argvdata/serial-udp-chardev.x86_64-latest.args index 73691050bd..bcb54a4fe1 100644 --- a/tests/qemuxml2argvdata/serial-udp-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-udp-chardev.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.args b/tests/qemuxm= l2argvdata/serial-unix-chardev.args index 80b5d2f86c..f518b03568 100644 --- a/tests/qemuxml2argvdata/serial-unix-chardev.args +++ b/tests/qemuxml2argvdata/serial-unix-chardev.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args = b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args index 12936d19ba..15bb205e36 100644 --- a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args b/tests/qemuxml2= argvdata/serial-vc-chardev.args index 5578acbd89..3d87049879 100644 --- a/tests/qemuxml2argvdata/serial-vc-chardev.args +++ b/tests/qemuxml2argvdata/serial-vc-chardev.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.x86_64-latest.args b/= tests/qemuxml2argvdata/serial-vc-chardev.x86_64-latest.args index 98026e0c98..fa5af4b978 100644 --- a/tests/qemuxml2argvdata/serial-vc-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-vc-chardev.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.args b/tests/qemux= ml2argvdata/shmem-plain-doorbell.args index 65c43b1856..0cda6eb716 100644 --- a/tests/qemuxml2argvdata/shmem-plain-doorbell.args +++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/shmem.args b/tests/qemuxml2argvdata/shm= em.args index 1a0d247409..1c35a8b6de 100644 --- a/tests/qemuxml2argvdata/shmem.args +++ b/tests/qemuxml2argvdata/shmem.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/smartcard-controller.args b/tests/qemux= ml2argvdata/smartcard-controller.args index c4d4b47762..8078935bd8 100644 --- a/tests/qemuxml2argvdata/smartcard-controller.args +++ b/tests/qemuxml2argvdata/smartcard-controller.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.ar= gs b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args index 4ff2721531..2609f5df94 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args b/test= s/qemuxml2argvdata/smartcard-host-certificates.args index fca3a7b249..ddde83064c 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/smartcard-host.args b/tests/qemuxml2arg= vdata/smartcard-host.args index c4d4b47762..8078935bd8 100644 --- a/tests/qemuxml2argvdata/smartcard-host.args +++ b/tests/qemuxml2argvdata/smartcard-host.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args b/t= ests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args index 3aa1366c26..47a783326d 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args b/tests/= qemuxml2argvdata/smartcard-passthrough-tcp.args index 1ae9e6872f..b317e0a7d7 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-lates= t.args b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.ar= gs index 34d4fe0076..737a96a4c1 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/smbios-type-fwcfg.args b/tests/qemuxml2= argvdata/smbios-type-fwcfg.args index da58f9bf52..2e8e4c8be1 100644 --- a/tests/qemuxml2argvdata/smbios-type-fwcfg.args +++ b/tests/qemuxml2argvdata/smbios-type-fwcfg.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/sm= bios.args index caeaf3974e..bbdd66b28f 100644 --- a/tests/qemuxml2argvdata/smbios.args +++ b/tests/qemuxml2argvdata/smbios.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/= smp-dies.args index daea4e1423..679e9785e6 100644 --- a/tests/qemuxml2argvdata/smp-dies.args +++ b/tests/qemuxml2argvdata/smp-dies.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,maxcpus=3D4,sockets=3D2,dies=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.a= rgs index 78e8198c68..50bc8af175 100644 --- a/tests/qemuxml2argvdata/smp.args +++ b/tests/qemuxml2argvdata/smp.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,maxcpus=3D2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/sound-device.x86_64-4.2.0.args b/tests/= qemuxml2argvdata/sound-device.x86_64-4.2.0.args index b2a5afd8c8..7d262ce330 100644 --- a/tests/qemuxml2argvdata/sound-device.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/sound-device.x86_64-4.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/sound-device.x86_64-latest.args b/tests= /qemuxml2argvdata/sound-device.x86_64-latest.args index e0a2f21b31..2d8e230388 100644 --- a/tests/qemuxml2argvdata/sound-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/sound-device.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/sparc-minimal.sparc-latest.args b/tests= /qemuxml2argvdata/sparc-minimal.sparc-latest.args index 531016737e..1cb520cf4a 100644 --- a/tests/qemuxml2argvdata/sparc-minimal.sparc-latest.args +++ b/tests/qemuxml2argvdata/sparc-minimal.sparc-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-redhat6= 2sparc/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-redhat62sparc/master-key.aes \ -machine SS-5,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 500 \ +-m size=3D512000k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 00010203-0405-4607-8809-0a0b0c0d0e0f \ diff --git a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args b/= tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args index dc2cfd9065..cba1950e2d 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-TPM-VM/= .config \ -machine pseries-5.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_= spapr.ram \ -accel tcg \ -cpu POWER9 \ --m 2048 \ +-m size=3D2097152k \ -object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":2147= 483648}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.arg= s b/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args index 512d0763d6..e79552a603 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-TPM-VM/= .config \ -machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,acpi=3Don \ -accel tcg \ -cpu qemu64 \ --m 2048 \ +-m size=3D2097152k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.= args b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args index 512d0763d6..e79552a603 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-TPM-VM/= .config \ -machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,acpi=3Don \ -accel tcg \ -cpu qemu64 \ --m 2048 \ +-m size=3D2097152k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args b/= tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args index 512d0763d6..e79552a603 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-TPM-VM/= .config \ -machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,acpi=3Don \ -accel tcg \ -cpu qemu64 \ --m 2048 \ +-m size=3D2097152k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args b/tests= /qemuxml2argvdata/tpm-emulator.x86_64-latest.args index 512d0763d6..e79552a603 100644 --- a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-TPM-VM/= .config \ -machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,acpi=3Don \ -accel tcg \ -cpu qemu64 \ --m 2048 \ +-m size=3D2097152k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/tpm-external.x86_64-latest.args b/tests= /qemuxml2argvdata/tpm-external.x86_64-latest.args index a574c5c9e5..f181cc2fa4 100644 --- a/tests/qemuxml2argvdata/tpm-external.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-external.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-TPM-VM/= .config \ -machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,acpi=3Don \ -accel tcg \ -cpu qemu64 \ --m 2048 \ +-m size=3D2097152k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args = b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args index 1532af5620..96da874a6b 100644 --- a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-TPM-VM/= .config \ -machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,acpi=3Don \ -accel tcg \ -cpu qemu64 \ --m 2048 \ +-m size=3D2097152k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args b/te= sts/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args index bd9a0eb77b..970869eaec 100644 --- a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-TPM-VM/= .config \ -machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,acpi=3Don \ -accel tcg \ -cpu qemu64 \ --m 2048 \ +-m size=3D2097152k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args b= /tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args index 327eebae16..e4259f32cd 100644 --- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args @@ -14,7 +14,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -accel tcg \ -global mch.extended-tseg-mbytes=3D48 \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.args b/tests= /qemuxml2argvdata/usb-controller-default-q35.args index e7aef94fd2..22a6d4d20a 100644 --- a/tests/qemuxml2argvdata/usb-controller-default-q35.args +++ b/tests/qemuxml2argvdata/usb-controller-default-q35.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args b/test= s/qemuxml2argvdata/usb-controller-explicit-q35.args index d8f559f121..9fd3065308 100644 --- a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args +++ b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-q35-test/master-key.aes \ -machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args b/tests/q= emuxml2argvdata/usb-controller-qemu-xhci.args index 053e472546..2f4bd5df0d 100644 --- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args +++ b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args b/tests/qemuxm= l2argvdata/usb-controller-xhci.args index 203afc305c..7f6cdbf348 100644 --- a/tests/qemuxml2argvdata/usb-controller-xhci.args +++ b/tests/qemuxml2argvdata/usb-controller-xhci.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/usb-controller.args b/tests/qemuxml2arg= vdata/usb-controller.args index 1813c49655..a336a06261 100644 --- a/tests/qemuxml2argvdata/usb-controller.args +++ b/tests/qemuxml2argvdata/usb-controller.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args b/tests/qem= uxml2argvdata/usb-hub-autoadd-deluxe.args index 3f80a7148b..313d218ec0 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args b/tests/qemuxml2ar= gvdata/usb-hub-autoadd.args index c8432674b1..dd7d1675c2 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/u= sb-hub.args index 230ecb97f3..645e81de1d 100644 --- a/tests/qemuxml2argvdata/usb-hub.args +++ b/tests/qemuxml2argvdata/usb-hub.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args b/tests/qemuxm= l2argvdata/usb-ich9-autoassign.args index 0a9b5bd0d7..6b24fcb208 100644 --- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args +++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args b/tests/qemuxml= 2argvdata/usb-ich9-companion.args index df13e93ca1..96041805f6 100644 --- a/tests/qemuxml2argvdata/usb-ich9-companion.args +++ b/tests/qemuxml2argvdata/usb-ich9-companion.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args b/tests/qemuxml= 2argvdata/usb-ich9-ehci-addr.args index 59a963c851..eb55883bd7 100644 --- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args +++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args b/tests/qemuxml= 2argvdata/usb-long-port-path.args index 1956d06a11..5874a1ff49 100644 --- a/tests/qemuxml2argvdata/usb-long-port-path.args +++ b/tests/qemuxml2argvdata/usb-long-port-path.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/= usb-none.args index 9224f17a83..2d39b29dbf 100644 --- a/tests/qemuxml2argvdata/usb-none.args +++ b/tests/qemuxml2argvdata/usb-none.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args b/tests/qemux= ml2argvdata/usb-piix3-controller.args index 5894afa852..085a9a9007 100644 --- a/tests/qemuxml2argvdata/usb-piix3-controller.args +++ b/tests/qemuxml2argvdata/usb-piix3-controller.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args b/tests/qemuxm= l2argvdata/usb-port-autoassign.args index 3f52c521fb..908025dada 100644 --- a/tests/qemuxml2argvdata/usb-port-autoassign.args +++ b/tests/qemuxml2argvdata/usb-port-autoassign.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/usb-port-missing.args b/tests/qemuxml2a= rgvdata/usb-port-missing.args index 08c55b7fec..fe268449ca 100644 --- a/tests/qemuxml2argvdata/usb-port-missing.args +++ b/tests/qemuxml2argvdata/usb-port-missing.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/usb-ports.args b/tests/qemuxml2argvdata= /usb-ports.args index f4d34d1db3..8119dd5400 100644 --- a/tests/qemuxml2argvdata/usb-ports.args +++ b/tests/qemuxml2argvdata/usb-ports.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args b/tests/qemuxml2arg= vdata/usb-redir-boot.args index b110d63a9e..f5f34eccca 100644 --- a/tests/qemuxml2argvdata/usb-redir-boot.args +++ b/tests/qemuxml2argvdata/usb-redir-boot.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args b/tests/q= emuxml2argvdata/usb-redir-filter-version.args index a6b1cac0c7..897886c83a 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter-version.args +++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args b/tests/qemuxml2a= rgvdata/usb-redir-filter.args index 45d72927ad..708e82417c 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter.args +++ b/tests/qemuxml2argvdata/usb-redir-filter.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args b/tes= ts/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args index e168844fb9..f01464521a 100644 --- a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/usb-redir.args b/tests/qemuxml2argvdata= /usb-redir.args index 9571a21c4f..963db5bc87 100644 --- a/tests/qemuxml2argvdata/usb-redir.args +++ b/tests/qemuxml2argvdata/usb-redir.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args b/tests/qemuxm= l2argvdata/usb-xhci-autoassign.args index 61cebea752..8a52f6ebeb 100644 --- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args +++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/usb1-usb2.args b/tests/qemuxml2argvdata= /usb1-usb2.args index 972cb795ad..c9881d3507 100644 --- a/tests/qemuxml2argvdata/usb1-usb2.args +++ b/tests/qemuxml2argvdata/usb1-usb2.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/user-aliases-usb.x86_64-latest.args b/t= ests/qemuxml2argvdata/user-aliases-usb.x86_64-latest.args index feb74824d8..3da572e975 100644 --- a/tests/qemuxml2argvdata/user-aliases-usb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/user-aliases-usb.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-gentoo/= .config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel kvm \ -cpu qemu64 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/user-aliases.x86_64-latest.args b/tests= /qemuxml2argvdata/user-aliases.x86_64-latest.args index 36279e7e0e..defc2c95ce 100644 --- a/tests/qemuxml2argvdata/user-aliases.x86_64-latest.args +++ b/tests/qemuxml2argvdata/user-aliases.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-gentoo/= .config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Don \ -accel kvm \ -cpu qemu64 \ --m 4096 \ +-m size=3D4194304k \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/d= ev/hugepages1G/libvirt/qemu/-1-gentoo","prealloc":true,"size":1073741824}' \ diff --git a/tests/qemuxml2argvdata/user-aliases2.x86_64-latest.args b/test= s/qemuxml2argvdata/user-aliases2.x86_64-latest.args index 30cbe6d735..4f015c4c28 100644 --- a/tests/qemuxml2argvdata/user-aliases2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/user-aliases2.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.x86_64-latest.arg= s b/tests/qemuxml2argvdata/vcpu-placement-static.x86_64-latest.args index 5ced682981..dc188d45fc 100644 --- a/tests/qemuxml2argvdata/vcpu-placement-static.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vcpu-placement-static.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-dummy2/= .config \ -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu qemu64 \ --m 128 \ +-m size=3D131072k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":134217728,"= host-nodes":[0,1,2,3],"policy":"bind"}' \ -overcommit mem-lock=3Doff \ -smp 2,maxcpus=3D6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args index f05480c25e..d3c71544f8 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel kvm \ -cpu qemu64 \ --m 14336 \ +-m size=3D14680064k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/v= ar/lib/libvirt/qemu/ram/-1-guest/ram-node0","share":true,"size":15032385536= }' \ diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args index ef8c7f8474..8a7a2fea0b 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine q35,usb=3Doff,dump-guest-core=3Doff,acpi=3Don \ -accel tcg \ -cpu qemu64 \ --m 2048 \ +-m size=3D2097152k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/d= ev/hugepages2M/libvirt/qemu/-1-guest","share":true,"prealloc":true,"size":2= 147483648}' \ diff --git a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.= args b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args index 1f708abe7a..26a2e56056 100644 --- a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-memfd","id":"ram-node0","share":true,= "size":224395264}' \ diff --git a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args b/tes= ts/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args index f96df5598f..92d90fbcb8 100644 --- a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-memfd","id":"ram-node0","share":true,= "size":224395264}' \ diff --git a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args b/t= ests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args index 5c6f0f78cf..1bad605e07 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -machine pc-i440fx-2.9,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args = b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args index b3105a7ff9..60fbf0ec5f 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args= b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args index a4fd4bd15e..7ada6ae81d 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args b/tes= ts/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args index 3ef2af7073..1493b9d646 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args b/tests/= qemuxml2argvdata/vhost-vsock.x86_64-latest.args index 4aaa3985eb..f800c6788c 100644 --- a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-lates= t.args b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.ar= gs index b06097c68e..f1d22cd422 100644 --- a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args b/tes= ts/qemuxml2argvdata/video-device-pciaddr-default.args index 12f16b68c1..e7d8f18b84 100644 --- a/tests/qemuxml2argvdata/video-device-pciaddr-default.args +++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid cdbebdfa-1d6d-65c3-be0f-fd74b978a773 \ diff --git a/tests/qemuxml2argvdata/video-none-device.args b/tests/qemuxml2= argvdata/video-none-device.args index f758366d05..8cd659c9ec 100644 --- a/tests/qemuxml2argvdata/video-none-device.args +++ b/tests/qemuxml2argvdata/video-none-device.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args b/tests/qe= muxml2argvdata/video-qxl-device-vgamem.args index 873f29f5d9..b6113e36be 100644 --- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args index 868f85725e..42a8197abe 100644 --- a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/video-qxl-device.args b/tests/qemuxml2a= rgvdata/video-qxl-device.args index ff61d30cb1..e62f524b11 100644 --- a/tests/qemuxml2argvdata/video-qxl-device.args +++ b/tests/qemuxml2argvdata/video-qxl-device.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/video-qxl-heads.args b/tests/qemuxml2ar= gvdata/video-qxl-heads.args index 66b6482482..fc70ff0fd5 100644 --- a/tests/qemuxml2argvdata/video-qxl-heads.args +++ b/tests/qemuxml2argvdata/video-qxl-heads.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.args b/tests/qemuxml2= argvdata/video-qxl-noheads.args index 3573f58624..08272ecc30 100644 --- a/tests/qemuxml2argvdata/video-qxl-noheads.args +++ b/tests/qemuxml2argvdata/video-qxl-noheads.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.args b/tests/qemux= ml2argvdata/video-qxl-resolution.args index ebec191c9b..23501a435c 100644 --- a/tests/qemuxml2argvdata/video-qxl-resolution.args +++ b/tests/qemuxml2argvdata/video-qxl-resolution.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args b/test= s/qemuxml2argvdata/video-qxl-sec-device-vgamem.args index e15a722c07..ac5af7c3ee 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-late= st.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.= args index 3eec23a14d..34f88d4cc5 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args b/tests/qemux= ml2argvdata/video-qxl-sec-device.args index 2a5c9d22d7..c835722ee8 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-lates= t.args b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.ar= gs index cba0cff3c4..d2f5cea74a 100644 --- a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.args b/tests/qe= muxml2argvdata/video-vga-device-vgamem.args index f4f96b3160..34bd93891b 100644 --- a/tests/qemuxml2argvdata/video-vga-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/video-vga-device.args b/tests/qemuxml2a= rgvdata/video-vga-device.args index d5b7d239d7..ef019414d2 100644 --- a/tests/qemuxml2argvdata/video-vga-device.args +++ b/tests/qemuxml2argvdata/video-vga-device.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args b/tests/qemuxm= l2argvdata/video-vga-qxl-heads.args index 66b6482482..fc70ff0fd5 100644 --- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args +++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/video-virtio-blob-off.x86_64-latest.arg= s b/tests/qemuxml2argvdata/video-virtio-blob-off.x86_64-latest.args index 48ca6047b8..f46fb2986d 100644 --- a/tests/qemuxml2argvdata/video-virtio-blob-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-virtio-blob-off.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/video-virtio-blob-on.x86_64-latest.args= b/tests/qemuxml2argvdata/video-virtio-blob-on.x86_64-latest.args index 05bf78dd46..ef37e32e5e 100644 --- a/tests/qemuxml2argvdata/video-virtio-blob-on.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-virtio-blob-on.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.s390x-latest.args = b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.s390x-latest.args index 646d28fade..84fd2da28b 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args b/tests/qe= muxml2argvdata/video-virtio-gpu-device.args index 8ef512bbd7..284c924e27 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args b/tests/qe= muxml2argvdata/video-virtio-gpu-sdl-gl.args index fe24fc0716..e0a0a6627f 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args b/tests= /qemuxml2argvdata/video-virtio-gpu-secondary.args index 5d92996de8..670058e7ac 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args b/tests/= qemuxml2argvdata/video-virtio-gpu-spice-gl.args index 0791de13e8..c50b218e6d 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args b/tests/qem= uxml2argvdata/video-virtio-gpu-virgl.args index 5ef95c5f5f..ad9d03bdce 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.args index 1215a2ec57..e4ecf34124 100644 --- a/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/video-virtio-vga.args b/tests/qemuxml2a= rgvdata/video-virtio-vga.args index 4e0b0f575f..71ee079100 100644 --- a/tests/qemuxml2argvdata/video-virtio-vga.args +++ b/tests/qemuxml2argvdata/video-virtio-vga.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 1024 \ +-m size=3D1048576k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args= b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args index 5a0a830360..8bc391a4fe 100644 --- a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args index 0838fc92ad..31b51f30c8 100644 --- a/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args b/tests/q= emuxml2argvdata/virtio-input-passthrough.args index ea0753ad3b..46915f9d37 100644 --- a/tests/qemuxml2argvdata/virtio-input-passthrough.args +++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-input.args b/tests/qemuxml2argvd= ata/virtio-input.args index 8e7753ff60..b689ed9d97 100644 --- a/tests/qemuxml2argvdata/virtio-input.args +++ b/tests/qemuxml2argvdata/virtio-input.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.arg= s b/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args index a58798acf1..e4a1adf5db 100644 --- a/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args +++ b/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine virt-6.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-p= flash1-format \ -accel tcg \ -cpu cortex-a15 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args index 90a2ed2f55..c2dbfd25ad 100644 --- a/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Don \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args b/tests/q= emuxml2argvdata/virtio-lun.x86_64-latest.args index c3ba02adc0..ee9539e672 100644 --- a/tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 1024 \ +-m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args index f138ce8fa6..375db8690b 100644 --- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-la= test.args b/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-lat= est.args index 3272aa0b07..a5ed1cbb41 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.ar= gs @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-= latest.args b/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64= -latest.args index 3ddf6cddf4..4193dc043d 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.= args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64= -latest.args b/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_= 64-latest.args index f325c67ada..069e1179b4 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest= .args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args index bb6e04a54d..9ba52a3309 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest= .args b/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args index bd739765e2..2b8aac5e38 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-lates= t.args b/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.ar= gs index ad37194b3d..2ccd559afe 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.arg= s b/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args index 25602c010d..2c88713004 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args index bacd131569..f94345baec 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.= args b/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args index 0326ce7851..708d2ea207 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.= args b/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args index 7064ed1b8b..fe93032cb2 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-lates= t.args b/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.ar= gs index a1cd66e49e..cdad9633d6 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-late= st.args b/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.= args index 34d9261cbb..80e290f77e 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-la= test.args b/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-lat= est.args index 96e16e8446..7805be0666 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.ar= gs @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-repo= rting.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon= -freepage-reporting.x86_64-latest.args index 6a1a12991f..1921441359 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x= 86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x= 86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-= latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64= -latest.args index c317bf95cf..82fadcfc19 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.= args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64= -latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_= 64-latest.args index 097c39098e..1eadfdb9ab 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest= .args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args index bc2200f85c..0c27d4b9b7 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.= args b/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args index af37842bf7..de8862357e 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest= .args b/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args index c2f48fcbb9..3d1270a180 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args index 84f818f851..bb9f95c150 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.= args b/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args index 0ed32b7adb..ea4d2cb533 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest= .args b/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args index 93f1569236..f18355db9d 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.= args b/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args index 8900766ad1..a6ac54961a 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-lates= t.args b/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.ar= gs index 53e39fa22c..f515669f17 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-late= st.args b/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.= args index 04ea6f861f..f0eefd1a5f 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args b/tes= ts/qemuxml2argvdata/virtio-options.x86_64-latest.args index 0ab4027c8e..ccc3b0e7d7 100644 --- a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-5.2.0.args b/= tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-5.2.0.args index 01e7d97457..58ba591167 100644 --- a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-5.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-i440fx-5.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ -accel kvm \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args b= /tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args index e25a8d64c3..2126b014d8 100644 --- a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.s390x-latest.args b/test= s/qemuxml2argvdata/virtio-rng-ccw.s390x-latest.args index 71f71dbf3e..4bc3b0daa0 100644 --- a/tests/qemuxml2argvdata/virtio-rng-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/virtio-rng-ccw.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args b/tests/qemuxml= 2argvdata/virtio-rng-default.args index 3d9c23af19..078eb058aa 100644 --- a/tests/qemuxml2argvdata/virtio-rng-default.args +++ b/tests/qemuxml2argvdata/virtio-rng-default.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-5.2.0.args b= /tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-5.2.0.args index 0f813efbe4..382472fada 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-5.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-i440fx-5.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ -accel kvm \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args index edbf3d49a6..94823c8a69 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args b/tests/qemuxml2arg= vdata/virtio-rng-egd.args index 6aeb4c4092..4811003393 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args b/tests/qemuxm= l2argvdata/virtio-rng-multiple.args index d29690f2f6..4ab70dc84c 100644 --- a/tests/qemuxml2argvdata/virtio-rng-multiple.args +++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args b/tests/qemuxml2= argvdata/virtio-rng-random.args index 641e31ea3c..d44f474c1b 100644 --- a/tests/qemuxml2argvdata/virtio-rng-random.args +++ b/tests/qemuxml2argvdata/virtio-rng-random.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args index 503ca6df58..4fe1dcefce 100644 --- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdat= a/vmcoreinfo.args index 1923ea6d3e..ec5ada5db7 100644 --- a/tests/qemuxml2argvdata/vmcoreinfo.args +++ b/tests/qemuxml2argvdata/vmcoreinfo.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ --m 214 \ +-m size=3D219136k \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/watchdog-device.x86_64-latest.args b/te= sts/qemuxml2argvdata/watchdog-device.x86_64-latest.args index 9fa6269ca1..fb1c033e35 100644 --- a/tests/qemuxml2argvdata/watchdog-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog-device.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/watchdog-diag288.s390x-latest.args b/te= sts/qemuxml2argvdata/watchdog-diag288.s390x-latest.args index 08d269098e..3f0c9495fe 100644 --- a/tests/qemuxml2argvdata/watchdog-diag288.s390x-latest.args +++ b/tests/qemuxml2argvdata/watchdog-diag288.s390x-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ -cpu qemu \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/watchdog-dump.x86_64-latest.args b/test= s/qemuxml2argvdata/watchdog-dump.x86_64-latest.args index 8273dc1937..2ee74a82d2 100644 --- a/tests/qemuxml2argvdata/watchdog-dump.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog-dump.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args b= /tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args index 5ca91ba10c..86c458dd8b 100644 --- a/tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/watchdog-q35-multiple.x86_64-latest.arg= s b/tests/qemuxml2argvdata/watchdog-q35-multiple.x86_64-latest.args index 4c14a95520..b790bb1f76 100644 --- a/tests/qemuxml2argvdata/watchdog-q35-multiple.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog-q35-multiple.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/watchdog.x86_64-latest.args b/tests/qem= uxml2argvdata/watchdog.x86_64-latest.args index 6d68e09261..c70d1ce50f 100644 --- a/tests/qemuxml2argvdata/watchdog.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel tcg \ -cpu qemu64 \ --m 214 \ +-m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-latest.args b/t= ests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-latest.args index 610ad21d08..2bd5e8bde6 100644 --- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-kvm/.co= nfig \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ -accel kvm \ -cpu qemu64 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-la= test.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-lat= est.args index bbb223e0c8..59a4a21451 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.ar= gs @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Don \ -accel kvm \ -cpu qemu64 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-l= atest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-l= atest.args index 4feebdf805..18b682e9b7 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.a= rgs @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,acpi=3Don \ -accel kvm \ -cpu qemu64 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.x86_64-= latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.x86_64= -latest.args index 2ab7a0c25b..14a3fbc6b4 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.x86_64-latest.= args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-q35-6.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,acpi=3Don \ -accel tcg,tb-size=3D100 \ -cpu qemu64 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-la= test.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-lat= est.args index 367b14a7a4..74a54d6d87 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.ar= gs @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Don \ -accel tcg \ -cpu qemu64 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-l= atest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-l= atest.args index 1283ed118b..5971d03336 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.a= rgs @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m,acpi=3Don \ -accel tcg \ -cpu qemu64 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args b= /tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args index ccee5611aa..45f33f6f31 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,hpet= =3Doff,acpi=3Don \ -accel tcg \ -cpu qemu64 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args b= /tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args index 2337644c8a..7ed7d8d19d 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,hpet= =3Doff,acpi=3Don \ -accel tcg \ -cpu qemu64 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args = b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args index f10d599518..419714b6d1 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,hpet= =3Doff,acpi=3Don \ -accel tcg \ -cpu qemu64 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args = b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args index 093cdd7873..1c7b94726d 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,hpet= =3Doff,acpi=3Don \ -accel tcg \ -cpu qemu64 \ --m 4096 \ +-m size=3D4194304k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}= ' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ --=20 2.40.1 From nobody Sat Feb 7 15:10:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1687438880; cv=none; d=zohomail.com; s=zohoarc; b=oImE1kTKeDSmX0jZGPwal7NU+JC12imIme/qJiGE8dZLwPeP603KUn+0yD/kgVPr485tciJw7vDUD+8wyVb6164Q8mMkxFMnVLLssFhjwRSO3fCci2UqwDAJNXyqRm/fo1oQB6bW+vqG+Qn+1eHg1IN/JcoBMZGG+EUiTCPwk9w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1687438880; 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=FNQGaNHQcDVma0KmuDK+ojtfnoIs22EGJ1vymErJHq0=; b=n1r2MfSFIz1PtyGimWwVHhT7os17PFp64zACo2hWMJHvFwk8ZK/trAEXgA8N6Mzrhf9SoCn/H7MyfM81eiM8ZbZakWkWvEha0YSM1JBuQlzWrlGF3jeaQLlFR4fCgtQF/mRnQNTGaCzlCeEbBBhn2nhRwXKP3fxPXKZ3g8WL/pI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 168743888060024.162732155609774; Thu, 22 Jun 2023 06:01:20 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-342-yyrmUtvsOLu-ED8moTHDyg-1; Thu, 22 Jun 2023 09:01:09 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CEA6388D196; Thu, 22 Jun 2023 13:00:40 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B7F252166B25; Thu, 22 Jun 2023 13:00:40 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 90F971946588; Thu, 22 Jun 2023 13:00:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 597851946587 for ; Thu, 22 Jun 2023 12:58:34 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 44218C1ED98; Thu, 22 Jun 2023 12:58:29 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id BAC6FC1ED97 for ; Thu, 22 Jun 2023 12:58:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687438879; 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=FNQGaNHQcDVma0KmuDK+ojtfnoIs22EGJ1vymErJHq0=; b=hYozpvUhd/DlkT67BtOmJ6AWOnKcwxVCWocOeFJ/MN4bmTB9FHl+a0C0jX6zQQlkjc2jIC XcUCEAdWfdmphaOg7V03dxyBtPeurztGhbqNLmHbY7lgOGAkd3IwEaBe0yxowYDrPVM58v at21IOUdh7kpUTlwK1RbzIsAconbwRk= X-MC-Unique: yyrmUtvsOLu-ED8moTHDyg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/4] qemu_domain: Properly validate count of memory slots Date: Thu, 22 Jun 2023 14:58:19 +0200 Message-Id: <2a473e1ee8e69f55a8b4095493e07f6bcf22f3be.1687436914.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1687438882175100001 Content-Type: text/plain; charset="utf-8" Memory slots are required only for DIMM-like devices, while other devices defined via such as virtio-mem may use the PCI bus and thus do not require/consume a memory slot. Fix the validation code to calculate the required count of memory devices only for DIMMs and NVDIMMs. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 31 ++++++++++++++----- ...mory-hotplug-virtio-mem.x86_64-latest.args | 2 +- .../memory-hotplug-virtio-mem.xml | 2 +- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 8f77e8fc58..c65c571398 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9279,6 +9279,7 @@ qemuDomainDefValidateMemoryHotplug(const virDomainDef= *def, unsigned int nmems =3D def->nmems; unsigned long long hotplugSpace; unsigned long long hotplugMemory =3D 0; + size_t slotsNeeded =3D 0; size_t i; hotplugSpace =3D def->mem.max_memory - virDomainDefGetMemoryInitial(de= f); @@ -9289,6 +9290,20 @@ qemuDomainDefValidateMemoryHotplug(const virDomainDe= f *def, if (qemuDomainDefValidateMemoryHotplugDevice(mem, def) < 0) return -1; + + switch (mem->model) { + case VIR_DOMAIN_MEMORY_MODEL_DIMM: + case VIR_DOMAIN_MEMORY_MODEL_NVDIMM: + slotsNeeded++; + break; + + case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: + case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM: + case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: + case VIR_DOMAIN_MEMORY_MODEL_LAST: + case VIR_DOMAIN_MEMORY_MODEL_NONE: + break; + } } if (!virDomainDefHasMemoryHotplug(def)) { @@ -9315,19 +9330,14 @@ qemuDomainDefValidateMemoryHotplug(const virDomainD= ef *def, } } - if (nmems > def->mem.memory_slots) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("memory device count '%1$u' exceeds slots count '= %2$u'"), - nmems, def->mem.memory_slots); - return -1; - } - for (i =3D 0; i < def->nmems; i++) { hotplugMemory +=3D def->mems[i]->size; switch (def->mems[i]->model) { case VIR_DOMAIN_MEMORY_MODEL_DIMM: case VIR_DOMAIN_MEMORY_MODEL_NVDIMM: + slotsNeeded++; + G_GNUC_FALLTHROUGH; case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM: /* already existing devices don't need to be checked on hotplu= g */ @@ -9344,6 +9354,13 @@ qemuDomainDefValidateMemoryHotplug(const virDomainDe= f *def, } } + if (slotsNeeded > def->mem.memory_slots) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("count of memory devices requiring memory slots '= %1$zu' exceeds slots count '%2$u'"), + slotsNeeded, def->mem.memory_slots); + return -1; + } + if (hotplugMemory > hotplugSpace) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("memory device total size exceeds hotplug space")= ); diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest= .args b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args index 592578fb59..7309fea2ff 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel kvm \ -cpu qemu64 \ --m size=3D2095104k,slots=3D16,maxmem=3D1099511627776k \ +-m size=3D2095104k,slots=3D1,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":21453864= 96}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml b/tests/q= emuxml2argvdata/memory-hotplug-virtio-mem.xml index f5cc4a35ed..6220ab4c82 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml @@ -1,7 +1,7 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 1099511627776 + 1099511627776 8388608 8388608 2 --=20 2.40.1 From nobody Sat Feb 7 15:10:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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 170.10.129.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=1687438795; cv=none; d=zohomail.com; s=zohoarc; b=MgVXz7YWJmwhp7K6dnS+hU/qG6+68GeFrdn2g1DVBaSpor8C6755dAh/y57iP4mYS2yEqKNyMXw23hdkeELXWM/t5V+rU9ezEqLCHyDaacZs3Z39zab7/RhG3Pc/P7WV5QWN2qCNfTx9XghE0Rh3SmfJrtdoZ31tspt9Bl+4Q2A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1687438795; 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=vNxaZqiJvfYQy+XE0oKNc+QSrB6wRecvav7opcp5oAc=; b=IiiY3gun42B8u0v8Hudw8Ky514ChCFzhyU3iSEB6vh0EXFn93S19bojgJ8ZTFGYvh/KK9kj2XGK35NamFFhbAfXmviI4faxXUrOZifGj+RNguKmkjfX8hN+QT/6FP5MojewsFXDDmdo/MuAbgHQNU9TQwu4OuJPxAeA43qRtqCI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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 [170.10.129.124]) by mx.zohomail.com with SMTPS id 1687438795806284.05354149338484; Thu, 22 Jun 2023 05:59:55 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-333-wSW8DdphPMaMq4lfEWhh1Q-1; Thu, 22 Jun 2023 08:59:51 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A3D141064AF8; Thu, 22 Jun 2023 12:59:47 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id E464E40C2063; Thu, 22 Jun 2023 12:59:46 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 32B031946588; Thu, 22 Jun 2023 12:59:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 37F371946587 for ; Thu, 22 Jun 2023 12:58:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 15196C478C6; Thu, 22 Jun 2023 12:58:30 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F9CEC1ED97 for ; Thu, 22 Jun 2023 12:58:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687438794; 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=vNxaZqiJvfYQy+XE0oKNc+QSrB6wRecvav7opcp5oAc=; b=dzEBu7EhnMzNsLpVUyzdrqXkgHf7aL0TzMtzrcbK0/kPSH6LGGv0at09F1wSseOM7J8IBY xAX1YaIXQuE5BN5m0QIM9v4msdwTO8Y3VfS24wGy3GKjtxLMkSEYUSlL+5zUex0ELBOprH bzWhPIv5JkJbd+oGk2PLuFqdsk01wgc= X-MC-Unique: wSW8DdphPMaMq4lfEWhh1Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/4] conf: Allow omitting 'slots' attribute of Date: Thu, 22 Jun 2023 14:58:20 +0200 Message-Id: <9c783b29603f4b04fc3a461774ce2b0562c46a13.1687436914.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1687438797380100001 Content-Type: text/plain; charset="utf-8" Memory slots are required only for DIMM-like devices, but the maximum memory address space is relevant also for other non-DIMM memory devices such as virtio-mem. Allow configurations where no slots are added. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 13 ++++++++++--- src/conf/domain_postparse.c | 5 ++--- src/conf/schemas/domaincommon.rng | 8 +++++--- .../memory-hotplug-virtio-mem.x86_64-latest.args | 2 +- .../qemuxml2argvdata/memory-hotplug-virtio-mem.xml | 2 +- .../memory-hotplug-virtio-pmem.x86_64-5.2.0.args | 2 +- .../memory-hotplug-virtio-pmem.x86_64-latest.args | 2 +- .../qemuxml2argvdata/memory-hotplug-virtio-pmem.xml | 2 +- 8 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0edb1bda9d..1fde53ff4c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -27416,9 +27416,16 @@ virDomainDefFormatInternalSetRootName(virDomainDef= *def, return -1; if (virDomainDefHasMemoryHotplug(def)) { - virBufferAsprintf(buf, - "%llu\n", - def->mem.memory_slots, def->mem.max_memory); + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) contentBuf =3D VIR_BUFFER_INITIALIZER; + + if (def->mem.memory_slots > 0) + virBufferAsprintf(&attrBuf, " slots=3D'%u'", def->mem.memory_s= lots); + + virBufferAddLit(&attrBuf, " unit=3D'KiB'"); + virBufferAsprintf(&contentBuf, "%llu", def->mem.max_memory); + + virXMLFormatElementInternal(buf, "maxMemory", &attrBuf, &contentBu= f, false, false); } virBufferAddLit(buf, "mem.cur_balloon =3D=3D 0) def->mem.cur_balloon =3D virDomainDefGetMemoryTotal(def); - if ((def->mem.max_memory || def->mem.memory_slots) && - !(def->mem.max_memory && def->mem.memory_slots)) { + if (def->mem.max_memory =3D=3D 0 && def->mem.memory_slots > 0) { virReportError(VIR_ERR_XML_ERROR, "%s", - _("both maximum memory size and memory slot count m= ust be specified")); + _("maximum memory size must be specified when speci= fying number of memory slots")); return -1; } diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom= mon.rng index c1725bb511..4b595fd066 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -721,9 +721,11 @@ - - - + + + + + diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest= .args b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args index 7309fea2ff..607ce9b0e8 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel kvm \ -cpu qemu64 \ --m size=3D2095104k,slots=3D1,maxmem=3D1099511627776k \ +-m size=3D2095104k,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":21453864= 96}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml b/tests/q= emuxml2argvdata/memory-hotplug-virtio-mem.xml index 6220ab4c82..c578209d8a 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml @@ -1,7 +1,7 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 1099511627776 + 1099511627776 8388608 8388608 2 diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0= .args b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args index e28dd339e9..fc42f9b108 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc-i440fx-5.2,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu qemu64 \ --m size=3D2095104k,slots=3D16,maxmem=3D1099511627776k \ +-m size=3D2095104k,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -object memory-backend-ram,id=3Dram-node0,size=3D2145386496 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-lates= t.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.ar= gs index bd8343c15e..9bbde420a9 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -machine pc,usb=3Doff,dump-guest-core=3Doff,acpi=3Doff \ -accel kvm \ -cpu qemu64 \ --m size=3D2095104k,slots=3D16,maxmem=3D1099511627776k \ +-m size=3D2095104k,maxmem=3D1099511627776k \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":21453864= 96}' \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml b/tests/= qemuxml2argvdata/memory-hotplug-virtio-pmem.xml index 21b90e4d8a..a8b22dd3c5 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml @@ -1,7 +1,7 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 1099511627776 + 1099511627776 2095104 2095104 2 --=20 2.40.1 From nobody Sat Feb 7 15:10:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1687438970; cv=none; d=zohomail.com; s=zohoarc; b=FWPxymIep08+Uzf3cD1sYUiYDmIX8cgvd8tOWGP6ATGfbgnf/FAXl3rl5105CE4Pj5D8GZK5xqxEayvZVDRaR67PIDDWkixcUA+uDGzHDDJMf0MCVwzd/Fbfwy9dDJLDa2ClcNVcfirYGqV8KpCEgXzZNhpr3T/8JmbAOXuFOfE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1687438970; 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=aWAhjIKJCrKIwKVtVWY67kgWpXO/mrDm55AfdS2T2yE=; b=Kikce2NO0EPVGOhSsBcfAejUQ15FQ9MJtuBRJAOTz48zz/b3qDb2zgkb9ppmHLsWdqOXoh1eZS3syUKCGPh6/qmR79Nm0L19Q5p0KK1bp9c1YB1A5PgR0Dy1SweOzQ7MZNQV6NDFihNppxb9wohYZBkrcYmJHBmrKK6OiwdL1kg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1687438969782185.52550155388428; Thu, 22 Jun 2023 06:02:49 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-166-K2F_DiYFNs6lGtPCjDLe8g-1; Thu, 22 Jun 2023 09:01:25 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 16A8F38117F2; Thu, 22 Jun 2023 13:00:57 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id F28232166B32; Thu, 22 Jun 2023 13:00:56 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 246CB19465B6; Thu, 22 Jun 2023 13:00:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 078F71946587 for ; Thu, 22 Jun 2023 12:58:31 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 02F44C478C6; Thu, 22 Jun 2023 12:58:31 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69EB8C1ED97 for ; Thu, 22 Jun 2023 12:58:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687438901; 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=aWAhjIKJCrKIwKVtVWY67kgWpXO/mrDm55AfdS2T2yE=; b=PBGEO1Z/3WLRtyZQYxct+VRKFuSgTlE4W+HefRRrnqu1TeA5KOM2LpRlZZ/pkHlql4/iYi k/fPMAqZil8sWXYhU343AfuiBl7M0OwraoBO/gS1/HgygKqw5mFQKYrSXfLL9/iyFEv0pc eesXROppSR2zTxKL/pkhOJverXFyQqg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687438968; 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=aWAhjIKJCrKIwKVtVWY67kgWpXO/mrDm55AfdS2T2yE=; b=IVHf4doQOpeyV3tUjOergPQ4H/RctI/jgDidjA1N+bIPDROOiqw6dgVpkeLDTuK9m/u0ea cIABidQgPrQPr51/vyn+He3uP0TPX5jnwgdZBCzkqvEZWGjSz/mAZGg0mWETEhWEHHVemN r+F+1qHv24hT2b+s8igDewKEuthMlFk= X-MC-Unique: K2F_DiYFNs6lGtPCjDLe8g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/4] qemuxml2(argv|xml)test: Add case for validating proper DIMM slot validation Date: Thu, 22 Jun 2023 14:58:21 +0200 Message-Id: <4d18e86604c7ed9279651aaf5b91b05d575cbd0f.1687436914.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) (identity @redhat.com) X-ZM-MESSAGEID: 1687438971124100001 Content-Type: text/plain; charset="utf-8" Add a config where both DIMM and non-DIMM devices are used so that it validates that only DIMMs require memory slots. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...memory-hotplug-multiple.x86_64-latest.args | 46 ++++++++++ .../memory-hotplug-multiple.xml | 89 ++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../memory-hotplug-multiple.x86_64-latest.xml | 90 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 5 files changed, 227 insertions(+) create mode 100644 tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-l= atest.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-multiple.xml create mode 100644 tests/qemuxml2xmloutdata/memory-hotplug-multiple.x86_64= -latest.xml diff --git a/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args new file mode 100644 index 0000000000..ad1dad01ac --- /dev/null +++ b/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args @@ -0,0 +1,46 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,nvdimm=3Don,acpi=3Doff \ +-accel kvm \ +-cpu qemu64 \ +-m size=3D2095104k,slots=3D2,maxmem=3D1099511627776k \ +-overcommit mem-lock=3Doff \ +-smp 2,sockets=3D2,dies=3D1,cores=3D1,threads=3D1 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":21453864= 96}' \ +-numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-device '{"driver":"pci-bridge","chassis_nr":1,"id":"pci.1","bus":"pci.0",= "addr":"0x3"}' \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-object '{"qom-type":"memory-backend-ram","id":"memdimm1","size":536870912= }' \ +-device '{"driver":"pc-dimm","node":0,"memdev":"memdimm1","id":"dimm1","sl= ot":1}' \ +-object '{"qom-type":"memory-backend-ram","id":"memvirtiomem0","reserve":f= alse,"size":1073741824}' \ +-device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"request= ed-size":536870912,"memdev":"memvirtiomem0","id":"virtiomem0","bus":"pci.0"= ,"addr":"0x2"}' \ +-object '{"qom-type":"memory-backend-file","id":"memvirtiomem1","mem-path"= :"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","reserve":false,"size":21474= 83648,"host-nodes":[1,2,3],"policy":"bind"}' \ +-device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"request= ed-size":1073741824,"memdev":"memvirtiomem1","prealloc":true,"memaddr":5637= 144576,"id":"virtiomem1","bus":"pci.1","addr":"0x1"}' \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","prealloc":true,"size":536870912}' \ +-device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0",= "slot":0}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-multiple.xml b/tests/qem= uxml2argvdata/memory-hotplug-multiple.xml new file mode 100644 index 0000000000..fe0e238e85 --- /dev/null +++ b/tests/qemuxml2argvdata/memory-hotplug-multiple.xml @@ -0,0 +1,89 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 1099511627776 + 8388608 + 8388608 + 2 + + hvm + + + + qemu64 + + + + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + + +
+ + +
+ + +
+ + + + + +
+ + + +