mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-24 03:59:52 +00:00
s390x: remove direct reference to mem_path global from s390x code
I plan to deprecate -mem-path option and replace it with memory-backend, for that it's necessary to get rid of mem_path global variable. Do it for s390x case, replacing it with alternative way to enable 1Mb hugepages capability. Todo that replace qemu_mempath_getpagesize() with qemu_getrampagesize() which also checks for -mem-path provided RAM. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: David Hildenbrand <david@redhat.com> Message-Id: <1548834906-133241-1-git-send-email-imammedo@redhat.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
parent
843caef2ef
commit
f6b51efa19
@ -42,6 +42,7 @@
|
||||
#include "hw/hw.h"
|
||||
#include "sysemu/device_tree.h"
|
||||
#include "exec/gdbstub.h"
|
||||
#include "exec/ram_addr.h"
|
||||
#include "trace.h"
|
||||
#include "hw/s390x/s390-pci-inst.h"
|
||||
#include "hw/s390x/s390-pci-bus.h"
|
||||
@ -287,7 +288,7 @@ void kvm_s390_crypto_reset(void)
|
||||
|
||||
static int kvm_s390_configure_mempath_backing(KVMState *s)
|
||||
{
|
||||
size_t path_psize = qemu_mempath_getpagesize(mem_path);
|
||||
size_t path_psize = qemu_getrampagesize();
|
||||
|
||||
if (path_psize == 4 * KiB) {
|
||||
return 0;
|
||||
@ -319,7 +320,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
|
||||
{
|
||||
MachineClass *mc = MACHINE_GET_CLASS(ms);
|
||||
|
||||
if (mem_path && kvm_s390_configure_mempath_backing(s)) {
|
||||
if (kvm_s390_configure_mempath_backing(s)) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user