Re: [PATCH] Fix i8259 for target-arches not supporting KVM
On 2012-01-29 14:18, Sergei Trofimovich wrote: From: Sergei Trofimovich sly...@gentoo.org $ ./configure --target-list=alpha-softmmu make CCalpha-softmmu/i8259.o cc1: warnings being treated as errors /home/slyfox/dev/git/qemu-kvm/hw/i8259.c: In function 'kvm_i8259_set_irq': /home/slyfox/dev/git/qemu-kvm/hw/i8259.c:688:13: error: implicit declaration of function 'apic_set_irq_delivered' /home/slyfox/dev/git/qemu-kvm/hw/i8259.c:688:13: error: nested extern declaration of 'apic_set_irq_delivered' make[1]: *** [i8259.o] Error 1 make: *** [subdir-alpha-softmmu] Error 2 LINK alpha-softmmu/qemu-system-alpha i8259.o: In function `kvm_i8259_set_irq': /tmp/portage/app-emulation/qemu-kvm-/work/qemu-kvm-/hw/i8259.c:689: undefined reference to `apic_set_irq_delivered' Signed-off-by: Sergei Trofimovich sly...@gentoo.org --- hw/i8259.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/hw/i8259.c b/hw/i8259.c index 0632ea2..2f6789d 100644 --- a/hw/i8259.c +++ b/hw/i8259.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include apic.h Won't be needed with current master. #include hw.h #include pc.h #include isa.h @@ -682,12 +683,14 @@ static int kvm_kernel_pic_load_from_user(PicState *s) static void kvm_i8259_set_irq(void *opaque, int irq, int level) { +#ifdef CONFIG_KVM int pic_ret; if (kvm_set_irq(irq, level, pic_ret)) { if (pic_ret != 0) apic_set_irq_delivered(); return; } +#endif } device_init(pic_register) This might be in trivial conflict with the current version. You should rebase, already to remove the include. More consistent would be KVM_CAP_IRQCHIP in fact, but it doesn't matter that much as this code will go away soon. BTW, is the reason for using this repository instead of qemu upstream for non-x86 related to packaging? It's not qemu-kvm's normal use case (which doesn't mean it is allowed to break). Jan -- Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux -- To unsubscribe from this list: send the line unsubscribe kvm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Fix i8259 for target-arches not supporting KVM
On Mon, 30 Jan 2012 11:08:37 +0100 Jan Kiszka jan.kis...@siemens.com wrote: On 2012-01-29 14:18, Sergei Trofimovich wrote: From: Sergei Trofimovich sly...@gentoo.org $ ./configure --target-list=alpha-softmmu make CCalpha-softmmu/i8259.o cc1: warnings being treated as errors /home/slyfox/dev/git/qemu-kvm/hw/i8259.c: In function 'kvm_i8259_set_irq': /home/slyfox/dev/git/qemu-kvm/hw/i8259.c:688:13: error: implicit declaration of function 'apic_set_irq_delivered' /home/slyfox/dev/git/qemu-kvm/hw/i8259.c:688:13: error: nested extern declaration of 'apic_set_irq_delivered' make[1]: *** [i8259.o] Error 1 make: *** [subdir-alpha-softmmu] Error 2 LINK alpha-softmmu/qemu-system-alpha i8259.o: In function `kvm_i8259_set_irq': /tmp/portage/app-emulation/qemu-kvm-/work/qemu-kvm-/hw/i8259.c:689: undefined reference to `apic_set_irq_delivered' Signed-off-by: Sergei Trofimovich sly...@gentoo.org --- hw/i8259.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/hw/i8259.c b/hw/i8259.c index 0632ea2..2f6789d 100644 --- a/hw/i8259.c +++ b/hw/i8259.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include apic.h Won't be needed with current master. #include hw.h #include pc.h #include isa.h @@ -682,12 +683,14 @@ static int kvm_kernel_pic_load_from_user(PicState *s) static void kvm_i8259_set_irq(void *opaque, int irq, int level) { +#ifdef CONFIG_KVM int pic_ret; if (kvm_set_irq(irq, level, pic_ret)) { if (pic_ret != 0) apic_set_irq_delivered(); return; } +#endif } device_init(pic_register) This might be in trivial conflict with the current version. You should rebase, already to remove the include. More consistent would be KVM_CAP_IRQCHIP in fact, but it doesn't matter that much as this code will go away soon. Yeah, it was. Will redo with KVM_CAP_IRQCHIP you are eager to accept such changes (see below). BTW, is the reason for using this repository instead of qemu upstream for non-x86 related to packaging? It's not qemu-kvm's normal use case (which doesn't mean it is allowed to break). Yeah, I build-only qemu-kvm and use qemu for exotics. I thought it would help later merging of qemu and qemu-kvm. If it does not make sense for you (and only creates annoying merge collisions) I'll stop bothering kvm@ otherwise I'll amend things and resend :] (ppc trivially broke as well after recent acpi merge). Thanks! -- Sergei signature.asc Description: PGP signature
Re: [PATCH] Fix i8259 for target-arches not supporting KVM
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 2012-01-30 18:15, Sergei Trofimovich wrote: On Mon, 30 Jan 2012 11:08:37 +0100 Jan Kiszka jan.kis...@siemens.com wrote: On 2012-01-29 14:18, Sergei Trofimovich wrote: From: Sergei Trofimovich sly...@gentoo.org $ ./configure --target-list=alpha-softmmu make CCalpha-softmmu/i8259.o cc1: warnings being treated as errors /home/slyfox/dev/git/qemu-kvm/hw/i8259.c: In function 'kvm_i8259_set_irq': /home/slyfox/dev/git/qemu-kvm/hw/i8259.c:688:13: error: implicit declaration of function 'apic_set_irq_delivered' /home/slyfox/dev/git/qemu-kvm/hw/i8259.c:688:13: error: nested extern declaration of 'apic_set_irq_delivered' make[1]: *** [i8259.o] Error 1 make: *** [subdir-alpha-softmmu] Error 2 LINK alpha-softmmu/qemu-system-alpha i8259.o: In function `kvm_i8259_set_irq': /tmp/portage/app-emulation/qemu-kvm-/work/qemu-kvm-/hw/i8259.c:689: undefined reference to `apic_set_irq_delivered' Signed-off-by: Sergei Trofimovich sly...@gentoo.org --- hw/i8259.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/hw/i8259.c b/hw/i8259.c index 0632ea2..2f6789d 100644 --- a/hw/i8259.c +++ b/hw/i8259.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include apic.h Won't be needed with current master. #include hw.h #include pc.h #include isa.h @@ -682,12 +683,14 @@ static int kvm_kernel_pic_load_from_user(PicState *s) static void kvm_i8259_set_irq(void *opaque, int irq, int level) { +#ifdef CONFIG_KVM int pic_ret; if (kvm_set_irq(irq, level, pic_ret)) { if (pic_ret != 0) apic_set_irq_delivered(); return; } +#endif } device_init(pic_register) This might be in trivial conflict with the current version. You should rebase, already to remove the include. More consistent would be KVM_CAP_IRQCHIP in fact, but it doesn't matter that much as this code will go away soon. Yeah, it was. Will redo with KVM_CAP_IRQCHIP you are eager to accept such changes (see below). BTW, is the reason for using this repository instead of qemu upstream for non-x86 related to packaging? It's not qemu-kvm's normal use case (which doesn't mean it is allowed to break). Yeah, I build-only qemu-kvm and use qemu for exotics. I thought it would help later merging of qemu and qemu-kvm. If it does not make sense for you (and only creates annoying merge collisions) I'll stop bothering kvm@ otherwise I'll amend things and resend :] (ppc trivially broke as well after recent acpi merge). Helping to clean up things is always appreciated. While the code here will not make it into upstream, other bits may - or will at least serve as blueprints for the upstream patches. And maybe certain distros will like this as well. Some used to build QEMU out of qemu-kvm sources, IIRC. Just make sure that a fix is not actually addressing an upstream issue. Then it should go there first. Thanks, Jan -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.16 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk8nCAMACgkQitSsb3rl5xRq0wCeNMkGrJMREb4W0SL8yeo8k/js vRAAn0eNdzetHn58OyFC0IUbQsArj3c9 =E0j2 -END PGP SIGNATURE- -- To unsubscribe from this list: send the line unsubscribe kvm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html