All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [RFC PATCH] qapi: Incorrect attempt to fix building with MC146818RTC=n
Date: Tue, 31 Dec 2019 19:49:16 +0100	[thread overview]
Message-ID: <20191231184916.10235-1-philmd@redhat.com> (raw)

When configured with --without-default-devices and setting
MC146818RTC=n, the build fails:

    LINK    x86_64-softmmu/qemu-system-x86_64
  /usr/bin/ld: qapi/qapi-commands-misc-target.o: in function `qmp_marshal_rtc_reset_reinjection':
  qapi/qapi-commands-misc-target.c:46: undefined reference to `qmp_rtc_reset_reinjection'
  /usr/bin/ld: qapi/qapi-commands-misc-target.c:46: undefined reference to `qmp_rtc_reset_reinjection'
  collect2: error: ld returned 1 exit status
  make[1]: *** [Makefile:206: qemu-system-x86_64] Error 1
  make: *** [Makefile:483: x86_64-softmmu/all] Error 2

This patch tries to fix this, but this is incorrect because QAPI
scripts only provide TARGET definitions, so with MC146818RTC=y we
get:

  hw/rtc/mc146818rtc.c:113:6: error: no previous prototype for ‘qmp_rtc_reset_reinjection’ [-Werror=missing-prototypes]
    113 | void qmp_rtc_reset_reinjection(Error **errp)
        |      ^~~~~~~~~~~~~~~~~~~~~~~~~
  cc1: all warnings being treated as errors
  make[1]: *** [rules.mak:69: hw/rtc/mc146818rtc.o] Error 1

Any idea? :)

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 qapi/misc-target.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qapi/misc-target.json b/qapi/misc-target.json
index a00fd821eb..8e49c113d1 100644
--- a/qapi/misc-target.json
+++ b/qapi/misc-target.json
@@ -41,7 +41,7 @@
 #
 ##
 { 'command': 'rtc-reset-reinjection',
-  'if': 'defined(TARGET_I386)' }
+  'if': 'defined(TARGET_I386) && defined(CONFIG_MC146818RTC)' }
 
 
 ##
-- 
2.21.0



             reply	other threads:[~2019-12-31 18:50 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-31 18:49 Philippe Mathieu-Daudé [this message]
2020-01-07 10:34 ` [RFC PATCH] qapi: Incorrect attempt to fix building with MC146818RTC=n Paolo Bonzini
2020-01-13 14:01 ` Markus Armbruster
2020-01-18 20:47   ` Paolo Bonzini
2020-01-21  5:49     ` Markus Armbruster
2020-01-21  8:16       ` Paolo Bonzini
2020-01-21 14:22         ` Markus Armbruster
2020-01-21 14:48           ` Philippe Mathieu-Daudé
2020-01-21 20:44           ` Paolo Bonzini
2020-01-22  5:41             ` Markus Armbruster
2020-01-22 14:30               ` Paolo Bonzini
2020-01-23  8:21                 ` Markus Armbruster

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=20191231184916.10235-1-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=armbru@redhat.com \
    --cc=pbonzini@redhat.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.