| Message ID | 1462914329-8797-4-git-send-email-cardoe@cardoe.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>>> On 10.05.16 at 23:05, <cardoe@cardoe.com> wrote: > --- a/xen/Kconfig.debug > +++ b/xen/Kconfig.debug > @@ -15,4 +15,11 @@ config DEBUG > option is intended for development purposes only, and not for > production use. > > +config VERBOSE_DEBUG > + bool "Verbose debug messages" > + default DEBUG > + ---help--- > + Guest output from HYPERVISOR_console_io and hypervisor parsing > + ELF images (dom0) is logged in the Xen ring buffer. The "depends on DEBUG || EXPERT" did get lost here (or, looking at the following patch, a respective "if" framing them all). Jan
On 5/11/16 4:45 AM, Jan Beulich wrote: >>>> On 10.05.16 at 23:05, <cardoe@cardoe.com> wrote: >> --- a/xen/Kconfig.debug >> +++ b/xen/Kconfig.debug >> @@ -15,4 +15,11 @@ config DEBUG >> option is intended for development purposes only, and not for >> production use. >> >> +config VERBOSE_DEBUG >> + bool "Verbose debug messages" >> + default DEBUG >> + ---help--- >> + Guest output from HYPERVISOR_console_io and hypervisor parsing >> + ELF images (dom0) is logged in the Xen ring buffer. > > The "depends on DEBUG || EXPERT" did get lost here (or, looking at > the following patch, a respective "if" framing them all). > > Jan > This option is always visible to someone and is not dependent on DEBUG due to the if not being possible in the form you asked. So I adjusted it to "default DEBUG" as you had asked. I can make this option dependent on DEBUG or EXPERT.
>>> On 11.05.16 at 19:37, <cardoe@cardoe.com> wrote: > On 5/11/16 4:45 AM, Jan Beulich wrote: >>>>> On 10.05.16 at 23:05, <cardoe@cardoe.com> wrote: >>> --- a/xen/Kconfig.debug >>> +++ b/xen/Kconfig.debug >>> @@ -15,4 +15,11 @@ config DEBUG >>> option is intended for development purposes only, and not for >>> production use. >>> >>> +config VERBOSE_DEBUG >>> + bool "Verbose debug messages" >>> + default DEBUG >>> + ---help--- >>> + Guest output from HYPERVISOR_console_io and hypervisor parsing >>> + ELF images (dom0) is logged in the Xen ring buffer. >> >> The "depends on DEBUG || EXPERT" did get lost here (or, looking at >> the following patch, a respective "if" framing them all). > > This option is always visible to someone and is not dependent on DEBUG > due to the if not being possible in the form you asked. So I adjusted it > to "default DEBUG" as you had asked. I can make this option dependent on > DEBUG or EXPERT. Same here - with the menuconfig gone, I don't see why. Jan
On 5/12/16 4:04 AM, Jan Beulich wrote: >>>> On 11.05.16 at 19:37, <cardoe@cardoe.com> wrote: >> On 5/11/16 4:45 AM, Jan Beulich wrote: >>>>>> On 10.05.16 at 23:05, <cardoe@cardoe.com> wrote: >>>> --- a/xen/Kconfig.debug >>>> +++ b/xen/Kconfig.debug >>>> @@ -15,4 +15,11 @@ config DEBUG >>>> option is intended for development purposes only, and not for >>>> production use. >>>> >>>> +config VERBOSE_DEBUG >>>> + bool "Verbose debug messages" >>>> + default DEBUG >>>> + ---help--- >>>> + Guest output from HYPERVISOR_console_io and hypervisor parsing >>>> + ELF images (dom0) is logged in the Xen ring buffer. >>> >>> The "depends on DEBUG || EXPERT" did get lost here (or, looking at >>> the following patch, a respective "if" framing them all). >> >> This option is always visible to someone and is not dependent on DEBUG >> due to the if not being possible in the form you asked. So I adjusted it >> to "default DEBUG" as you had asked. I can make this option dependent on >> DEBUG or EXPERT. > > Same here - with the menuconfig gone, I don't see why. > > Jan > So no change? From the first email I gather that it should be "depends on DEBUG || EXPERT" but from the last one I gather no change.
>>> On 18.05.16 at 04:16, <cardoe@cardoe.com> wrote: > On 5/12/16 4:04 AM, Jan Beulich wrote: >>>>> On 11.05.16 at 19:37, <cardoe@cardoe.com> wrote: >>> On 5/11/16 4:45 AM, Jan Beulich wrote: >>>>>>> On 10.05.16 at 23:05, <cardoe@cardoe.com> wrote: >>>>> --- a/xen/Kconfig.debug >>>>> +++ b/xen/Kconfig.debug >>>>> @@ -15,4 +15,11 @@ config DEBUG >>>>> option is intended for development purposes only, and not for >>>>> production use. >>>>> >>>>> +config VERBOSE_DEBUG >>>>> + bool "Verbose debug messages" >>>>> + default DEBUG >>>>> + ---help--- >>>>> + Guest output from HYPERVISOR_console_io and hypervisor parsing >>>>> + ELF images (dom0) is logged in the Xen ring buffer. >>>> >>>> The "depends on DEBUG || EXPERT" did get lost here (or, looking at >>>> the following patch, a respective "if" framing them all). >>> >>> This option is always visible to someone and is not dependent on DEBUG >>> due to the if not being possible in the form you asked. So I adjusted it >>> to "default DEBUG" as you had asked. I can make this option dependent on >>> DEBUG or EXPERT. >> >> Same here - with the menuconfig gone, I don't see why. > > So no change? From the first email I gather that it should be "depends > on DEBUG || EXPERT" but from the last one I gather no change. Oh, my mistake. I read the "can" in the last sentence of your previous reply as "can only", i.e. understanding you mean either DEBUG or EXPERT. So yes, what I meant to be asking for is "depends on DEBUG || EXPERT" uniformly for all the DEBUG sub-options. Which, it no longer being a menuconfig, should be possible to express by just an "if DEBUG || EXPERT" framing them all. Jan
diff --git a/INSTALL b/INSTALL index 2974b9b..35668bd 100644 --- a/INSTALL +++ b/INSTALL @@ -227,7 +227,6 @@ VGABIOS_REL_DATE="dd Mon yyyy" The following variables can be used to tweak some aspects of the hypervisor build. -verbose=y perfc=y perfc_arrays=y lock_profile=y diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug index 8abfbaa..734e78d 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -15,4 +15,11 @@ config DEBUG option is intended for development purposes only, and not for production use. +config VERBOSE_DEBUG + bool "Verbose debug messages" + default DEBUG + ---help--- + Guest output from HYPERVISOR_console_io and hypervisor parsing + ELF images (dom0) is logged in the Xen ring buffer. + endmenu diff --git a/xen/Rules.mk b/xen/Rules.mk index 1a220bd..b159451 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -3,7 +3,6 @@ # If you change any of these configuration options then you must # 'make clean' before rebuilding. # -verbose ?= n perfc ?= n perfc_arrays ?= n lock_profile ?= n @@ -17,7 +16,6 @@ include $(XEN_ROOT)/Config.mk # Hardcoded configuration implications and dependencies. # Do this is a neater way if it becomes unwieldy. ifeq ($(debug),y) -verbose := y frame_pointer := y endif ifeq ($(perfc_arrays),y) @@ -57,7 +55,6 @@ ifneq ($(clang),y) CFLAGS += -Wa,--strip-local-absolute endif -CFLAGS-$(verbose) += -DVERBOSE CFLAGS-$(perfc) += -DPERF_COUNTERS CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS CFLAGS-$(lock_profile) += -DLOCK_PROFILE diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 9871bd9..3f6cce3 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -472,7 +472,7 @@ static int kernel_elf_probe(struct kernel_info *info, if ( (rc = elf_init(&info->elf.elf, info->elf.kernel_img, size )) != 0 ) goto err; -#ifdef VERBOSE +#ifdef CONFIG_VERBOSE_DEBUG elf_set_verbose(&info->elf.elf); #endif elf_parse_binary(&info->elf.elf); diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index f9a3eca..b29c377 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -942,7 +942,7 @@ int __init construct_dom0( if ( (rc = elf_init(&elf, image_start, image_len)) != 0 ) return rc; -#ifdef VERBOSE +#ifdef CONFIG_VERBOSE_DEBUG elf_set_verbose(&elf); #endif elf_parse_binary(&elf); diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index abbe282..406cd18 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -215,7 +215,7 @@ static XSM_INLINE int xsm_memory_stat_reservation(XSM_DEFAULT_ARG struct domain static XSM_INLINE int xsm_console_io(XSM_DEFAULT_ARG struct domain *d, int cmd) { XSM_ASSERT_ACTION(XSM_OTHER); -#ifdef VERBOSE +#ifdef CONFIG_VERBOSE_DEBUG if ( cmd == CONSOLEIO_write ) return xsm_default_action(XSM_HOOK, d, NULL); #endif
Convert 'verbose', which was enabled by 'debug=y' to Kconfig as CONFIG_VERBOSE_DEBUG which is enabled by default when CONFIG_DEBUG is enabled. Signed-off-by: Doug Goldstein <cardoe@cardoe.com> --- CC: Stefano Stabellini <sstabellini@kernel.org> CC: Julien Grall <julien.grall@arm.com> CC: Jan Beulich <jbeulich@suse.com> CC: Andrew Cooper <andrew.cooper3@citrix.com> CC: Daniel De Graaf <dgdegra@tycho.nsa.gov> --- INSTALL | 1 - xen/Kconfig.debug | 7 +++++++ xen/Rules.mk | 3 --- xen/arch/arm/kernel.c | 2 +- xen/arch/x86/domain_build.c | 2 +- xen/include/xsm/dummy.h | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-)