From patchwork Wed Aug 24 10:11:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 9297393 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5D418607F0 for ; Wed, 24 Aug 2016 10:13:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E88428E8E for ; Wed, 24 Aug 2016 10:13:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 438B928EE2; Wed, 24 Aug 2016 10:13:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E1D4B28E8E for ; Wed, 24 Aug 2016 10:13:45 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bcVA6-0001nM-19; Wed, 24 Aug 2016 10:11:58 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bcVA3-0001Y3-I2; Wed, 24 Aug 2016 10:11:55 +0000 Received: from [193.109.254.147] by server-5.bemta-6.messagelabs.com id 0A/EC-29563-AE27DB75; Wed, 24 Aug 2016 10:11:54 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrFLMWRWlGSWpSXmKPExsVyuP0Ov+6ror3 hBtP2Slq8/bqE2eL7lslMDkwehz9cYQlgjGLNzEvKr0hgzWh6+ou14JNExanNm9kbGHeLdDFy ckgIGEm8nfiPqYuRi0NIYCGjxLzbb9lBEmwCqhIbrp9iBbFFBNwkvnyfxQZiMwtESMz5cIoFx BYWCJdYdeIwI4jNAlS/800bE4jNK+Agse79dGaIBXIS12dOB4tzAsWnLX4A1iskYC+x/+1U1g mM3AsYGVYxqhenFpWlFuka6yUVZaZnlOQmZuboGhqY6eWmFhcnpqfmJCYV6yXn525iBPqZAQh 2MHb8czrEKMnBpCTKe1N1b7gQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCd4vhUA5waLU9NSKtMwc YMDBpCU4eJREeDmAQSfEW1yQmFucmQ6ROsWoKCXOaw2SEABJZJTmwbXBgvwSo6yUMC8j0CFCP AWpRbmZJajyrxjFORiVhHnrQbbzZOaVwE1/BbSYCWhxy/3dIItLEhFSUg2MynOXTouNEhFMm3 NSbuPWa/0Lbks1m7mLyS6sbNB4+ew+J9O0P173N3s++nxUp13+c4JKp5Uit0b9Gf/Yn88quU5 kfLp15fSh0sDF1Ump7tGT/uReCy5fLrY8fFdzSuO+g0f9kp7uj92uFugvLpfwPktfdmvJlBm1 ISt5795c0+QhnnthbaeWEktxRqKhFnNRcSIA7wH+cm0CAAA= X-Env-Sender: jgross@suse.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1472033514!55200297!1 X-Originating-IP: [195.135.220.15] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26839 invoked from network); 24 Aug 2016 10:11:54 -0000 Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by server-12.tower-27.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 24 Aug 2016 10:11:54 -0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id EF045AD3B; Wed, 24 Aug 2016 10:11:53 +0000 (UTC) From: Juergen Gross To: minios-devel@lists.xenproject.org, xen-devel@lists.xenproject.org Date: Wed, 24 Aug 2016 12:11:42 +0200 Message-Id: <1472033504-23180-21-git-send-email-jgross@suse.com> X-Mailer: git-send-email 2.6.6 In-Reply-To: <1472033504-23180-1-git-send-email-jgross@suse.com> References: <1472033504-23180-1-git-send-email-jgross@suse.com> Cc: Juergen Gross , samuel.thibault@ens-lyon.org, wei.liu2@citrix.com Subject: [Xen-devel] [PATCH v2 20/22] mini-os: print start of day messages depending on domain type X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Select what to print in arch_init() depending on the domain type. Signed-off-by: Juergen Gross Reviewed-by: Samuel Thibault --- V2: add printing nr_modules as requested by Samuel Thibault --- arch/x86/setup.c | 48 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/arch/x86/setup.c b/arch/x86/setup.c index 50aa504..f422a96 100644 --- a/arch/x86/setup.c +++ b/arch/x86/setup.c @@ -91,6 +91,24 @@ static void get_cmdline(void *p) strncpy(cmdline, (char *)si->cmd_line, MAX_CMDLINE_SIZE - 1); } + +static void print_start_of_day(void *p) +{ + start_info_t *si = p; + + printk("Xen Minimal OS (pv)!\n"); + printk(" start_info: %p(VA)\n", si); + printk(" nr_pages: 0x%lx\n", si->nr_pages); + printk(" shared_inf: 0x%08lx(MA)\n", si->shared_info); + printk(" pt_base: %p(VA)\n", (void *)si->pt_base); + printk("nr_pt_frames: 0x%lx\n", si->nr_pt_frames); + printk(" mfn_list: %p(VA)\n", (void *)si->mfn_list); + printk(" mod_start: 0x%lx(VA)\n", si->mod_start); + printk(" mod_len: %lu\n", si->mod_len); + printk(" flags: 0x%x\n", (unsigned int)si->flags); + printk(" cmd_line: %s\n", cmdline); + printk(" stack: %p-%p\n", stack, stack + sizeof(stack)); +} #else static void hpc_init(void) { @@ -120,6 +138,20 @@ static void get_cmdline(void *p) if ( si->cmdline_paddr ) strncpy(cmdline, to_virt(si->cmdline_paddr), MAX_CMDLINE_SIZE - 1); } + +static void print_start_of_day(void *p) +{ + struct hvm_start_info *si = p; + + printk("Xen Minimal OS (hvm)!\n"); + printk(" start_info: %p(VA)\n", si); + printk(" shared_inf: %p(VA)\n", HYPERVISOR_shared_info); + printk(" modlist: 0x%lx(PA)\n", (unsigned long)si->modlist_paddr); + printk(" nr_modules: %u\n", si->nr_modules); + printk(" flags: 0x%x\n", (unsigned int)si->flags); + printk(" cmd_line: %s\n", cmdline); + printk(" stack: %p-%p\n", stack, stack + sizeof(stack)); +} #endif /* @@ -129,7 +161,6 @@ void arch_init(void *par) { static char hello[] = "Bootstrapping...\n"; - start_info_t *si; hpc_init(); (void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(hello), hello); @@ -154,21 +185,8 @@ arch_init(void *par) /* Grab the shared_info pointer and put it in a safe place. */ HYPERVISOR_shared_info = map_shared_info(par); - si = par; - /* print out some useful information */ - printk("Xen Minimal OS!\n"); - printk(" start_info: %p(VA)\n", si); - printk(" nr_pages: 0x%lx\n", si->nr_pages); - printk(" shared_inf: %p(VA)\n", HYPERVISOR_shared_info); - printk(" pt_base: %p(VA)\n", (void *)si->pt_base); - printk("nr_pt_frames: 0x%lx\n", si->nr_pt_frames); - printk(" mfn_list: %p(VA)\n", (void *)si->mfn_list); - printk(" mod_start: 0x%lx(VA)\n", si->mod_start); - printk(" mod_len: %lu\n", si->mod_len); - printk(" flags: 0x%x\n", (unsigned int)si->flags); - printk(" cmd_line: %s\n", cmdline); - printk(" stack: %p-%p\n", stack, stack + sizeof(stack)); + print_start_of_day(par); start_kernel(); }