From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41883) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVmf3-0003Ec-Os for qemu-devel@nongnu.org; Wed, 11 Mar 2015 15:51:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YVmex-00055n-Kb for qemu-devel@nongnu.org; Wed, 11 Mar 2015 15:51:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54216) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVmex-00055N-Ak for qemu-devel@nongnu.org; Wed, 11 Mar 2015 15:51:15 -0400 Date: Wed, 11 Mar 2015 20:51:08 +0100 From: "Michael S. Tsirkin" Message-ID: <20150311205108-mutt-send-email-mst@redhat.com> References: <1426096767-30494-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1426096767-30494-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 10/25] machine: query kvm-shadow-mem machine property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , kvm@vger.kernel.org, Marcelo Tosatti , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson From: Marcel Apfelbaum Commit e79d5a6 ("machine: remove qemu_machine_opts global list") removed the global option descriptions and moved them to MachineState's QOM properties. Query kvm-shadow-mem by accessing machine properties through designated wrappers. Signed-off-by: Marcel Apfelbaum Acked-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Paolo Bonzini --- include/hw/boards.h | 1 + hw/core/machine.c | 6 ++++++ target-i386/kvm.c | 3 +-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 69ab606..4be3cd1 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -69,6 +69,7 @@ bool machine_usb(MachineState *machine); bool machine_iommu(MachineState *machine); bool machine_kernel_irqchip_allowed(MachineState *machine); bool machine_kernel_irqchip_required(MachineState *machine); +int machine_kvm_shadow_mem(MachineState *machine); /** * MachineClass: diff --git a/hw/core/machine.c b/hw/core/machine.c index e04e5ab..0ad5b12 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -284,6 +284,7 @@ static void machine_initfn(Object *obj) MachineState *ms = MACHINE(obj); ms->kernel_irqchip_allowed = true; + ms->kvm_shadow_mem = -1; object_property_add_str(obj, "accel", machine_get_accel, machine_set_accel, NULL); @@ -414,6 +415,11 @@ bool machine_kernel_irqchip_required(MachineState *machine) return machine->kernel_irqchip_required; } +int machine_kvm_shadow_mem(MachineState *machine) +{ + return machine->kvm_shadow_mem; +} + static const TypeInfo machine_info = { .name = TYPE_MACHINE, .parent = TYPE_OBJECT, diff --git a/target-i386/kvm.c b/target-i386/kvm.c index ce554e4..acb6831 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -890,8 +890,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s) } qemu_register_reset(kvm_unpoison_all, NULL); - shadow_mem = qemu_opt_get_size(qemu_get_machine_opts(), - "kvm_shadow_mem", -1); + shadow_mem = machine_kvm_shadow_mem(ms); if (shadow_mem != -1) { shadow_mem /= 4096; ret = kvm_vm_ioctl(s, KVM_SET_NR_MMU_PAGES, shadow_mem); -- MST