xen: Make xen-blkfront write its protocol ABI to xenstore (3e334239) · Commits · 戴 / test

Frontends are expected to write their protocol ABI to xenstore. Since the protocol ABI defaults to the backend's native ABI, things work fine without that as long as the frontend's native ABI is identical to the backend's native ABI. This is not the case for xen-blkfront running 32-on-64, because its ABI differs between 32 and 64 bit, and thus needs this fix. Based on http://xenbits.xensource.com/xen-unstable.hg?rev/c545932a18f3 and http://xenbits.xensource.com/xen-unstable.hg?rev/ffe52263b430 by Gerd Hoffmann <kraxel@suse.de> Signed-off-by:

Markus Armbruster <armbru@redhat.com> Signed-off-by:

Jeremy Fitzhardinge <Jeremy.Fitzhardinge@citrix.com> Signed-off-by:

Ingo Molnar <mingo@elte.hu> Signed-off-by:

Thomas Gleixner <tglx@linutronix.de>

drivers/block/xen-blkfront.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@

		#include <xen/interface/grant_table.h>
		#include <xen/interface/io/blkif.h>
		#include <xen/interface/io/protocols.h>

		#include <asm/xen/hypervisor.h>

		@@ -614,6 +615,12 @@ again:
		message = "writing event-channel";
		goto abort_transaction;
		}
		err = xenbus_printf(xbt, dev->nodename, "protocol", "%s",
		XEN_IO_PROTO_ABI_NATIVE);
		if (err) {
		message = "writing protocol";
		goto abort_transaction;
		}

		err = xenbus_transaction_end(xbt, 0);
		if (err) {

include/xen/interface/io/protocols.h

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		#ifndef __XEN_PROTOCOLS_H__
		#define __XEN_PROTOCOLS_H__

		#define XEN_IO_PROTO_ABI_X86_32 "x86_32-abi"
		#define XEN_IO_PROTO_ABI_X86_64 "x86_64-abi"
		#define XEN_IO_PROTO_ABI_IA64 "ia64-abi"
		#define XEN_IO_PROTO_ABI_POWERPC64 "powerpc64-abi"

		#if defined(__i386__)
		# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_32
		#elif defined(__x86_64__)
		# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_64
		#elif defined(__ia64__)
		# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_IA64
		#elif defined(__powerpc64__)
		# define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_POWERPC64
		#else
		# error arch fixup needed here
		#endif

		#endif

Admin message