History | View | Annotate | Download (59.6 kB)
migration: make qemu_ftell() public and support writable files
Migration .save_live_iterate() functions return the number of bytestransferred. The easiest way of doing this is by calling qemu_ftell(f)at the beginning and end of the function to calculate the difference....
migration: restrict scope of incoming fd read handler
The incoming migration is processed in a coroutine and uses an fd readhandler to enter the yielded coroutine when data becomes available.
The read handler was set too broadly, so that spurious coroutine entries...
net: introduce qemu_get_queue()
To support multiqueue, the patch introduce a helper qemu_get_queue()which is used to get the NetClientState of a device. The following patches wouldrefactor this helper to support multiqueue.
Signed-off-by: Jason Wang <jasowang@redhat.com>...
Move XBZRLE encoding code to a separate file to allow testing
Signed-off-by: Orit Wasserman <owasserm@redhat.com>Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>Reviewed-by: Eric Blake <eblake@redhat.com>
Merge remote-tracking branch 'quintela/thread.next' into staging
migration: remove argument to qemu_savevm_state_cancel
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Reviewed-by: Eric Blake <eblake@redhat.com>Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
qemu-file: Only set last_error if it is not already set
HMP: add QDict to info callback handler
This patch change all info call back function to takeadditional QDict * parameter, which allow those commandtake parameter. Now it is set to NULL at default case.
Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>...
savevm: Remove MinGW specific code which is no longer needed
QEMU provides a portable function qemu_gettimeofday instead ofgettimeofday and also an implementation of localtime_r for MinGW.
Signed-off-by: Stefan Weil <sw@weilnetz.de>Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
savevm.c: cleanup system includes
savevm.c suffers from the same problem as some other files.Some years ago savevm.c was created from vl.c, moving somecode from there into a separate file. At that time, allincludes were just copied from vl.c to savevm.c, without...
migration: make writes blocking
Move all the writes to the migration_thread, and make writingsblocking. Notice that are still using the iothread for everythingthat we do.
savevm: New save live migration method: pending
Code just now does (simplified for clarity)
if (qemu_savevm_state_iterate(s->file) == 1) { vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); qemu_savevm_state_complete(s->file); }
Problem here is that qemu_savevm_state_iterate() returns 1 when it...
softmmu: move include files to include/sysemu/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
misc: move include files to include/qemu/
monitor: move include files to include/monitor/
migration: move include files to include/migration/
exec: move include files to include/exec/
net: reorganize headers
Move public headers to include/net, and leave private headers in net/.Put the virtio headers in include/net/tap.h, removing the multiple copiesthat existed. Leave include/net/tap.h as the interface for NICs, andnet/tap_int.h as the interface for OS-specific parts of the tap backend....
janitor: do not include qemu-char everywhere
Touching char/char.h basically causes the whole of QEMU tobe rebuilt. Avoid this, it is usually unnecessary.
migration: close socket QEMUFile from socket_close
The common suffix now is process_incoming_migration+qemu_fclose.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
migration: handle EAGAIN while reading QEMUFile
This will never happen right now (the assertion would fail). Thenext patch will set the socket or pipe in non-blocking mode, thusenabling this part of the code.
Coroutines can just stop whenever they want with qemu_coroutine_yield....
migration: replace qemu_stdio_fd with qemu_get_fd
migration: unify stdio-based QEMUFile operations
Now that qemu_fseek does not exist anymore, there is no reason to doan fseek before fread/fwrite when operating on an stdio file.Thus, unify the get/put_buffer callbacks used by qemu_fopenwith those used for pipes....
migration: consolidate QEMUFile methods in a single QEMUFileOps struct
migration: add qemu_get_fd
vmstate: Add support for saving/loading bitmaps
Add support for saving/loading bitmap.h bitmaps in vmstate.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>Tested-by: Igor Mitsyanko <i.mitsyanko@samsung.com>Reviewed-by: Juan Quintela <quintela@redhat.com>
savevm: make qemu_file_put_notify() return errors
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
savevm: unexport qemu_fflush
It is not used outside of savevm.c
savevm: Remove qemu_fseek()
It has no users, and is only half implemented.
savevm: make qemu_fflush() return an error code
Adjust all the callers. We moved the set of last_error from insideqemu_fflush() to all the callers.
savevm: unfold qemu_fclose_internal()
It was used only one, and was only one if. It makes error handlingsaner.
savevm: unexport qemu_ftell()
It was unused out of savevm.c.
savevm: make qemu_fill_buffer() be consistent
It was setting last_error directly once, and with the helper the other time.
savevm: Only qemu_fflush() can generate errors
Move the error check to the beggining of the callers. Once this is fixedqemu_file_set_if_error() is not used anymore, so remove it.
savevm: un-export qemu_file_set_error()
cleanup useless return sentence
This patch cleans up return sentences in the end of void functions.
Reported-by: Paolo Bonzini <pbonzini@redhat.com>Signed-off-by: Amos Kong <akong@redhat.com>Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Merge remote-tracking branch 'agraf/ppc-for-upstream' into staging
xbzrle: fix compilation on ppc32
When compiling the xbzrle code on my ppc32 user space, I hit the followinggcc compiler warning (treated as an error):
cc1: warnings being treated as errors savevm.c: In function ‘xbzrle_encode_buffer’: savevm.c:2476: error: overflow in implicit constant conversion...
block: Convert close calls to qemu_close
This patch converts all block layer close calls, that correspondto qemu_open calls, to qemu_close.
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Add xbzrle_encode_buffer and xbzrle_decode_buffer functions
For performance we are encoding long word at a time.For nzrun we use long-word-at-a-time NULL-detection tricks from strcmp():using ((lword - 0x0101010101010101) & (~lword) & 0x8080808080808080) test...
savevm: Use a struct to pass all handlers
This would make easier to add more operations in the next patches.
savevm: Live migration handlers register the struct directly
Notice that the live migration users never unregister, so no problemabout freeing the ops structure.
savevm: Refactor cancel operation in its own operation
Intead of abusing stage with value -1.
savevm: introduce is_active method
Enable the creation of a method to tell migration if that section isactive and should be migrate. We use it for blk-migration, that isnormally not active. We don't create the method for RAM, as setupswithout RAM are very strange O:-)...
savevm: split save_live_setup from save_live_state
This patch splits stage 1 to its own function for both save_liveusers, ram and block. It is just a copy of the function, removing theparts of the other stages. Optimizations would came later.
savevm: split save_live into stage2 and stage3
We split it into 2 functions, foo_live_iterate, and foo_live_complete.At this point, we only remove the bits that are for the other stage,functionally this is equivalent to previous code.
Add tracepoints for savevm section start/end
This allows to know how long each section takes to save.
An awk script like this tells us sections that takes more that 10ms
$1 ~ /savevm_state_iterate_end/ { /* Print savevm_section_end line when > 10ms duration */...
No need to iterate if we already are over the limit
If buffers are full, don't iterate, just exit.
Add MigrationParams structure
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Merge remote-tracking branch 'afaerber-or/qom-next-2' into staging
qdev: Use wrapper for qdev_get_path
This makes it easier to remove it from BusInfo.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>[AF: Drop now unnecessary NULL initialization in scsibus_get_dev_path()]...
savevm: flush after saving vm state
Writing vm state uses bdrv_pwrite, so it will automatically get flushesin writethrough mode. But doing a flush at the end in writeback modeis probably a good idea anyway.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>...
w64: Fix time conversion for some versions of MinGW-w64
tb.time is a time value, but not necessarily of the same size as time_t:while time_t is 64 bit for w64, tb.time still is 32 bit only.
Therefore we need en explicit conversion.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Merge remote-tracking branch 'sstabellini/saverestore-8' into staging
Introduce "xen-save-devices-state"
- add an "is_ram" flag to SaveStateEntry;
- register_savevm_live sets is_ram for live_savevm devices;
- introduce a "xen-save-devices-state" QAPI command that can be used to savethe state of all devices, but not the RAM or the block devices of the...
Merge remote-tracking branch 'qemu-kvm/memory/urgent' into staging
vmstate: fix varrays with uint32_t indexes
VMSTATE_VARRAY_UINT32() is used in hw/ds1225y.c, and we checkedVMS_VARRAY_UINT32 bit of field->flags in vmstate_load_state(),but we don't check this bit in vmstate_save_state().
Signed-off-by: Amos Kong <akong@redhat.com>...
Purge migration of (almost) everything to do with monitors
The Monitor object is passed back and forth within the migration/savevmcode so that it can print errors and progress to the user.
However, that approach assumes a HMP monitor, being completely invalid...
qapi: Convert migrate
The migrate command is one of those commands where HMP and QMP completelymix up together. This made the conversion to the QAPI (which separates thecommand into QMP and HMP parts) a bit difficult.
The first important change to be noticed is that this commit completes the...
Fix vmstate_register_ram() for rom/device regions
rom/device regions have a ram_addr that is composed of both an I/O handler(low bits) and RAM region (high bits); but qemu_ram_set_idstr() expects justa RAM region. Mask the I/O handler to make it happy....
vmstate, memory: decouple vmstate from memory API
Currently creating a memory region automatically registers it forlive migration. This differs from other state (which is enumeratedin a VMStateDescription structure) and ties the live migration codeinto the memory core....
qcow2: Allow >4 GB VM state
This is a compatible extension to the snapshot header format that allowssaving a 64 bit VM state size.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
stdio_fclose: return -errno on errors (v2)
This is what qemu_fclose() expects.
Changes v1 -> v2: - Add braces to if statement to match coding style
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
savevm: use qemu_file_set_error() instead of setting last_error directly
Some code uses qemu_file_set_error() already, so use it everywherewhen setting last_error, for consistency.
qemu_fclose: return last_error if set (v3)
This will make sure no error will be missed as long as callers alwayscheck for qemu_fclose() return value. For reference, this is thecomplete list of qemu_fclose() callers:
- exec_close(): already fixed to check for negative values, not -1...
stdio_pclose: return -errno on error (v3)
Changes v1 -> v2: - On success, keep returning pclose() return value, instead of always 0.
Changes v2 -> v3: - Add braces on if statements to match coding style
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>...
Merge remote-tracking branch 'kwolf/for-anthony' into staging
block: convert qemu_aio_flush() calls to bdrv_drain_all()
Many places in QEMU call qemu_aio_flush() to complete all pendingasynchronous I/O. Most of these places actually want to drain all blockrequests but there is no block layer API to do so.
This patch introduces the bdrv_drain_all() API to wait for requests...
fix spelling in main directory
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
ivshmem: use migration blockers to prevent live migration in peer mode (v2)
Now when you try to migrate with ivshmem, you get a proper QMP error:
(qemu) migrate tcp:localhost:1025Migration is disabled when using feature 'peer mode' in device 'ivshmem'(qemu)...
savevm: qemu_fille_buffer() used to return one error for reads of size 0.
Signed-off-by: Juan Quintela <quintela@redhat.com>Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
qemu-timer: move more stuff out of qemu-timer.c
Merge remote-tracking branch 'quintela/migration-pull' into staging
migration: change has_error to contain errno values
We normally already have an errno value. When not, abuse EIO.
migration: return real error code
make functions propagate errno, instead of just using -EIO. Add acomment about what are the return value of qemu_savevm_state_iterate().
migration: rename qemu_file_has_error to qemu_file_get_error
Now the function returned errno, so it is better the new name.
Signed-off-by: Juan Quintela <quintela@redhat.com>Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
savevm: Rename has_error to last_error field
Now the field contains the last error name, so rename acordingly.
migration: use qemu_file_get_error() return value when possible
migration: make *save_live return errors
Make *save_live() return negative values when there is one error, andupdates all callers to check for the error.
savevm: teach qemu_fill_buffer to do partial refills
We will need on next patch to be able to lookahead on next patch
v2: rename "used" to "pending" (Alex Williams)
Signed-off-by: Juan Quintela<quintela@redhat.com>Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
savevm: some coding style cleanups
This patch will make moving code on next patches and having checkpatchhappy easier.
savevm: define qemu_get_byte() using qemu_peek_byte()
Signed-off-by: Juan Quintela<quintela@redhat.com>
savevm: improve subsections detection on load
We add qemu_peek_buffer, that is identical to qemu_get_buffer, justthat it don't update f->buf_index.
We add a paramenter to qemu_peek_byte() to be able to peek more thanone byte.
Once this is done, to see if we have a subsection we look:...
Revert "savevm: fix corruption in vmstate_subsection_load()."
This reverts commit eb60260de0b050a5e8ab725e84d377d0b44c43ae.
Conflicts:
savevm.c
We changed qemu_peek_byte() prototype, just fixed the rejects.
Signed-off-by: Juan Quintela<quintela@redhat.com>...
savevm: qemu_savevm_state(): Drop stop VM logic
qemu_savevm_state() has some logic to stop the VM and to (or not to)resume it. But this seems to be a big noop, as qemu_savevm_state()is only called by do_savevm() when the VM is already stopped.
So, let's drop qemu_savevm_state()'s stop VM logic....
RunState: Rename enum values as generated by the QAPI
Next commit will convert the query-status command to use theRunState type as generated by the QAPI.
In order to "transparently" replace the current enum by the QAPIone, we have to make some changes to some enum values....
Replace the VMSTOP macros with a proper state type
Today, when notifying a VM state change with vm_state_notify(),we pass a VMSTOP macro as the 'reason' argument. This is not idealbecause the VMSTOP macros tell why qemu stopped and not exactlywhat the current VM state is....
Drop the vm_running global variable
Use runstate_is_running() instead, which is introduced by this commit.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
savevm: Include writable devices with removable media
savevm and loadvm silently ignore block devices with removable media,such as floppies and SD cards. Rolling back a VM to a previouscheckpoint will not roll back writes to block devices with removable...
Use glib memory allocation and free functions
qemu_malloc/qemu_free no longer exist after this commit.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Merge remote-tracking branch 'kraxel/migration.2' into staging
Wrap recv to avoid warnings
Avoid warnings like these by wrapping recv(): CC slirp/ip_icmp.o/src/qemu/slirp/ip_icmp.c: In function 'icmp_receive':/src/qemu/slirp/ip_icmp.c:418:5: error: passing argument 2 of 'recv' from incompatible pointer type [-Werror]...
vmstate: add no_migrate flag to VMStateDescription
This allows to easily tag devices as non-migratable,so any attempt to migrate a virtual machine with thedevice in question active will make migration fail.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reset system before loadvm
In case we load the vmstate during incoming migration, we start from aclean, default machine state as we went through system reset before. Butif we load from a snapshot, the machine can be in any state. That cancause troubles if loading an older image which does not carry all state...
Fix compilation warning due to missing header for sigaction (followup)
This patch removes all references to signal.h when qemu-common.h is includedas they become redundant.
Signed-off-by: Alexandre Raymond <cerbere@gmail.com>Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Fix some typos in comments and documentation
helpfull -> helpfulusefull -> usefulcotrol -> control
and a grammar fix.
Signed-off-by: Stefan Weil <weil@mail.berlios.de>Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Move CPU related functions to cpus.h
Move declarations of CPU related functions to cpus.h. Adjust the only user.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Fix migration uint8 arrys handled
commit 82fa39b75181b730d6d4d09f443bd26bcfcd045c
only contains half of the fix. It forgots the save state fix forUINT8 indexes.
Anthony, please apply, without this migration using hpet is broken.(only current user)....
Merge branch 'for-anthony' of git://github.com/bonzini/qemu
change all other clock references to use nanosecond resolution accessors
This was done with:
sed -i 's/qemu_get_clock\>/qemu_get_clock_ns/' \ $(git grep -l 'qemu_get_clock\>' ) sed -i 's/qemu_new_timer\>/qemu_new_timer_ns/' \ $(git grep -l 'qemu_new_timer\>' )...