| Message ID | 1530536651-1588-1-git-send-email-imbrenda@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 2 Jul 2018 15:04:11 +0200 Claudio Imbrenda <imbrenda@linux.vnet.ibm.com> wrote: > The macro CMMA_BLOCK_SIZE was defined but not used, and a hardcoded > value was instead used in the code. > > This patch fixes the value of CMMA_BLOCK_SIZE and uses it in the > appropriate place in the code, and fixes another case of hardcoded > value in the KVM backend, replacing it with the more appropriate > constant KVM_S390_CMMA_SIZE_MAX. > > Signed-off-by: Claudio Imbrenda <imbrenda@linux.vnet.ibm.com> > --- > hw/s390x/s390-stattrib-kvm.c | 3 ++- > hw/s390x/s390-stattrib.c | 5 +++-- > 2 files changed, 5 insertions(+), 3 deletions(-) > diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c > index 70b9555..a788cdb 100644 > --- a/hw/s390x/s390-stattrib.c > +++ b/hw/s390x/s390-stattrib.c > @@ -20,7 +20,8 @@ > #include "qapi/error.h" > #include "qapi/qmp/qdict.h" > > -#define CMMA_BLOCK_SIZE (1 << 10) > +/* 512kB cover 2GB of guest memory */ > +#define CMMA_BLOCK_SIZE (1 << 19) Hm, this doesn't apply to current master anymore. Do we want to switch to something based on the IEC binary prefix definitions here, or keep the 1 << 19? > > #define STATTR_FLAG_EOS 0x01ULL > #define STATTR_FLAG_MORE 0x02ULL > @@ -202,7 +203,7 @@ static int cmma_save(QEMUFile *f, void *opaque, int final) > S390StAttribClass *sac = S390_STATTRIB_GET_CLASS(sas); > uint8_t *buf; > int r, cx, reallen = 0, ret = 0; > - uint32_t buflen = 1 << 19; /* 512kB cover 2GB of guest memory */ > + uint32_t buflen = CMMA_BLOCK_SIZE; > uint64_t start_gfn = sas->migration_cur_gfn; > > buf = g_try_malloc(buflen);
diff --git a/hw/s390x/s390-stattrib-kvm.c b/hw/s390x/s390-stattrib-kvm.c index 480551c..c7e1f35 100644 --- a/hw/s390x/s390-stattrib-kvm.c +++ b/hw/s390x/s390-stattrib-kvm.c @@ -105,7 +105,8 @@ static void kvm_s390_stattrib_synchronize(S390StAttribState *sa) KVMS390StAttribState *sas = KVM_S390_STATTRIB(sa); MachineState *machine = MACHINE(qdev_get_machine()); unsigned long max = machine->maxram_size / TARGET_PAGE_SIZE; - unsigned long cx, len = 1 << 19; + /* We do not need to reach the maximum buffer size allowed */ + unsigned long cx, len = KVM_S390_SKEYS_MAX / 2; int r; struct kvm_s390_cmma_log clog = { .flags = 0, diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c index 70b9555..a788cdb 100644 --- a/hw/s390x/s390-stattrib.c +++ b/hw/s390x/s390-stattrib.c @@ -20,7 +20,8 @@ #include "qapi/error.h" #include "qapi/qmp/qdict.h" -#define CMMA_BLOCK_SIZE (1 << 10) +/* 512kB cover 2GB of guest memory */ +#define CMMA_BLOCK_SIZE (1 << 19) #define STATTR_FLAG_EOS 0x01ULL #define STATTR_FLAG_MORE 0x02ULL @@ -202,7 +203,7 @@ static int cmma_save(QEMUFile *f, void *opaque, int final) S390StAttribClass *sac = S390_STATTRIB_GET_CLASS(sas); uint8_t *buf; int r, cx, reallen = 0, ret = 0; - uint32_t buflen = 1 << 19; /* 512kB cover 2GB of guest memory */ + uint32_t buflen = CMMA_BLOCK_SIZE; uint64_t start_gfn = sas->migration_cur_gfn; buf = g_try_malloc(buflen);
The macro CMMA_BLOCK_SIZE was defined but not used, and a hardcoded value was instead used in the code. This patch fixes the value of CMMA_BLOCK_SIZE and uses it in the appropriate place in the code, and fixes another case of hardcoded value in the KVM backend, replacing it with the more appropriate constant KVM_S390_CMMA_SIZE_MAX. Signed-off-by: Claudio Imbrenda <imbrenda@linux.vnet.ibm.com> --- hw/s390x/s390-stattrib-kvm.c | 3 ++- hw/s390x/s390-stattrib.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-)