From: Gleb Natapov <gleb@redhat.com>
To: erik.rull@rdsoftware.de
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] commit 67feec6ed854b3618b37ccf050b90192cbb96e0f breaks compilation of hw/pci.c
Date: Wed, 25 Jan 2012 13:28:09 +0200 [thread overview]
Message-ID: <20120125112808.GA30469@redhat.com> (raw)
In-Reply-To: <0NTI34-1SCBjI0PXD-00UWfd@icpu819.kundenserver.de>
On Wed, Jan 25, 2012 at 12:22:51PM +0100, erik.rull@rdsoftware.de wrote:
> Hi all,
>
> from the qemu-kvm master I did some bisectioning because I cannot compile it.
>
I got the same error because of some stale .h file. Removing it resolved
the problem, but I do not remember what was the file exactly. Try "git
status"
> My error is:
>
> In file included from /home/erik/qemu-kvm/hw/pci.c:36:
> /qmp-commands.h:3: error: expected identifier or '(' before '{' token
> /qmp-commands.h:10: error: expected identifier or '(' before ',' token
> /qmp-commands.h:20: error: expected identifier or '(' before ',' token
> /qmp-commands.h:30: error: expected identifier or '(' before ',' token
> /qmp-commands.h:40: error: expected identifier or '(' before ',' token
> /qmp-commands.h:50: error: expected identifier or '(' before ',' token
> /qmp-commands.h:60: error: expected identifier or '(' before ',' token
> /qmp-commands.h:70: error: expected identifier or '(' before ',' token
> /qmp-commands.h:80: error: expected identifier or '(' before ',' token
> /qmp-commands.h:90: error: expected identifier or '(' before ',' token
> /qmp-commands.h:100: error: expected identifier or '(' before ',' token
> /qmp-commands.h:110: error: expected identifier or '(' before ',' token
> /qmp-commands.h:120: error: expected identifier or '(' before ',' token
> /qmp-commands.h:130: error: expected identifier or '(' before ',' token
> /qmp-commands.h:140: error: expected identifier or '(' before ',' token
> /qmp-commands.h:154: error: expected identifier or '(' before ',' token
> /qmp-commands.h:164: error: expected identifier or '(' before ',' token
> /qmp-commands.h:174: error: expected identifier or '(' before ',' token
> /qmp-commands.h:184: error: expected identifier or '(' before ',' token
> /qmp-commands.h:194: error: expected identifier or '(' before ',' token
> /qmp-commands.h:204: error: expected identifier or '(' before ',' token
> /qmp-commands.h:214: error: expected identifier or '(' before ',' token
> /qmp-commands.h:224: error: expected identifier or '(' before ',' token
> /qmp-commands.h:233: error: expected identifier or '(' before ',' token
> /qmp-commands.h:244: error: expected identifier or '(' before ',' token
> /qmp-commands.h:254: error: expected identifier or '(' before ',' token
> /qmp-commands.h:264: error: expected identifier or '(' before ',' token
> /qmp-commands.h:274: error: expected identifier or '(' before ',' token
> /qmp-commands.h:284: error: expected identifier or '(' before ',' token
> /qmp-commands.h:294: error: expected identifier or '(' before ',' token
> /qmp-commands.h:304: error: expected identifier or '(' before ',' token
> /qmp-commands.h:314: error: expected identifier or '(' before ',' token
> /qmp-commands.h:323: error: expected identifier or '(' before ',' token
> /qmp-commands.h:333: error: expected identifier or '(' before ',' token
> /home/erik/qemu-kvm/hw/pci.c:1432: warning: no previous prototype for
> 'qmp_query_pci'
>
>
> Here the results of the bisectioning (master against qemu-kvm-1.0)
>
> git bisect start
> # bad: [07e1e20b47d3e7841dc63a843502600d0a16542f] qemu-kvm: Resolve
> unneeded diffs to upstream in pc-bios
> git bisect bad 07e1e20b47d3e7841dc63a843502600d0a16542f
> # good: [30c044521889195f54a9f2c21310894f545994e8] Merge commit 'v1.0' into
> next
> git bisect good 30c044521889195f54a9f2c21310894f545994e8
> # good: [b9b2008bbff49e2714491a95109e1189e54a6491] block: dma_bdrv_* does
> not return NULL
> git bisect good b9b2008bbff49e2714491a95109e1189e54a6491
> # good: [05c194384f836240ea4c2da5fa3be43a54bff021] pseries: Emit device
> tree nodes in reg order
> git bisect good 05c194384f836240ea4c2da5fa3be43a54bff021
> # bad: [372951014b5008ca047e4dfbfaf4003bc27a2f6b] qemu-kvm: Fix
> save/restore of in-kernel i8259
> git bisect bad 372951014b5008ca047e4dfbfaf4003bc27a2f6b
> # bad: [682a3c07f0e28d2532c911a44a9b6142d6299cc2] Merge commit
> 'c5705a7728b4a6bc9e4f2d35911adbaf28042b25' into upstream-merge
> git bisect bad 682a3c07f0e28d2532c911a44a9b6142d6299cc2
> # good: [2817b260e3ca57ee091fc56403bfafdcc18b6a96] vhost: avoid
> cpu_get_physical_page_desc()
> git bisect good 2817b260e3ca57ee091fc56403bfafdcc18b6a96
> # bad: [ce00ce6a909bc9b1ecc697d826d71b2c7ab07994] Merge commit
> '48a18b3c698295e4d891f34e919615e84e20f027' into upstream-merge
> git bisect bad ce00ce6a909bc9b1ecc697d826d71b2c7ab07994
> # bad: [90695ad2ede04a7ce6a86e8283e82f8bdbe8a54a] Merge commit
> '217bfb445b54db618a30f3a39170bebd9fd9dbf2' into upstream-merge
> git bisect bad 90695ad2ede04a7ce6a86e8283e82f8bdbe8a54a
> # bad: [e021b07bd795c76035c48c158943dd8ee47e9c27] qemu-kvm: Move
> make-release to scripts/qemu-kvm
> git bisect bad e021b07bd795c76035c48c158943dd8ee47e9c27
> # bad: [67feec6ed854b3618b37ccf050b90192cbb96e0f] qemu-kvm: fix improper
> nmi emulation
> git bisect bad 67feec6ed854b3618b37ccf050b90192cbb96e0f
>
> final git bisect result:
>
> 67feec6ed854b3618b37ccf050b90192cbb96e0f is the first bad commit
> commit 67feec6ed854b3618b37ccf050b90192cbb96e0f
> Author: Lai Jiangshan <laijs@cn.fujitsu.com>
> Date: Tue Oct 18 00:00:06 2011 +0800
>
> qemu-kvm: fix improper nmi emulation
>
> Currently, NMI interrupt is blindly sent to all the vCPUs when NMI
> button event happens. This doesn't properly emulate real hardware on
> which NMI button event triggers LINT1. Because of this, NMI is sent to
> the processor even when LINT1 is maskied in LVT. For example, this
> causes the problem that kdump initiated by NMI sometimes doesn't work
> on KVM, because kdump assumes NMI is masked on CPUs other than CPU0.
>
> With this patch, inject-nmi request is handled as follows.
>
> - When in-kernel irqchip is disabled, deliver LINT1 instead of NMI
> interrupt.
> - When in-kernel irqchip is enabled, get the in-kernel LAPIC states
> and test the APIC_LVT_MASKED, if LINT1 is unmasked, and then
> delivering the NMI directly. (Suggested by Jan Kiszka)
>
> Changed from old version:
> re-implement it by the Jan's suggestion.
> fix the race found by Jan.
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
> Reported-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
> Signed-off-by: Avi Kivity <avi@redhat.com>
>
> :040000 040000 c9ff9b464fff2c08d8a492fb780504df5bdd5ddb
> d0f864ba68472983065f8f2cfa53cdf04c5aed62 M hw
> :100644 100644 f956eb7e867927f1d223070a49acf65ed13deb85
> 92ac4533c2b6d40a0ccb2f04981f6c32a4f560da M
>
>
> Best regards,
>
> Erik
>
>
--
Gleb.
next prev parent reply other threads:[~2012-01-25 11:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-25 11:22 [Qemu-devel] commit 67feec6ed854b3618b37ccf050b90192cbb96e0f breaks compilation of hw/pci.c erik.rull
2012-01-25 11:28 ` Gleb Natapov [this message]
2012-01-25 21:07 ` Erik Rull
2012-01-26 6:38 ` Gleb Natapov
2012-01-26 10:00 ` Andreas Färber
2012-01-26 10:32 ` Jan Kiszka
2012-01-26 10:38 ` Andreas Färber
2012-01-26 14:58 ` Erik Rull
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120125112808.GA30469@redhat.com \
--to=gleb@redhat.com \
--cc=erik.rull@rdsoftware.de \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).