| Message ID | 20200403144149.14068-1-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] nvdimm-utils: clean up headers and add license comment | expand |
Hi Igor, On 4/3/20 4:41 PM, Igor Mammedov wrote: > Fixes: 3f350f6bb36233be50fc2bc18dc78b6a948a5dbe > Reported-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Igor Mammedov <imammedo@redhat.com> > --- > v2: > - add license blob to header as well > - trim comment a litle bit to remove unrelated NFIT/PMEM sentences > --- > include/qemu/nvdimm-utils.h | 23 +++++++++++++++++++++-- > util/nvdimm-utils.c | 23 +++++++++++++++++++++++ > 2 files changed, 44 insertions(+), 2 deletions(-) > > diff --git a/include/qemu/nvdimm-utils.h b/include/qemu/nvdimm-utils.h > index 4b8b198ba7..2d8cde085c 100644 > --- a/include/qemu/nvdimm-utils.h > +++ b/include/qemu/nvdimm-utils.h > @@ -1,7 +1,26 @@ > #ifndef NVDIMM_UTILS_H > #define NVDIMM_UTILS_H I think most of the files in the tree use the pattern "license comment before the ifdef guard", but I won't write a script to prove me right/wrong :) > - > -#include "qemu/osdep.h" > +/* > + * NVDIMM utilities > + * > + * Copyright(C) 2015 Intel Corporation. > + * > + * Author: > + * Xiao Guangrong <guangrong.xiao@linux.intel.com> > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, see <http://www.gnu.org/licenses/> > + */ So here goes the ifdef: #ifndef NVDIMM_UTILS_H #define NVDIMM_UTILS_H > > GSList *nvdimm_get_device_list(void); > #endif > diff --git a/util/nvdimm-utils.c b/util/nvdimm-utils.c > index 5cc768ca47..3d570c3c3e 100644 > --- a/util/nvdimm-utils.c > +++ b/util/nvdimm-utils.c > @@ -1,3 +1,26 @@ > +/* > + * NVDIMM utilities > + * > + * Copyright(C) 2015 Intel Corporation. > + * > + * Author: > + * Xiao Guangrong <guangrong.xiao@linux.intel.com> > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, see <http://www.gnu.org/licenses/> > + */ > + > +#include "qemu/osdep.h" > #include "qemu/nvdimm-utils.h" > #include "hw/mem/nvdimm.h" > >
diff --git a/include/qemu/nvdimm-utils.h b/include/qemu/nvdimm-utils.h index 4b8b198ba7..2d8cde085c 100644 --- a/include/qemu/nvdimm-utils.h +++ b/include/qemu/nvdimm-utils.h @@ -1,7 +1,26 @@ #ifndef NVDIMM_UTILS_H #define NVDIMM_UTILS_H - -#include "qemu/osdep.h" +/* + * NVDIMM utilities + * + * Copyright(C) 2015 Intel Corporation. + * + * Author: + * Xiao Guangrong <guangrong.xiao@linux.intel.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see <http://www.gnu.org/licenses/> + */ GSList *nvdimm_get_device_list(void); #endif diff --git a/util/nvdimm-utils.c b/util/nvdimm-utils.c index 5cc768ca47..3d570c3c3e 100644 --- a/util/nvdimm-utils.c +++ b/util/nvdimm-utils.c @@ -1,3 +1,26 @@ +/* + * NVDIMM utilities + * + * Copyright(C) 2015 Intel Corporation. + * + * Author: + * Xiao Guangrong <guangrong.xiao@linux.intel.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see <http://www.gnu.org/licenses/> + */ + +#include "qemu/osdep.h" #include "qemu/nvdimm-utils.h" #include "hw/mem/nvdimm.h"
Fixes: 3f350f6bb36233be50fc2bc18dc78b6a948a5dbe Reported-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- v2: - add license blob to header as well - trim comment a litle bit to remove unrelated NFIT/PMEM sentences --- include/qemu/nvdimm-utils.h | 23 +++++++++++++++++++++-- util/nvdimm-utils.c | 23 +++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-)