qemu-kvm.git now live

After a lengthy testing phase, qemu-kvm.git has replaced kvm-userspace.git as the source repository for kvm userspace development.

Differences from kvm-userspace.git are as follows:
- everything under qemu/ has been moved to the top-level directory
- everything not under qemu/ has been moved under a new top-level directory, kvm/
- all qemu subversion commits have been rewritten to be compatible with what will become the master qemu git repository
- all branches and tags have been converted
- qemu-kvm.git builds standalone (does not require kvm.git)

The repository is compatible with upstream qemu.git; merges and cherry-picking will work fine in either direction

Still missing:
- I have not tested powerpc or ia64. Patches welcome!
- testsuite (kvm/user/ directory) does not build

git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git

After a lengthy testing phase, qemu-kvm.git has replaced kvm-userspace.git as the source repository for kvm userspace development.

Differences from kvm-userspace.git are as follows:
- everything under qemu/ has been moved to the top-level directory
- everything not under qemu/ has been moved under a new top-level directory, kvm/
- all qemu subversion commits have been rewritten to be compatible with what will become the master qemu git repository
- all branches and tags have been converted
- qemu-kvm.git builds standalone (does not require kvm.git)

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Avi Kivity
Sent: Thursday, April 23, 2009 11:40 PM
To: KVM list
Cc: Anthony Liguori; Hollis Blanchard; Zhang, Xiantao; kvm-ppc; [email protected]; Carsten Otte
Subject: qemu-kvm.git now live

After a lengthy testing phase, qemu-kvm.git has replaced kvm-userspace.git as the source repository for kvm userspace development.

Differences from kvm-userspace.git are as follows:
- everything under qemu/ has been moved to the top-level directory
- everything not under qemu/ has been moved under a new top-level directory, kvm/
- all qemu subversion commits have been rewritten to be compatible with
what will become the master qemu git repository
- all branches and tags have been converted
- qemu-kvm.git builds standalone (does not require kvm.git)

The repository is compatible with upstream qemu.git; merges and cherry-picking will work fine in either direction

Still missing:
- I have not tested powerpc or ia64. Patches welcome!
- testsuite (kvm/user/ directory) does not build

git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git

Quoted 6 lines

After a lengthy testing phase, qemu-kvm.git has replaced kvm-userspace.git as the source repository for kvm userspace development.

git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git

Is there a http interface?

Quoted 12 lines · Avi Kivity

After a lengthy testing phase, qemu-kvm.git has replaced kvm-userspace.git as the source repository for kvm userspace development.

Differences from kvm-userspace.git are as follows:
- everything under qemu/ has been moved to the top-level directory
- everything not under qemu/ has been moved under a new top-level directory, kvm/
- all qemu subversion commits have been rewritten to be compatible with what will become the master qemu git repository
- all branches and tags have been converted
- qemu-kvm.git builds standalone (does not require kvm.git)

Hi Avi,

When I run configure on a clean copy I get this error:

KVM support no - (field 'arch' has incomplete type, field 'arch'
has incomplete type)

I think it's caused by the include/asm and include-compat/asm symlinks not being created until the kvm/configure script runs...

Quoted 20 lines · Cam Macdonell

Quoted 12 lines · Avi Kivity

After a lengthy testing phase, qemu-kvm.git has replaced kvm-userspace.git as the source repository for kvm userspace development.

Differences from kvm-userspace.git are as follows:
- everything under qemu/ has been moved to the top-level directory
- everything not under qemu/ has been moved under a new top-level directory, kvm/
- all qemu subversion commits have been rewritten to be compatible with what will become the master qemu git repository
- all branches and tags have been converted
- qemu-kvm.git builds standalone (does not require kvm.git)

Hi Avi,

When I run configure on a clean copy I get this error:

KVM support no - (field 'arch' has incomplete type, field 'arch'
has incomplete type)

Quoted 2 lines

I think it's caused by the include/asm and include-compat/asm symlinks not being created until the kvm/configure script runs...

I see now that running 'make' fixed the problem, and when I went back and repeated 'configure' everything started working correctly. No idea why running kvm/configure by hand gave me such bad results yesterday but everything's working now.

After a lengthy testing phase, qemu-kvm.git has replaced kvm-userspace.git as the source repository for kvm userspace development.

Make kvm configure script and Makefile work again after things have been moved around, so that you can do 'cd kvm && ./configure' to get a kvm-enabled qemu.

Also, guard against infinite recursion in case of 'cd' commands failing.

Signed-off-by Michael S. Tsirkin <[email protected]>

--

Quoted 2 lines · Avi Kivity

After a lengthy testing phase, qemu-kvm.git has replaced kvm-userspace.git as the source repository for kvm userspace development.

This patch makes cd kvm; ./configure work.
Is this the expected mode of operation?

kvm/Makefile +17 -17

index 617504c..1ef6493 100644
@@ -7,29 +7,29 @@ rpmrelease = devel
 
 sane-arch = $(subst i386,x86,$(subst x86_64,x86,$(subst s390x,s390,$(ARCH))))
 
-.PHONY: kernel user libkvm qemu bios vgabios extboot clean libfdt cscope
+.PHONY: kernel user libkvm ${QEMU_DIR} bios vgabios extboot clean libfdt cscope
 
-all: libkvm qemu
+all: libkvm ${QEMU_DIR}
 ifneq '$(filter $(ARCH), x86_64 i386 ia64)' ''
     all: $(if $(WANT_MODULE), kernel) user
 endif
 
 kcmd = $(if $(WANT_MODULE),,@\#)
 
-qemu kernel user libkvm:
+${QEMU_DIR} kernel user libkvm:
 	$(MAKE) -C $@
 
-qemu: libkvm
+${QEMU_DIR}: libkvm
 ifneq '$(filter $(ARCH), i386 x86_64)' ''
-    qemu: extboot
+    ${QEMU_DIR}: extboot
 endif
 ifneq '$(filter $(ARCH), powerpc ia64)' ''
-    qemu: libfdt
+    ${QEMU_DIR}: libfdt
 endif
 user: libkvm
 
 # sync if kernel/Makefile exists and if using --with-patched-kernel
-user libkvm qemu: header-sync-$(if $(wildcard kernel/Makefile),$(if $(WANT_MODULE),n,y),n)
+user libkvm ${QEMU_DIR}: header-sync-$(if $(wildcard kernel/Makefile),$(if $(WANT_MODULE),n,y),n)
 
 header-sync-n:
 

@@ -42,18 +42,18 @@ header-sync-y:
 
 bios:
 	$(MAKE) -C $@
-	cp bios/BIOS-bochs-latest qemu/pc-bios/bios.bin
+	cp bios/BIOS-bochs-latest ${QEMU_DIR}/pc-bios/bios.bin
 
 vgabios:
 	$(MAKE) -C $@
-	cp vgabios/VGABIOS-lgpl-latest.bin qemu/pc-bios/vgabios.bin
-	cp vgabios/VGABIOS-lgpl-latest.cirrus.bin qemu/pc-bios/vgabios-cirrus.bin
+	cp vgabios/VGABIOS-lgpl-latest.bin ${QEMU_DIR}/pc-bios/vgabios.bin
+	cp vgabios/VGABIOS-lgpl-latest.cirrus.bin ${QEMU_DIR}/pc-bios/vgabios-cirrus.bin
 
 extboot:
 	$(MAKE) -C $@
-	if ! [ -f qemu/pc-bios/extboot.bin ] \
-           || ! cmp -s qemu/pc-bios/extboot.bin extboot/extboot.bin; then \
-		cp extboot/extboot.bin qemu/pc-bios/extboot.bin; \
+	if ! [ -f ${QEMU_DIR}/pc-bios/extboot.bin ] \
+           || ! cmp -s ${QEMU_DIR}/pc-bios/extboot.bin extboot/extboot.bin; then \
+		cp extboot/extboot.bin ${QEMU_DIR}/pc-bios/extboot.bin; \
 	fi
 libfdt:
 	$(MAKE) -C $@

@@ -75,7 +75,7 @@ install-rpm:
 	mkdir -p $(DESTDIR)/$(initdir)
 	mkdir -p $(DESTDIR)/$(utilsdir)
 	mkdir -p $(DESTDIR)/etc/udev/rules.d
-	make -C qemu DESTDIR=$(DESTDIR)/ install
+	make -C ${QEMU_DIR} DESTDIR=$(DESTDIR)/ install
 	ln -sf /usr/kvm/bin/qemu-system-x86_64 $(DESTDIR)/$(bin)
 	install -m 755 kvm_stat $(DESTDIR)/$(bindir)/kvm_stat
 	cp scripts/kvm $(DESTDIR)/$(initdir)/kvm

@@ -85,7 +85,7 @@ install-rpm:
 install:
 	$(kcmd)make -C kernel DESTDIR="$(DESTDIR)" install
 	make -C libkvm DESTDIR="$(DESTDIR)" install
-	make -C qemu DESTDIR="$(DESTDIR)" install
+	make -C ${QEMU_DIR} DESTDIR="$(DESTDIR)" install
 
 tmpspec = .tmp.kvm.spec
 RPMTOPDIR = $$(pwd)/rpmtop

@@ -100,7 +100,7 @@ rpm:	srpm
 srpm:
 	mkdir -p $(RPMTOPDIR)/{SOURCES,SRPMS}
 	sed 's/^Release:.*/Release: $(rpmrelease)/' kvm.spec > $(tmpspec)
-	tar czf $(RPMTOPDIR)/SOURCES/kvm.tar.gz qemu
+	tar czf $(RPMTOPDIR)/SOURCES/kvm.tar.gz ${QEMU_DIR}
 	tar czf $(RPMTOPDIR)/SOURCES/user.tar.gz user
 	tar czf $(RPMTOPDIR)/SOURCES/libkvm.tar.gz libkvm
 	tar czf $(RPMTOPDIR)/SOURCES/kernel.tar.gz kernel

@@ -111,7 +111,7 @@ srpm:
 	$(RM) $(tmpspec)
 
 clean:
-	for i in $(if $(WANT_MODULE), kernel) user libkvm qemu libfdt; do \
+	for i in $(if $(WANT_MODULE), kernel) user libkvm ${QEMU_DIR} libfdt; do \
 		make -C $$i clean; \
 	done
 	rm -f ./cscope.*

kvm/configure +7 -7

index 249c743..f4873c1 100755
@@ -14,6 +14,7 @@ qemu_opts=()
 cross_prefix>  arch=`uname -m`
 target_exec> +qemu_directory=$PWD/..
 # don't use uname if kerneldir is set
 no_uname>  if [ -z "TMPDIR" ] ; then

@@ -41,8 +42,7 @@ usage() {
 	Any additional option is given to qemu's configure verbatim; including:
 
 EOF
-    cd qemu
-    ./configure --help | egrep "enable-|disable-" \
+    cd $qemu_directory && ./configure --help | egrep "enable-|disable-" \
 	| grep -v user | grep -v system | grep -v kqemu | grep -v kvm \
 	| sed -e "s/^  /    /g" \
 	| sed -e"s/  enable/enable/g" | sed -e "s/  disable/disable/g"

@@ -117,7 +117,7 @@ processor=${arch#*-}
 arch=${arch%%-*}
 
 #configure kernel module
-[ -e kernel/Makefile ] && (cd kernel;
+[ -e kernel/Makefile ] && (cd kernel &&
     ./configure \
 	--kerneldir="$kerneldir" \
 	--arch="$arch" \

@@ -127,15 +127,15 @@ arch=${arch%%-*}
 )
 
 #configure user dir
-(cd user; ./configure --prefix="$prefix" --kerneldir="$libkvm_kerneldir" \
+(cd user && ./configure --prefix="$prefix" --kerneldir="$libkvm_kerneldir" \
           --arch="$arch" --processor="$processor" \
           ${cross_prefix:+"--cross-prefix=$cross_prefix"})
 
 #configure qemu
-(cd qemu; ./configure --target-list=$target_exec \
+(cd $qemu_directory && ./configure --target-list=$target_exec \
     --disable-kqemu \
-    --extra-cflags="-I $PWD/../libkvm $qemu_cflags" \
-    --extra-ldflags="-L $PWD/../libkvm $qemu_ldflags" \
+    --extra-cflags="-I $PWD/libkvm $qemu_cflags" \
+    --extra-ldflags="-L $PWD/libkvm $qemu_ldflags" \
     --kerneldir="$libkvm_kerneldir" \
     --prefix="$prefix" \
     ${cross_prefix:+"--cross-prefix=$cross_prefix"} \

@@ -144,6 +144,7 @@ arch=${arch%%-*}
 
 
 cat <<EOF > config.mak
+QEMU_DIR=$qemu_directory
 ARCH=$arch
 PROCESSOR=$processor
 PREFIX=$prefix

kvm/kernel/include/asm-x86/kvm.h +0 -1

index dc90c47..8dfd630 100644
@@ -56,7 +56,6 @@
 #define __KVM_HAVE_MSI
 #define __KVM_HAVE_USER_NMI
 #define __KVM_HAVE_GUEST_DEBUG
-#define __KVM_HAVE_MSIX
 
 /* Architectural interrupt line count. */
 #define KVM_NR_INTERRUPTS 256

kvm/kernel/include/asm-x86/kvm_host.h +6 -6

index 07e1058..aa87be7 100644
@@ -225,7 +225,6 @@ union kvm_mmu_page_role {
 		unsigned access:3;
 		unsigned invalid:1;
 		unsigned cr4_pge:1;
-		unsigned nxe:1;
 	};
 };
 

@@ -253,6 +252,7 @@ struct kvm_mmu_page {
 	int multimapped;         /* More than one parent_pte? */
 	int root_count;          /* Currently serving as active root */
 	bool unsync;
+	bool global;
 	unsigned int unsync_children;
 	union {
 		u64 *parent_pte;               /* !multimapped */

@@ -301,7 +301,6 @@ struct kvm_mmu {
 	union kvm_mmu_page_role base_role;
 
 	u64 *pae_root;
-	u64 rsvd_bits_mask[2][4];
 };
 
 struct kvm_vcpu_arch {

@@ -327,7 +326,6 @@ struct kvm_vcpu_arch {
 	u64 shadow_efer;
 	u64 apic_base;
 	struct kvm_lapic *apic;    /* kernel irqchip context */
-	int32_t apic_arb_prio;
 	int mp_state;
 	int sipi_vector;
 	u64 ia32_misc_enable_msr;

@@ -434,6 +432,7 @@ struct kvm_arch{
 	 */
 	struct list_head active_mmu_pages;
 	struct list_head assigned_dev_head;
+	struct list_head oos_global_pages;
 	struct iommu_domain *iommu_domain;
 	struct kvm_pic *vpic;
 	struct kvm_ioapic *vioapic;

@@ -441,6 +440,7 @@ struct kvm_arch{
 	struct hlist_head irq_ack_notifier_list;
 	int vapics_in_nmi_mode;
 
+	int round_robin_prev_vcpu;
 	unsigned int tss_addr;
 	struct page *apic_access_page;
 

@@ -463,6 +463,7 @@ struct kvm_vm_stat {
 	u32 mmu_recycled;
 	u32 mmu_cache_miss;
 	u32 mmu_unsync;
+	u32 mmu_unsync_global;
 	u32 remote_tlb_flush;
 	u32 lpages;
 };

@@ -560,7 +561,7 @@ struct kvm_x86_ops {
 	void (*inject_pending_irq)(struct kvm_vcpu *vcpu);
 	void (*inject_pending_vectors)(struct kvm_vcpu *vcpu,
 				       struct kvm_run *run);
-	int (*interrupt_allowed)(struct kvm_vcpu *vcpu);
+
 	int (*set_tss_addr)(struct kvm *kvm, unsigned int addr);
 	int (*get_tdp_level)(void);
 	int (*get_mt_mask_shift)(void);

@@ -602,7 +603,6 @@ enum emulation_result {
 
 #define EMULTYPE_NO_DECODE	    (1 << 0)
 #define EMULTYPE_TRAP_UD	    (1 << 1)
-#define EMULTYPE_SKIP		    (1 << 2)
 int emulate_instruction(struct kvm_vcpu *vcpu, struct kvm_run *run,
 			unsigned long cr2, u16 error_code, int emulation_type);
 void kvm_report_emulation_failure(struct kvm_vcpu *cvpu, const char *context);

@@ -678,6 +678,7 @@ void __kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu);
 int kvm_mmu_load(struct kvm_vcpu *vcpu);
 void kvm_mmu_unload(struct kvm_vcpu *vcpu);
 void kvm_mmu_sync_roots(struct kvm_vcpu *vcpu);
+void kvm_mmu_sync_global(struct kvm_vcpu *vcpu);
 
 int kvm_emulate_hypercall(struct kvm_vcpu *vcpu);
 

@@ -830,6 +831,5 @@ asmlinkage void kvm_handle_fault_on_reboot(void);
 #define KVM_ARCH_WANT_MMU_NOTIFIER
 int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);
 int kvm_age_hva(struct kvm *kvm, unsigned long hva);
-int cpuid_maxphyaddr(struct kvm_vcpu *vcpu);
 
 #endif /* _ASM_X86_KVM_HOST_H */

kvm/kernel/include/asm-x86/svm.h +0 -1

index 5a34c94..ae5aa0d 100644
@@ -265,7 +265,6 @@ struct __attribute__ ((__packed__)) vmcb {
 #define SVM_EVTINJ_VALID_ERR (1 << 11)
 
 #define SVM_EXITINTINFO_VEC_MASK SVM_EVTINJ_VEC_MASK
-#define SVM_EXITINTINFO_TYPE_MASK SVM_EVTINJ_TYPE_MASK
 
 #define	SVM_EXITINTINFO_TYPE_INTR SVM_EVTINJ_TYPE_INTR
 #define	SVM_EXITINTINFO_TYPE_NMI SVM_EVTINJ_TYPE_NMI

kvm/kernel/include/linux/kvm.h +6 -42

index f5e9d66..0746631 100644
@@ -159,7 +159,7 @@ struct kvm_run {
 			__u32 error_code;
 		} ex;
 		/* KVM_EXIT_IO */
-		struct {
+		struct kvm_io {
 #define KVM_EXIT_IO_IN  0
 #define KVM_EXIT_IO_OUT 1
 			__u8 direction;

@@ -264,10 +264,10 @@ struct kvm_interrupt {
 /* for KVM_GET_DIRTY_LOG */
 struct kvm_dirty_log {
 	__u32 slot;
-	__u32 padding1;
+	__u32 padding;
 	union {
 		void   *dirty_bitmap; /* one bit per page */
-		__u64 padding2;
+		__u64 padding;
 	};
 };
 

@@ -449,12 +449,6 @@ struct kvm_trace_rec {
 #ifdef __KVM_HAVE_DEVICE_ASSIGNMENT
 #define KVM_CAP_DEVICE_DEASSIGNMENT 27
 #endif
-#ifdef __KVM_HAVE_MSIX
-#define KVM_CAP_DEVICE_MSIX 28
-#endif
-#define KVM_CAP_ASSIGN_DEV_IRQ 29
-/* Another bug in KVM_SET_USER_MEMORY_REGION fixed: */
-#define KVM_CAP_JOIN_MEMORY_REGIONS_WORKS 30
 
 #ifdef KVM_CAP_IRQ_ROUTING
 

@@ -526,18 +520,11 @@ struct kvm_irq_routing {
 #define KVM_ASSIGN_PCI_DEVICE _IOR(KVMIO, 0x69, \
 				   struct kvm_assigned_pci_dev)
 #define KVM_SET_GSI_ROUTING       _IOW(KVMIO, 0x6a, struct kvm_irq_routing)
-/* deprecated, replaced by KVM_ASSIGN_DEV_IRQ */
 #define KVM_ASSIGN_IRQ _IOR(KVMIO, 0x70, \
 			    struct kvm_assigned_irq)
-#define KVM_ASSIGN_DEV_IRQ        _IOW(KVMIO, 0x70, struct kvm_assigned_irq)
 #define KVM_REINJECT_CONTROL      _IO(KVMIO, 0x71)
 #define KVM_DEASSIGN_PCI_DEVICE _IOW(KVMIO, 0x72, \
 				     struct kvm_assigned_pci_dev)
-#define KVM_ASSIGN_SET_MSIX_NR \
-			_IOW(KVMIO, 0x73, struct kvm_assigned_msix_nr)
-#define KVM_ASSIGN_SET_MSIX_ENTRY \
-			_IOW(KVMIO, 0x74, struct kvm_assigned_msix_entry)
-#define KVM_DEASSIGN_DEV_IRQ       _IOW(KVMIO, 0x75, struct kvm_assigned_irq)
 
 /*
  * ioctls for vcpu fds

@@ -628,8 +615,6 @@ struct kvm_debug_guest {
 #define KVM_TRC_STLB_INVAL       (KVM_TRC_HANDLER + 0x18)
 #define KVM_TRC_PPC_INSTR        (KVM_TRC_HANDLER + 0x19)
 
-#define KVM_DEV_ASSIGN_ENABLE_IOMMU	(1 << 0)
-
 struct kvm_assigned_pci_dev {
 	__u32 assigned_dev_id;
 	__u32 busnr;

@@ -640,17 +625,6 @@ struct kvm_assigned_pci_dev {
 	};
 };
 
-#define KVM_DEV_IRQ_HOST_INTX    (1 << 0)
-#define KVM_DEV_IRQ_HOST_MSI     (1 << 1)
-#define KVM_DEV_IRQ_HOST_MSIX    (1 << 2)
-
-#define KVM_DEV_IRQ_GUEST_INTX   (1 << 8)
-#define KVM_DEV_IRQ_GUEST_MSI    (1 << 9)
-#define KVM_DEV_IRQ_GUEST_MSIX   (1 << 10)
-
-#define KVM_DEV_IRQ_HOST_MASK	 0x00ff
-#define KVM_DEV_IRQ_GUEST_MASK   0xff00
-
 struct kvm_assigned_irq {
 	__u32 assigned_dev_id;
 	__u32 host_irq;

@@ -666,19 +640,9 @@ struct kvm_assigned_irq {
 	};
 };
 
+#define KVM_DEV_ASSIGN_ENABLE_IOMMU	(1 << 0)
 
-struct kvm_assigned_msix_nr {
-	__u32 assigned_dev_id;
-	__u16 entry_nr;
-	__u16 padding;
-};
-
-#define KVM_MAX_MSIX_PER_DEV		512
-struct kvm_assigned_msix_entry {
-	__u32 assigned_dev_id;
-	__u32 gsi;
-	__u16 entry; /* The index of entry in the MSI-X table */
-	__u16 padding[3];
-};
+#define KVM_DEV_IRQ_ASSIGN_MSI_ACTION	KVM_DEV_IRQ_ASSIGN_ENABLE_MSI
+#define KVM_DEV_IRQ_ASSIGN_ENABLE_MSI	(1 << 0)
 
 #endif

kvm/kernel/include/linux/kvm_host.h +4 -16

index 0c3c5b1..965f186 100644
@@ -338,7 +338,6 @@ int kvm_arch_hardware_setup(void);
 void kvm_arch_hardware_unsetup(void);
 void kvm_arch_check_processor_compat(void *rtn);
 int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu);
-int kvm_arch_interrupt_allowed(struct kvm_vcpu *vcpu);
 
 void kvm_free_physmem(struct kvm *kvm);
 

@@ -360,13 +359,6 @@ struct kvm_irq_ack_notifier {
 	void (*irq_acked)(struct kvm_irq_ack_notifier *kian);
 };
 
-#define KVM_ASSIGNED_MSIX_PENDING		0x1
-struct kvm_guest_msix_entry {
-	u32 vector;
-	u16 entry;
-	u16 flags;
-};
-
 struct kvm_assigned_dev_kernel {
 	struct kvm_irq_ack_notifier ack_notifier;
 	struct work_struct interrupt_work;

@@ -374,12 +366,13 @@ struct kvm_assigned_dev_kernel {
 	int assigned_dev_id;
 	int host_busnr;
 	int host_devfn;
-	unsigned int entries_nr;
 	int host_irq;
 	bool host_irq_disabled;
-	struct msix_entry *host_msix_entries;
 	int guest_irq;
-	struct kvm_guest_msix_entry *guest_msix_entries;
+#define KVM_ASSIGNED_DEV_GUEST_INTX	(1 << 0)
+#define KVM_ASSIGNED_DEV_GUEST_MSI	(1 << 1)
+#define KVM_ASSIGNED_DEV_HOST_INTX	(1 << 8)
+#define KVM_ASSIGNED_DEV_HOST_MSI	(1 << 9)
 	unsigned long irq_requested_type;
 	int irq_source_id;
 	int flags;

@@ -399,11 +392,6 @@ void kvm_unregister_irq_mask_notifier(struct kvm *kvm, int irq,
 				      struct kvm_irq_mask_notifier *kimn);
 void kvm_fire_mask_notifiers(struct kvm *kvm, int irq, bool mask);
 
-#ifdef __KVM_HAVE_IOAPIC
-void kvm_get_intr_delivery_bitmask(struct kvm_ioapic *ioapic,
-				   union kvm_ioapic_redirect_entry *entry,
-				   unsigned long *deliver_bitmask);
-#endif
 int kvm_set_irq(struct kvm *kvm, int irq_source_id, int irq, int level);
 void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin);
 void kvm_register_irq_ack_notifier(struct kvm *kvm,

kvm/kernel/include/linux/kvm_types.h +0 -28

index c65f89e..e204dd3 100644
@@ -80,31 +80,4 @@ typedef unsigned long  hfn_t;
 
 typedef hfn_t pfn_t;
 
-union kvm_ioapic_redirect_entry {
-	u64 bits;
-	struct {
-		u8 vector;
-		u8 delivery_mode:3;
-		u8 dest_mode:1;
-		u8 delivery_status:1;
-		u8 polarity:1;
-		u8 remote_irr:1;
-		u8 trig_mode:1;
-		u8 mask:1;
-		u8 reserve:7;
-		u8 reserved[4];
-		u8 dest_id;
-	} fields;
-};
-
-struct kvm_lapic_irq {
-	u32 vector;
-	u32 delivery_mode;
-	u32 dest_mode;
-	u32 level;
-	u32 trig_mode;
-	u32 shorthand;
-	u32 dest_id;
-};
-
 #endif /* __KVM_TYPES_H__ */
--

To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Quoted 6 lines · Michael S. Tsirkin

Make kvm configure script and Makefile work again after things have been moved around, so that you can do 'cd kvm && ./configure' to get a kvm-enabled qemu.

Also, guard against infinite recursion in case of 'cd' commands failing.

I suppose changes under kvm/kernel/* are not relevant to this goal.

Also
for me running ./configure --kerneldir=/path/to/kernel at top dir works. (/path/to/kernel should be absolute though, otherwise kernel include path is incorrect).

Quoted 486 lines

Signed-off-by Michael S. Tsirkin <[email protected]>

--

Quoted 2 lines · Avi Kivity

After a lengthy testing phase, qemu-kvm.git has replaced kvm-userspace.git as the source repository for kvm userspace development.

This patch makes cd kvm; ./configure work.
Is this the expected mode of operation?

kvm/Makefile +17 -17

index 617504c..1ef6493 100644
@@ -7,29 +7,29 @@ rpmrelease = devel
 
 sane-arch = $(subst i386,x86,$(subst x86_64,x86,$(subst s390x,s390,$(ARCH))))
 
-.PHONY: kernel user libkvm qemu bios vgabios extboot clean libfdt cscope
+.PHONY: kernel user libkvm ${QEMU_DIR} bios vgabios extboot clean libfdt cscope
 
-all: libkvm qemu
+all: libkvm ${QEMU_DIR}
 ifneq '$(filter $(ARCH), x86_64 i386 ia64)' ''
     all: $(if $(WANT_MODULE), kernel) user
 endif
 
 kcmd = $(if $(WANT_MODULE),,@\#)
 
-qemu kernel user libkvm:
+${QEMU_DIR} kernel user libkvm:
 	$(MAKE) -C $@
 
-qemu: libkvm
+${QEMU_DIR}: libkvm
 ifneq '$(filter $(ARCH), i386 x86_64)' ''
-    qemu: extboot
+    ${QEMU_DIR}: extboot
 endif
 ifneq '$(filter $(ARCH), powerpc ia64)' ''
-    qemu: libfdt
+    ${QEMU_DIR}: libfdt
 endif
 user: libkvm
 
 # sync if kernel/Makefile exists and if using --with-patched-kernel
-user libkvm qemu: header-sync-$(if $(wildcard kernel/Makefile),$(if $(WANT_MODULE),n,y),n)
+user libkvm ${QEMU_DIR}: header-sync-$(if $(wildcard kernel/Makefile),$(if $(WANT_MODULE),n,y),n)
 
 header-sync-n:
 

@@ -42,18 +42,18 @@ header-sync-y:
 
 bios:
 	$(MAKE) -C $@
-	cp bios/BIOS-bochs-latest qemu/pc-bios/bios.bin
+	cp bios/BIOS-bochs-latest ${QEMU_DIR}/pc-bios/bios.bin
 
 vgabios:
 	$(MAKE) -C $@
-	cp vgabios/VGABIOS-lgpl-latest.bin qemu/pc-bios/vgabios.bin
-	cp vgabios/VGABIOS-lgpl-latest.cirrus.bin qemu/pc-bios/vgabios-cirrus.bin
+	cp vgabios/VGABIOS-lgpl-latest.bin ${QEMU_DIR}/pc-bios/vgabios.bin
+	cp vgabios/VGABIOS-lgpl-latest.cirrus.bin ${QEMU_DIR}/pc-bios/vgabios-cirrus.bin
 
 extboot:
 	$(MAKE) -C $@
-	if ! [ -f qemu/pc-bios/extboot.bin ] \
-           || ! cmp -s qemu/pc-bios/extboot.bin extboot/extboot.bin; then \
-		cp extboot/extboot.bin qemu/pc-bios/extboot.bin; \
+	if ! [ -f ${QEMU_DIR}/pc-bios/extboot.bin ] \
+           || ! cmp -s ${QEMU_DIR}/pc-bios/extboot.bin extboot/extboot.bin; then \
+		cp extboot/extboot.bin ${QEMU_DIR}/pc-bios/extboot.bin; \
 	fi
 libfdt:
 	$(MAKE) -C $@

@@ -75,7 +75,7 @@ install-rpm:
 	mkdir -p $(DESTDIR)/$(initdir)
 	mkdir -p $(DESTDIR)/$(utilsdir)
 	mkdir -p $(DESTDIR)/etc/udev/rules.d
-	make -C qemu DESTDIR=$(DESTDIR)/ install
+	make -C ${QEMU_DIR} DESTDIR=$(DESTDIR)/ install
 	ln -sf /usr/kvm/bin/qemu-system-x86_64 $(DESTDIR)/$(bin)
 	install -m 755 kvm_stat $(DESTDIR)/$(bindir)/kvm_stat
 	cp scripts/kvm $(DESTDIR)/$(initdir)/kvm

@@ -85,7 +85,7 @@ install-rpm:
 install:
 	$(kcmd)make -C kernel DESTDIR="$(DESTDIR)" install
 	make -C libkvm DESTDIR="$(DESTDIR)" install
-	make -C qemu DESTDIR="$(DESTDIR)" install
+	make -C ${QEMU_DIR} DESTDIR="$(DESTDIR)" install
 
 tmpspec = .tmp.kvm.spec
 RPMTOPDIR = $$(pwd)/rpmtop

@@ -100,7 +100,7 @@ rpm:	srpm
 srpm:
 	mkdir -p $(RPMTOPDIR)/{SOURCES,SRPMS}
 	sed 's/^Release:.*/Release: $(rpmrelease)/' kvm.spec > $(tmpspec)
-	tar czf $(RPMTOPDIR)/SOURCES/kvm.tar.gz qemu
+	tar czf $(RPMTOPDIR)/SOURCES/kvm.tar.gz ${QEMU_DIR}
 	tar czf $(RPMTOPDIR)/SOURCES/user.tar.gz user
 	tar czf $(RPMTOPDIR)/SOURCES/libkvm.tar.gz libkvm
 	tar czf $(RPMTOPDIR)/SOURCES/kernel.tar.gz kernel

@@ -111,7 +111,7 @@ srpm:
 	$(RM) $(tmpspec)
 
 clean:
-	for i in $(if $(WANT_MODULE), kernel) user libkvm qemu libfdt; do \
+	for i in $(if $(WANT_MODULE), kernel) user libkvm ${QEMU_DIR} libfdt; do \
 		make -C $$i clean; \
 	done
 	rm -f ./cscope.*

kvm/configure +7 -7

index 249c743..f4873c1 100755
@@ -14,6 +14,7 @@ qemu_opts=()
 cross_prefix> >  arch=`uname -m`
 target_exec> > +qemu_directory=$PWD/..
 # don't use uname if kerneldir is set
 no_uname> >  if [ -z "TMPDIR" ] ; then

@@ -41,8 +42,7 @@ usage() {
 	Any additional option is given to qemu's configure verbatim; including:
 
 EOF
-    cd qemu
-    ./configure --help | egrep "enable-|disable-" \
+    cd $qemu_directory && ./configure --help | egrep "enable-|disable-" \
 	| grep -v user | grep -v system | grep -v kqemu | grep -v kvm \
 	| sed -e "s/^  /    /g" \
 	| sed -e"s/  enable/enable/g" | sed -e "s/  disable/disable/g"

@@ -117,7 +117,7 @@ processor=${arch#*-}
 arch=${arch%%-*}
 
 #configure kernel module
-[ -e kernel/Makefile ] && (cd kernel;
+[ -e kernel/Makefile ] && (cd kernel &&
     ./configure \
 	--kerneldir="$kerneldir" \
 	--arch="$arch" \

@@ -127,15 +127,15 @@ arch=${arch%%-*}
 )
 
 #configure user dir
-(cd user; ./configure --prefix="$prefix" --kerneldir="$libkvm_kerneldir" \
+(cd user && ./configure --prefix="$prefix" --kerneldir="$libkvm_kerneldir" \
           --arch="$arch" --processor="$processor" \
           ${cross_prefix:+"--cross-prefix=$cross_prefix"})
 
 #configure qemu
-(cd qemu; ./configure --target-list=$target_exec \
+(cd $qemu_directory && ./configure --target-list=$target_exec \
     --disable-kqemu \
-    --extra-cflags="-I $PWD/../libkvm $qemu_cflags" \
-    --extra-ldflags="-L $PWD/../libkvm $qemu_ldflags" \
+    --extra-cflags="-I $PWD/libkvm $qemu_cflags" \
+    --extra-ldflags="-L $PWD/libkvm $qemu_ldflags" \
     --kerneldir="$libkvm_kerneldir" \
     --prefix="$prefix" \
     ${cross_prefix:+"--cross-prefix=$cross_prefix"} \

@@ -144,6 +144,7 @@ arch=${arch%%-*}
 
 
 cat <<EOF > config.mak
+QEMU_DIR=$qemu_directory
 ARCH=$arch
 PROCESSOR=$processor
 PREFIX=$prefix

kvm/kernel/include/asm-x86/kvm.h +0 -1

index dc90c47..8dfd630 100644
@@ -56,7 +56,6 @@
 #define __KVM_HAVE_MSI
 #define __KVM_HAVE_USER_NMI
 #define __KVM_HAVE_GUEST_DEBUG
-#define __KVM_HAVE_MSIX
 
 /* Architectural interrupt line count. */
 #define KVM_NR_INTERRUPTS 256

kvm/kernel/include/asm-x86/kvm_host.h +6 -6

index 07e1058..aa87be7 100644
@@ -225,7 +225,6 @@ union kvm_mmu_page_role {
 		unsigned access:3;
 		unsigned invalid:1;
 		unsigned cr4_pge:1;
-		unsigned nxe:1;
 	};
 };
 

@@ -253,6 +252,7 @@ struct kvm_mmu_page {
 	int multimapped;         /* More than one parent_pte? */
 	int root_count;          /* Currently serving as active root */
 	bool unsync;
+	bool global;
 	unsigned int unsync_children;
 	union {
 		u64 *parent_pte;               /* !multimapped */

@@ -301,7 +301,6 @@ struct kvm_mmu {
 	union kvm_mmu_page_role base_role;
 
 	u64 *pae_root;
-	u64 rsvd_bits_mask[2][4];
 };
 
 struct kvm_vcpu_arch {

@@ -327,7 +326,6 @@ struct kvm_vcpu_arch {
 	u64 shadow_efer;
 	u64 apic_base;
 	struct kvm_lapic *apic;    /* kernel irqchip context */
-	int32_t apic_arb_prio;
 	int mp_state;
 	int sipi_vector;
 	u64 ia32_misc_enable_msr;

@@ -434,6 +432,7 @@ struct kvm_arch{
 	 */
 	struct list_head active_mmu_pages;
 	struct list_head assigned_dev_head;
+	struct list_head oos_global_pages;
 	struct iommu_domain *iommu_domain;
 	struct kvm_pic *vpic;
 	struct kvm_ioapic *vioapic;

@@ -441,6 +440,7 @@ struct kvm_arch{
 	struct hlist_head irq_ack_notifier_list;
 	int vapics_in_nmi_mode;
 
+	int round_robin_prev_vcpu;
 	unsigned int tss_addr;
 	struct page *apic_access_page;
 

@@ -463,6 +463,7 @@ struct kvm_vm_stat {
 	u32 mmu_recycled;
 	u32 mmu_cache_miss;
 	u32 mmu_unsync;
+	u32 mmu_unsync_global;
 	u32 remote_tlb_flush;
 	u32 lpages;
 };

@@ -560,7 +561,7 @@ struct kvm_x86_ops {
 	void (*inject_pending_irq)(struct kvm_vcpu *vcpu);
 	void (*inject_pending_vectors)(struct kvm_vcpu *vcpu,
 				       struct kvm_run *run);
-	int (*interrupt_allowed)(struct kvm_vcpu *vcpu);
+
 	int (*set_tss_addr)(struct kvm *kvm, unsigned int addr);
 	int (*get_tdp_level)(void);
 	int (*get_mt_mask_shift)(void);

@@ -602,7 +603,6 @@ enum emulation_result {
 
 #define EMULTYPE_NO_DECODE	    (1 << 0)
 #define EMULTYPE_TRAP_UD	    (1 << 1)
-#define EMULTYPE_SKIP		    (1 << 2)
 int emulate_instruction(struct kvm_vcpu *vcpu, struct kvm_run *run,
 			unsigned long cr2, u16 error_code, int emulation_type);
 void kvm_report_emulation_failure(struct kvm_vcpu *cvpu, const char *context);

@@ -678,6 +678,7 @@ void __kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu);
 int kvm_mmu_load(struct kvm_vcpu *vcpu);
 void kvm_mmu_unload(struct kvm_vcpu *vcpu);
 void kvm_mmu_sync_roots(struct kvm_vcpu *vcpu);
+void kvm_mmu_sync_global(struct kvm_vcpu *vcpu);
 
 int kvm_emulate_hypercall(struct kvm_vcpu *vcpu);
 

@@ -830,6 +831,5 @@ asmlinkage void kvm_handle_fault_on_reboot(void);
 #define KVM_ARCH_WANT_MMU_NOTIFIER
 int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);
 int kvm_age_hva(struct kvm *kvm, unsigned long hva);
-int cpuid_maxphyaddr(struct kvm_vcpu *vcpu);
 
 #endif /* _ASM_X86_KVM_HOST_H */

kvm/kernel/include/asm-x86/svm.h +0 -1

index 5a34c94..ae5aa0d 100644
@@ -265,7 +265,6 @@ struct __attribute__ ((__packed__)) vmcb {
 #define SVM_EVTINJ_VALID_ERR (1 << 11)
 
 #define SVM_EXITINTINFO_VEC_MASK SVM_EVTINJ_VEC_MASK
-#define SVM_EXITINTINFO_TYPE_MASK SVM_EVTINJ_TYPE_MASK
 
 #define	SVM_EXITINTINFO_TYPE_INTR SVM_EVTINJ_TYPE_INTR
 #define	SVM_EXITINTINFO_TYPE_NMI SVM_EVTINJ_TYPE_NMI

kvm/kernel/include/linux/kvm.h +6 -42

index f5e9d66..0746631 100644
@@ -159,7 +159,7 @@ struct kvm_run {
 			__u32 error_code;
 		} ex;
 		/* KVM_EXIT_IO */
-		struct {
+		struct kvm_io {
 #define KVM_EXIT_IO_IN  0
 #define KVM_EXIT_IO_OUT 1
 			__u8 direction;

@@ -264,10 +264,10 @@ struct kvm_interrupt {
 /* for KVM_GET_DIRTY_LOG */
 struct kvm_dirty_log {
 	__u32 slot;
-	__u32 padding1;
+	__u32 padding;
 	union {
 		void   *dirty_bitmap; /* one bit per page */
-		__u64 padding2;
+		__u64 padding;
 	};
 };
 

@@ -449,12 +449,6 @@ struct kvm_trace_rec {
 #ifdef __KVM_HAVE_DEVICE_ASSIGNMENT
 #define KVM_CAP_DEVICE_DEASSIGNMENT 27
 #endif
-#ifdef __KVM_HAVE_MSIX
-#define KVM_CAP_DEVICE_MSIX 28
-#endif
-#define KVM_CAP_ASSIGN_DEV_IRQ 29
-/* Another bug in KVM_SET_USER_MEMORY_REGION fixed: */
-#define KVM_CAP_JOIN_MEMORY_REGIONS_WORKS 30
 
 #ifdef KVM_CAP_IRQ_ROUTING
 

@@ -526,18 +520,11 @@ struct kvm_irq_routing {
 #define KVM_ASSIGN_PCI_DEVICE _IOR(KVMIO, 0x69, \
 				   struct kvm_assigned_pci_dev)
 #define KVM_SET_GSI_ROUTING       _IOW(KVMIO, 0x6a, struct kvm_irq_routing)
-/* deprecated, replaced by KVM_ASSIGN_DEV_IRQ */
 #define KVM_ASSIGN_IRQ _IOR(KVMIO, 0x70, \
 			    struct kvm_assigned_irq)
-#define KVM_ASSIGN_DEV_IRQ        _IOW(KVMIO, 0x70, struct kvm_assigned_irq)
 #define KVM_REINJECT_CONTROL      _IO(KVMIO, 0x71)
 #define KVM_DEASSIGN_PCI_DEVICE _IOW(KVMIO, 0x72, \
 				     struct kvm_assigned_pci_dev)
-#define KVM_ASSIGN_SET_MSIX_NR \
-			_IOW(KVMIO, 0x73, struct kvm_assigned_msix_nr)
-#define KVM_ASSIGN_SET_MSIX_ENTRY \
-			_IOW(KVMIO, 0x74, struct kvm_assigned_msix_entry)
-#define KVM_DEASSIGN_DEV_IRQ       _IOW(KVMIO, 0x75, struct kvm_assigned_irq)
 
 /*
  * ioctls for vcpu fds

@@ -628,8 +615,6 @@ struct kvm_debug_guest {
 #define KVM_TRC_STLB_INVAL       (KVM_TRC_HANDLER + 0x18)
 #define KVM_TRC_PPC_INSTR        (KVM_TRC_HANDLER + 0x19)
 
-#define KVM_DEV_ASSIGN_ENABLE_IOMMU	(1 << 0)
-
 struct kvm_assigned_pci_dev {
 	__u32 assigned_dev_id;
 	__u32 busnr;

@@ -640,17 +625,6 @@ struct kvm_assigned_pci_dev {
 	};
 };
 
-#define KVM_DEV_IRQ_HOST_INTX    (1 << 0)
-#define KVM_DEV_IRQ_HOST_MSI     (1 << 1)
-#define KVM_DEV_IRQ_HOST_MSIX    (1 << 2)
-
-#define KVM_DEV_IRQ_GUEST_INTX   (1 << 8)
-#define KVM_DEV_IRQ_GUEST_MSI    (1 << 9)
-#define KVM_DEV_IRQ_GUEST_MSIX   (1 << 10)
-
-#define KVM_DEV_IRQ_HOST_MASK	 0x00ff
-#define KVM_DEV_IRQ_GUEST_MASK   0xff00
-
 struct kvm_assigned_irq {
 	__u32 assigned_dev_id;
 	__u32 host_irq;

@@ -666,19 +640,9 @@ struct kvm_assigned_irq {
 	};
 };
 
+#define KVM_DEV_ASSIGN_ENABLE_IOMMU	(1 << 0)
 
-struct kvm_assigned_msix_nr {
-	__u32 assigned_dev_id;
-	__u16 entry_nr;
-	__u16 padding;
-};
-
-#define KVM_MAX_MSIX_PER_DEV		512
-struct kvm_assigned_msix_entry {
-	__u32 assigned_dev_id;
-	__u32 gsi;
-	__u16 entry; /* The index of entry in the MSI-X table */
-	__u16 padding[3];
-};
+#define KVM_DEV_IRQ_ASSIGN_MSI_ACTION	KVM_DEV_IRQ_ASSIGN_ENABLE_MSI
+#define KVM_DEV_IRQ_ASSIGN_ENABLE_MSI	(1 << 0)
 
 #endif

kvm/kernel/include/linux/kvm_host.h +4 -16

index 0c3c5b1..965f186 100644
@@ -338,7 +338,6 @@ int kvm_arch_hardware_setup(void);
 void kvm_arch_hardware_unsetup(void);
 void kvm_arch_check_processor_compat(void *rtn);
 int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu);
-int kvm_arch_interrupt_allowed(struct kvm_vcpu *vcpu);
 
 void kvm_free_physmem(struct kvm *kvm);
 

@@ -360,13 +359,6 @@ struct kvm_irq_ack_notifier {
 	void (*irq_acked)(struct kvm_irq_ack_notifier *kian);
 };
 
-#define KVM_ASSIGNED_MSIX_PENDING		0x1
-struct kvm_guest_msix_entry {
-	u32 vector;
-	u16 entry;
-	u16 flags;
-};
-
 struct kvm_assigned_dev_kernel {
 	struct kvm_irq_ack_notifier ack_notifier;
 	struct work_struct interrupt_work;

@@ -374,12 +366,13 @@ struct kvm_assigned_dev_kernel {
 	int assigned_dev_id;
 	int host_busnr;
 	int host_devfn;
-	unsigned int entries_nr;
 	int host_irq;
 	bool host_irq_disabled;
-	struct msix_entry *host_msix_entries;
 	int guest_irq;
-	struct kvm_guest_msix_entry *guest_msix_entries;
+#define KVM_ASSIGNED_DEV_GUEST_INTX	(1 << 0)
+#define KVM_ASSIGNED_DEV_GUEST_MSI	(1 << 1)
+#define KVM_ASSIGNED_DEV_HOST_INTX	(1 << 8)
+#define KVM_ASSIGNED_DEV_HOST_MSI	(1 << 9)
 	unsigned long irq_requested_type;
 	int irq_source_id;
 	int flags;

@@ -399,11 +392,6 @@ void kvm_unregister_irq_mask_notifier(struct kvm *kvm, int irq,
 				      struct kvm_irq_mask_notifier *kimn);
 void kvm_fire_mask_notifiers(struct kvm *kvm, int irq, bool mask);
 
-#ifdef __KVM_HAVE_IOAPIC
-void kvm_get_intr_delivery_bitmask(struct kvm_ioapic *ioapic,
-				   union kvm_ioapic_redirect_entry *entry,
-				   unsigned long *deliver_bitmask);
-#endif
 int kvm_set_irq(struct kvm *kvm, int irq_source_id, int irq, int level);
 void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin);
 void kvm_register_irq_ack_notifier(struct kvm *kvm,

kvm/kernel/include/linux/kvm_types.h +0 -28

index c65f89e..e204dd3 100644
@@ -80,31 +80,4 @@ typedef unsigned long  hfn_t;
 
 typedef hfn_t pfn_t;
 
-union kvm_ioapic_redirect_entry {
-	u64 bits;
-	struct {
-		u8 vector;
-		u8 delivery_mode:3;
-		u8 dest_mode:1;
-		u8 delivery_status:1;
-		u8 polarity:1;
-		u8 remote_irr:1;
-		u8 trig_mode:1;
-		u8 mask:1;
-		u8 reserve:7;
-		u8 reserved[4];
-		u8 dest_id;
-	} fields;
-};
-
-struct kvm_lapic_irq {
-	u32 vector;
-	u32 delivery_mode;
-	u32 dest_mode;
-	u32 level;
-	u32 trig_mode;
-	u32 shorthand;
-	u32 dest_id;
-};
-
 #endif /* __KVM_TYPES_H__ */
--

Quoted 3 lines

To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

--
Gleb.
--
To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Also
for me running ./configure --kerneldir=/path/to/kernel at top dir works. (/path/to/kernel should be absolute though, otherwise kernel include path is incorrect).

When I run configure on a clean copy I get this error:

KVM support no - (field 'arch' has incomplete type, field 'arch' has incomplete type)

I think it's caused by the include/asm and include-compat/asm symlinks not being created until the kvm/configure script runs. Should configure call the qemu-kvm/kvm configure script?

Is "make" supposed to build the host kernel module?

Quoted 3 lines

git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git

Is there a http interface?

I'm getting closer to a working qemu-kvm, but there are still a few messy parts. The magic dance goes like this:

Quoted 3 lines · Jan Kiszka

I'm getting closer to a working qemu-kvm, but there are still a few messy parts. The magic dance goes like this:

Try a fresh fetch. ./configure && make ought to work.

Quoted 3 lines · Jan Kiszka

I'm getting closer to a working qemu-kvm, but there are still a few messy parts. The magic dance goes like this:

Try a fresh fetch. ./configure && make ought to work.

with more verbosity:

# make V=1
make -C x86_64-softmmu V="1" TARGET_DIR="x86_64-softmmu/" all
make[1]: Entering directory `/data/qemu-kvm/x86_64-softmmu'
gcc -I. -I.. -I/data/qemu-kvm/target-i386 -I/data/qemu-kvm -MMD -MT
i8254-kvm.o -MP -DNEED_CPU_H -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64

(quoted diff) +0 -6

-D_LARGEFILE_SOURCE -D__user= -I/data/qemu-kvm/tcg
-I/data/qemu-kvm/tcg/x86_64 -I/data/qemu-kvm/fpu   -DHAS_AUDIO
-DHAS_AUDIO_CHOICE -I/data/qemu-kvm/slirp -O2 -g -fno-strict-aliasing
-Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes
-Wstrict-prototypes -Wredundant-decls -I/data/qemu-kvm/kvm/libkvm  -m64
-c -o i8254-kvm.o /data/qemu-kvm/hw/i8254-kvm.c

/data/qemu-kvm/hw/i8254-kvm.c: In function ‘kvm_pit_save’:
/data/qemu-kvm/hw/i8254-kvm.c:36: error: storage size of ‘pit’ isn’t known /data/qemu-kvm/hw/i8254-kvm.c:41: warning: implicit declaration of function ‘kvm_get_pit’
/data/qemu-kvm/hw/i8254-kvm.c:46: error: dereferencing pointer to incomplete type

I bet it still picks up the host's kernel headers instead of the included ones... (you know, my host is oooold :) )

Quoted 21 lines · Jan Kiszka

with more verbosity:

# make V=1
make -C x86_64-softmmu V="1" TARGET_DIR="x86_64-softmmu/" all
make[1]: Entering directory `/data/qemu-kvm/x86_64-softmmu'
gcc -I. -I.. -I/data/qemu-kvm/target-i386 -I/data/qemu-kvm -MMD -MT
i8254-kvm.o -MP -DNEED_CPU_H -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64

(quoted diff) +0 -6

-D_LARGEFILE_SOURCE -D__user= -I/data/qemu-kvm/tcg
-I/data/qemu-kvm/tcg/x86_64 -I/data/qemu-kvm/fpu   -DHAS_AUDIO
-DHAS_AUDIO_CHOICE -I/data/qemu-kvm/slirp -O2 -g -fno-strict-aliasing
-Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes
-Wstrict-prototypes -Wredundant-decls -I/data/qemu-kvm/kvm/libkvm  -m64
-c -o i8254-kvm.o /data/qemu-kvm/hw/i8254-kvm.c

/data/qemu-kvm/hw/i8254-kvm.c: In function ‘kvm_pit_save’:
/data/qemu-kvm/hw/i8254-kvm.c:36: error: storage size of ‘pit’ isn’t known
/data/qemu-kvm/hw/i8254-kvm.c:41: warning: implicit declaration of function ‘kvm_get_pit’
/data/qemu-kvm/hw/i8254-kvm.c:46: error: dereferencing pointer to incomplete type

Quoted 4 lines

I bet it still picks up the host's kernel headers instead of the included ones... (you know, my host is oooold :) )

Yes. Pull again, I added i8254.c to the list of files which have their #includes hacked to add kvm/kernel/... .

Quoted 4 lines

Yes. Pull again, I added i8254.c to the list of files which have their #includes hacked to add kvm/kernel/... .

No change here.

Quoted 7 lines · Jan Kiszka

Quoted 4 lines

Yes. Pull again, I added i8254.c to the list of files which have their #includes hacked to add kvm/kernel/... .

No change here.

Drat, it's i8254-kvm.c, not i8254.c. Please try again.

Next topic: for kernel module build, I need to cd to kvm/kernel, run configure and then make, right? What's the kvm/configure now for? Looks at least broken ATM.

Quoted 6 lines · Cam Macdonell

When I run configure on a clean copy I get this error:

KVM support no - (field 'arch' has incomplete type, field 'arch' has incomplete type)

I think it's caused by the include/asm and include-compat/asm symlinks not being created until the kvm/configure script runs. Should configure call the qemu-kvm/kvm configure script?

There was a big mix-up in this area. I just pushed changes to make everything work as expected (./configure && make -> builds qemu)

Quoted 1 line

Is "make" supposed to build the host kernel module?

No, the external module build will be moved to a different repository.

Great. They work as expected. One thing I noticed is that make clean doesn't remove libkvm.{o,a} and .libkvm.d. Should it?

Still missing:
- I have not tested powerpc or ia64. Patches welcome!

Quoted 3 lines · Avi Kivity

Still missing:
- I have not tested powerpc or ia64. Patches welcome!

This repository seems pretty messed up; I'm not even sure what you want from me.

Quoted 8 lines · Hollis Blanchard

Quoted 4 lines · Avi Kivity

Still missing:
- I have not tested powerpc or ia64.  Patches welcome!

Quoted 2 lines

This repository seems pretty messed up; I'm not even sure what you want from me.

Since PPC is now supported in upstream QEMU, does it really matter if it works in qemu-kvm.git?

Yes. There are people (me) who still rely on building everything from the same source.
It can only be done by the superset (qemu-kvm.git)

Quoted 8 lines · Hollis Blanchard

Quoted 3 lines · Avi Kivity

Still missing:
- I have not tested powerpc or ia64. Patches welcome!

This repository seems pretty messed up; I'm not even sure what you want from me.

Since PPC is now supported in upstream QEMU, does it really matter if it works in qemu-kvm.git?

Quoted 4 lines · Glauber Costa

Yes. There are people (me) who still rely on building everything from the same source.
It can only be done by the superset (qemu-kvm.git)

Fedora doesn't package a KVM enabled qemu-system-ppcemb, do they?

Quoted 3 lines · Avi Kivity

Still missing:
- I have not tested powerpc or ia64. Patches welcome!

This repository seems pretty messed up; I'm not even sure what you want from me. Some of the bigger problems:

* configure completely ignores --kerneldir and only uses kvm/kernel headers instead.

* The headers in kvm/kernel/arch/foo seem to be the important ones, but they have odd ifdefs at the top and I'm not sure how they should be generated.

* "make -C kvm/kernel sync" doesn't even come close to working.

There are a host of other issues and confusing issues, even with a fresh checkout. In general it seems like the mess that was kvm-userspace has been rearranged, and as a consequence is even worse than before.

How am I supposed to create kvm/kernel/arch/powerpc/include/asm/*? Just cp from a Linux tree, or must I add funny ifdefs somehow?

Here's one patch that I think will be needed:

Set kvm_arch=powerpc for PPC builds.

The name of the Linux arch directory is "powerpc", not "ppc".

Signed-off-by Hollis Blanchard <hollisb-r/[email protected]>

configure +0 -0

index fc0fb9b..257cf02 100755

Quoted 2 lines

Since PPC is now supported in upstream QEMU, does it really matter if it works in qemu-kvm.git?

I was going to take that position too, except Avi asked me specifically if some of the code inside TARGET_I386 ifdefs in qemu-kvm.c works for other architectures.

After a lengthy testing phase, qemu-kvm.git has replaced kvm-userspace.git as the source repository for kvm userspace development.

Differences from kvm-userspace.git are as follows:
- everything under qemu/ has been moved to the top-level directory
- everything not under qemu/ has been moved under a new top-level directory, kvm/
- all qemu subversion commits have been rewritten to be compatible with what will become the master qemu git repository
- all branches and tags have been converted
- qemu-kvm.git builds standalone (does not require kvm.git)

The repository is compatible with upstream qemu.git; merges and cherry-picking will work fine in either direction

Still missing:
- I have not tested powerpc or ia64. Patches welcome!
- testsuite (kvm/user/ directory) does not build

Quoted 12 lines · Avi Kivity

After a lengthy testing phase, qemu-kvm.git has replaced kvm-userspace.git as the source repository for kvm userspace development.

Differences from kvm-userspace.git are as follows:
- everything under qemu/ has been moved to the top-level directory
- everything not under qemu/ has been moved under a new top-level directory, kvm/
- all qemu subversion commits have been rewritten to be compatible with what will become the master qemu git repository
- all branches and tags have been converted
- qemu-kvm.git builds standalone (does not require kvm.git)

Quoted 7 lines

The repository is compatible with upstream qemu.git; merges and cherry-picking will work fine in either direction

Still missing:
- I have not tested powerpc or ia64. Patches welcome!
- testsuite (kvm/user/ directory) does not build

- proper guest memory setup

During merge with upstream, the call to qemu_alloc_physram dropped under the table (due to removal of phys_ram_base from qemu). And that means we no longer call kvm_setup_guest_memory (fork will cause troubles, deja vu...) and -mempath is broken. Sorry, I'm not deep enough into all parts to provide a quick-fix.

Quoted 25 lines · Jan Kiszka

Quoted 13 lines · Avi Kivity

After a lengthy testing phase, qemu-kvm.git has replaced kvm-userspace.git as the source repository for kvm userspace development.

Differences from kvm-userspace.git are as follows:
- everything under qemu/ has been moved to the top-level directory
- everything not under qemu/ has been moved under a new top-level directory, kvm/
- all qemu subversion commits have been rewritten to be compatible with what will become the master qemu git repository
- all branches and tags have been converted
- qemu-kvm.git builds standalone (does not require kvm.git)

Quoted 7 lines

The repository is compatible with upstream qemu.git; merges and cherry-picking will work fine in either direction

Still missing:
- I have not tested powerpc or ia64. Patches welcome!
- testsuite (kvm/user/ directory) does not build

- proper guest memory setup

Quoted 6 lines

During merge with upstream, the call to qemu_alloc_physram dropped under the table (due to removal of phys_ram_base from qemu). And that means we no longer call kvm_setup_guest_memory (fork will cause troubles, deja vu...) and -mempath is broken. Sorry, I'm not deep enough into all parts to provide a quick-fix.

That's unrelated to the repository conversion.

I'm unhappy with both qemu.git and qemu-kvm.git memory slot management; qemu-kvm.git is clumsy, and qemu.git is too simplistic (for example, it ignores the fact that dirty logging is a global resource with multiple users).

Quoted 5 lines

I'm unhappy with both qemu.git and qemu-kvm.git memory slot management; qemu-kvm.git is clumsy, and qemu.git is too simplistic (for example, it ignores the fact that dirty logging is a global resource with multiple users).

Don't get your point yet. Can you name a concrete scenario that is problematic in upstream? I'd really like to get slot management right there before we drop the old version of qemu-kvm.

Quoted 6 lines · Jan Kiszka

Quoted 5 lines

I'm unhappy with both qemu.git and qemu-kvm.git memory slot management; qemu-kvm.git is clumsy, and qemu.git is too simplistic (for example, it ignores the fact that dirty logging is a global resource with multiple users).

Quoted 4 lines

Don't get your point yet. Can you name a concrete scenario that is problematic in upstream? I'd really like to get slot management right there before we drop the old version of qemu-kvm.

If migration disables dirty memory logging, it must keep the vga logging enabled, and vice versa.

Quoted 3 lines

If migration disables dirty memory logging, it must keep the vga logging enabled, and vice versa.

So we need some notifier callbacks on slot changes so that all users can re-enable dirty logging after the update as required.

Where/how does the
migration code disable dirty logging?

Quoted 4 lines · Jan Kiszka

Quoted 3 lines

If migration disables dirty memory logging, it must keep the vga logging enabled, and vice versa.

Quoted 2 lines

So we need some notifier callbacks on slot changes so that all users can re-enable dirty logging after the update as required.

Simpler to do reference counting. When a user enables logging for a memory range, the refcount for all slots containing that range gets bumped. When a user enables logging for all of memory, a global refcount is bumped. For a given slot, dirty logging is enabled if either the slot logging refcount or the global logging refcount is nonzero.

That's sort of what's implemented in qemu-kvm.git. In qemu.git vga logging does not get disabled, which is really broken. It prevents optimizations like disabling logging when the screen is not displayed to a human.

Quoted 4 lines

Where/how does the
migration code disable dirty logging?

Should be phase 3 of ram_save_live().

Quoted 5 lines

That's sort of what's implemented in qemu-kvm.git. In qemu.git vga logging does not get disabled, which is really broken. It prevents optimizations like disabling logging when the screen is not displayed to a human.

Is there a channel that tells vga "nothing will be displayed"? I may have missed it while removing all those disable-logging-as-it-may- confuse-slot-management hooks.

Quoted 6 lines

Quoted 4 lines

Where/how does the
migration code disable dirty logging?

Should be phase 3 of ram_save_live().

But only in qemu-kvm. What is the plan about pushing it upstream? Then we could discuss how to extend the exiting support best.

Quoted 6 lines

Quoted 5 lines

Quoted 3 lines

Where/how does the
migration code disable dirty logging?

Should be phase 3 of ram_save_live().

Quoted 3 lines

But only in qemu-kvm. What is the plan about pushing it upstream? Then we could discuss how to extend the exiting support best.

Pushing things upstream is quite difficult because of the very different infrastructure.

It's unfortunate that upstream rewrote everything
instead of changing things incrementally. Rewrites are almost always a mistake since they throw away accumulated knowledge.

Quoted 11 lines · Avi Kivity

Quoted 11 lines

Quoted 7 lines

Quoted 4 lines

Where/how does the
migration code disable dirty logging?

Should be phase 3 of ram_save_live().

But only in qemu-kvm. What is the plan about pushing it upstream? Then we could discuss how to extend the exiting support best.

Quoted 3 lines

Pushing things upstream is quite difficult because of the very different infrastructure.

Isn't the midterm goal to get rid of most of these differences (namely libkvm)?

Quoted 5 lines

It's unfortunate that upstream rewrote everything
instead of changing things incrementally. Rewrites are almost always a mistake since they throw away accumulated knowledge.

I disagree, at least in this particular case. Upstream already diverged from qemu-kvm, and the latter provided no comparable alternative for slot management and dirty logging. And I still don't see that we lost anything that could not easily be re-integrated into upstream (ie. global dirty logging), finally leading to a cleaner and more complete result.

So, what bits are missing to make KVM migration work in upstream?

Quoted 14 lines · Jan Kiszka

Quoted 11 lines · Avi Kivity

Quoted 8 lines

Quoted 5 lines

Quoted 3 lines

Where/how does the
migration code disable dirty logging?

Should be phase 3 of ram_save_live().

But only in qemu-kvm. What is the plan about pushing it upstream? Then we could discuss how to extend the exiting support best.

Pushing things upstream is quite difficult because of the very different infrastructure.

Quoted 3 lines

Isn't the midterm goal to get rid of most of these differences (namely libkvm)?

Yes, but not by removing existing functionality.

Quoted 7 lines

Quoted 6 lines

It's unfortunate that upstream rewrote everything
instead of changing things incrementally. Rewrites are almost always a mistake since they throw away accumulated knowledge.

Quoted 7 lines

I disagree, at least in this particular case. Upstream already diverged from qemu-kvm, and the latter provided no comparable alternative for slot management and dirty logging. And I still don't see that we lost anything that could not easily be re-integrated into upstream (ie. global dirty logging), finally leading to a cleaner and more complete result.

It could have been done differently, by morphing the existing support into something mergable, and merging that. In this way, we'd ensure no needed functionality is lost.

As is, we're adding something simple, then discovering it's insufficient. We're throwing away information, that's not a good way to make progress.

Quoted 3 lines

So, what bits are missing to make KVM migration work in upstream?

I don't know of anything beyond dirty logging.

Quoted 6 lines

Quoted 6 lines

Quoted 6 lines

Quoted 2 lines

Pushing things upstream is quite difficult because of the very different infrastructure.

Quoted 6 lines

Quoted 4 lines

Isn't the midterm goal to get rid of most of these differences (namely libkvm)?

Yes, but not by removing existing functionality.

No one said this.

Quoted 4 lines

As is, we're adding something simple, then discovering it's insufficient. We're throwing away information, that's not a good way to make progress.

I doubt this applies here.

Quoted 5 lines

* configure completely ignores --kerneldir and only uses kvm/kernel headers instead.

That's intentional.

Quoted 2 lines

* The headers in kvm/kernel/arch/foo seem to be the important ones, but they have odd ifdefs at the top and I'm not sure

how

Quoted 2 lines

they should be generated.

They were generated by the old 'make sync' to remove CONFIG_ dependencies. I guess a better way to generate them is a 'make headers-install' from the kernel tree and grab the results.

Quoted 7 lines · Hollis Blanchard

Quoted 3 lines

Since PPC is now supported in upstream QEMU, does it really matter if it works in qemu-kvm.git?

I was going to take that position too, except Avi asked me specifically if some of the code inside TARGET_I386 ifdefs in qemu-kvm.c works for other architectures.

In that case it's sufficient to have the build system use the upstream kvm integration (CONFIG_KVM) rather than the qemu-kvm integration (USE_KVM).

Quoted 7 lines · Avi Kivity

Quoted 5 lines

* configure completely ignores --kerneldir and only uses kvm/kernel headers instead.

That's intentional.

Huh? If --kerneldir does nothing, why does it exist?

Quoted 6 lines · Hollis Blanchard

Quoted 4 lines · Avi Kivity

Quoted 4 lines

* configure completely ignores --kerneldir and only uses kvm/kernel headers instead.

Quoted 5 lines

Quoted 2 lines

That's intentional.

Huh? If --kerneldir does nothing, why does it exist?

BTW Avi, if you intend on carrying the KVM kernel headers in qemu-kvm, I see no strong reason not to do the same in QEMU.

I'd like to move them from kvm/kernel/include to kvm/include. I'm open to suggestion actually.

How often do you intend on updating the headers?

Quoted 2 lines

In that case it's sufficient to have the build system use the upstream kvm integration (CONFIG_KVM) rather than the qemu-kvm integration (USE_KVM).

OK, I give up... how is this supposed to work? Nobody ever sets CONFIG_KVM or KVM_UPSTREAM, but there are a couple tests for it. Glauber once sent a patch related to that, but I don't see how it helps.

Quoted 4 lines

Quoted 2 lines

They were generated by the old 'make sync' to remove CONFIG_ dependencies. I guess a better way to generate them is a 'make headers-install' from the kernel tree and grab the results.

'make headers_install' only produces include/asm/kvm.h, which apparently is not sufficient.

I can use output from an old 'make sync' for now, but obviously that doesn't help with future changes to these headers. Defining a process for updating those headers would be useful.

Quoted 7 lines · Avi Kivity

Quoted 5 lines

* configure completely ignores --kerneldir and only uses kvm/kernel headers instead.

That's intentional.

Huh? If --kerneldir does nothing, why does it exist?

I can use output from an old 'make sync' for now, but obviously that doesn't help with future changes to these headers. Defining a process for updating those headers would be useful.

I'm getting closer to a working qemu-kvm, but there are still a few messy parts. The magic dance goes like this:

cd qemu-kvm/kvm
ln -s .. qemu (or apply patch below)
./configure -whatever
make

Still, this is unintuitive. As both top-level configure and Makefile already differ from upstream, I see no reason not tweaking them also in way that ./configure && make from the top-level directory behaves as expected again. May look into this later (and the other warnings the build threw at me), now I've to understand an ugly shadow page table inconsistency of kvm...

Jan

------->

Subject: [PATCH] qemu-kvm: build system Add link to qemu

Signed-off-by Jan Kiszka <[email protected]>

---
 kvm/qemu |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 120000 kvm/qemu

kvm/qemu new file +0 -0

new file mode 120000
index 0000000..a96aa0e

Quoted 27 lines · Jan Kiszka

I'm getting closer to a working qemu-kvm, but there are still a few messy parts. The magic dance goes like this:

cd qemu-kvm/kvm
ln -s .. qemu (or apply patch below)
./configure -whatever
make

Still, this is unintuitive. As both top-level configure and Makefile already differ from upstream, I see no reason not tweaking them also in way that ./configure && make from the top-level directory behaves as expected again. May look into this later (and the other warnings the build threw at me), now I've to understand an ugly shadow page table inconsistency of kvm...

Jan

------->

Subject: [PATCH] qemu-kvm: build system Add link to qemu

Signed-off-by Jan Kiszka <[email protected]>

---
 kvm/qemu |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 120000 kvm/qemu

kvm/qemu line 1

Quoted 9 lines

kvm/qemu new file +1 -0

new file mode 120000
index 0000000..a96aa0e
@@ -0,0 +1 @@
+..
\ No newline at end of file

This shouldn't be needed. Can you confirm this with current qemu-kvm.git?

Quoted 4 lines · Hollis Blanchard

Quoted 3 lines

In that case it's sufficient to have the build system use the upstream kvm integration (CONFIG_KVM) rather than the qemu-kvm integration (USE_KVM).

Quoted 4 lines

OK, I give up... how is this supposed to work? Nobody ever sets CONFIG_KVM or KVM_UPSTREAM, but there are a couple tests for it. Glauber once sent a patch related to that, but I don't see how it helps.

KVM_UPSTREAM is just a marker to let us know which parts of upstream qemu/kvm integration conflict with qemu-kvm.git.