于 2014/6/18 0:30, Paolo Bonzini 写道:
Il 17/06/2014 18:05, Eric Blake ha scritto:
diff --git a/Makefile b/Makefile
index 3e65525..f473cf5 100644
--- a/Makefile
+++ b/Makefile
@@ -246,8 +246,7 @@ $(SRC_PATH)/qga/qapi-schema.json
$(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
         $(gen-out-type) -o "." -b -i $<, \
         "  GEN   $@")
 qapi-event.c qapi-event.h :\
-$(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi-event.json \
-$(SRC_PATH)/scripts/qapi-event.py $(qapi-py)
+$(qapi-modules) $(SRC_PATH)/scripts/qapi-event.py $(qapi-py)

Where's the change that adds qapi/event.json to $(qapi-modules)?  (Maybe
the interdiff doesn't show it?)

Oops, it's not there.

+++ b/include/sysemu/os-posix.h
@@ -26,8 +26,6 @@
 #ifndef QEMU_OS_POSIX_H
 #define QEMU_OS_POSIX_H

-#include <sys/time.h>
-
 void os_set_line_buffering(void);

Why this hunk? Did you accidentally forget to include Wenchao's 1/29 in
your series?

Yes, fixing now.

@@ -535,14 +533,15 @@ static void monitor_qapi_event_handler(void
*opaque)
  * more than 1 event will be emitted within @rate
  * milliseconds
  */
-static void monitor_qapi_event_throttle(QAPIEvent event, int64_t rate)
+static void
+monitor_qapi_event_throttle(QAPIEvent event, int64_t rate)
 {

Not the usual qemu formatting style.

Yeah, this happened because of __attribute__((__unused__)) and matches
other monitor_qapi_ functions.  I kind of like the
return-type-then-newline too. :)

Overall the interdiff looks like it resolves most of my concerns on v6.
 Now for me to read the actual commits in your git repo...

Will fix in a moment.

Paolo
  If you and Eric think v6 is OK to catch up 2.1, I can send a clean up
patch fixing the typo/doc issues after merge.

Reply via email to