qemu: missing definitions from qemu-cvs merge
cover qemu: missing definitions from qemu-cvs merge
The following patch series fixes compilation warnings from kvm 57 triggered by 25a2e04e5689af63d104de2dea755f30bf643afd :
PATCH 1/9 : fix definition for vmchannel_init in qemu/vl.c PATCH 2/9 : fix definition for migrate_incoming in qemu/vl.c PATCH 3/9 : fix definition for pci_hypercall_init in qemu/hw/pc.c PATCH 4/9 : fix definitions for qemu_*_requested in qemu/qemu-kvm.c PATCH 5/9 : fix definition for qemu_system_reset in qemu/qemu-kvm.c PATCH 6/9 : fix definition for bdrv_flush_all in qemu/migration.c PATCH 7/9 : fix definitions for monitor_{resume,suspend} in qemu/migration.c PATCH 8/9 : fix definitions for qemu_live_*_save in qemu/migration.c PATCH 9/9 : fix definition for qemu_get_launch_info in qemu/migration.c
All this definitions are kvm specific and therefore were missed by the splitting of vl.h and other headers upstream.
Carlo
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
PATCH 1/9 qemu: re-add missing definition for vmchannel_init
The following patch re applies the definitions added to qemu/vl.h in cbd2cefaf7b6185c3ebdb421a4cc4c363f6dbc39 and which were missed in merge f4b21ce8084fc3ffcfc1a2b92bd26466700d3d40, resulting in the following compilation warning :
qemu/vl.c:9378: warning: implicit declaration of function `vmchannel_init'
--- qemu/sysemu.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
qemu/sysemu.h +1 -0
@@ -140,6 +140,7 @@ extern int drive_get_max_bus(BlockInterfaceType interface);/* vmchannel devices */ #define MAX_VMCHANNEL_DEVICES 4 +void vmchannel_init (CharDriverState *hd,uint32_t deviceid,uint32_t index);/* serial ports */
Signature · 7 lines
1.5.2.5 ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
PATCH 2/9 qemu: add "migration.h" to vl.c so that migrate_incoming is defined
In reply to Carlo Marcelo Arenas BelonThe following patch fixes :
qemu/vl.c:9450: warning: implicit declaration of function `migrate_incoming'
--- qemu/vl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
qemu/vl.c +1 -0
@@ -37,6 +37,7 @@#include "qemu-char.h" #include "block.h" #include "audio/audio.h" +#include "migration.h" #include "qemu-kvm.h" #include <unistd.h>
Signature · 7 lines
1.5.2.5 ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
PATCH 3/9 qemu: re-add missing definition for pci_hypercall_init
In reply to Carlo Marcelo Arenas BelonThe following patch re applies the definitions added to qemu/vl.h in 2ea040d9b4a2f0642cb595898801d1abe6e47dc4 and which were missed in merge f4b21ce8084fc3ffcfc1a2b92bd26466700d3d40, resulting in the following compilation warning :
qemu/hw/pc.c:1028: warning: implicit declaration of function `pci_hypercall_init'
--- qemu/sysemu.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
qemu/sysemu.h +1 -0
@@ -140,6 +140,7 @@ extern int drive_get_max_bus(BlockInterfaceType interface);/* vmchannel devices */ #define MAX_VMCHANNEL_DEVICES 4 +void pci_hypercall_init (PCIBus *bus);void vmchannel_init (CharDriverState *hd,uint32_t deviceid,uint32_t index);/* serial ports */
Signature · 7 lines
1.5.2.5 ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
PATCH 4/9 qemu: re-add missing definitions for qemu_{shutdown, powerdown, reset}_requested
In reply to Carlo Marcelo Arenas BelonThe following patch re applies the definitions added to qemu/vl.h in 469b506a270347a88d11c65392ac1df7b476d176 and which were missed in merge f4b21ce8084fc3ffcfc1a2b92bd26466700d3d40, resulting in the following compilation warnings :
qemu/qemu-kvm.c:343: warning: implicit declaration of function qemu_shutdown_requested' qemu/qemu-kvm.c:345: warning: implicit declaration of function qemu_powerdown_requested' qemu/qemu-kvm.c:347: warning: implicit declaration of function `qemu_reset_requested'
--- qemu/sysemu.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
qemu/sysemu.h +3 -0
@@ -30,6 +30,9 @@ void cpu_disable_ticks(void);void qemu_system_reset_request (void );void qemu_system_shutdown_request (void );void qemu_system_powerdown_request (void ); +int qemu_shutdown_requested (void ); +int qemu_reset_requested (void ); +int qemu_powerdown_requested (void );#if !defined(TARGET_SPARC )// Please implement a power failure function to signal the OS #define qemu_system_powerdown () do{}while(0)
Signature · 7 lines
1.5.2.5 ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
PATCH 5/9 qemu: add missing definition for qemu_system_reset
In reply to Carlo Marcelo Arenas BelonThe following patch fixes :
qemu/qemu-kvm.c:349: warning: implicit declaration of function `qemu_system_reset'
--- qemu/sysemu.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
qemu/sysemu.h +1 -0
@@ -39,6 +39,7 @@ int qemu_powerdown_requested(void);#else void qemu_system_powerdown (void );#endif +void qemu_system_reset (void );void cpu_save (QEMUFile *f,void *opaque);int cpu_load (QEMUFile *f,void *opaque,int version_id);
Signature · 7 lines
1.5.2.5 ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
PATCH 6/9 qemu: add missing definition for bdrv_flush_all
In reply to Carlo Marcelo Arenas BelonThe following patch fixes :
qemu/migration.c:187: warning: implicit declaration of function `bdrv_flush_all'
--- qemu/block.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
qemu/block.h +2 -0
@@ -109,6 +109,8 @@ void bdrv_flush(BlockDriverState *bs);#define BIOS_ATA_TRANSLATION_LARGE 3#define BIOS_ATA_TRANSLATION_RECHS 4 +void bdrv_flush_all (void ); +void bdrv_set_geometry_hint (BlockDriverState *bs,int cyls,int heads,int secs);void bdrv_set_type_hint (BlockDriverState *bs,int type);
Signature · 7 lines
1.5.2.5 ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
PATCH 7/9 qemu: add missing definitions for monitor_{resume, suspend}
In reply to Carlo Marcelo Arenas BelonThe following patch fixes :
qemu/migration.c:210: warning: implicit declaration of function monitor_resume' qemu/migration.c:507: warning: implicit declaration of function monitor_suspend'
--- qemu/console.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
qemu/console.h +2 -0
@@ -131,6 +131,8 @@ extern uint8_t _translate_keycode(const int key);does not need to include console.h */ /* monitor.c */ void monitor_init (CharDriverState *hd,int show_banner); +void monitor_suspend (void ); +void monitor_resume (void );void term_puts (const char *str);void term_vprintf (const char *fmt,va_list ap);void term_printf (const char *fmt, ...) __attribute__ ((__format__ (__printf__,1 ,2 )));
Signature · 7 lines
1.5.2.5 ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
PATCH 8/9 qemu: re-add missing definitions for qemu_live_{savevm, loadvm}_state
In reply to Carlo Marcelo Arenas BelonThe following patch re applies the definitions added to qemu/vl.h in 4213cbcf86847c8568d0147bd055d6a13bb1c963 and which were missed in merge f4b21ce8084fc3ffcfc1a2b92bd26466700d3d40, resulting in the following compilation warnings :
qemu/migration.c:193: warning: implicit declaration of function qemu_live_savevm_state' qemu/migration.c:855: warning: implicit declaration of function qemu_live_loadvm_state'
--- qemu/sysemu.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
qemu/sysemu.h +3 -0
@@ -49,6 +49,9 @@ void do_loadvm(const char *name);void do_delvm (const char *name);void do_info_snapshots (void ); +int qemu_live_savevm_state (QEMUFile *f); +int qemu_live_loadvm_state (QEMUFile *f); +void main_loop_wait (int timeout);/* Polling handling */
Signature · 7 lines
1.5.2.5 ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
PATCH 9/9 qemu: re-add missing definitions for qemu_get_launch_info
In reply to Carlo Marcelo Arenas BelonThe following patch re applies the definitions added to qemu/vl.h in 4213cbcf86847c8568d0147bd055d6a13bb1c963 and which were missed in merge f4b21ce8084fc3ffcfc1a2b92bd26466700d3d40, resulting in the following compilation warning :
qemu/migration.c:603: warning: implicit declaration of function `qemu_get_launch_info'
--- qemu/sysemu.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
qemu/sysemu.h +3 -0
@@ -44,6 +44,9 @@ void qemu_system_reset(void);void cpu_save (QEMUFile *f,void *opaque);int cpu_load (QEMUFile *f,void *opaque,int version_id); +void qemu_get_launch_info (int *argc,char ***argv, +int *opt_daemonize,const char **opt_incoming); +void do_savevm (const char *name);void do_loadvm (const char *name);void do_delvm (const char *name);
Signature · 7 lines
1.5.2.5 ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
Avi Kivity
AppliedQuoted 13 lines · Carlo Marcelo Arenas Belon
The following patch series fixes compilation warnings from kvm 57 triggered by
25a2e04e5689af63d104de2dea755f30bf643afd:PATCH 1/9 : fix definition for
vmchannel_initinqemu/vl.cPATCH 2/9 : fix definition formigrate_incominginqemu/vl.cPATCH 3/9 : fix definition forpci_hypercall_initinqemu/hw/pc.cPATCH 4/9 : fix definitions for qemu_*_requested inqemu/qemu-kvm.cPATCH 5/9 : fix definition forqemu_system_resetinqemu/qemu-kvm.cPATCH 6/9 : fix definition forbdrv_flush_allinqemu/migration.cPATCH 7/9 : fix definitions for monitor_{resume,suspend} inqemu/migration.cPATCH 8/9 : fix definitions for qemu_live_*_save inqemu/migration.cPATCH 9/9 : fix definition forqemu_get_launch_infoinqemu/migration.c
Quoted 3 lines
All this definitions are kvm specific and therefore were missed by the splitting of
vl.hand other headers upstream.
Applied all, thanks. I should have done this myself but was quite tired out by the merge.
Signature · 7 lines
Do not meddle in the internals of kernels, for they are subtle and quick to panic. ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/