From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: [PATCH v4 18/19] xen_pvh: support grub-install for xen_pvh Date: Fri, 2 Nov 2018 13:37:37 +0100 Message-ID: <20181102123738.16395-19-jgross@suse.com> References: <20181102123738.16395-1-jgross@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181102123738.16395-1-jgross@suse.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: grub-devel@gnu.org Cc: hans@knorrie.org, phcoder@gmail.com, daniel.kiper@oracle.com, Juergen Gross , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org QWRkIHhlbl9wdmggc3VwcG9ydCB0byBncnViLWluc3RhbGwuCgpTaWduZWQtb2ZmLWJ5OiBKdWVy Z2VuIEdyb3NzIDxqZ3Jvc3NAc3VzZS5jb20+ClJldmlld2VkLWJ5OiBEYW5pZWwgS2lwZXIgPGRh bmllbC5raXBlckBvcmFjbGUuY29tPgotLS0KIGluY2x1ZGUvZ3J1Yi91dGlsL2luc3RhbGwuaCB8 IDEgKwogdXRpbC9ncnViLWluc3RhbGwtY29tbW9uLmMgIHwgMSArCiB1dGlsL2dydWItaW5zdGFs bC5jICAgICAgICAgfCA3ICsrKysrKysKIDMgZmlsZXMgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCsp CgpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9ncnViL3V0aWwvaW5zdGFsbC5oIGIvaW5jbHVkZS9ncnVi L3V0aWwvaW5zdGFsbC5oCmluZGV4IDBkYmE4YjY3Zi4uYWYyYmY2NWQ3IDEwMDY0NAotLS0gYS9p bmNsdWRlL2dydWIvdXRpbC9pbnN0YWxsLmgKKysrIGIvaW5jbHVkZS9ncnViL3V0aWwvaW5zdGFs bC5oCkBAIC0xMDAsNiArMTAwLDcgQEAgZW51bSBncnViX2luc3RhbGxfcGxhdAogICAgIEdSVUJf SU5TVEFMTF9QTEFURk9STV9NSVBTX1FFTVVfTUlQUywKICAgICBHUlVCX0lOU1RBTExfUExBVEZP Uk1fSTM4Nl9YRU4sCiAgICAgR1JVQl9JTlNUQUxMX1BMQVRGT1JNX1g4Nl82NF9YRU4sCisgICAg R1JVQl9JTlNUQUxMX1BMQVRGT1JNX0kzODZfWEVOX1BWSCwKICAgICBHUlVCX0lOU1RBTExfUExB VEZPUk1fQVJNNjRfRUZJLAogICAgIEdSVUJfSU5TVEFMTF9QTEFURk9STV9BUk1fQ09SRUJPT1Qs CiAgICAgR1JVQl9JTlNUQUxMX1BMQVRGT1JNX01BWApkaWZmIC0tZ2l0IGEvdXRpbC9ncnViLWlu c3RhbGwtY29tbW9uLmMgYi91dGlsL2dydWItaW5zdGFsbC1jb21tb24uYwppbmRleCAwYTJlMjRh NzkuLjFiMWNiNDNiNCAxMDA2NDQKLS0tIGEvdXRpbC9ncnViLWluc3RhbGwtY29tbW9uLmMKKysr IGIvdXRpbC9ncnViLWluc3RhbGwtY29tbW9uLmMKQEAgLTcxNiw2ICs3MTYsNyBAQCBzdGF0aWMg c3RydWN0CiAgICAgW0dSVUJfSU5TVEFMTF9QTEFURk9STV9YODZfNjRfRUZJXSA9ICAgICAgIHsg Ing4Nl82NCIsICAiZWZpIiAgICAgICB9LAogICAgIFtHUlVCX0lOU1RBTExfUExBVEZPUk1fSTM4 Nl9YRU5dID0gICAgICAgICB7ICJpMzg2IiwgICAgInhlbiIgICAgICAgfSwKICAgICBbR1JVQl9J TlNUQUxMX1BMQVRGT1JNX1g4Nl82NF9YRU5dID0gICAgICAgeyAieDg2XzY0IiwgICJ4ZW4iICAg ICAgIH0sCisgICAgW0dSVUJfSU5TVEFMTF9QTEFURk9STV9JMzg2X1hFTl9QVkhdID0gICAgIHsg ImkzODYiLCAgICAieGVuX3B2aCIgICB9LAogICAgIFtHUlVCX0lOU1RBTExfUExBVEZPUk1fTUlQ U0VMX0xPT05HU09OXSA9ICB7ICJtaXBzZWwiLCAgImxvb25nc29uIiAgfSwKICAgICBbR1JVQl9J TlNUQUxMX1BMQVRGT1JNX01JUFNFTF9RRU1VX01JUFNdID0geyAibWlwc2VsIiwgICJxZW11X21p cHMiIH0sCiAgICAgW0dSVUJfSU5TVEFMTF9QTEFURk9STV9NSVBTX1FFTVVfTUlQU10gPSAgIHsg Im1pcHMiLCAgICAicWVtdV9taXBzIiB9LApkaWZmIC0tZ2l0IGEvdXRpbC9ncnViLWluc3RhbGwu YyBiL3V0aWwvZ3J1Yi1pbnN0YWxsLmMKaW5kZXggNDM3NWMxNjE5Li43NDMyOTZmMzYgMTAwNjQ0 Ci0tLSBhL3V0aWwvZ3J1Yi1pbnN0YWxsLmMKKysrIGIvdXRpbC9ncnViLWluc3RhbGwuYwpAQCAt NDk2LDYgKzQ5Niw3IEBAIGhhdmVfYm9vdGRldiAoZW51bSBncnViX2luc3RhbGxfcGxhdCBwbCkK IAogICAgIGNhc2UgR1JVQl9JTlNUQUxMX1BMQVRGT1JNX0kzODZfWEVOOgogICAgIGNhc2UgR1JV Ql9JTlNUQUxMX1BMQVRGT1JNX1g4Nl82NF9YRU46CisgICAgY2FzZSBHUlVCX0lOU1RBTExfUExB VEZPUk1fSTM4Nl9YRU5fUFZIOgogICAgICAgcmV0dXJuIDA7CiAKICAgICAgIC8qIHBhY2lmeSB3 YXJuaW5nLiAgKi8KQEAgLTkxMyw2ICs5MTQsNyBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqYXJn dltdKQogICAgIGNhc2UgR1JVQl9JTlNUQUxMX1BMQVRGT1JNX0FSTV9VQk9PVDoKICAgICBjYXNl IEdSVUJfSU5TVEFMTF9QTEFURk9STV9JMzg2X1hFTjoKICAgICBjYXNlIEdSVUJfSU5TVEFMTF9Q TEFURk9STV9YODZfNjRfWEVOOgorICAgIGNhc2UgR1JVQl9JTlNUQUxMX1BMQVRGT1JNX0kzODZf WEVOX1BWSDoKICAgICAgIGJyZWFrOwogCiAgICAgY2FzZSBHUlVCX0lOU1RBTExfUExBVEZPUk1f STM4Nl9RRU1VOgpAQCAtOTYwLDYgKzk2Miw3IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICphcmd2 W10pCiAgICAgY2FzZSBHUlVCX0lOU1RBTExfUExBVEZPUk1fTUlQU19RRU1VX01JUFM6CiAgICAg Y2FzZSBHUlVCX0lOU1RBTExfUExBVEZPUk1fSTM4Nl9YRU46CiAgICAgY2FzZSBHUlVCX0lOU1RB TExfUExBVEZPUk1fWDg2XzY0X1hFTjoKKyAgICBjYXNlIEdSVUJfSU5TVEFMTF9QTEFURk9STV9J Mzg2X1hFTl9QVkg6CiAgICAgICBmcmVlIChpbnN0YWxsX2RldmljZSk7CiAgICAgICBpbnN0YWxs X2RldmljZSA9IE5VTEw7CiAgICAgICBicmVhazsKQEAgLTE0NzcsNiArMTQ4MCw3IEBAIG1haW4g KGludCBhcmdjLCBjaGFyICphcmd2W10pCiAJCSAgY2FzZSBHUlVCX0lOU1RBTExfUExBVEZPUk1f QVJNX1VCT09UOgogCQkgIGNhc2UgR1JVQl9JTlNUQUxMX1BMQVRGT1JNX0kzODZfWEVOOgogCQkg IGNhc2UgR1JVQl9JTlNUQUxMX1BMQVRGT1JNX1g4Nl82NF9YRU46CisJCSAgY2FzZSBHUlVCX0lO U1RBTExfUExBVEZPUk1fSTM4Nl9YRU5fUFZIOgogCQkgICAgZ3J1Yl91dGlsX3dhcm4gKCIlcyIs IF8oIm5vIGhpbnRzIGF2YWlsYWJsZSBmb3IgeW91ciBwbGF0Zm9ybS4gRXhwZWN0IHJlZHVjZWQg cGVyZm9ybWFuY2UiKSk7CiAJCSAgICBicmVhazsKIAkJICAgIC8qIHBhY2lmeSB3YXJuaW5nLiAg Ki8KQEAgLTE1NjgsNiArMTU3Miw3IEBAIG1haW4gKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAg ICAgY2FzZSBHUlVCX0lOU1RBTExfUExBVEZPUk1fUE9XRVJQQ19JRUVFMTI3NToKICAgICBjYXNl IEdSVUJfSU5TVEFMTF9QTEFURk9STV9JMzg2X1hFTjoKICAgICBjYXNlIEdSVUJfSU5TVEFMTF9Q TEFURk9STV9YODZfNjRfWEVOOgorICAgIGNhc2UgR1JVQl9JTlNUQUxMX1BMQVRGT1JNX0kzODZf WEVOX1BWSDoKICAgICAgIGNvcmVfbmFtZSA9ICJjb3JlLmVsZiI7CiAgICAgICBzbnByaW50ZiAo bWtpbWFnZV90YXJnZXQsIHNpemVvZiAobWtpbWFnZV90YXJnZXQpLAogCQkiJXMtJXMiLApAQCAt MTY2MCw2ICsxNjY1LDcgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKICAgICBjYXNl IEdSVUJfSU5TVEFMTF9QTEFURk9STV9TUEFSQzY0X0lFRUUxMjc1OgogICAgIGNhc2UgR1JVQl9J TlNUQUxMX1BMQVRGT1JNX0kzODZfWEVOOgogICAgIGNhc2UgR1JVQl9JTlNUQUxMX1BMQVRGT1JN X1g4Nl82NF9YRU46CisgICAgY2FzZSBHUlVCX0lOU1RBTExfUExBVEZPUk1fSTM4Nl9YRU5fUFZI OgogICAgICAgYnJlYWs7CiAgICAgICAvKiBwYWNpZnkgd2FybmluZy4gICovCiAgICAgY2FzZSBH UlVCX0lOU1RBTExfUExBVEZPUk1fTUFYOgpAQCAtMTkyNiw2ICsxOTMyLDcgQEAgbWFpbiAoaW50 IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKICAgICBjYXNlIEdSVUJfSU5TVEFMTF9QTEFURk9STV9JMzg2 X1FFTVU6CiAgICAgY2FzZSBHUlVCX0lOU1RBTExfUExBVEZPUk1fSTM4Nl9YRU46CiAgICAgY2Fz ZSBHUlVCX0lOU1RBTExfUExBVEZPUk1fWDg2XzY0X1hFTjoKKyAgICBjYXNlIEdSVUJfSU5TVEFM TF9QTEFURk9STV9JMzg2X1hFTl9QVkg6CiAgICAgICBncnViX3V0aWxfd2FybiAoIiVzIiwKIAkJ ICAgICAgXygiV0FSTklORzogbm8gcGxhdGZvcm0tc3BlY2lmaWMgaW5zdGFsbCB3YXMgcGVyZm9y bWVkIikpOwogICAgICAgYnJlYWs7Ci0tIAoyLjE2LjQKCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZl bEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxt YW4vbGlzdGluZm8veGVuLWRldmVs From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1gIYwO-0006Q2-7H for mharc-grub-devel@gnu.org; Fri, 02 Nov 2018 08:52:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43425) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIYwH-0005NI-HN for grub-devel@gnu.org; Fri, 02 Nov 2018 08:52:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gIYiE-0005Ay-T0 for grub-devel@gnu.org; Fri, 02 Nov 2018 08:38:07 -0400 Received: from mx2.suse.de ([195.135.220.15]:50274 helo=mx1.suse.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gIYiE-00053H-IY for grub-devel@gnu.org; Fri, 02 Nov 2018 08:38:06 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id BD008AF9C; Fri, 2 Nov 2018 12:37:44 +0000 (UTC) From: Juergen Gross To: grub-devel@gnu.org Cc: xen-devel@lists.xen.org, phcoder@gmail.com, daniel.kiper@oracle.com, hans@knorrie.org, Juergen Gross Subject: [PATCH v4 18/19] xen_pvh: support grub-install for xen_pvh Date: Fri, 2 Nov 2018 13:37:37 +0100 Message-Id: <20181102123738.16395-19-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20181102123738.16395-1-jgross@suse.com> References: <20181102123738.16395-1-jgross@suse.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2018 12:52:42 -0000 Add xen_pvh support to grub-install. Signed-off-by: Juergen Gross Reviewed-by: Daniel Kiper --- include/grub/util/install.h | 1 + util/grub-install-common.c | 1 + util/grub-install.c | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/include/grub/util/install.h b/include/grub/util/install.h index 0dba8b67f..af2bf65d7 100644 --- a/include/grub/util/install.h +++ b/include/grub/util/install.h @@ -100,6 +100,7 @@ enum grub_install_plat GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS, GRUB_INSTALL_PLATFORM_I386_XEN, GRUB_INSTALL_PLATFORM_X86_64_XEN, + GRUB_INSTALL_PLATFORM_I386_XEN_PVH, GRUB_INSTALL_PLATFORM_ARM64_EFI, GRUB_INSTALL_PLATFORM_ARM_COREBOOT, GRUB_INSTALL_PLATFORM_MAX diff --git a/util/grub-install-common.c b/util/grub-install-common.c index 0a2e24a79..1b1cb43b4 100644 --- a/util/grub-install-common.c +++ b/util/grub-install-common.c @@ -716,6 +716,7 @@ static struct [GRUB_INSTALL_PLATFORM_X86_64_EFI] = { "x86_64", "efi" }, [GRUB_INSTALL_PLATFORM_I386_XEN] = { "i386", "xen" }, [GRUB_INSTALL_PLATFORM_X86_64_XEN] = { "x86_64", "xen" }, + [GRUB_INSTALL_PLATFORM_I386_XEN_PVH] = { "i386", "xen_pvh" }, [GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON] = { "mipsel", "loongson" }, [GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS] = { "mipsel", "qemu_mips" }, [GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS] = { "mips", "qemu_mips" }, diff --git a/util/grub-install.c b/util/grub-install.c index 4375c1619..743296f36 100644 --- a/util/grub-install.c +++ b/util/grub-install.c @@ -496,6 +496,7 @@ have_bootdev (enum grub_install_plat pl) case GRUB_INSTALL_PLATFORM_I386_XEN: case GRUB_INSTALL_PLATFORM_X86_64_XEN: + case GRUB_INSTALL_PLATFORM_I386_XEN_PVH: return 0; /* pacify warning. */ @@ -913,6 +914,7 @@ main (int argc, char *argv[]) case GRUB_INSTALL_PLATFORM_ARM_UBOOT: case GRUB_INSTALL_PLATFORM_I386_XEN: case GRUB_INSTALL_PLATFORM_X86_64_XEN: + case GRUB_INSTALL_PLATFORM_I386_XEN_PVH: break; case GRUB_INSTALL_PLATFORM_I386_QEMU: @@ -960,6 +962,7 @@ main (int argc, char *argv[]) case GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS: case GRUB_INSTALL_PLATFORM_I386_XEN: case GRUB_INSTALL_PLATFORM_X86_64_XEN: + case GRUB_INSTALL_PLATFORM_I386_XEN_PVH: free (install_device); install_device = NULL; break; @@ -1477,6 +1480,7 @@ main (int argc, char *argv[]) case GRUB_INSTALL_PLATFORM_ARM_UBOOT: case GRUB_INSTALL_PLATFORM_I386_XEN: case GRUB_INSTALL_PLATFORM_X86_64_XEN: + case GRUB_INSTALL_PLATFORM_I386_XEN_PVH: grub_util_warn ("%s", _("no hints available for your platform. Expect reduced performance")); break; /* pacify warning. */ @@ -1568,6 +1572,7 @@ main (int argc, char *argv[]) case GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275: case GRUB_INSTALL_PLATFORM_I386_XEN: case GRUB_INSTALL_PLATFORM_X86_64_XEN: + case GRUB_INSTALL_PLATFORM_I386_XEN_PVH: core_name = "core.elf"; snprintf (mkimage_target, sizeof (mkimage_target), "%s-%s", @@ -1660,6 +1665,7 @@ main (int argc, char *argv[]) case GRUB_INSTALL_PLATFORM_SPARC64_IEEE1275: case GRUB_INSTALL_PLATFORM_I386_XEN: case GRUB_INSTALL_PLATFORM_X86_64_XEN: + case GRUB_INSTALL_PLATFORM_I386_XEN_PVH: break; /* pacify warning. */ case GRUB_INSTALL_PLATFORM_MAX: @@ -1926,6 +1932,7 @@ main (int argc, char *argv[]) case GRUB_INSTALL_PLATFORM_I386_QEMU: case GRUB_INSTALL_PLATFORM_I386_XEN: case GRUB_INSTALL_PLATFORM_X86_64_XEN: + case GRUB_INSTALL_PLATFORM_I386_XEN_PVH: grub_util_warn ("%s", _("WARNING: no platform-specific install was performed")); break; -- 2.16.4