Skip to content

Commit efdaa61

Browse files
committed
drivers/xen/xenbus: remove quirk for Xen 3.x
The kernel is not supported to run as a Xen guest on Xen versions older than 4.0. Remove xen_strict_xenbus_quirk() which is testing the Xen version to be at least 4.0. Acked-by: Stefano Stabellini <[email protected]> Reviewed-by: Jason Andryuk <[email protected]> Signed-off-by: Juergen Gross <[email protected]> Message-ID: <[email protected]>
1 parent 8ea8153 commit efdaa61

File tree

1 file changed

+0
-23
lines changed

1 file changed

+0
-23
lines changed

drivers/xen/xenbus/xenbus_xs.c

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -718,36 +718,13 @@ int xs_watch_msg(struct xs_watch_event *event)
718718
return 0;
719719
}
720720

721-
/*
722-
* Certain older XenBus toolstack cannot handle reading values that are
723-
* not populated. Some Xen 3.4 installation are incapable of doing this
724-
* so if we are running on anything older than 4 do not attempt to read
725-
* control/platform-feature-xs_reset_watches.
726-
*/
727-
static bool xen_strict_xenbus_quirk(void)
728-
{
729-
#ifdef CONFIG_X86
730-
uint32_t eax, ebx, ecx, edx, base;
731-
732-
base = xen_cpuid_base();
733-
cpuid(base + 1, &eax, &ebx, &ecx, &edx);
734-
735-
if ((eax >> 16) < 4)
736-
return true;
737-
#endif
738-
return false;
739-
740-
}
741721
static void xs_reset_watches(void)
742722
{
743723
int err;
744724

745725
if (!xen_hvm_domain() || xen_initial_domain())
746726
return;
747727

748-
if (xen_strict_xenbus_quirk())
749-
return;
750-
751728
if (!xenbus_read_unsigned("control",
752729
"platform-feature-xs_reset_watches", 0))
753730
return;

0 commit comments

Comments
 (0)