Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d32917ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull KVM fixes from Paolo Bonzini:
 "Two small x86 patches, improving "make kvmconfig" and fixing an
  objtool warning for CONFIG_PROFILE_ALL_BRANCHES"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  kvmconfig: add more virtio drivers
  x86/kvm: Add stack frame dependency to fastop() inline asm
parents c5114626 44ca941a

arch/x86/configs/kvm_guest.config

+3 −0
Original line number Original line Diff line number Diff line
@@ -26,3 +26,6 @@ CONFIG_VIRTIO_NET=y 
CONFIG_9P_FS=y

CONFIG_9P_FS=y

CONFIG_NET_9P=y

CONFIG_NET_9P=y

CONFIG_NET_9P_VIRTIO=y

CONFIG_NET_9P_VIRTIO=y

CONFIG_SCSI_LOWLEVEL=y

CONFIG_SCSI_VIRTIO=y

CONFIG_VIRTIO_INPUT=y

arch/x86/kvm/emulate.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -5110,13 +5110,17 @@ static void fetch_possible_mmx_operand(struct x86_emulate_ctxt *ctxt, 




static int fastop(struct x86_emulate_ctxt *ctxt, void (*fop)(struct fastop *))

static int fastop(struct x86_emulate_ctxt *ctxt, void (*fop)(struct fastop *))

{

{

	register void *__sp asm(_ASM_SP);

	ulong flags = (ctxt->eflags & EFLAGS_MASK) | X86_EFLAGS_IF;

	ulong flags = (ctxt->eflags & EFLAGS_MASK) | X86_EFLAGS_IF;



	if (!(ctxt->d & ByteOp))

	if (!(ctxt->d & ByteOp))

		fop += __ffs(ctxt->dst.bytes) * FASTOP_SIZE;

		fop += __ffs(ctxt->dst.bytes) * FASTOP_SIZE;



	asm("push %[flags]; popf; call *%[fastop]; pushf; pop %[flags]\n"

	asm("push %[flags]; popf; call *%[fastop]; pushf; pop %[flags]\n"

	    : "+a"(ctxt->dst.val), "+d"(ctxt->src.val), [flags]"+D"(flags),

	    : "+a"(ctxt->dst.val), "+d"(ctxt->src.val), [flags]"+D"(flags),

	      [fastop]"+S"(fop)

	      [fastop]"+S"(fop), "+r"(__sp)

	    : "c"(ctxt->src2.val));

	    : "c"(ctxt->src2.val));



	ctxt->eflags = (ctxt->eflags & ~EFLAGS_MASK) | (flags & EFLAGS_MASK);

	ctxt->eflags = (ctxt->eflags & ~EFLAGS_MASK) | (flags & EFLAGS_MASK);

	if (!fop) /* exception is returned in fop variable */

	if (!fop) /* exception is returned in fop variable */

		return emulate_de(ctxt);

		return emulate_de(ctxt);