508747f303
xen-4.20.0-testing-src.tar.bz2
- New Features
* On Arm:
- Experimental support for Armv8-R.
- Support for NXP S32G3 Processors Family and NXP LINFlexD UART driver.
- Basic handling for SCMI requests over SMC using Shared Memory, by allowing
forwarding the calls to EL3 FW if coming from hwdom.
- Support for LLC (Last Level Cache) coloring.
* On x86:
- xl suspend/resume subcommands.
- Changed Features
* Fixed blkif protocol specification for sector sizes different than 512b.
* The dombuilder in libxenguest no longer un-gzips secondary modules, instead
leaving this to the guest kernel to do in guest context.
* On x86:
- Prefer ACPI reboot over UEFI ResetSystem() run time service call.
- Switched the xAPIC flat driver to use physical destination mode for external
interrupts instead of logical destination mode.
- Removed Features
* On x86:
- Support for running on Xeon Phi processors.
- Removed the `ucode=allow-same` command line option.
- Removed x2APIC Cluster Mode for external interrupts. x2APIC Physical and
Mixed Modes are still available.
- Dropped patches
xsa466.patch
- Move /etc/bash_completion.d/xl back to %_datadir/bash-completion/completions
OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=863
60 lines
2.4 KiB
Diff
60 lines
2.4 KiB
Diff
References: bsc#978413
|
|
|
|
The parsing code can't handle a single line menu entry.
|
|
For example: menuentry 'halt' { halt }
|
|
Force it to fall through where it will handle the closing brace.
|
|
Also change warning to debug to cut down on verbose output.
|
|
|
|
Index: xen-4.18.0-testing/tools/pygrub/src/GrubConf.py
|
|
===================================================================
|
|
--- xen-4.18.0-testing.orig/tools/pygrub/src/GrubConf.py
|
|
+++ xen-4.18.0-testing/tools/pygrub/src/GrubConf.py
|
|
@@ -150,7 +150,7 @@ class GrubImage(_GrubImage):
|
|
else:
|
|
logging.info("Ignored image directive %s" %(com,))
|
|
else:
|
|
- logging.warning("Unknown image directive %s" %(com,))
|
|
+ logging.debug("Unknown image directive %s" %(com,))
|
|
|
|
# now put the line in the list of lines
|
|
if replace is None:
|
|
@@ -309,7 +309,7 @@ class GrubConfigFile(_GrubConfigFile):
|
|
else:
|
|
logging.info("Ignored directive %s" %(com,))
|
|
else:
|
|
- logging.warning("Unknown directive %s" %(com,))
|
|
+ logging.debug("Unknown directive %s" %(com,))
|
|
|
|
if img:
|
|
self.add_image(GrubImage(title, img))
|
|
@@ -343,7 +343,7 @@ class Grub2Image(_GrubImage):
|
|
elif com.startswith('set:'):
|
|
pass
|
|
else:
|
|
- logging.warning("Unknown image directive %s" %(com,))
|
|
+ logging.debug("Unknown image directive %s" %(com,))
|
|
|
|
# now put the line in the list of lines
|
|
if replace is None:
|
|
@@ -408,7 +408,10 @@ class Grub2ConfigFile(_GrubConfigFile):
|
|
raise RuntimeError("syntax error: cannot nest menuentry (%d %s)" % (len(img),img))
|
|
img = []
|
|
title = title_match.group(1)
|
|
- continue
|
|
+ if not l.endswith('}'):
|
|
+ continue
|
|
+ # One line menuentry, Ex. menuentry 'halt' { halt }
|
|
+ l = '}'
|
|
|
|
if l.startswith("submenu"):
|
|
menu_level += 1
|
|
@@ -447,7 +450,7 @@ class Grub2ConfigFile(_GrubConfigFile):
|
|
elif com.startswith('set:'):
|
|
pass
|
|
else:
|
|
- logging.warning("Unknown directive %s" %(com,))
|
|
+ logging.debug("Unknown directive %s" %(com,))
|
|
|
|
if img is not None:
|
|
raise RuntimeError("syntax error: end of file with open menuentry(%d %s)" % (len(img),img))
|