| Message ID | 1467688367-17320-5-git-send-email-zhaoshenglong@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Jul 05, 2016 at 11:12:34AM +0800, Shannon Zhao wrote: > From: Shannon Zhao <shannon.zhao@linaro.org> > > It only constructs the ACPI tables for 64-bit ARM DomU when user enables > acpi because 32-bit DomU doesn't support ACPI. > > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> > --- > tools/libxl/Makefile | 4 ++++ > tools/libxl/libxl_arm.c | 19 ++++++++++++++- > tools/libxl/libxl_arm.h | 33 ++++++++++++++++++++++++++ > tools/libxl/libxl_arm_acpi.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 111 insertions(+), 1 deletion(-) > create mode 100644 tools/libxl/libxl_arm.h > create mode 100644 tools/libxl/libxl_arm_acpi.c > > diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile > index 0cf9f6a..88ab4d2 100644 > --- a/tools/libxl/Makefile > +++ b/tools/libxl/Makefile > @@ -91,6 +91,10 @@ acpi: > > LIBXL_OBJS-$(CONFIG_X86) += libxl_cpuid.o libxl_x86.o libxl_psr.o libxl_x86_acpi.o > LIBXL_OBJS-$(CONFIG_ARM) += libxl_nocpuid.o libxl_arm.o libxl_libfdt_compat.o > +LIBXL_OBJS-$(CONFIG_ARM) += libxl_arm_acpi.o > + > +libxl_arm_acpi.o: libxl_arm_acpi.c > + $(CC) -c $(CFLAGS) -I../../xen/include/ -o $@ libxl_arm_acpi.c > > ifeq ($(CONFIG_NetBSD),y) > LIBXL_OBJS-y += libxl_netbsd.o > diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c > index 4a57dd7..7c522e1 100644 > --- a/tools/libxl/libxl_arm.c > +++ b/tools/libxl/libxl_arm.c > @@ -1,6 +1,7 @@ > #include "libxl_internal.h" > #include "libxl_arch.h" > #include "libxl_libfdt_compat.h" > +#include "libxl_arm.h" > > #include <xc_dom.h> > #include <stdbool.h> > @@ -885,8 +886,24 @@ int libxl__arch_domain_init_hw_description(libxl__gc *gc, > libxl__domain_build_state *state, > struct xc_dom_image *dom) > { > + int rc; > + > assert(info->type == LIBXL_DOMAIN_TYPE_PV); > - return libxl__prepare_dtb(gc, info, state, dom); > + rc = libxl__prepare_dtb(gc, info, state, dom); > + if (rc) > + return rc; > + > + if (!libxl_defbool_val(info->arch_arm.acpi)) { > + LOG(DEBUG, "Generating ACPI tables is disabled by user."); > + return 0; > + } > + > + if (strcmp(dom->guest_type, "xen-3.0-aarch64")) { > + LOG(ERROR, "Can not enable xl option 'acpi' for %s", dom->guest_type); > + return ERROR_FAIL; > + } > + > + return libxl__prepare_acpi(gc, info, state, dom); Please use goto style error handling for consistency. See tools/libxl/CODING_STYLE. Please fix all other instances as well. > } > > static void finalise_one_memory_node(libxl__gc *gc, void *fdt, > diff --git a/tools/libxl/libxl_arm.h b/tools/libxl/libxl_arm.h > new file mode 100644 > index 0000000..1c01177 > --- /dev/null > +++ b/tools/libxl/libxl_arm.h > @@ -0,0 +1,33 @@ > +/* > + * Copyright (C) 2016 Linaro Ltd. > + * > + * Author: Shannon Zhao <shannon.zhao@linaro.org> > + * > + * This program 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; version 2.1 only. with the special > + * exception on linking described in file LICENSE. > + * > + * This program 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. > + */ > + > +#include "libxl_internal.h" > +#include "libxl_arch.h" > + > +#include <xc_dom.h> > + > +_hidden > +int libxl__prepare_acpi(libxl__gc *gc, libxl_domain_build_info *info, > + libxl__domain_build_state *state, > + struct xc_dom_image *dom); > + > +/* > + * Local variables: > + * mode: C > + * c-basic-offset: 4 > + * indent-tabs-mode: nil > + * End: > + */ > diff --git a/tools/libxl/libxl_arm_acpi.c b/tools/libxl/libxl_arm_acpi.c > new file mode 100644 > index 0000000..8c273f9 > --- /dev/null > +++ b/tools/libxl/libxl_arm_acpi.c > @@ -0,0 +1,56 @@ > +/* > + * ARM DomU ACPI generation > + * > + * Copyright (C) 2016 Linaro Ltd. > + * > + * Author: Shannon Zhao <shannon.zhao@linaro.org> > + * > + * This program 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; version 2.1 only. with the special > + * exception on linking described in file LICENSE. > + * > + * This program 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. > + */ > + > +#include "libxl_arm.h" > + > +#include <stdint.h> > + > +typedef uint8_t u8; > +typedef uint16_t u16; > +typedef uint32_t u32; > +typedef uint64_t u64; > + > +#include <acpi/acconfig.h> > +#include <acpi/actbl.h> > + > +int libxl__prepare_acpi(libxl__gc *gc, libxl_domain_build_info *info, > + libxl__domain_build_state *state, > + struct xc_dom_image *dom) > +{ > + const libxl_version_info *vers; > + > + vers = libxl_get_version_info(CTX); > + if (vers == NULL) > + return ERROR_FAIL; > + > + LOG(DEBUG, "constructing ACPI tables for Xen version %d.%d guest", > + vers->xen_version_major, vers->xen_version_minor); > + > + dom->acpitable_blob = NULL; > + dom->acpitable_size = 0; > + > + return 0; Same here. > +} > + > +/* > + * Local variables: > + * mode: C > + * c-basic-offset: 4 > + * indent-tabs-mode: nil > + * End: > + */ > -- > 2.0.4 > >
On 2016/7/7 23:50, Wei Liu wrote: > On Tue, Jul 05, 2016 at 11:12:34AM +0800, Shannon Zhao wrote: >> > From: Shannon Zhao <shannon.zhao@linaro.org> >> > >> > It only constructs the ACPI tables for 64-bit ARM DomU when user enables >> > acpi because 32-bit DomU doesn't support ACPI. >> > >> > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> >> > --- >> > tools/libxl/Makefile | 4 ++++ >> > tools/libxl/libxl_arm.c | 19 ++++++++++++++- >> > tools/libxl/libxl_arm.h | 33 ++++++++++++++++++++++++++ >> > tools/libxl/libxl_arm_acpi.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ >> > 4 files changed, 111 insertions(+), 1 deletion(-) >> > create mode 100644 tools/libxl/libxl_arm.h >> > create mode 100644 tools/libxl/libxl_arm_acpi.c >> > >> > diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile >> > index 0cf9f6a..88ab4d2 100644 >> > --- a/tools/libxl/Makefile >> > +++ b/tools/libxl/Makefile >> > @@ -91,6 +91,10 @@ acpi: >> > >> > LIBXL_OBJS-$(CONFIG_X86) += libxl_cpuid.o libxl_x86.o libxl_psr.o libxl_x86_acpi.o >> > LIBXL_OBJS-$(CONFIG_ARM) += libxl_nocpuid.o libxl_arm.o libxl_libfdt_compat.o >> > +LIBXL_OBJS-$(CONFIG_ARM) += libxl_arm_acpi.o >> > + >> > +libxl_arm_acpi.o: libxl_arm_acpi.c >> > + $(CC) -c $(CFLAGS) -I../../xen/include/ -o $@ libxl_arm_acpi.c >> > >> > ifeq ($(CONFIG_NetBSD),y) >> > LIBXL_OBJS-y += libxl_netbsd.o >> > diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c >> > index 4a57dd7..7c522e1 100644 >> > --- a/tools/libxl/libxl_arm.c >> > +++ b/tools/libxl/libxl_arm.c >> > @@ -1,6 +1,7 @@ >> > #include "libxl_internal.h" >> > #include "libxl_arch.h" >> > #include "libxl_libfdt_compat.h" >> > +#include "libxl_arm.h" >> > >> > #include <xc_dom.h> >> > #include <stdbool.h> >> > @@ -885,8 +886,24 @@ int libxl__arch_domain_init_hw_description(libxl__gc *gc, >> > libxl__domain_build_state *state, >> > struct xc_dom_image *dom) >> > { >> > + int rc; >> > + >> > assert(info->type == LIBXL_DOMAIN_TYPE_PV); >> > - return libxl__prepare_dtb(gc, info, state, dom); >> > + rc = libxl__prepare_dtb(gc, info, state, dom); >> > + if (rc) >> > + return rc; >> > + >> > + if (!libxl_defbool_val(info->arch_arm.acpi)) { >> > + LOG(DEBUG, "Generating ACPI tables is disabled by user."); >> > + return 0; >> > + } >> > + >> > + if (strcmp(dom->guest_type, "xen-3.0-aarch64")) { >> > + LOG(ERROR, "Can not enable xl option 'acpi' for %s", dom->guest_type); >> > + return ERROR_FAIL; >> > + } >> > + >> > + return libxl__prepare_acpi(gc, info, state, dom); > Please use goto style error handling for consistency. See > tools/libxl/CODING_STYLE. Please fix all other instances as well. > Ok, will fix these. Thanks.
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 0cf9f6a..88ab4d2 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -91,6 +91,10 @@ acpi: LIBXL_OBJS-$(CONFIG_X86) += libxl_cpuid.o libxl_x86.o libxl_psr.o libxl_x86_acpi.o LIBXL_OBJS-$(CONFIG_ARM) += libxl_nocpuid.o libxl_arm.o libxl_libfdt_compat.o +LIBXL_OBJS-$(CONFIG_ARM) += libxl_arm_acpi.o + +libxl_arm_acpi.o: libxl_arm_acpi.c + $(CC) -c $(CFLAGS) -I../../xen/include/ -o $@ libxl_arm_acpi.c ifeq ($(CONFIG_NetBSD),y) LIBXL_OBJS-y += libxl_netbsd.o diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 4a57dd7..7c522e1 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -1,6 +1,7 @@ #include "libxl_internal.h" #include "libxl_arch.h" #include "libxl_libfdt_compat.h" +#include "libxl_arm.h" #include <xc_dom.h> #include <stdbool.h> @@ -885,8 +886,24 @@ int libxl__arch_domain_init_hw_description(libxl__gc *gc, libxl__domain_build_state *state, struct xc_dom_image *dom) { + int rc; + assert(info->type == LIBXL_DOMAIN_TYPE_PV); - return libxl__prepare_dtb(gc, info, state, dom); + rc = libxl__prepare_dtb(gc, info, state, dom); + if (rc) + return rc; + + if (!libxl_defbool_val(info->arch_arm.acpi)) { + LOG(DEBUG, "Generating ACPI tables is disabled by user."); + return 0; + } + + if (strcmp(dom->guest_type, "xen-3.0-aarch64")) { + LOG(ERROR, "Can not enable xl option 'acpi' for %s", dom->guest_type); + return ERROR_FAIL; + } + + return libxl__prepare_acpi(gc, info, state, dom); } static void finalise_one_memory_node(libxl__gc *gc, void *fdt, diff --git a/tools/libxl/libxl_arm.h b/tools/libxl/libxl_arm.h new file mode 100644 index 0000000..1c01177 --- /dev/null +++ b/tools/libxl/libxl_arm.h @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2016 Linaro Ltd. + * + * Author: Shannon Zhao <shannon.zhao@linaro.org> + * + * This program 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; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program 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. + */ + +#include "libxl_internal.h" +#include "libxl_arch.h" + +#include <xc_dom.h> + +_hidden +int libxl__prepare_acpi(libxl__gc *gc, libxl_domain_build_info *info, + libxl__domain_build_state *state, + struct xc_dom_image *dom); + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/libxl/libxl_arm_acpi.c b/tools/libxl/libxl_arm_acpi.c new file mode 100644 index 0000000..8c273f9 --- /dev/null +++ b/tools/libxl/libxl_arm_acpi.c @@ -0,0 +1,56 @@ +/* + * ARM DomU ACPI generation + * + * Copyright (C) 2016 Linaro Ltd. + * + * Author: Shannon Zhao <shannon.zhao@linaro.org> + * + * This program 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; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program 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. + */ + +#include "libxl_arm.h" + +#include <stdint.h> + +typedef uint8_t u8; +typedef uint16_t u16; +typedef uint32_t u32; +typedef uint64_t u64; + +#include <acpi/acconfig.h> +#include <acpi/actbl.h> + +int libxl__prepare_acpi(libxl__gc *gc, libxl_domain_build_info *info, + libxl__domain_build_state *state, + struct xc_dom_image *dom) +{ + const libxl_version_info *vers; + + vers = libxl_get_version_info(CTX); + if (vers == NULL) + return ERROR_FAIL; + + LOG(DEBUG, "constructing ACPI tables for Xen version %d.%d guest", + vers->xen_version_major, vers->xen_version_minor); + + dom->acpitable_blob = NULL; + dom->acpitable_size = 0; + + return 0; +} + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */