summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'qmp/for-anthony' into stagingAnthony Liguori2010-10-0512-1192/+1527
|\
| * QMP/README: Update QMP homepage addressLuiz Capitulino2010-10-011-1/+1
| | | | | | | | Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * Monitor: Rename the qemu-monitor.hx fileLuiz Capitulino2010-10-014-6/+6
| | | | | | | | | | | | | | | | | | | | | | Let's be consistent and call it hmp-commands.hx, so that we have qmp-commands.hx for QMP and hmp-commands.hx for HMP. Please, note that this commit doesn't touch qemu-monitor.texi. All texi files have the qemu- prefix and I don't think it's worth changing that. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * QMP: Introduce qmp_call_cmd()Luiz Capitulino2010-10-011-24/+15
| | | | | | | | | | | | | | Calls a QObject handler and emits the QMP response, also drops monitor_call_handler() which is now unused. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * Monitor: Directly call QObject handlersLuiz Capitulino2010-10-011-1/+9
| | | | | | | | | | | | | | This avoids handle_user_command() calling monitor_call_handler(), which is currently shared with QMP. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * Monitor: Rename monitor_handler_is_async()Luiz Capitulino2010-10-011-5/+5
| | | | | | | | | | | | | | Let's follow the convention introduced by the previous commit and call it handler_is_async(). Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * Monitor: Rename monitor_handler_ported()Luiz Capitulino2010-10-011-3/+3
| | | | | | | | | | | | | | | | That name makes no sense anymore, as dispatch tables have been split, a better name is handler_is_qobject(), which really communicates the handler's type. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * Monitor: Drop monitor_cmd_user_only()Luiz Capitulino2010-10-012-6/+0
| | | | | | | | | | | | | | This function was only needed when QMP and HMP were sharing dispatch tables, this is no longer true so just drop it. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * Monitor: Drop QMP info from the qemu-monitor.hx fileLuiz Capitulino2010-10-012-1366/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMP has its own dispatch table and documentation file (qmp-commands.hx), we can now drop the following QMP specific info from qemu-monitor.hx: o SQMP/EQMP sections o The qmp_capabilities command o The query-commands command However, note that QObject handlers entries are not being removed. This will only happen when we introduce a proper QMP call interface. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * QMP: Small cleanup in handle_qmp_command()Luiz Capitulino2010-10-011-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMP has its own dispatch tables, we can now drop the following checks: o 'info' command: this command doesn't exist in QMP's dispatch table, the right thing will happen when it's issued by a client (ie. command not found error) o monitor_handler_ported(): all QMP handlers are 'ported', no need to check for that o monitor_cmd_user_only(): no HMP handler will exist in QMP's dispatch tables, that's why we have split them after all :-) Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * QMP: Simplify do_info_commands()Luiz Capitulino2010-10-011-9/+4
| | | | | | | | | | | | | | We now iterate over QMP's dispatch tables, no need to check for QMP-only handlers anymore. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * QMP: Introduce query commands dispatch tableLuiz Capitulino2010-10-011-2/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | The new table is a copy of HMP's table, containing only QObject handlers. In the near future HMP will be making QMP calls and then we will be able to drop QObject handlers from HMP's table. From now on, QMP and HMP have different query command dispatch tables. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * QMP: Introduce command dispatch tableLuiz Capitulino2010-10-012-4/+14
| | | | | | | | | | | | | | | | | | | | Also update QMP functions to use it. The table is generated from the qmp-commands.hx file. From now on, QMP and HMP have different command dispatch tables. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * QMP: Introduce qmp_find_cmd()Luiz Capitulino2010-10-011-1/+6
| | | | | | | | | | | | | | | | Next commit needs this new function: it will introduce the the QMP's command dispatch table and qmp_find_cmd() will be used to search on it. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * Monitor: Introduce the qmp-commands.hx fileLuiz Capitulino2010-10-013-2/+1543
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file contains a copy of the following information from the qemu-monitor.hx file: o QObject handlers entries o QMP documentation (all SQMP/EQMP sections) Right now it's only used to generate the QMP docs in QMP/, but next commits will turn this into QMP's command dispatch table. It's important to note that QObject handlers entries are going to get duplicated: they will exist in both QMP's and HMP's dispatch tables. This will be fixed in the near future, when we add a proper QMP call interface and HMP is converted to use it. This way we can completely drop QObject handlers entries from HMP's tables. NOTE: HMP specific constructions, like "q|quit", have been dropped. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * Monitor: Convert do_info() back to HMPLuiz Capitulino2010-10-012-5/+3
| | | | | | | | | | | | | | This is a HMP specific handler, it makes no sense to have it under QMP. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * Monitor: Drop is_async_return()Luiz Capitulino2010-10-011-24/+1
| | | | | | | | | | | | | | | | | | | | | | If I understood it correcty, the is_async_return() logic was only used to prevent QMP from issuing duplicated success responses for asynchronous handlers. However, QMP doesn't use do_info() anymore so this is dead logic and (hopefully) can be safely dropped. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * Monitor: Drop QMP bits from do_info()Luiz Capitulino2010-10-011-30/+7
| | | | | | | | | | | | As of last commit, QMP doesn't use do_info() anymore. Simplify it. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * QMP: Don't use do_info()Luiz Capitulino2010-10-011-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since its inception, QMP has been using HMP's do_info() function to run query commands. This was a bad choice, as it made do_info() more complex and contributed to couple QMP and HMP. This commit fixes that by doing the following changes: 1. Introduce qmp_find_query_cmd() and use it to directly lookup the info_cmds table 2. Introduce qmp_call_query_cmd() so that QMP code is able to call query handlers without using do_info() 3. Drop do_info() usage (via monitor_find_command("info")) We need all the three changes in one shot so that we don't break the calling of query commands in QMP. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * QMP: handle_qmp_command(): Move 'cmd' sanity checkLuiz Capitulino2010-10-011-5/+5
| | | | | | | | | | | | | | | | | | | | Next commit will change how query commands are handled in a way that the 'cmd' sanity check is also going to be needed for query commands handling. Let's move it out of the else body then. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * Monitor: Introduce search_dispatch_table()Luiz Capitulino2010-10-011-2/+8
| | | | | | | | | | | | | | | | | | | | It's a generic version of monitor_find_command() which searches the dispatch table passed as an argument. Future commits will introduce new dispatch tables, so we need common code to search them. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * disable guest-provided stats on "info balloon" commandEduardo Habkost2010-10-011-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The addition of memory stats reporting to the virtio balloon causes the 'info balloon' command to become asynchronous. This is a regression because in some cases it can hang the user monitor. This is an alternative to Adam Litke's patch. Adam's patch disabled the corresponding (guest-visible) virtio feature bit, causing issues for migration. Original discussion is available at: http://marc.info/?l=qemu-devel&m=128448124328314&w=2 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Acked-by: Adam Litke <agl@us.ibm.com Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * Add option to turn on JSON pretty printing in monitorDaniel P. Berrange2010-10-014-1/+11
| | | | | | | | | | | | | | | | Expaned '-mon' arg to allow a 'pretty=on' flag. This makes the monitor pretty print its replies to easy human debugging / reading Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| * Add support for JSON pretty printingDaniel P. Berrange2010-10-012-8/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The monitor does not pretty-print JSON output, so that everything will be on a single line reply. When JSON docs get large this is quite unpleasant to read. For the future command line capabilities query ability, huge JSON docs will be available. This needs the ability to pretty-print. This introduces a new API qobject_to_json_pretty() that does a minimal indentation of list and dict members. As an example, this makes {"QMP": {"version": {"micro": 50, "minor": 12, "package": "", "major": 0}, "capabilities": []}} Output as { "QMP": { "version": { "micro": 50, "minor": 12, "package": "", "major": 0 }, "capabilities": [ ] } } NB: this is not turned on for the QMP monitor. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
* | linux-user: Fix typo m86k -> m68kStefan Weil2010-10-051-3/+3
| | | | | | | | | | | | | | Replace m86k_sim_stat by m68k_sim_stat. Cc: Riku Voipio <riku.voipio@iki.fi> Signed-off-by: Stefan Weil <weil@mail.berlios.de>
* | Fix spelling in commentsStefan Weil2010-10-053-3/+3
| | | | | | | | | | | | | | multifuction -> multifunction successfull -> successful. Signed-off-by: Stefan Weil <weil@mail.berlios.de>
* | docs: Improve documentationStefan Weil2010-10-051-28/+28
| | | | | | | | | | | | | | | | Fix some inconsistencies (tabs and punctuation) and try to improve grammar and spelling. Cc: Juan Quintela <quintela@redhat.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de>
* | Add new user mode option -ignore-environmentStefan Weil2010-10-053-0/+26
| | | | | | | | | | | | | | | | | | | | | | An empty environment is sometimes useful in user mode. The new option provides it for linux-user and bsd-user (darwin-user still has no environment related options). The patch also adds the documentation for other environment related options. Signed-off-by: Stefan Weil <weil@mail.berlios.de>
* | ppc: Minor 40x MMU fixesJohn Clark2010-10-052-27/+49
| | | | | | | | | | | | | | | | | | * Fix swapped reading of tlblo/hi. * Fix tlb exec permissions Signed-off-by: John Clark <clarkjc@runbox.com> Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
* | console: Avoid dereferencing NULL active_consoleStefan Hajnoczi2010-10-031-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The console_select() function does not check that active_console is non-NULL before dereferencing it. When invoked with qemu -nodefaults it is possible to hit this case. This patch checks that active_console is non-NULL before stashing away the old console dimensions in console_select(). Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Acked-by: Gerd Hoffmann <kraxel@redhat.com> Acked-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | exec: Fix compilation error for debug codeStefan Weil2010-10-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | is_softmmu was removed with commit d4c430a80f000d722bb70287af4d4c184a8d7006, so remove it now from debug code, too. Fix also the format specifier for paddr in the same line of code. Cc: Blue Swirl <blauwirbel@gmail.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | rc4030: Fix compilation error in debug codeStefan Weil2010-10-031-1/+4
| | | | | | | | | | | | | | | | min was unknown here, so avoid it. Cc: Blue Swirl <blauwirbel@gmail.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | mipsnet: Fix compiler warning in debug codeStefan Weil2010-10-031-1/+1
| | | | | | | | | | | | | | | | size_t needs a different format specifier, so fix this. Cc: Blue Swirl <blauwirbel@gmail.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | block/vvfat: Fix compiler warning in debug codeStefan Weil2010-10-031-1/+0
| | | | | | | | | | | | | | | | | | | | Fix this compiler warning: ./block/vvfat.c:2285: error: comparison of unsigned expression >= 0 is always true Cc: Blue Swirl <blauwirbel@gmail.com> Cc: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | virtio-9p: Use GCC_FMT_ATTR and fix a format warningStefan Weil2010-10-031-4/+6
| | | | | | | | | | | | | | | | | | | | With the new gcc format warnings, gcc detected this: /qemu/hw/virtio-9p.c:1040: error: format ‘%u’ expects type ‘unsigned int’, but argument 4 has type ‘__nlink_t’ Cc: Blue Swirl <blauwirbel@gmail.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | blockdev: Use GCC_FMT_ATTR (format checking)Stefan Weil2010-10-031-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | Additional changes: * Removed 'extern' from drive_add (avoids too long line). * Removed 'extern' from other functions (makes declarations consistent with others in same header file). Cc: Blue Swirl <blauwirbel@gmail.com> Cc: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Use GCC_FMT_ATTR (format checking)Stefan Weil2010-10-0314-16/+25
| | | | | | | | | | Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Replace most gcc format attributes by macro GCC_FMT_ATTR (format checking)Stefan Weil2010-10-0310-21/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since version 4.4.x, gcc supports additional format attributes. __attribute__ ((format (gnu_printf, 1, 2))) should be used instead of __attribute__ ((format (printf, 1, 2)) because QEMU always uses standard format strings (even with mingw32). The patch replaces format attribute printf / __printf__ by macro GCC_FMT_ATTR which uses gnu_printf if supported. It also removes an #ifdef __GNUC__ (not needed any longer). Cc: Blue Swirl <blauwirbel@gmail.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | slirp: Silence warning on HaikuAndreas Färber2010-10-031-1/+3
| | | | | | | | | | | | | | | | Haiku has O_BINARY in fcntl.h. Signed-off-by: Andreas Färber <andreas.faerber@web.de> Cc: Jan Kiszka <jan.kiszka@web.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | tap: Add stub for HaikuAndreas Färber2010-10-032-0/+62
| | | | | | | | | | | | | | Adapted from AIX code. Signed-off-by: Andreas Färber <andreas.faerber@web.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | nbd: Haiku has _IO() in its BSD compatibility layerAndreas Färber2010-10-031-1/+1
| | | | | | | | | | Signed-off-by: Andreas Färber <andreas.faerber@web.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Haiku doesn't have libmAndreas Färber2010-10-031-0/+2
| | | | | | | | | | | | | | Math functions are integrated into Haiku's libroot. Signed-off-by: Andreas Färber <andreas.faerber@web.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | configure: Don't rely on special pthreads libraryAndreas Färber2010-10-031-7/+11
| | | | | | | | | | | | | | | | Haiku has pthreads integrated into its libroot.so library. No linker arguments are needed for it, so don't fail if -lpthread and similar don't link. Signed-off-by: Andreas Färber <andreas.faerber@web.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | configure: Add basic support for HaikuAndreas Färber2010-10-031-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For compatibility with BeOS, Haiku's error codes are negative whereas recent POSIX versions require them to be positive. As spotted by François, some parts of QEMU code rely on this, so use a mapper library to convert them to positive ones. Cc: François Revol <revol@free.fr> Cc: Ingo Weinhold <ingo_weinhold@gmx.de> Haiku has network functions in libnetwork.so. It doesn't ship libutil.so. Signed-off-by: Andreas Färber <andreas.faerber@web.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | trace: avoid unnecessary recompilation if nothing changedBlue Swirl2010-10-021-5/+9
| | | | | | | | | | | | | | | | | | | | Add logic to detect changes in generated files. If the old and new files are identical, don't touch the generated file. This avoids a lot of churn since many files depend on trace.h. Based on suggestion by Paolo Bonzini. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Makefile: fix config-devices.mak generationBlue Swirl2010-10-021-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | The logic of detecting changes in default-configs/*.mak is flawed as can be demonstrated by 'touch default-configs/*.mak' followed by make. This results in a message claiming that user made changes to the */config-devices.mak files. Fix by separating the detection of changes made by the user and changes in the default-configs. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | sysbus: fix address truncationBlue Swirl2010-10-022-3/+5
| | | | | | | | | | | | | | | | Fix address truncation in sysbus by using a wider type. Reported-by: Artyom Tarasenko <atar4qemu@googlemail.com> Tested-by: Andreas Färber <andreas.faerber@web.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | target-cris: Use %td for ptrdiff_t arguments in debug messageStefan Weil2010-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | According to ISO/IEC 9899:1999 7.19.6.1, the correct length modifier for ptrdiff_t is 't', not 'z'. Cc: Blue Swirl <blauwirbel@gmail.com> Cc: Markus Armbruster <armbru@redhat.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
* | target-microblaze: Use %td for ptrdiff_t arguments in debug messageStefan Weil2010-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | According to ISO/IEC 9899:1999 7.19.6.1, the correct length modifier for ptrdiff_t is 't', not 'z'. Cc: Blue Swirl <blauwirbel@gmail.com> Cc: Markus Armbruster <armbru@redhat.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
* | virtex: Add bracesEdgar E. Iglesias2010-10-021-1/+2
|/ | | | Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
OpenPOWER on IntegriCloud