block migration: Allow compile time disable
PATCH v2 1/1 block migration: Allow compile time disable
From: "Dr. David Alan Gilbert" <[email protected]>
Many users now prefer to use drive_mirror over NBD as an alternative to the older migrate -b option; drive_mirror is more complex to setup but gives you more options (e.g. only migrating some of the disks if some of them are shared).
Allow the large chunk of block migration code to be compiled out for those who don't use it.
Based on a downstream-patch we've had for a while by Jeff Cody.
--- configure | 11 +++++++++++ include/migration/block.h | 23 +++++++++++++++++++++++ migration/Makefile.objs | 2 +- migration/migration.c | 9 +++++++++ 4 files changed, 44 insertions(+), 1 deletion(-)
v2
use error_append_hint, remove a '.' - Eric
Move ifdef's to block.h header - Juan
Explicitly state the blk/-b inc/-i in the message - Kashyap
configure +11 -0
@@ -316,6 +316,7 @@ vte="" virglrenderer="" tpm="yes" libssh2="" +live_block_migration="yes" numa="" tcmalloc="no" jemalloc="no"
@@ -1168,6 +1169,10 @@ for opt do ;; --enable-libssh2) libssh2="yes" ;; + --disable-live-block-migration) live_block_migration="no" + ;; + --enable-live-block-migration) live_block_migration="yes" + ;; --disable-numa) numa="no" ;; --enable-numa) numa="yes"
@@ -1400,6 +1405,7 @@ disabled with --disable-FEATURE, default is enabled if available: libnfs nfs support smartcard smartcard support (libcacard) libusb libusb (for usb passthrough) + live-block-migration Block migration in the main migration stream usb-redir usb network redirection support lzo support of lzo compression library snappy support of snappy compression library
@@ -5215,6 +5221,7 @@ echo "TPM support $tpm" echo "libssh2 support $libssh2" echo "TPM passthrough $tpm_passthrough" echo "QOM debugging $qom_cast_debug" +echo "Live block migration $live_block_migration" echo "lzo support $lzo" echo "snappy support $snappy" echo "bzip2 support $bzip2"
@@ -5781,6 +5788,10 @@ if test "$libssh2" = "yes" ; then echo "LIBSSH2_LIBS=$libssh2_libs" >> $config_host_mak fi +if test "$live_block_migration" = "yes" ; then + echo "CONFIG_LIVE_BLOCK_MIGRATION=y" >> $config_host_mak +fi + # USB host support if test "$libusb" = "yes"; then echo "HOST_USB=libusb legacy" >> $config_host_mak
include/migration/block.h +23 -0
@@ -14,10 +14,33 @@#ifndef MIGRATION_BLOCK_H #define MIGRATION_BLOCK_H +#ifdef CONFIG_LIVE_BLOCK_MIGRATION void blk_mig_init (void );int blk_mig_active (void );uint64_t blk_mig_bytes_transferred (void );uint64_t blk_mig_bytes_remaining (void );uint64_t blk_mig_bytes_total (void ); +#else +static inline void blk_mig_init (void ) { }; +static inline int blk_mig_active (void ) +{ +return false; +} +static inline uint64_t blk_mig_bytes_transferred (void ) +{ +return 0 ; +} + +static inline uint64_t blk_mig_bytes_remaining (void ) +{ +return 0 ; +} + +static inline uint64_t blk_mig_bytes_total (void ) +{ +return 0 ; +} +#endif /* CONFIG_LIVE_BLOCK_MIGRATION */ +#endif /* MIGRATION_BLOCK_H */
migration/Makefile.objs +1 -1
@@ -9,5 +9,5 @@ common-obj-y += qjson.o common-obj-$(CONFIG_RDMA) += rdma.o -common-obj-y += block.o +common-obj-$(CONFIG_LIVE_BLOCK_MIGRATION) += block.o
migration/migration.c +9 -0
@@ -1213,6 +1213,15 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, params.blk = has_blk && blk; params.shared = has_inc && inc; +#ifndef CONFIG_LIVE_BLOCK_MIGRATION +if (params.blk || params.shared) { +error_setg (errp,"QEMU compiled without old-style (blk/-b, inc/-i) " +"block migration" ); +error_append_hint (errp,"Use drive_mirror+NBD instead.\n" ); +return ; + } +#endif +if (migration_is_setup_or_active (s->state) || s->state ==MIGRATION_STATUS_CANCELLING || s->state ==MIGRATION_STATUS_COLO ) {
Signature · 1 line
2.13.0
Quoted 22 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Many users now prefer to use
drive_mirrorover NBD as an alternative to the older migrate -b option;drive_mirroris more complex to setup but gives you more options (e.g. only migrating some of the disks if some of them are shared).Allow the large chunk of block migration code to be compiled out for those who don't use it.
Based on a downstream-patch we've had for a while by Jeff Cody.
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- configure | 11 +++++++++++ include/migration/block.h | 23 +++++++++++++++++++++++ migration/Makefile.objs | 2 +- migration/migration.c | 9 +++++++++ 4 files changed, 44 insertions(+), 1 deletion(-)
configure disabled with --disable-FEATURE, default is enabled if available: · line 1408
Quoted 4 lines
configure +1
-0@@ -1400,6 +1405,7 @@ disabled with --disable-FEATURE, default is enabled if available: libnfs nfs support smartcard smartcard support (libcacard) libusb libusb (for usb passthrough) + live-block-migration Block migration in the main migration stream
Bummer that the long name breaks alignment. But I don't have any bikeshed paint handy to suggest a shorter name.
migration/migration.c void qmp_migrate(const char *uri, bool has_blk, bool blk, · line 1223
Quoted 13 lines
migration/migration.c +9
-0+++ b/migration/migration.c@@ -1213,6 +1213,15 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, params.blk = has_blk && blk; params.shared = has_inc && inc; +#ifndef CONFIG_LIVE_BLOCK_MIGRATION +if (params.blk || params.shared) { +error_setg (errp,"QEMU compiled without old-style (blk/-b, inc/-i) " +"block migration" ); +error_append_hint (errp,"Use drive_mirror+NBD instead.\n" ); +return ; + } +#endif
Juan's pending series to simplify the representation of -b/-i may also play a role here, particularly if we want to bite the bullet and change the QMP command to drop the optional parameters altogether.
It may be worth documenting in the .json file (independently of whether the configure option is used) that blk/inc are deprecated, and may be removed in a future release, if we want to start the clock on removing them.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Quoted 7 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Many users now prefer to use
drive_mirrorover NBD as an alternative to the older migrate -b option;drive_mirroris more complex to setup but gives you more options (e.g. only migrating some of the disks if some of them are shared).
Quoted 6 lines
Allow the large chunk of block migration code to be compiled out for those who don't use it.
Based on a downstream-patch we've had for a while by Jeff Cody.
Signed-off-by Dr. David Alan Gilbert <[email protected]>
Quoted 7 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Many users now prefer to use
drive_mirrorover NBD as an alternative to the older migrate -b option;drive_mirroris more complex to setup but gives you more options (e.g. only migrating some of the disks if some of them are shared).
Quoted 6 lines
Allow the large chunk of block migration code to be compiled out for those who don't use it.
Based on a downstream-patch we've had for a while by Jeff Cody.
Signed-off-by Dr. David Alan Gilbert <[email protected]>
Quoted 134 lines
--- configure | 11 +++++++++++ include/migration/block.h | 23 +++++++++++++++++++++++ migration/Makefile.objs | 2 +- migration/migration.c | 9 +++++++++ 4 files changed, 44 insertions(+), 1 deletion(-)v2
useerror_append_hint, remove a '.' - Eric
Move ifdef's toblock.hheader - Juan
Explicitly state the blk/-b inc/-i in the message - Kashyapconfigure +11
-0@@ -316,6 +316,7 @@ vte="" virglrenderer="" tpm="yes" libssh2="" +live_block_migration="yes" numa="" tcmalloc="no" jemalloc="no"@@ -1168,6 +1169,10 @@ for opt do ;; --enable-libssh2) libssh2="yes" ;; + --disable-live-block-migration) live_block_migration="no" + ;; + --enable-live-block-migration) live_block_migration="yes" + ;; --disable-numa) numa="no" ;; --enable-numa) numa="yes"@@ -1400,6 +1405,7 @@ disabled with --disable-FEATURE, default is enabled if available: libnfs nfs support smartcard smartcard support (libcacard) libusb libusb (for usb passthrough) + live-block-migration Block migration in the main migration stream usb-redir usb network redirection support lzo support of lzo compression library snappy support of snappy compression library@@ -5215,6 +5221,7 @@ echo "TPM support $tpm" echo "libssh2 support $libssh2" echo "TPM passthrough $tpm_passthrough" echo "QOM debugging $qom_cast_debug" +echo "Live block migration $live_block_migration" echo "lzo support $lzo" echo "snappy support $snappy" echo "bzip2 support $bzip2"@@ -5781,6 +5788,10 @@ if test "$libssh2" = "yes" ; then echo "LIBSSH2_LIBS=$libssh2_libs" >> $config_host_mak fi +if test "$live_block_migration" = "yes" ; then + echo "CONFIG_LIVE_BLOCK_MIGRATION=y" >> $config_host_mak +fi + # USB host support if test "$libusb" = "yes"; then echo "HOST_USB=libusb legacy" >> $config_host_makinclude/migration/block.h +23
-0@@ -14,10 +14,33 @@#ifndef MIGRATION_BLOCK_H #define MIGRATION_BLOCK_H +#ifdef CONFIG_LIVE_BLOCK_MIGRATION void blk_mig_init (void );int blk_mig_active (void );uint64_t blk_mig_bytes_transferred (void );uint64_t blk_mig_bytes_remaining (void );uint64_t blk_mig_bytes_total (void ); +#else +static inline void blk_mig_init (void ) { }; +static inline int blk_mig_active (void ) +{ +return false; +} +static inline uint64_t blk_mig_bytes_transferred (void ) +{ +return 0 ; +} + +static inline uint64_t blk_mig_bytes_remaining (void ) +{ +return 0 ; +} + +static inline uint64_t blk_mig_bytes_total (void ) +{ +return 0 ; +} +#endif /* CONFIG_LIVE_BLOCK_MIGRATION */ +#endif /* MIGRATION_BLOCK_H */ migration/Makefile.objs +1
-1@@ -9,5 +9,5 @@ common-obj-y += qjson.o common-obj-$(CONFIG_RDMA) += rdma.o -common-obj-y += block.o +common-obj-$(CONFIG_LIVE_BLOCK_MIGRATION) += block.omigration/migration.c +9
-0@@ -1213,6 +1213,15 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, params.blk = has_blk && blk; params.shared = has_inc && inc; +#ifndef CONFIG_LIVE_BLOCK_MIGRATION +if (params.blk || params.shared) { +error_setg (errp,"QEMU compiled without old-style (blk/-b, inc/-i) " +"block migration" ); +error_append_hint (errp,"Use drive_mirror+NBD instead.\n" ); +return ; + } +#endif +if (migration_is_setup_or_active (s->state) || s->state ==MIGRATION_STATUS_CANCELLING || s->state ==MIGRATION_STATUS_COLO ) {Signature · 1 line
2.13.0
Quoted 8 lines · Jeff Cody
Quoted 7 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Many users now prefer to use
drive_mirrorover NBD as an alternative to the older migrate -b option;drive_mirroris more complex to setup but gives you more options (e.g. only migrating some of the disks if some of them are shared).
Quoted 8 lines
Quoted 6 lines
Allow the large chunk of block migration code to be compiled out for those who don't use it.
Based on a downstream-patch we've had for a while by Jeff Cody.
Signed-off-by Dr. David Alan Gilbert <[email protected]>Reviewed-by Jeff Cody <[email protected]>
Hi
You thought it was going to be so easy O:-)
You can see that this patch is the last one of the Series:
Remove old MigrationParams
And as there has been quite a bit of changes, I would preffer the review-by there. (Hint, hint)
Thanks, Juan.