From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:43425) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqA3s-0002Me-84 for qemu-devel@nongnu.org; Wed, 25 Jan 2012 16:07:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RqA3q-0001s1-2H for qemu-devel@nongnu.org; Wed, 25 Jan 2012 16:07:19 -0500 Received: from moutng.kundenserver.de ([212.227.17.8]:61884) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqA3p-0001rx-Lw for qemu-devel@nongnu.org; Wed, 25 Jan 2012 16:07:18 -0500 Message-ID: <4F206F02.2050100@rdsoftware.de> Date: Wed, 25 Jan 2012 22:07:14 +0100 From: Erik Rull MIME-Version: 1.0 References: <0NTI34-1SCBjI0PXD-00UWfd@icpu819.kundenserver.de> <20120125112808.GA30469@redhat.com> In-Reply-To: <20120125112808.GA30469@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] commit 67feec6ed854b3618b37ccf050b90192cbb96e0f breaks compilation of hw/pci.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gleb Natapov Cc: qemu-devel@nongnu.org Gleb Natapov wrote: > 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 >> 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 >> Reported-by: Kenji Kaneshige >> Signed-off-by: Avi Kivity >> >> :040000 040000 c9ff9b464fff2c08d8a492fb780504df5bdd5ddb >> d0f864ba68472983065f8f2cfa53cdf04c5aed62 M hw >> :100644 100644 f956eb7e867927f1d223070a49acf65ed13deb85 >> 92ac4533c2b6d40a0ccb2f04981f6c32a4f560da M >> >> >> Best regards, >> >> Erik >> >> > > -- > Gleb. > Is it possible that you provide this patch? Or was it already applied somewhere? Thanks! Best regards, Erik