[libvirt] [PATCH] Print hex values with '0x' prefix and octal with '0' in debug messages

Seeing a log message saying 'flags=93' is ambiguous & confusing unless you happen to know that libvirt always prints flags as hex. Change our debug messages so that they always add a '0x' prefix when printing flags, and '0' prefix when printing mode. A few other misc places gain a '0x' prefix in error messages too. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- cfg.mk | 8 +- po/af.po | 4 +- po/am.po | 4 +- po/anp.po | 4 +- po/ar.po | 4 +- po/as.po | 12 +- po/ast.po | 4 +- po/bal.po | 4 +- po/be.po | 4 +- po/bg.po | 4 +- po/bn.po | 4 +- po/bn_IN.po | 12 +- po/bo.po | 4 +- po/br.po | 4 +- po/brx.po | 4 +- po/bs.po | 4 +- po/ca.po | 12 +- po/cs.po | 4 +- po/cy.po | 4 +- po/da.po | 4 +- po/de.po | 12 +- po/de_CH.po | 4 +- po/el.po | 4 +- po/en_GB.po | 4 +- po/eo.po | 4 +- po/es.po | 12 +- po/et.po | 4 +- po/eu.po | 4 +- po/fa.po | 4 +- po/fi.po | 4 +- po/fr.po | 4 +- po/gl.po | 4 +- po/gu.po | 12 +- po/he.po | 4 +- po/hi.po | 12 +- po/hr.po | 4 +- po/hu.po | 4 +- po/ia.po | 4 +- po/id.po | 4 +- po/ilo.po | 4 +- po/is.po | 4 +- po/it.po | 12 +- po/ja.po | 12 +- po/ka.po | 4 +- po/kk.po | 4 +- po/km.po | 4 +- po/kn.po | 12 +- po/ko.po | 12 +- po/kw.po | 4 +- po/kw(a)kkcor.po | 4 +- po/kw(a)uccor.po | 4 +- po/kw_GB.po | 4 +- po/ky.po | 4 +- po/libvirt.pot | 4 +- po/lt.po | 4 +- po/lv.po | 4 +- po/mai.po | 4 +- po/mk.po | 4 +- po/ml.po | 12 +- po/mn.po | 4 +- po/mr.po | 4 +- po/ms.po | 4 +- po/nb.po | 4 +- po/nds.po | 4 +- po/ne.po | 4 +- po/nl.po | 12 +- po/nn.po | 4 +- po/nso.po | 4 +- po/or.po | 4 +- po/pa.po | 12 +- po/pl.po | 12 +- po/pt.po | 4 +- po/pt_BR.po | 12 +- po/ro.po | 4 +- po/ru.po | 8 +- po/si.po | 4 +- po/sk.po | 4 +- po/sl.po | 4 +- po/sq.po | 4 +- po/sr.po | 4 +- po/sr(a)latin.po | 4 +- po/sv.po | 12 +- po/ta.po | 4 +- po/te.po | 12 +- po/tg.po | 4 +- po/th.po | 4 +- po/tr.po | 4 +- po/tw.po | 4 +- po/uk.po | 4 +- po/ur.po | 4 +- po/vi.po | 4 +- po/wba.po | 4 +- po/yo.po | 4 +- po/zh_CN.po | 4 +- po/zh_HK.po | 4 +- po/zh_TW.po | 4 +- po/zu.po | 4 +- src/libvirt-admin.c | 30 ++--- src/libvirt-domain-snapshot.c | 32 ++--- src/libvirt-domain.c | 266 +++++++++++++++++++------------------- src/libvirt-host.c | 22 ++-- src/libvirt-interface.c | 16 +-- src/libvirt-lxc.c | 8 +- src/libvirt-network.c | 6 +- src/libvirt-nodedev.c | 14 +- src/libvirt-nwfilter.c | 4 +- src/libvirt-qemu.c | 8 +- src/libvirt-secret.c | 10 +- src/libvirt-storage.c | 40 +++--- src/libvirt-stream.c | 8 +- src/libvirt.c | 2 +- src/locking/lock_driver_lockd.c | 2 +- src/locking/lock_driver_nop.c | 2 +- src/locking/lock_driver_sanlock.c | 2 +- src/locking/lock_manager.c | 12 +- src/lxc/lxc_container.c | 6 +- src/lxc/lxc_controller.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_migration.c | 24 ++-- src/qemu/qemu_monitor.c | 8 +- src/qemu/qemu_process.c | 4 +- src/remote/remote_driver.c | 6 +- src/rpc/virnetclientprogram.c | 10 +- src/rpc/virnetclientstream.c | 2 +- src/rpc/virnetserverclient.c | 2 +- src/security/security_manager.c | 2 +- src/util/virfdstream.c | 2 +- src/util/virfile.c | 4 +- src/util/virfirewall.c | 2 +- src/util/virlockspace.c | 2 +- src/util/virrotatingfile.c | 2 +- 131 files changed, 552 insertions(+), 552 deletions(-) diff --git a/cfg.mk b/cfg.mk index f2a053f4b..0f4065b98 100644 --- a/cfg.mk +++ b/cfg.mk @@ -284,11 +284,11 @@ sc_avoid_write: # In debug statements, print flags as bitmask and mode_t as octal. sc_flags_debug: - @prohibit='\<mode=%[0-9.]*[diux]' \ - halt='use %o to debug mode_t values' \ + @prohibit='\<mode=%[0-9.]*[diuxo]' \ + halt='use \"0%o\" to debug mode_t values' \ $(_sc_search_regexp) - @prohibit='[Ff]lags=%[0-9.]*l*[diou]' \ - halt='use %x to debug flag values' \ + @prohibit='[Ff]lags=%[0-9.]*l*[dioux]' \ + halt='use \"0x%x\" to debug flag values' \ $(_sc_search_regexp) # Prefer 'unsigned int flags', along with checks for unknown flags. diff --git a/po/af.po b/po/af.po index fd28e3aeb..9b473cb3b 100644 --- a/po/af.po +++ b/po/af.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/am.po b/po/am.po index 8fb04a4fd..09e98ca69 100644 --- a/po/am.po +++ b/po/am.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/anp.po b/po/anp.po index e50673596..48ff7be3d 100644 --- a/po/anp.po +++ b/po/anp.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/ar.po b/po/ar.po index b1d5c294f..e758f06e8 100644 --- a/po/ar.po +++ b/po/ar.po @@ -13343,12 +13343,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/as.po b/po/as.po index eefb88d8b..2160dbc46 100644 --- a/po/as.po +++ b/po/as.po @@ -13546,14 +13546,14 @@ msgid "Failed to make mount %s readonly" msgstr "মাউণ্ট %s কেৱল-পঢ়িব পৰা কৰিবলৈ ব্যৰ্থ" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "%s ধৰণ %s ত %s মাউণ্ট কৰিবলে ব্যৰ্থ" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "%s ধৰণ %s ত %s মাউণ্ট কৰিবলে ব্যৰ্থ" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/ast.po b/po/ast.po index 0c2cad206..2661eca2e 100644 --- a/po/ast.po +++ b/po/ast.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/bal.po b/po/bal.po index b1c32b83c..4587a9a3f 100644 --- a/po/bal.po +++ b/po/bal.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/be.po b/po/be.po index 0fb3b5416..d371cc537 100644 --- a/po/be.po +++ b/po/be.po @@ -13256,12 +13256,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/bg.po b/po/bg.po index 383213a5d..2e248f4b0 100644 --- a/po/bg.po +++ b/po/bg.po @@ -13347,12 +13347,12 @@ msgstr "Неуспешно записване на домейн %s в %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Неуспешно записване на домейн %s в %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Неуспешно записване на домейн %s в %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/bn.po b/po/bn.po index 5a2e45c3f..47b27b4a6 100644 --- a/po/bn.po +++ b/po/bn.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/bn_IN.po b/po/bn_IN.po index aaf397692..e3951de15 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po @@ -13480,14 +13480,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "%s-কে devpts-এ মাউন্ট করতে ব্যর্থ" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "%s-কে devpts-এ মাউন্ট করতে ব্যর্থ" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/bo.po b/po/bo.po index 3f251f770..ed99933f4 100644 --- a/po/bo.po +++ b/po/bo.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/br.po b/po/br.po index 42c39b37d..e813afd21 100644 --- a/po/br.po +++ b/po/br.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/brx.po b/po/brx.po index 44d27d4a9..20c3c078c 100644 --- a/po/brx.po +++ b/po/brx.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/bs.po b/po/bs.po index b8e52d93b..185bf54bf 100644 --- a/po/bs.po +++ b/po/bs.po @@ -13344,12 +13344,12 @@ msgstr "Spremanje domene %s na lokaciju %s nije uspjelo" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Spremanje domene %s na lokaciju %s nije uspjelo" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Spremanje domene %s na lokaciju %s nije uspjelo" #: src/lxc/lxc_container.c:1035 diff --git a/po/ca.po b/po/ca.po index a6cd73311..30cf7d260 100644 --- a/po/ca.po +++ b/po/ca.po @@ -13335,14 +13335,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "No s'ha pogut desar el domini %s a %s" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "No es pot obtenir informació de disc" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/cs.po b/po/cs.po index 047674f2a..43291c11c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -13368,12 +13368,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Nepodařilo se uložit doménu %s do %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Nepodařilo se uložit paměť domény %s do %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/cy.po b/po/cy.po index a33943a78..7e49c1df4 100644 --- a/po/cy.po +++ b/po/cy.po @@ -13353,12 +13353,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/da.po b/po/da.po index 8daa31c12..420c9211d 100644 --- a/po/da.po +++ b/po/da.po @@ -13347,12 +13347,12 @@ msgstr "Kunne ikke gemme domæne %s til %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Kunne ikke gemme domæne %s til %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Kunne ikke gemme domæne %s til %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/de.po b/po/de.po index b98f05340..974342073 100644 --- a/po/de.po +++ b/po/de.po @@ -13761,14 +13761,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "Anschließen von %s in %s Typ %s fehlgeschlagen" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "Anschließen von %s in %s Typ %s fehlgeschlagen" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/de_CH.po b/po/de_CH.po index 28361783a..e7789bffc 100644 --- a/po/de_CH.po +++ b/po/de_CH.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/el.po b/po/el.po index 31697049c..9fe6178ef 100644 --- a/po/el.po +++ b/po/el.po @@ -13516,12 +13516,12 @@ msgstr "Αποτυχία fork ως δαίμονα: %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Αποτυχία fork ως δαίμονα: %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Αποτυχία fork ως δαίμονα: %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/en_GB.po b/po/en_GB.po index 6b64f13db..7cbaa4353 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -13695,12 +13695,12 @@ msgstr "Failed to make mount %s readonly" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to mount %s on %s type %s flags=%x opts=%s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to mount %s on %s type %s flags=%x opts=%s" #: src/lxc/lxc_container.c:1035 diff --git a/po/eo.po b/po/eo.po index ed468c1b8..aa993b8c7 100644 --- a/po/eo.po +++ b/po/eo.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/es.po b/po/es.po index 79195945a..811c52abd 100644 --- a/po/es.po +++ b/po/es.po @@ -13828,14 +13828,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "No se pudo montar %s en %s tipo %s" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "No se pudo montar %s en %s tipo %s" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/et.po b/po/et.po index 1048f9d0b..bd91d0d5d 100644 --- a/po/et.po +++ b/po/et.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/eu.po b/po/eu.po index da2cd8682..0fc2ad34a 100644 --- a/po/eu.po +++ b/po/eu.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/fa.po b/po/fa.po index e4354784e..b7099806c 100644 --- a/po/fa.po +++ b/po/fa.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/fi.po b/po/fi.po index da72a683b..4aaa80407 100644 --- a/po/fi.po +++ b/po/fi.po @@ -13350,12 +13350,12 @@ msgstr "Toimialueen %s tallentaminen tiedostoon %s epäonnistui" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Toimialueen %s tallentaminen tiedostoon %s epäonnistui" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Toimialueen %s tallentaminen tiedostoon %s epäonnistui" #: src/lxc/lxc_container.c:1035 diff --git a/po/fr.po b/po/fr.po index 9896140e6..7959ae1c7 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13507,12 +13507,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Impossible d'enregistrer le domaine %s dans %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Impossible de vider l'espace mémoire du domaine %s dans %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/gl.po b/po/gl.po index 12d535d92..f44eae8f1 100644 --- a/po/gl.po +++ b/po/gl.po @@ -13352,12 +13352,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/gu.po b/po/gu.po index 7f580ffe7..3cbee0e64 100644 --- a/po/gu.po +++ b/po/gu.po @@ -13510,14 +13510,14 @@ msgid "Failed to make mount %s readonly" msgstr "ફક્ત વાંચી શકાય તેવી માઉન્ટ %s ને બનાવવામાં નિષ્ફળતા" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "%s પ્રકાર %s પર %s ને માઉન્ટ કરવામાં નિષ્ફળ" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "%s પ્રકાર %s પર %s ને માઉન્ટ કરવામાં નિષ્ફળ" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/he.po b/po/he.po index 354240586..dbcdd4ced 100644 --- a/po/he.po +++ b/po/he.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/hi.po b/po/hi.po index e015534f2..a742fa29f 100644 --- a/po/hi.po +++ b/po/hi.po @@ -13537,14 +13537,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "%s प्रकार %s पर %s को माउंट करने में विफल " #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "%s प्रकार %s पर %s को माउंट करने में विफल " #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/hr.po b/po/hr.po index 7aacfc227..190dc3aff 100644 --- a/po/hr.po +++ b/po/hr.po @@ -13256,12 +13256,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/hu.po b/po/hu.po index 63d0cc224..e0a5976a9 100644 --- a/po/hu.po +++ b/po/hu.po @@ -13346,12 +13346,12 @@ msgstr "Nem sikerült menteni a(z) %s tartományt ide: %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Nem sikerült menteni a(z) %s tartományt ide: %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Nem sikerült menteni a(z) %s tartományt ide: %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/ia.po b/po/ia.po index 64788aa05..a5f669b42 100644 --- a/po/ia.po +++ b/po/ia.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/id.po b/po/id.po index 58c46d8da..76fb5e8cb 100644 --- a/po/id.po +++ b/po/id.po @@ -13340,12 +13340,12 @@ msgstr "Gagal menyimpan domain %s ke %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Gagal menyimpan domain %s ke %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Gagal menyimpan domain %s ke %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/ilo.po b/po/ilo.po index b8727c125..f7bc8f816 100644 --- a/po/ilo.po +++ b/po/ilo.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/is.po b/po/is.po index 2ca1c525f..e7181b146 100644 --- a/po/is.po +++ b/po/is.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/it.po b/po/it.po index b3c5ad28e..445305271 100644 --- a/po/it.po +++ b/po/it.po @@ -13427,14 +13427,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "Impossibile montare devpts su %s" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "Impossibile montare devpts su %s" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/ja.po b/po/ja.po index cba215238..50a2ac2e6 100644 --- a/po/ja.po +++ b/po/ja.po @@ -13758,14 +13758,14 @@ msgid "Failed to make mount %s readonly" msgstr "%s の読み取り専用マウントに失敗しました" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "%s を %s に %s 形式でマウントできませんでした" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "%s を %s に %s 形式でマウントできませんでした" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/ka.po b/po/ka.po index 7e2c6772a..e79e9d741 100644 --- a/po/ka.po +++ b/po/ka.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/kk.po b/po/kk.po index fce538b1e..c6f19d544 100644 --- a/po/kk.po +++ b/po/kk.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/km.po b/po/km.po index c2b233a7b..3e619262a 100644 --- a/po/km.po +++ b/po/km.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/kn.po b/po/kn.po index 0b507f598..a23e0ffa3 100644 --- a/po/kn.po +++ b/po/kn.po @@ -13668,14 +13668,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "%s ಅನ್ನು, %s ನಲ್ಲಿ (ಬಗೆ %s) ಏರಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "%s ಅನ್ನು, %s ನಲ್ಲಿ (ಬಗೆ %s) ಏರಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/ko.po b/po/ko.po index cd1c526ec..16391eefe 100644 --- a/po/ko.po +++ b/po/ko.po @@ -13525,14 +13525,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "%s 유형 %s (%s)에 devfs를 마운트 실패했습니다 " #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "장치 %s를 %s로 %s에 마운트하는데 실패했습니다 " #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/kw.po b/po/kw.po index d62bc7850..61d7e02c4 100644 --- a/po/kw.po +++ b/po/kw.po @@ -13256,12 +13256,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/kw(a)kkcor.po b/po/kw(a)kkcor.po index c01c32ef4..b46e847b6 100644 --- a/po/kw(a)kkcor.po +++ b/po/kw(a)kkcor.po @@ -13256,12 +13256,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/kw(a)uccor.po b/po/kw(a)uccor.po index 295d0b31a..536093b38 100644 --- a/po/kw(a)uccor.po +++ b/po/kw(a)uccor.po @@ -13256,12 +13256,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/kw_GB.po b/po/kw_GB.po index c55619847..09d894b6d 100644 --- a/po/kw_GB.po +++ b/po/kw_GB.po @@ -13256,12 +13256,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/ky.po b/po/ky.po index 49a5343a6..f36ad41dc 100644 --- a/po/ky.po +++ b/po/ky.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/libvirt.pot b/po/libvirt.pot index 00c9d87a6..57155c1ed 100644 --- a/po/libvirt.pot +++ b/po/libvirt.pot @@ -13254,12 +13254,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/lt.po b/po/lt.po index 70928e7ac..1f493b902 100644 --- a/po/lt.po +++ b/po/lt.po @@ -13343,12 +13343,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/lv.po b/po/lv.po index 52aa43b14..bd694f376 100644 --- a/po/lv.po +++ b/po/lv.po @@ -13343,12 +13343,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/mai.po b/po/mai.po index 89bc7dd30..979b87136 100644 --- a/po/mai.po +++ b/po/mai.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/mk.po b/po/mk.po index 01e39b828..de4c4de28 100644 --- a/po/mk.po +++ b/po/mk.po @@ -13347,12 +13347,12 @@ msgstr "Не успеав да го зачувам доменот %s во %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Не успеав да го зачувам доменот %s во %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Не успеав да го зачувам доменот %s во %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/ml.po b/po/ml.po index 4e8755889..fbf824789 100644 --- a/po/ml.po +++ b/po/ml.po @@ -13583,14 +13583,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "%s, %s-ല്‍ (തരം %s) മൌണ്ട് ചെയ്യുന്നതില്‍ പരാജയം" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "%s, %s-ല്‍ (തരം %s) മൌണ്ട് ചെയ്യുന്നതില്‍ പരാജയം" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/mn.po b/po/mn.po index c2e2d4e22..96b3d7c76 100644 --- a/po/mn.po +++ b/po/mn.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/mr.po b/po/mr.po index 990e939c9..f88b7d504 100644 --- a/po/mr.po +++ b/po/mr.po @@ -13533,12 +13533,12 @@ msgstr "माउंट %s फक्तवाचनीय करण्यास #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "%s ला, %s प्रकार %s flags=%x वरील माउंट करण्यास अपयशी" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "%s ला %s flags=%x वरील पुन्हा माउंट करण्यास अपयशी" #: src/lxc/lxc_container.c:1035 diff --git a/po/ms.po b/po/ms.po index 63a217c81..a651c12f9 100644 --- a/po/ms.po +++ b/po/ms.po @@ -13298,12 +13298,12 @@ msgstr "gagal untuk mendapatkan domain '%s'" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "gagal untuk mendapatkan domain '%s'" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "gagal untuk mendapatkan domain '%s'" #: src/lxc/lxc_container.c:1035 diff --git a/po/nb.po b/po/nb.po index aa3ee8655..332b6d6db 100644 --- a/po/nb.po +++ b/po/nb.po @@ -13335,12 +13335,12 @@ msgstr "Kunne ikke lagre domenet %s til %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Kunne ikke lagre domenet %s til %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Kunne ikke lagre domenet %s til %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/nds.po b/po/nds.po index d3a8e5b54..0b8a99733 100644 --- a/po/nds.po +++ b/po/nds.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/ne.po b/po/ne.po index 9e030bab9..36e2e94a4 100644 --- a/po/ne.po +++ b/po/ne.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/nl.po b/po/nl.po index 63e336b8e..34161dc51 100644 --- a/po/nl.po +++ b/po/nl.po @@ -13471,14 +13471,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "devpts aankoppelen op %s mislukte" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "devpts aankoppelen op %s mislukte" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/nn.po b/po/nn.po index c40c21163..2311b3b07 100644 --- a/po/nn.po +++ b/po/nn.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/nso.po b/po/nso.po index c437147c0..dc5f113d2 100644 --- a/po/nso.po +++ b/po/nso.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/or.po b/po/or.po index 202b9f785..4ae1bfa57 100644 --- a/po/or.po +++ b/po/or.po @@ -13466,12 +13466,12 @@ msgstr "%s କୁ କେବଳ ପଠନୀୟ ଭାବରେ ସ୍ଥାପ #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "%s କୁ %s ଉପରେ %s ପ୍ରକାର ପତାକାକୁ ସ୍ଥାପନ କରିବାରେ ବିଫଳ=%x" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "%s କୁ %s ଫ୍ଲାଗଗୁଡ଼ିକ ଉପରେ ପୁନଃସ୍ଥାପନ କରିବାରେ ବିଫଳ=%x" #: src/lxc/lxc_container.c:1035 diff --git a/po/pa.po b/po/pa.po index 84caff348..d763d54a6 100644 --- a/po/pa.po +++ b/po/pa.po @@ -13478,14 +13478,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "%s ਨੂੰ %s ਉੱਪਰ ਕਿਸਮ %s ਮਾਊਂਟ ਕਰਨ ਵਿੱਚ ਫੇਲ" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "%s ਨੂੰ %s ਉੱਪਰ ਕਿਸਮ %s ਮਾਊਂਟ ਕਰਨ ਵਿੱਚ ਫੇਲ" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/pl.po b/po/pl.po index 8274723a1..cff867f5b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -13478,14 +13478,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "Zamontowanie devpts w %s się nie powiodło" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "Zamontowanie devpts w %s się nie powiodło" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/pt.po b/po/pt.po index b4c7cb12f..fb106f93e 100644 --- a/po/pt.po +++ b/po/pt.po @@ -13309,12 +13309,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Não foi possível gravar o domínio %s em %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Não foi possível gravar o 'core' do domínio %s em %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/pt_BR.po b/po/pt_BR.po index 6d5f33e7f..3f0c90979 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13738,14 +13738,14 @@ msgid "Failed to make mount %s readonly" msgstr "Incapaz de transformar o volume %s em somente leitura" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "Falha ao montar %s no %s tipo %s " #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "Falha ao montar %s no %s tipo %s " #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/ro.po b/po/ro.po index 5f0ea4cc8..c0bd8a047 100644 --- a/po/ro.po +++ b/po/ro.po @@ -13343,12 +13343,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/ru.po b/po/ru.po index 0638f22d6..1209d6f0a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13717,13 +13717,13 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Не удалось смонтировать %s в %s (тип %s, флаги=%x, параметры)" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "Не удалось смонтировать %s в %s (тип %s, флаги=%x, параметры)" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/si.po b/po/si.po index 095bf1c88..e7f1f4238 100644 --- a/po/si.po +++ b/po/si.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/sk.po b/po/sk.po index 596df133e..964c2c04b 100644 --- a/po/sk.po +++ b/po/sk.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/sl.po b/po/sl.po index 3aa71602a..23e7a94e4 100644 --- a/po/sl.po +++ b/po/sl.po @@ -13343,12 +13343,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/sq.po b/po/sq.po index a675a7a45..a45255369 100644 --- a/po/sq.po +++ b/po/sq.po @@ -13259,12 +13259,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/sr.po b/po/sr.po index 40c677ee6..ada521b7d 100644 --- a/po/sr.po +++ b/po/sr.po @@ -13440,12 +13440,12 @@ msgstr "Неуспело креирање уверења ауторизациј #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Неуспело чување домена %s у %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Неуспело чување домена %s у %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index bde06e953..aca46f3fa 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -13440,12 +13440,12 @@ msgstr "Neuspelo kreiranje uverenja autorizacije" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Neuspelo čuvanje domena %s u %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Neuspelo čuvanje domena %s u %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/sv.po b/po/sv.po index ee1482a3d..33d1985c1 100644 --- a/po/sv.po +++ b/po/sv.po @@ -13402,14 +13402,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "Misslyckades att spara domän %s till %s" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "Misslyckades att få diskinformation" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/ta.po b/po/ta.po index aeba75ecc..63e38da48 100644 --- a/po/ta.po +++ b/po/ta.po @@ -13724,12 +13724,12 @@ msgstr "%s ஐ வாசிக்க மட்டுமானதாக மாற #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "வகை %3$s flags=%4$x %2$s இல் %1$s ஐ மவுன்ட் செய்தல் தோல்வியடைந்தது" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "%2$s flags=%3$x இல் %1$s ஐ மவுன்ட் செய்தல் தோல்வியடைந்தது" #: src/lxc/lxc_container.c:1035 diff --git a/po/te.po b/po/te.po index b8293bcee..ba679bff7 100644 --- a/po/te.po +++ b/po/te.po @@ -13438,14 +13438,14 @@ msgid "Failed to make mount %s readonly" msgstr "" #: src/lxc/lxc_container.c:990 -#, c-format -msgid "Failed to mount %s on %s type %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to mount %s on %s type %s flags=0x%x" +msgstr "%s ను %s రకం %s పైన మౌంట్ చేయుటకు విఫలమైంది" #: src/lxc/lxc_container.c:1000 -#, c-format -msgid "Failed to re-mount %s on %s flags=%x" -msgstr "" +#, fuzzy, c-format +msgid "Failed to re-mount %s on %s flags=0x%x" +msgstr "%s ను %s రకం %s పైన మౌంట్ చేయుటకు విఫలమైంది" #: src/lxc/lxc_container.c:1035 #, c-format diff --git a/po/tg.po b/po/tg.po index 99efec221..40173af37 100644 --- a/po/tg.po +++ b/po/tg.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/th.po b/po/th.po index 49b3a7b27..0f2614fac 100644 --- a/po/th.po +++ b/po/th.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/tr.po b/po/tr.po index b2e51ec2e..09c678377 100644 --- a/po/tr.po +++ b/po/tr.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/tw.po b/po/tw.po index 48f633957..067f56edc 100644 --- a/po/tw.po +++ b/po/tw.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/uk.po b/po/uk.po index 1258eec73..10f257a81 100644 --- a/po/uk.po +++ b/po/uk.po @@ -14194,12 +14194,12 @@ msgstr "Не вдалося зробити змонтований %s прида #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Не вдалося змонтувати %s до %s, тип %s, прапорці=%x" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Не вдалося повторно змонтувати %s до %s, прапорці=%x" #: src/lxc/lxc_container.c:1035 diff --git a/po/ur.po b/po/ur.po index 4300a5708..c5eee9100 100644 --- a/po/ur.po +++ b/po/ur.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/vi.po b/po/vi.po index 20ead9937..aa6a7df72 100644 --- a/po/vi.po +++ b/po/vi.po @@ -13504,12 +13504,12 @@ msgstr "Thất bại khi tạo ủy nhiệm xác thực" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Thất bại khi lắp devpts trên %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Thất bại khi lắp devpts trên %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/wba.po b/po/wba.po index 7724a2cb3..f3c7af4b6 100644 --- a/po/wba.po +++ b/po/wba.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/yo.po b/po/yo.po index 93093dc9f..512df25dc 100644 --- a/po/yo.po +++ b/po/yo.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/zh_CN.po b/po/zh_CN.po index 14596afe6..714ea70dd 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -13438,12 +13438,12 @@ msgstr "让挂载 %s 成为只读失败" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "在 %s 类型 %s flags=%x 中挂载 %s 失败" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "在%s flags=%x 中重新挂载 %s 失败" #: src/lxc/lxc_container.c:1035 diff --git a/po/zh_HK.po b/po/zh_HK.po index 2a5640e2d..937d9d501 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -13255,12 +13255,12 @@ msgstr "" #: src/lxc/lxc_container.c:990 #, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1000 #, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "" #: src/lxc/lxc_container.c:1035 diff --git a/po/zh_TW.po b/po/zh_TW.po index 6045d2872..e8d953974 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -13360,12 +13360,12 @@ msgstr "無法將區域 %s 存至 %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "無法將區域 %s 存至 %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "無法將區域 %s 存至 %s" #: src/lxc/lxc_container.c:1035 diff --git a/po/zu.po b/po/zu.po index 2959d76fe..f4e850eb0 100644 --- a/po/zu.po +++ b/po/zu.po @@ -13342,12 +13342,12 @@ msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:990 #, fuzzy, c-format -msgid "Failed to mount %s on %s type %s flags=%x" +msgid "Failed to mount %s on %s type %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1000 #, fuzzy, c-format -msgid "Failed to re-mount %s on %s flags=%x" +msgid "Failed to re-mount %s on %s flags=0x%x" msgstr "Failed to save domain %s to %s" #: src/lxc/lxc_container.c:1035 diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index 67d9b6beb..593248f04 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -214,7 +214,7 @@ virAdmConnectOpen(const char *name, unsigned int flags) if (virAdmInitialize() < 0) goto error; - VIR_DEBUG("flags=%x", flags); + VIR_DEBUG("flags=0x%x", flags); virResetLastError(); if (!(conn = virAdmConnectNew())) @@ -711,7 +711,7 @@ virAdmConnectListServers(virAdmConnectPtr conn, { int ret = -1; - VIR_DEBUG("conn=%p, servers=%p, flags=%x", conn, servers, flags); + VIR_DEBUG("conn=%p, servers=%p, flags=0x%x", conn, servers, flags); virResetLastError(); @@ -749,7 +749,7 @@ virAdmConnectLookupServer(virAdmConnectPtr conn, { virAdmServerPtr ret = NULL; - VIR_DEBUG("conn=%p, name=%s, flags=%x", conn, NULLSTR(name), flags); + VIR_DEBUG("conn=%p, name=%s, flags=0x%x", conn, NULLSTR(name), flags); virResetLastError(); virCheckAdmConnectGoto(conn, cleanup); @@ -791,7 +791,7 @@ virAdmServerGetThreadPoolParameters(virAdmServerPtr srv, { int ret = -1; - VIR_DEBUG("srv=%p, params=%p, nparams=%p, flags=%x", + VIR_DEBUG("srv=%p, params=%p, nparams=%p, flags=0x%x", srv, params, nparams, flags); virResetLastError(); @@ -828,7 +828,7 @@ virAdmServerSetThreadPoolParameters(virAdmServerPtr srv, int nparams, unsigned int flags) { - VIR_DEBUG("srv=%p, params=%p, nparams=%x, flags=%x", + VIR_DEBUG("srv=%p, params=%p, nparams=%x, flags=0x%x", srv, params, nparams, flags); virResetLastError(); @@ -870,7 +870,7 @@ virAdmServerListClients(virAdmServerPtr srv, { int ret = -1; - VIR_DEBUG("srv=%p, clients=%p, flags=%x", srv, clients, flags); + VIR_DEBUG("srv=%p, clients=%p, flags=0x%x", srv, clients, flags); virResetLastError(); @@ -908,7 +908,7 @@ virAdmServerLookupClient(virAdmServerPtr srv, { virAdmClientPtr ret = NULL; - VIR_DEBUG("srv=%p, id=%llu, flags=%x", srv, id, flags); + VIR_DEBUG("srv=%p, id=%llu, flags=0x%x", srv, id, flags); virResetLastError(); virCheckAdmServerGoto(srv, error); @@ -955,7 +955,7 @@ virAdmClientGetInfo(virAdmClientPtr client, { int ret = -1; - VIR_DEBUG("client=%p, params=%p, nparams=%p, flags=%x", + VIR_DEBUG("client=%p, params=%p, nparams=%p, flags=0x%x", client, params, nparams, flags); virResetLastError(); @@ -986,7 +986,7 @@ int virAdmClientClose(virAdmClientPtr client, { int ret = -1; - VIR_DEBUG("client=%p, flags=%x", client, flags); + VIR_DEBUG("client=%p, flags=0x%x", client, flags); virResetLastError(); virCheckAdmClientGoto(client, error); @@ -1026,7 +1026,7 @@ virAdmServerGetClientLimits(virAdmServerPtr srv, { int ret = -1; - VIR_DEBUG("srv=%p, flags=%x", srv, flags); + VIR_DEBUG("srv=%p, flags=0x%x", srv, flags); virResetLastError(); virCheckAdmServerGoto(srv, error); @@ -1065,7 +1065,7 @@ virAdmServerSetClientLimits(virAdmServerPtr srv, { int ret = -1; - VIR_DEBUG("srv=%p, params=%p, nparams=%d, flags=%x", srv, params, nparams, + VIR_DEBUG("srv=%p, params=%p, nparams=%d, flags=0x%x", srv, params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -1110,7 +1110,7 @@ virAdmConnectGetLoggingOutputs(virAdmConnectPtr conn, { int ret = -1; - VIR_DEBUG("conn=%p, flags=%x", conn, flags); + VIR_DEBUG("conn=%p, flags=0x%x", conn, flags); virResetLastError(); virCheckAdmConnectReturn(conn, -1); @@ -1151,7 +1151,7 @@ virAdmConnectGetLoggingFilters(virAdmConnectPtr conn, { int ret = -1; - VIR_DEBUG("conn=%p, flags=%x", conn, flags); + VIR_DEBUG("conn=%p, flags=0x%x", conn, flags); virResetLastError(); virCheckAdmConnectReturn(conn, -1); @@ -1190,7 +1190,7 @@ virAdmConnectSetLoggingOutputs(virAdmConnectPtr conn, { int ret = -1; - VIR_DEBUG("conn=%p, outputs=%s, flags=%x", conn, outputs, flags); + VIR_DEBUG("conn=%p, outputs=%s, flags=0x%x", conn, outputs, flags); virResetLastError(); virCheckAdmConnectReturn(conn, -1); @@ -1228,7 +1228,7 @@ virAdmConnectSetLoggingFilters(virAdmConnectPtr conn, { int ret = -1; - VIR_DEBUG("conn=%p, flags=%x", conn, flags); + VIR_DEBUG("conn=%p, flags=0x%x", conn, flags); virResetLastError(); virCheckAdmConnectReturn(conn, -1); diff --git a/src/libvirt-domain-snapshot.c b/src/libvirt-domain-snapshot.c index 953a586e5..e44a1d1f3 100644 --- a/src/libvirt-domain-snapshot.c +++ b/src/libvirt-domain-snapshot.c @@ -205,7 +205,7 @@ virDomainSnapshotCreateXML(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "xmlDesc=%s, flags=%x", xmlDesc, flags); + VIR_DOMAIN_DEBUG(domain, "xmlDesc=%s, flags=0x%x", xmlDesc, flags); virResetLastError(); @@ -261,7 +261,7 @@ virDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("snapshot=%p, flags=%x", snapshot, flags); + VIR_DEBUG("snapshot=%p, flags=0x%x", snapshot, flags); virResetLastError(); @@ -335,7 +335,7 @@ virDomainSnapshotNum(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -417,7 +417,7 @@ virDomainSnapshotListNames(virDomainPtr domain, char **names, int nameslen, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "names=%p, nameslen=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "names=%p, nameslen=%d, flags=0x%x", names, nameslen, flags); virResetLastError(); @@ -500,7 +500,7 @@ virDomainListAllSnapshots(virDomainPtr domain, virDomainSnapshotPtr **snaps, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "snaps=%p, flags=%x", snaps, flags); + VIR_DOMAIN_DEBUG(domain, "snaps=%p, flags=0x%x", snaps, flags); virResetLastError(); @@ -570,7 +570,7 @@ virDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("snapshot=%p, flags=%x", snapshot, flags); + VIR_DEBUG("snapshot=%p, flags=0x%x", snapshot, flags); virResetLastError(); @@ -655,7 +655,7 @@ virDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot, { virConnectPtr conn; - VIR_DEBUG("snapshot=%p, names=%p, nameslen=%d, flags=%x", + VIR_DEBUG("snapshot=%p, names=%p, nameslen=%d, flags=0x%x", snapshot, names, nameslen, flags); virResetLastError(); @@ -741,7 +741,7 @@ virDomainSnapshotListAllChildren(virDomainSnapshotPtr snapshot, { virConnectPtr conn; - VIR_DEBUG("snapshot=%p, snaps=%p, flags=%x", snapshot, snaps, flags); + VIR_DEBUG("snapshot=%p, snaps=%p, flags=0x%x", snapshot, snaps, flags); virResetLastError(); @@ -785,7 +785,7 @@ virDomainSnapshotLookupByName(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "name=%s, flags=%x", name, flags); + VIR_DOMAIN_DEBUG(domain, "name=%s, flags=0x%x", name, flags); virResetLastError(); @@ -823,7 +823,7 @@ virDomainHasCurrentSnapshot(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -864,7 +864,7 @@ virDomainSnapshotCurrent(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -906,7 +906,7 @@ virDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, { virConnectPtr conn; - VIR_DEBUG("snapshot=%p, flags=%x", snapshot, flags); + VIR_DEBUG("snapshot=%p, flags=0x%x", snapshot, flags); virResetLastError(); @@ -944,7 +944,7 @@ virDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, { virConnectPtr conn; - VIR_DEBUG("snapshot=%p, flags=%x", snapshot, flags); + VIR_DEBUG("snapshot=%p, flags=0x%x", snapshot, flags); virResetLastError(); @@ -983,7 +983,7 @@ virDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, { virConnectPtr conn; - VIR_DEBUG("snapshot=%p, flags=%x", snapshot, flags); + VIR_DEBUG("snapshot=%p, flags=0x%x", snapshot, flags); virResetLastError(); @@ -1054,7 +1054,7 @@ virDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, { virConnectPtr conn; - VIR_DEBUG("snapshot=%p, flags=%x", snapshot, flags); + VIR_DEBUG("snapshot=%p, flags=0x%x", snapshot, flags); virResetLastError(); @@ -1111,7 +1111,7 @@ virDomainSnapshotDelete(virDomainSnapshotPtr snapshot, { virConnectPtr conn; - VIR_DEBUG("snapshot=%p, flags=%x", snapshot, flags); + VIR_DEBUG("snapshot=%p, flags=0x%x", snapshot, flags); virResetLastError(); diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index ca5a1536a..9c07991e6 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -163,7 +163,7 @@ virDomainPtr virDomainCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, NULLSTR(xmlDesc), flags); + VIR_DEBUG("conn=%p, xmlDesc=%s, flags=0x%x", conn, NULLSTR(xmlDesc), flags); virResetLastError(); @@ -230,7 +230,7 @@ virDomainCreateXMLWithFiles(virConnectPtr conn, const char *xmlDesc, int *files, unsigned int flags) { - VIR_DEBUG("conn=%p, xmlDesc=%s, nfiles=%u, files=%p, flags=%x", + VIR_DEBUG("conn=%p, xmlDesc=%s, nfiles=%u, files=%p, flags=0x%x", conn, NULLSTR(xmlDesc), nfiles, files, flags); virResetLastError(); @@ -521,7 +521,7 @@ virDomainDestroyFlags(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -720,7 +720,7 @@ virDomainPMSuspendForDuration(virDomainPtr dom, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "target=%u duration=%llu flags=%x", + VIR_DOMAIN_DEBUG(dom, "target=%u duration=%llu flags=0x%x", target, duration, flags); virResetLastError(); @@ -765,7 +765,7 @@ virDomainPMWakeup(virDomainPtr dom, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "flags=%x", flags); + VIR_DOMAIN_DEBUG(dom, "flags=0x%x", flags); virResetLastError(); @@ -894,7 +894,7 @@ virDomainSaveFlags(virDomainPtr domain, const char *to, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "to=%s, dxml=%s, flags=%x", + VIR_DOMAIN_DEBUG(domain, "to=%s, dxml=%s, flags=0x%x", to, NULLSTR(dxml), flags); virResetLastError(); @@ -1020,7 +1020,7 @@ int virDomainRestoreFlags(virConnectPtr conn, const char *from, const char *dxml, unsigned int flags) { - VIR_DEBUG("conn=%p, from=%s, dxml=%s, flags=%x", + VIR_DEBUG("conn=%p, from=%s, dxml=%s, flags=0x%x", conn, NULLSTR(from), NULLSTR(dxml), flags); virResetLastError(); @@ -1084,7 +1084,7 @@ char * virDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *file, unsigned int flags) { - VIR_DEBUG("conn=%p, file=%s, flags=%x", + VIR_DEBUG("conn=%p, file=%s, flags=0x%x", conn, NULLSTR(file), flags); virResetLastError(); @@ -1157,7 +1157,7 @@ int virDomainSaveImageDefineXML(virConnectPtr conn, const char *file, const char *dxml, unsigned int flags) { - VIR_DEBUG("conn=%p, file=%s, dxml=%s, flags=%x", + VIR_DEBUG("conn=%p, file=%s, dxml=%s, flags=0x%x", conn, NULLSTR(file), NULLSTR(dxml), flags); virResetLastError(); @@ -1232,7 +1232,7 @@ virDomainCoreDump(virDomainPtr domain, const char *to, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "to=%s, flags=%x", to, flags); + VIR_DOMAIN_DEBUG(domain, "to=%s, flags=0x%x", to, flags); virResetLastError(); @@ -1309,7 +1309,7 @@ virDomainCoreDumpWithFormat(virDomainPtr domain, const char *to, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "to=%s, dumpformat=%u, flags=%x", + VIR_DOMAIN_DEBUG(domain, "to=%s, dumpformat=%u, flags=0x%x", to, dumpformat, flags); virResetLastError(); @@ -1388,7 +1388,7 @@ virDomainScreenshot(virDomainPtr domain, unsigned int screen, unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, "stream=%p, flags=%x", stream, flags); + VIR_DOMAIN_DEBUG(domain, "stream=%p, flags=0x%x", stream, flags); virResetLastError(); @@ -1506,7 +1506,7 @@ virDomainShutdownFlags(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -1564,7 +1564,7 @@ virDomainReboot(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -1608,7 +1608,7 @@ virDomainReset(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -1952,7 +1952,7 @@ virDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "memory=%lu, flags=%x", memory, flags); + VIR_DOMAIN_DEBUG(domain, "memory=%lu, flags=0x%x", memory, flags); virResetLastError(); @@ -2012,7 +2012,7 @@ virDomainSetMemoryStatsPeriod(virDomainPtr domain, int period, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "period=%d, flags=%x", period, flags); + VIR_DOMAIN_DEBUG(domain, "period=%d, flags=0x%x", period, flags); virResetLastError(); @@ -2063,7 +2063,7 @@ virDomainSetMemoryParameters(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=0x%x", params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -2137,7 +2137,7 @@ virDomainGetMemoryParameters(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=0x%x", params, (nparams) ? *nparams : -1, flags); virResetLastError(); @@ -2193,7 +2193,7 @@ virDomainSetNumaParameters(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=0x%x", params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -2258,7 +2258,7 @@ virDomainGetNumaParameters(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=0x%x", params, (nparams) ? *nparams : -1, flags); virResetLastError(); @@ -2311,7 +2311,7 @@ virDomainSetBlkioParameters(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=0x%x", params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -2376,7 +2376,7 @@ virDomainGetBlkioParameters(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=0x%x", params, (nparams) ? *nparams : -1, flags); virResetLastError(); @@ -2477,7 +2477,7 @@ virDomainGetState(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "state=%p, reason=%p, flags=%x", + VIR_DOMAIN_DEBUG(domain, "state=%p, reason=%p, flags=0x%x", state, reason, flags); virResetLastError(); @@ -2519,7 +2519,7 @@ virDomainGetControlInfo(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "info=%p, flags=%x", info, flags); + VIR_DOMAIN_DEBUG(domain, "info=%p, flags=0x%x", info, flags); virResetLastError(); @@ -2569,7 +2569,7 @@ virDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -2619,7 +2619,7 @@ virConnectDomainXMLFromNative(virConnectPtr conn, const char *nativeConfig, unsigned int flags) { - VIR_DEBUG("conn=%p, format=%s, config=%s, flags=%x", + VIR_DEBUG("conn=%p, format=%s, config=%s, flags=0x%x", conn, NULLSTR(nativeFormat), NULLSTR(nativeConfig), flags); virResetLastError(); @@ -2669,7 +2669,7 @@ virConnectDomainXMLToNative(virConnectPtr conn, const char *domainXml, unsigned int flags) { - VIR_DEBUG("conn=%p, format=%s, xml=%s, flags=%x", + VIR_DEBUG("conn=%p, format=%s, xml=%s, flags=0x%x", conn, NULLSTR(nativeFormat), NULLSTR(domainXml), flags); virResetLastError(); @@ -2731,7 +2731,7 @@ virDomainMigrateVersion1(virDomainPtr domain, unsigned int destflags; VIR_DOMAIN_DEBUG(domain, - "dconn=%p, flags=%lx, dname=%s, uri=%s, bandwidth=%lu", + "dconn=%p, flags=0x%lx, dname=%s, uri=%s, bandwidth=%lu", dconn, flags, NULLSTR(dname), NULLSTR(uri), bandwidth); ret = virDomainGetInfo(domain, &info); @@ -2830,7 +2830,7 @@ virDomainMigrateVersion2(virDomainPtr domain, unsigned long destflags; VIR_DOMAIN_DEBUG(domain, - "dconn=%p, flags=%lx, dname=%s, uri=%s, bandwidth=%lu", + "dconn=%p, flags=0x%lx, dname=%s, uri=%s, bandwidth=%lu", dconn, flags, NULLSTR(dname), NULLSTR(uri), bandwidth); /* Prepare the migration. @@ -2872,7 +2872,7 @@ virDomainMigrateVersion2(virDomainPtr domain, destflags = flags & ~(VIR_MIGRATE_ABORT_ON_ERROR | VIR_MIGRATE_AUTO_CONVERGE); - VIR_DEBUG("Prepare2 %p flags=%lx", dconn, destflags); + VIR_DEBUG("Prepare2 %p flags=0x%lx", dconn, destflags); ret = dconn->driver->domainMigratePrepare2 (dconn, &cookie, &cookielen, uri, &uri_out, destflags, dname, bandwidth, dom_xml); @@ -2989,7 +2989,7 @@ virDomainMigrateVersion3Full(virDomainPtr domain, VIR_DOMAIN_DEBUG(domain, "dconn=%p, xmlin=%s, dname=%s, uri=%s, bandwidth=%llu, " - "params=%p, nparams=%d, useParams=%d, flags=%x", + "params=%p, nparams=%d, useParams=%d, flags=0x%x", dconn, NULLSTR(xmlin), NULLSTR(dname), NULLSTR(uri), bandwidth, params, nparams, useParams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -3045,7 +3045,7 @@ virDomainMigrateVersion3Full(virDomainPtr domain, destflags = flags & ~(VIR_MIGRATE_ABORT_ON_ERROR | VIR_MIGRATE_AUTO_CONVERGE); - VIR_DEBUG("Prepare3 %p flags=%x", dconn, destflags); + VIR_DEBUG("Prepare3 %p flags=0x%x", dconn, destflags); cookiein = cookieout; cookieinlen = cookieoutlen; cookieout = NULL; @@ -3423,7 +3423,7 @@ virDomainMigrateUnmanagedParams(virDomainPtr domain, int nparams, unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, "dconnuri=%s, params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "dconnuri=%s, params=%p, nparams=%d, flags=0x%x", NULLSTR(dconnuri), params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -3537,7 +3537,7 @@ virDomainMigrate(virDomainPtr domain, virDomainPtr ddomain = NULL; VIR_DOMAIN_DEBUG(domain, - "dconn=%p, flags=%lx, dname=%s, uri=%s, bandwidth=%lu", + "dconn=%p, flags=0x%lx, dname=%s, uri=%s, bandwidth=%lu", dconn, flags, NULLSTR(dname), NULLSTR(uri), bandwidth); virResetLastError(); @@ -3692,7 +3692,7 @@ virDomainMigrate2(virDomainPtr domain, virDomainPtr ddomain = NULL; VIR_DOMAIN_DEBUG(domain, - "dconn=%p, flags=%lx, dname=%s, uri=%s, bandwidth=%lu", + "dconn=%p, flags=0x%lx, dname=%s, uri=%s, bandwidth=%lu", dconn, flags, NULLSTR(dname), NULLSTR(uri), bandwidth); virResetLastError(); @@ -3865,7 +3865,7 @@ virDomainMigrate3(virDomainPtr domain, const char *dxml = NULL; unsigned long long bandwidth = 0; - VIR_DOMAIN_DEBUG(domain, "dconn=%p, params=%p, nparms=%u flags=%x", + VIR_DOMAIN_DEBUG(domain, "dconn=%p, params=%p, nparms=%u flags=0x%x", dconn, params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -4085,7 +4085,7 @@ virDomainMigrateToURI(virDomainPtr domain, const char *dconnuri = NULL; const char *miguri = NULL; - VIR_DOMAIN_DEBUG(domain, "duri=%p, flags=%lx, dname=%s, bandwidth=%lu", + VIR_DOMAIN_DEBUG(domain, "duri=%p, flags=0x%lx, dname=%s, bandwidth=%lu", NULLSTR(duri), flags, NULLSTR(dname), bandwidth); virResetLastError(); @@ -4157,7 +4157,7 @@ virDomainMigrateToURI2(virDomainPtr domain, unsigned long bandwidth) { VIR_DOMAIN_DEBUG(domain, "dconnuri=%s, miguri=%s, dxml=%s, " - "flags=%lx, dname=%s, bandwidth=%lu", + "flags=0x%lx, dname=%s, bandwidth=%lu", NULLSTR(dconnuri), NULLSTR(miguri), NULLSTR(dxml), flags, NULLSTR(dname), bandwidth); @@ -4230,7 +4230,7 @@ virDomainMigrateToURI3(virDomainPtr domain, unsigned int nparams, unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, "dconnuri=%s, params=%p, nparms=%u flags=%x", + VIR_DOMAIN_DEBUG(domain, "dconnuri=%s, params=%p, nparms=%u flags=0x%x", NULLSTR(dconnuri), params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -4275,7 +4275,7 @@ virDomainMigratePrepare(virConnectPtr dconn, unsigned long bandwidth) { VIR_DEBUG("dconn=%p, cookie=%p, cookielen=%p, uri_in=%s, uri_out=%p, " - "flags=%lx, dname=%s, bandwidth=%lu", dconn, cookie, cookielen, + "flags=0x%lx, dname=%s, bandwidth=%lu", dconn, cookie, cookielen, NULLSTR(uri_in), uri_out, flags, NULLSTR(dname), bandwidth); virResetLastError(); @@ -4316,7 +4316,7 @@ virDomainMigratePerform(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "cookie=%p, cookielen=%d, uri=%s, flags=%lx, " + VIR_DOMAIN_DEBUG(domain, "cookie=%p, cookielen=%d, uri=%s, flags=0x%lx, " "dname=%s, bandwidth=%lu", cookie, cookielen, uri, flags, NULLSTR(dname), bandwidth); @@ -4358,7 +4358,7 @@ virDomainMigrateFinish(virConnectPtr dconn, unsigned long flags) { VIR_DEBUG("dconn=%p, dname=%s, cookie=%p, cookielen=%d, uri=%s, " - "flags=%lx", dconn, NULLSTR(dname), cookie, cookielen, + "flags=0x%lx", dconn, NULLSTR(dname), cookie, cookielen, NULLSTR(uri), flags); virResetLastError(); @@ -4400,7 +4400,7 @@ virDomainMigratePrepare2(virConnectPtr dconn, const char *dom_xml) { VIR_DEBUG("dconn=%p, cookie=%p, cookielen=%p, uri_in=%s, uri_out=%p," - "flags=%lx, dname=%s, bandwidth=%lu, dom_xml=%s", dconn, + "flags=0x%lx, dname=%s, bandwidth=%lu, dom_xml=%s", dconn, cookie, cookielen, NULLSTR(uri_in), uri_out, flags, NULLSTR(dname), bandwidth, NULLSTR(dom_xml)); @@ -4442,7 +4442,7 @@ virDomainMigrateFinish2(virConnectPtr dconn, int retcode) { VIR_DEBUG("dconn=%p, dname=%s, cookie=%p, cookielen=%d, uri=%s, " - "flags=%lx, retcode=%d", dconn, NULLSTR(dname), cookie, + "flags=0x%lx, retcode=%d", dconn, NULLSTR(dname), cookie, cookielen, NULLSTR(uri), flags, retcode); virResetLastError(); @@ -4481,7 +4481,7 @@ virDomainMigratePrepareTunnel(virConnectPtr conn, unsigned long bandwidth, const char *dom_xml) { - VIR_DEBUG("conn=%p, stream=%p, flags=%lx, dname=%s, " + VIR_DEBUG("conn=%p, stream=%p, flags=0x%lx, dname=%s, " "bandwidth=%lu, dom_xml=%s", conn, st, flags, NULLSTR(dname), bandwidth, NULLSTR(dom_xml)); @@ -4529,7 +4529,7 @@ virDomainMigrateBegin3(virDomainPtr domain, virConnectPtr conn; VIR_DOMAIN_DEBUG(domain, "xmlin=%s cookieout=%p, cookieoutlen=%p, " - "flags=%lx, dname=%s, bandwidth=%lu", + "flags=0x%lx, dname=%s, bandwidth=%lu", NULLSTR(xmlin), cookieout, cookieoutlen, flags, NULLSTR(dname), bandwidth); @@ -4577,7 +4577,7 @@ virDomainMigratePrepare3(virConnectPtr dconn, const char *dom_xml) { VIR_DEBUG("dconn=%p, cookiein=%p, cookieinlen=%d, cookieout=%p, " - "cookieoutlen=%p, uri_in=%s, uri_out=%p, flags=%lx, dname=%s, " + "cookieoutlen=%p, uri_in=%s, uri_out=%p, flags=0x%lx, dname=%s, " "bandwidth=%lu, dom_xml=%s", dconn, cookiein, cookieinlen, cookieout, cookieoutlen, NULLSTR(uri_in), uri_out, flags, NULLSTR(dname), bandwidth, NULLSTR(dom_xml)); @@ -4625,7 +4625,7 @@ virDomainMigratePrepareTunnel3(virConnectPtr conn, const char *dom_xml) { VIR_DEBUG("conn=%p, stream=%p, cookiein=%p, cookieinlen=%d, cookieout=%p, " - "cookieoutlen=%p, flags=%lx, dname=%s, bandwidth=%lu, " + "cookieoutlen=%p, flags=0x%lx, dname=%s, bandwidth=%lu, " "dom_xml=%s", conn, st, cookiein, cookieinlen, cookieout, cookieoutlen, flags, NULLSTR(dname), bandwidth, NULLSTR(dom_xml)); @@ -4681,7 +4681,7 @@ virDomainMigratePerform3(virDomainPtr domain, VIR_DOMAIN_DEBUG(domain, "xmlin=%s cookiein=%p, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, dconnuri=%s, " - "uri=%s, flags=%lx, dname=%s, bandwidth=%lu", + "uri=%s, flags=0x%lx, dname=%s, bandwidth=%lu", NULLSTR(xmlin), cookiein, cookieinlen, cookieout, cookieoutlen, NULLSTR(dconnuri), NULLSTR(uri), flags, NULLSTR(dname), bandwidth); @@ -4730,7 +4730,7 @@ virDomainMigrateFinish3(virConnectPtr dconn, int cancelled) { VIR_DEBUG("dconn=%p, dname=%s, cookiein=%p, cookieinlen=%d, cookieout=%p," - "cookieoutlen=%p, dconnuri=%s, uri=%s, flags=%lx, retcode=%d", + "cookieoutlen=%p, dconnuri=%s, uri=%s, flags=0x%lx, retcode=%d", dconn, NULLSTR(dname), cookiein, cookieinlen, cookieout, cookieoutlen, NULLSTR(dconnuri), NULLSTR(uri), flags, cancelled); @@ -4773,7 +4773,7 @@ virDomainMigrateConfirm3(virDomainPtr domain, virConnectPtr conn; VIR_DOMAIN_DEBUG(domain, - "cookiein=%p, cookieinlen=%d, flags=%lx, cancelled=%d", + "cookiein=%p, cookieinlen=%d, flags=0x%lx, cancelled=%d", cookiein, cookieinlen, flags, cancelled); virResetLastError(); @@ -4816,7 +4816,7 @@ virDomainMigrateBegin3Params(virDomainPtr domain, virConnectPtr conn; VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, " - "cookieout=%p, cookieoutlen=%p, flags=%x", + "cookieout=%p, cookieoutlen=%p, flags=0x%x", params, nparams, cookieout, cookieoutlen, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -4862,7 +4862,7 @@ virDomainMigratePrepare3Params(virConnectPtr dconn, unsigned int flags) { VIR_DEBUG("dconn=%p, params=%p, nparams=%d, cookiein=%p, cookieinlen=%d, " - "cookieout=%p, cookieoutlen=%p, uri_out=%p, flags=%x", + "cookieout=%p, cookieoutlen=%p, uri_out=%p, flags=0x%x", dconn, params, nparams, cookiein, cookieinlen, cookieout, cookieoutlen, uri_out, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -4907,7 +4907,7 @@ virDomainMigratePrepareTunnel3Params(virConnectPtr conn, unsigned int flags) { VIR_DEBUG("conn=%p, stream=%p, params=%p, nparams=%d, cookiein=%p, " - "cookieinlen=%d, cookieout=%p, cookieoutlen=%p, flags=%x", + "cookieinlen=%d, cookieout=%p, cookieoutlen=%p, flags=0x%x", conn, st, params, nparams, cookiein, cookieinlen, cookieout, cookieoutlen, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -4959,7 +4959,7 @@ virDomainMigratePerform3Params(virDomainPtr domain, virConnectPtr conn; VIR_DOMAIN_DEBUG(domain, "dconnuri=%s, params=%p, nparams=%d, cookiein=%p, " - "cookieinlen=%d, cookieout=%p, cookieoutlen=%p, flags=%x", + "cookieinlen=%d, cookieout=%p, cookieoutlen=%p, flags=0x%x", NULLSTR(dconnuri), params, nparams, cookiein, cookieinlen, cookieout, cookieoutlen, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -5005,7 +5005,7 @@ virDomainMigrateFinish3Params(virConnectPtr dconn, int cancelled) { VIR_DEBUG("dconn=%p, params=%p, nparams=%d, cookiein=%p, cookieinlen=%d, " - "cookieout=%p, cookieoutlen=%p, flags=%x, cancelled=%d", + "cookieout=%p, cookieoutlen=%p, flags=0x%x, cancelled=%d", dconn, params, nparams, cookiein, cookieinlen, cookieout, cookieoutlen, flags, cancelled); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -5049,7 +5049,7 @@ virDomainMigrateConfirm3Params(virDomainPtr domain, virConnectPtr conn; VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, cookiein=%p, " - "cookieinlen=%d, flags=%x, cancelled=%d", + "cookieinlen=%d, flags=0x%x, cancelled=%d", params, nparams, cookiein, cookieinlen, flags, cancelled); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -5208,7 +5208,7 @@ virDomainGetSchedulerParametersFlags(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%p, flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%p, flags=0x%x", params, nparams, flags); virResetLastError(); @@ -5323,7 +5323,7 @@ virDomainSetSchedulerParametersFlags(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d, flags=0x%x", params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -5472,7 +5472,7 @@ virDomainBlockStatsFlags(virDomainPtr dom, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(dom, "disk=%s, params=%p, nparams=%d, flags=0x%x", disk, params, nparams ? *nparams : -1, flags); virResetLastError(); @@ -5593,7 +5593,7 @@ virDomainSetInterfaceParameters(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "device=%s, params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "device=%s, params=%p, nparams=%d, flags=0x%x", device, params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -5661,7 +5661,7 @@ virDomainGetInterfaceParameters(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "device=%s, params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "device=%s, params=%p, nparams=%d, flags=0x%x", device, params, (nparams) ? *nparams : -1, flags); virResetLastError(); @@ -5739,7 +5739,7 @@ virDomainMemoryStats(virDomainPtr dom, virDomainMemoryStatPtr stats, virConnectPtr conn; unsigned long nr_stats_ret = 0; - VIR_DOMAIN_DEBUG(dom, "stats=%p, nr_stats=%u, flags=%x", + VIR_DOMAIN_DEBUG(dom, "stats=%p, nr_stats=%u, flags=0x%x", stats, nr_stats, flags); virResetLastError(); @@ -5823,7 +5823,7 @@ virDomainBlockPeek(virDomainPtr dom, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, offset=%lld, size=%zi, buffer=%p, flags=%x", + VIR_DOMAIN_DEBUG(dom, "disk=%s, offset=%lld, size=%zi, buffer=%p, flags=0x%x", disk, offset, size, buffer, flags); virResetLastError(); @@ -5890,7 +5890,7 @@ virDomainBlockResize(virDomainPtr dom, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, size=%llu, flags=%x", disk, size, flags); + VIR_DOMAIN_DEBUG(dom, "disk=%s, size=%llu, flags=0x%x", disk, size, flags); virResetLastError(); @@ -5959,7 +5959,7 @@ virDomainMemoryPeek(virDomainPtr dom, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "start=%lld, size=%zi, buffer=%p, flags=%x", + VIR_DOMAIN_DEBUG(dom, "start=%lld, size=%zi, buffer=%p, flags=0x%x", start, size, buffer, flags); virResetLastError(); @@ -6092,7 +6092,7 @@ virDomainGetBlockInfo(virDomainPtr domain, const char *disk, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "info=%p, flags=%x", info, flags); + VIR_DOMAIN_DEBUG(domain, "info=%p, flags=0x%x", info, flags); virResetLastError(); @@ -6192,7 +6192,7 @@ virDomainDefineXML(virConnectPtr conn, const char *xml) virDomainPtr virDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags) { - VIR_DEBUG("conn=%p, xml=%s flags=%x", conn, NULLSTR(xml), flags); + VIR_DEBUG("conn=%p, xml=%s flags=0x%x", conn, NULLSTR(xml), flags); virResetLastError(); @@ -6295,7 +6295,7 @@ virDomainUndefineFlags(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -6473,7 +6473,7 @@ virConnectListAllDomains(virConnectPtr conn, virDomainPtr **domains, unsigned int flags) { - VIR_DEBUG("conn=%p, domains=%p, flags=%x", conn, domains, flags); + VIR_DEBUG("conn=%p, domains=%p, flags=0x%x", conn, domains, flags); virResetLastError(); @@ -6577,7 +6577,7 @@ virDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -6650,7 +6650,7 @@ virDomainCreateWithFiles(virDomainPtr domain, unsigned int nfiles, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "nfiles=%u, files=%p, flags=%x", + VIR_DOMAIN_DEBUG(domain, "nfiles=%u, files=%p, flags=0x%x", nfiles, files, flags); virResetLastError(); @@ -6774,7 +6774,7 @@ int virDomainInjectNMI(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -6821,7 +6821,7 @@ virDomainSendKey(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "codeset=%u, holdtime=%u, nkeycodes=%u, flags=%x", + VIR_DOMAIN_DEBUG(domain, "codeset=%u, holdtime=%u, nkeycodes=%u, flags=0x%x", codeset, holdtime, nkeycodes, flags); virResetLastError(); @@ -6897,7 +6897,7 @@ virDomainSendProcessSignal(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "pid=%lld, signum=%u flags=%x", + VIR_DOMAIN_DEBUG(domain, "pid=%lld, signum=%u flags=0x%x", pid_value, signum, flags); virResetLastError(); @@ -7024,7 +7024,7 @@ virDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "nvcpus=%u, flags=%x", nvcpus, flags); + VIR_DOMAIN_DEBUG(domain, "nvcpus=%u, flags=0x%x", nvcpus, flags); virResetLastError(); @@ -7092,7 +7092,7 @@ virDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -7216,7 +7216,7 @@ virDomainPinVcpuFlags(virDomainPtr domain, unsigned int vcpu, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "vcpu=%u, cpumap=%p, maplen=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "vcpu=%u, cpumap=%p, maplen=%d, flags=0x%x", vcpu, cpumap, maplen, flags); virResetLastError(); @@ -7274,7 +7274,7 @@ virDomainGetVcpuPinInfo(virDomainPtr domain, int ncpumaps, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "ncpumaps=%d, cpumaps=%p, maplen=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "ncpumaps=%d, cpumaps=%p, maplen=%d, flags=0x%x", ncpumaps, cpumaps, maplen, flags); virResetLastError(); @@ -7351,7 +7351,7 @@ virDomainPinEmulator(virDomainPtr domain, unsigned char *cpumap, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "cpumap=%p, maplen=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "cpumap=%p, maplen=%d, flags=0x%x", cpumap, maplen, flags); virResetLastError(); @@ -7406,7 +7406,7 @@ virDomainGetEmulatorPinInfo(virDomainPtr domain, unsigned char *cpumap, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "cpumap=%p, maplen=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "cpumap=%p, maplen=%d, flags=0x%x", cpumap, maplen, flags); virResetLastError(); @@ -7573,7 +7573,7 @@ virDomainGetIOThreadInfo(virDomainPtr dom, virDomainIOThreadInfoPtr **info, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "info=%p flags=%x", info, flags); + VIR_DOMAIN_DEBUG(dom, "info=%p flags=0x%x", info, flags); virResetLastError(); @@ -7721,7 +7721,7 @@ virDomainAddIOThread(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "iothread_id=%u, flags=%x", + VIR_DOMAIN_DEBUG(domain, "iothread_id=%u, flags=0x%x", iothread_id, flags); virResetLastError(); @@ -7780,7 +7780,7 @@ virDomainDelIOThread(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "iothread_id=%u, flags=%x", iothread_id, flags); + VIR_DOMAIN_DEBUG(domain, "iothread_id=%u, flags=0x%x", iothread_id, flags); virResetLastError(); @@ -7932,7 +7932,7 @@ virDomainSetMetadata(virDomainPtr domain, virConnectPtr conn; VIR_DOMAIN_DEBUG(domain, - "type=%d, metadata='%s', key='%s', uri='%s', flags=%x", + "type=%d, metadata='%s', key='%s', uri='%s', flags=0x%x", type, NULLSTR(metadata), NULLSTR(key), NULLSTR(uri), flags); @@ -8014,7 +8014,7 @@ virDomainGetMetadata(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "type=%d, uri='%s', flags=%x", + VIR_DOMAIN_DEBUG(domain, "type=%d, uri='%s', flags=0x%x", type, NULLSTR(uri), flags); virResetLastError(); @@ -8138,7 +8138,7 @@ virDomainAttachDeviceFlags(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "xml=%s, flags=%x", xml, flags); + VIR_DOMAIN_DEBUG(domain, "xml=%s, flags=0x%x", xml, flags); virResetLastError(); @@ -8264,7 +8264,7 @@ virDomainDetachDeviceFlags(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "xml=%s, flags=%x", xml, flags); + VIR_DOMAIN_DEBUG(domain, "xml=%s, flags=0x%x", xml, flags); virResetLastError(); @@ -8320,7 +8320,7 @@ virDomainUpdateDeviceFlags(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "xml=%s, flags=%x", xml, flags); + VIR_DOMAIN_DEBUG(domain, "xml=%s, flags=0x%x", xml, flags); virResetLastError(); @@ -8665,7 +8665,7 @@ virDomainGetJobStats(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "type=%p, params=%p, nparams=%p, flags=%x", + VIR_DOMAIN_DEBUG(domain, "type=%p, params=%p, nparams=%p, flags=0x%x", type, params, nparams, flags); virResetLastError(); @@ -8754,7 +8754,7 @@ virDomainMigrateSetMaxDowntime(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "downtime=%llu, flags=%x", downtime, flags); + VIR_DOMAIN_DEBUG(domain, "downtime=%llu, flags=0x%x", downtime, flags); virResetLastError(); @@ -8795,7 +8795,7 @@ virDomainMigrateGetMaxDowntime(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "downtime = %p, flags=%x", downtime, flags); + VIR_DOMAIN_DEBUG(domain, "downtime = %p, flags=0x%x", downtime, flags); virResetLastError(); @@ -8835,7 +8835,7 @@ virDomainMigrateGetCompressionCache(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "cacheSize=%p, flags=%x", cacheSize, flags); + VIR_DOMAIN_DEBUG(domain, "cacheSize=%p, flags=0x%x", cacheSize, flags); virResetLastError(); @@ -8879,7 +8879,7 @@ virDomainMigrateSetCompressionCache(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "cacheSize=%llu, flags=%x", cacheSize, flags); + VIR_DOMAIN_DEBUG(domain, "cacheSize=%llu, flags=0x%x", cacheSize, flags); virResetLastError(); @@ -8921,7 +8921,7 @@ virDomainMigrateSetMaxSpeed(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "bandwidth=%lu, flags=%x", bandwidth, flags); + VIR_DOMAIN_DEBUG(domain, "bandwidth=%lu, flags=0x%x", bandwidth, flags); virResetLastError(); @@ -8961,7 +8961,7 @@ virDomainMigrateGetMaxSpeed(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "bandwidth = %p, flags=%x", bandwidth, flags); + VIR_DOMAIN_DEBUG(domain, "bandwidth = %p, flags=0x%x", bandwidth, flags); virResetLastError(); @@ -9228,7 +9228,7 @@ virDomainManagedSave(virDomainPtr dom, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "flags=%x", flags); + VIR_DOMAIN_DEBUG(dom, "flags=0x%x", flags); virResetLastError(); @@ -9275,7 +9275,7 @@ virDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "flags=%x", flags); + VIR_DOMAIN_DEBUG(dom, "flags=0x%x", flags); virResetLastError(); @@ -9313,7 +9313,7 @@ virDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "flags=%x", flags); + VIR_DOMAIN_DEBUG(dom, "flags=0x%x", flags); virResetLastError(); @@ -9360,7 +9360,7 @@ virDomainManagedSaveGetXMLDesc(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -9418,7 +9418,7 @@ virDomainManagedSaveDefineXML(virDomainPtr domain, const char *dxml, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -9484,7 +9484,7 @@ virDomainOpenConsole(virDomainPtr dom, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "dev_name=%s, st=%p, flags=%x", + VIR_DOMAIN_DEBUG(dom, "dev_name=%s, st=%p, flags=0x%x", NULLSTR(dev_name), st, flags); virResetLastError(); @@ -9548,7 +9548,7 @@ virDomainOpenChannel(virDomainPtr dom, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "name=%s, st=%p, flags=%x", + VIR_DOMAIN_DEBUG(dom, "name=%s, st=%p, flags=0x%x", NULLSTR(name), st, flags); virResetLastError(); @@ -9604,7 +9604,7 @@ int virDomainGetPerfEvents(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%p flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%p flags=0x%x", params, nparams, flags); virResetLastError(); @@ -9654,7 +9654,7 @@ int virDomainSetPerfEvents(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%d flags=0x%x", params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -9736,7 +9736,7 @@ virDomainBlockJobAbort(virDomainPtr dom, const char *disk, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, flags=%x", disk, flags); + VIR_DOMAIN_DEBUG(dom, "disk=%s, flags=0x%x", disk, flags); virResetLastError(); @@ -9798,7 +9798,7 @@ virDomainGetBlockJobInfo(virDomainPtr dom, const char *disk, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, info=%p, flags=%x", disk, info, flags); + VIR_DOMAIN_DEBUG(dom, "disk=%s, info=%p, flags=0x%x", disk, info, flags); virResetLastError(); @@ -9861,7 +9861,7 @@ virDomainBlockJobSetSpeed(virDomainPtr dom, const char *disk, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, bandwidth=%lu, flags=%x", + VIR_DOMAIN_DEBUG(dom, "disk=%s, bandwidth=%lu, flags=0x%x", disk, bandwidth, flags); virResetLastError(); @@ -9935,7 +9935,7 @@ virDomainBlockPull(virDomainPtr dom, const char *disk, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, bandwidth=%lu, flags=%x", + VIR_DOMAIN_DEBUG(dom, "disk=%s, bandwidth=%lu, flags=0x%x", disk, bandwidth, flags); virResetLastError(); @@ -10080,7 +10080,7 @@ virDomainBlockRebase(virDomainPtr dom, const char *disk, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, base=%s, bandwidth=%lu, flags=%x", + VIR_DOMAIN_DEBUG(dom, "disk=%s, base=%s, bandwidth=%lu, flags=0x%x", disk, NULLSTR(base), bandwidth, flags); virResetLastError(); @@ -10204,7 +10204,7 @@ virDomainBlockCopy(virDomainPtr dom, const char *disk, virConnectPtr conn; VIR_DOMAIN_DEBUG(dom, - "disk=%s, destxml=%s, params=%p, nparams=%d, flags=%x", + "disk=%s, destxml=%s, params=%p, nparams=%d, flags=0x%x", disk, destxml, params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -10347,7 +10347,7 @@ virDomainBlockCommit(virDomainPtr dom, const char *disk, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, base=%s, top=%s, bandwidth=%lu, flags=%x", + VIR_DOMAIN_DEBUG(dom, "disk=%s, base=%s, top=%s, bandwidth=%lu, flags=0x%x", disk, NULLSTR(base), NULLSTR(top), bandwidth, flags); virResetLastError(); @@ -10406,7 +10406,7 @@ virDomainOpenGraphics(virDomainPtr dom, unsigned int flags) { struct stat sb; - VIR_DOMAIN_DEBUG(dom, "idx=%u, fd=%d, flags=%x", + VIR_DOMAIN_DEBUG(dom, "idx=%u, fd=%d, flags=0x%x", idx, fd, flags); virResetLastError(); @@ -10478,7 +10478,7 @@ virDomainOpenGraphicsFD(virDomainPtr dom, unsigned int idx, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "idx=%u, flags=%x", idx, flags); + VIR_DOMAIN_DEBUG(dom, "idx=%u, flags=0x%x", idx, flags); virResetLastError(); @@ -10538,7 +10538,7 @@ virDomainSetBlockIoTune(virDomainPtr dom, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(dom, "disk=%s, params=%p, nparams=%d, flags=0x%x", disk, params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -10613,7 +10613,7 @@ virDomainGetBlockIoTune(virDomainPtr dom, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(dom, "disk=%s, params=%p, nparams=%d, flags=%x", + VIR_DOMAIN_DEBUG(dom, "disk=%s, params=%p, nparams=%d, flags=0x%x", NULLSTR(disk), params, (nparams) ? *nparams : -1, flags); virResetLastError(); @@ -10740,7 +10740,7 @@ virDomainGetCPUStats(virDomainPtr domain, virConnectPtr conn; VIR_DOMAIN_DEBUG(domain, - "params=%p, nparams=%d, start_cpu=%d, ncpus=%u, flags=%x", + "params=%p, nparams=%d, start_cpu=%d, ncpus=%u, flags=0x%x", params, nparams, start_cpu, ncpus, flags); virResetLastError(); @@ -10831,7 +10831,7 @@ virDomainGetDiskErrors(virDomainPtr dom, unsigned int maxerrors, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "errors=%p, maxerrors=%u, flags=%x", + VIR_DOMAIN_DEBUG(dom, "errors=%p, maxerrors=%u, flags=0x%x", errors, maxerrors, flags); virResetLastError(); @@ -10877,7 +10877,7 @@ virDomainGetHostname(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); @@ -10925,7 +10925,7 @@ virDomainFSTrim(virDomainPtr dom, unsigned long long minimum, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "mountPoint=%s, minimum=%llu, flags=%x", + VIR_DOMAIN_DEBUG(dom, "mountPoint=%s, minimum=%llu, flags=0x%x", mountPoint, minimum, flags); virResetLastError(); @@ -10969,7 +10969,7 @@ virDomainFSFreeze(virDomainPtr dom, unsigned int nmountpoints, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "mountpoints=%p, nmountpoints=%d, flags=%x", + VIR_DOMAIN_DEBUG(dom, "mountpoints=%p, nmountpoints=%d, flags=0x%x", mountpoints, nmountpoints, flags); virResetLastError(); @@ -11015,7 +11015,7 @@ virDomainFSThaw(virDomainPtr dom, unsigned int nmountpoints, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "flags=%x", flags); + VIR_DOMAIN_DEBUG(dom, "flags=0x%x", flags); virResetLastError(); @@ -11063,7 +11063,7 @@ virDomainGetTime(virDomainPtr dom, unsigned int *nseconds, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "seconds=%p, nseconds=%p, flags=%x", + VIR_DOMAIN_DEBUG(dom, "seconds=%p, nseconds=%p, flags=0x%x", seconds, nseconds, flags); virResetLastError(); @@ -11113,7 +11113,7 @@ virDomainSetTime(virDomainPtr dom, unsigned int nseconds, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "seconds=%lld, nseconds=%u, flags=%x", + VIR_DOMAIN_DEBUG(dom, "seconds=%lld, nseconds=%u, flags=0x%x", seconds, nseconds, flags); virResetLastError(); @@ -11159,7 +11159,7 @@ virDomainSetUserPassword(virDomainPtr dom, const char *password, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "user=%s, password=%s, flags=%x", + VIR_DOMAIN_DEBUG(dom, "user=%s, password=%s, flags=0x%x", NULLSTR(user), NULLSTR(password), flags); virResetLastError(); @@ -11212,7 +11212,7 @@ virConnectGetDomainCapabilities(virConnectPtr conn, unsigned int flags) { VIR_DEBUG("conn=%p, emulatorbin=%s, arch=%s, " - "machine=%s, virttype=%s, flags=%x", + "machine=%s, virttype=%s, flags=0x%x", conn, NULLSTR(emulatorbin), NULLSTR(arch), NULLSTR(machine), NULLSTR(virttype), flags); @@ -11643,7 +11643,7 @@ virDomainGetFSInfo(virDomainPtr dom, virDomainFSInfoPtr **info, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "info=%p, flags=%x", info, flags); + VIR_DOMAIN_DEBUG(dom, "info=%p, flags=0x%x", info, flags); virResetLastError(); @@ -11761,7 +11761,7 @@ virDomainInterfaceAddresses(virDomainPtr dom, unsigned int source, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "ifaces=%p, source=%d, flags=%x", ifaces, source, flags); + VIR_DOMAIN_DEBUG(dom, "ifaces=%p, source=%d, flags=0x%x", ifaces, source, flags); virResetLastError(); @@ -11845,7 +11845,7 @@ virDomainGetGuestVcpus(virDomainPtr domain, unsigned int *nparams, unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%p, flags=%x", + VIR_DOMAIN_DEBUG(domain, "params=%p, nparams=%p, flags=0x%x", params, nparams, flags); virResetLastError(); @@ -11903,7 +11903,7 @@ virDomainSetGuestVcpus(virDomainPtr domain, int state, unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, "cpumap='%s' state=%x flags=%x", + VIR_DOMAIN_DEBUG(domain, "cpumap='%s' state=%x flags=0x%x", NULLSTR(cpumap), state, flags); virResetLastError(); @@ -11952,7 +11952,7 @@ virDomainSetVcpu(virDomainPtr domain, int state, unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, "vcpumap='%s' state=%i flags=%x", + VIR_DOMAIN_DEBUG(domain, "vcpumap='%s' state=%i flags=0x%x", NULLSTR(vcpumap), state, flags); virResetLastError(); @@ -12007,7 +12007,7 @@ virDomainSetBlockThreshold(virDomainPtr domain, unsigned long long threshold, unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, "dev='%s' threshold=%llu flags=%x", + VIR_DOMAIN_DEBUG(domain, "dev='%s' threshold=%llu flags=0x%x", NULLSTR(dev), threshold, flags); virResetLastError(); diff --git a/src/libvirt-host.c b/src/libvirt-host.c index 335798abf..0d8a2d1e8 100644 --- a/src/libvirt-host.c +++ b/src/libvirt-host.c @@ -285,7 +285,7 @@ virConnectGetURI(virConnectPtr conn) char * virConnectGetSysinfo(virConnectPtr conn, unsigned int flags) { - VIR_DEBUG("conn=%p, flags=%x", conn, flags); + VIR_DEBUG("conn=%p, flags=0x%x", conn, flags); virResetLastError(); @@ -475,7 +475,7 @@ virNodeGetCPUStats(virConnectPtr conn, virNodeCPUStatsPtr params, int *nparams, unsigned int flags) { - VIR_DEBUG("conn=%p, cpuNum=%d, params=%p, nparams=%d, flags=%x", + VIR_DEBUG("conn=%p, cpuNum=%d, params=%p, nparams=%d, flags=0x%x", conn, cpuNum, params, nparams ? *nparams : -1, flags); virResetLastError(); @@ -562,7 +562,7 @@ virNodeGetMemoryStats(virConnectPtr conn, virNodeMemoryStatsPtr params, int *nparams, unsigned int flags) { - VIR_DEBUG("conn=%p, cellNum=%d, params=%p, nparams=%d, flags=%x", + VIR_DEBUG("conn=%p, cellNum=%d, params=%p, nparams=%d, flags=0x%x", conn, cellNum, params, nparams ? *nparams : -1, flags); virResetLastError(); @@ -655,7 +655,7 @@ virNodeSuspendForDuration(virConnectPtr conn, unsigned long long duration, unsigned int flags) { - VIR_DEBUG("conn=%p, target=%d, duration=%lld, flags=%x", + VIR_DEBUG("conn=%p, target=%d, duration=%lld, flags=0x%x", conn, target, duration, flags); virResetLastError(); @@ -708,7 +708,7 @@ virNodeGetMemoryParameters(virConnectPtr conn, int *nparams, unsigned int flags) { - VIR_DEBUG("conn=%p, params=%p, nparams=%p, flags=%x", + VIR_DEBUG("conn=%p, params=%p, nparams=%p, flags=0x%x", conn, params, nparams, flags); virResetLastError(); @@ -767,7 +767,7 @@ virNodeSetMemoryParameters(virConnectPtr conn, int nparams, unsigned int flags) { - VIR_DEBUG("conn=%p, params=%p, nparams=%d, flags=%x", + VIR_DEBUG("conn=%p, params=%p, nparams=%d, flags=0x%x", conn, params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -968,7 +968,7 @@ virConnectCompareCPU(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, NULLSTR(xmlDesc), flags); + VIR_DEBUG("conn=%p, xmlDesc=%s, flags=0x%x", conn, NULLSTR(xmlDesc), flags); virResetLastError(); @@ -1012,7 +1012,7 @@ int virConnectGetCPUModelNames(virConnectPtr conn, const char *arch, char ***models, unsigned int flags) { - VIR_DEBUG("conn=%p, arch=%s, models=%p, flags=%x", + VIR_DEBUG("conn=%p, arch=%s, models=%p, flags=0x%x", conn, NULLSTR(arch), models, flags); virResetLastError(); @@ -1069,7 +1069,7 @@ virConnectBaselineCPU(virConnectPtr conn, { size_t i; - VIR_DEBUG("conn=%p, xmlCPUs=%p, ncpus=%u, flags=%x", + VIR_DEBUG("conn=%p, xmlCPUs=%p, ncpus=%u, flags=0x%x", conn, xmlCPUs, ncpus, flags); if (xmlCPUs) { for (i = 0; i < ncpus; i++) @@ -1294,7 +1294,7 @@ virNodeGetCPUMap(virConnectPtr conn, unsigned int *online, unsigned int flags) { - VIR_DEBUG("conn=%p, cpumap=%p, online=%p, flags=%x", + VIR_DEBUG("conn=%p, cpumap=%p, online=%p, flags=0x%x", conn, cpumap, online, flags); virResetLastError(); @@ -1384,7 +1384,7 @@ virNodeGetFreePages(virConnectPtr conn, unsigned int flags) { VIR_DEBUG("conn=%p, npages=%u, pages=%p, startCell=%u, " - "cellCount=%u, counts=%p, flags=%x", + "cellCount=%u, counts=%p, flags=0x%x", conn, npages, pages, startCell, cellCount, counts, flags); virResetLastError(); diff --git a/src/libvirt-interface.c b/src/libvirt-interface.c index 7c8996c58..bb79101ab 100644 --- a/src/libvirt-interface.c +++ b/src/libvirt-interface.c @@ -82,7 +82,7 @@ virConnectListAllInterfaces(virConnectPtr conn, virInterfacePtr **ifaces, unsigned int flags) { - VIR_DEBUG("conn=%p, ifaces=%p, flags=%x", conn, ifaces, flags); + VIR_DEBUG("conn=%p, ifaces=%p, flags=0x%x", conn, ifaces, flags); virResetLastError(); @@ -410,7 +410,7 @@ char * virInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("iface=%p, flags=%x", iface, flags); + VIR_DEBUG("iface=%p, flags=0x%x", iface, flags); virResetLastError(); @@ -460,7 +460,7 @@ virInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) virInterfacePtr virInterfaceDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) { - VIR_DEBUG("conn=%p, xml=%s, flags=%x", conn, NULLSTR(xml), flags); + VIR_DEBUG("conn=%p, xml=%s, flags=0x%x", conn, NULLSTR(xml), flags); virResetLastError(); @@ -550,7 +550,7 @@ int virInterfaceCreate(virInterfacePtr iface, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("iface=%p, flags=%x", iface, flags); + VIR_DEBUG("iface=%p, flags=0x%x", iface, flags); virResetLastError(); @@ -597,7 +597,7 @@ int virInterfaceDestroy(virInterfacePtr iface, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("iface=%p, flags=%x", iface, flags); + VIR_DEBUG("iface=%p, flags=0x%x", iface, flags); virResetLastError(); @@ -696,7 +696,7 @@ virInterfaceFree(virInterfacePtr iface) int virInterfaceChangeBegin(virConnectPtr conn, unsigned int flags) { - VIR_DEBUG("conn=%p, flags=%x", conn, flags); + VIR_DEBUG("conn=%p, flags=0x%x", conn, flags); virResetLastError(); @@ -736,7 +736,7 @@ virInterfaceChangeBegin(virConnectPtr conn, unsigned int flags) int virInterfaceChangeCommit(virConnectPtr conn, unsigned int flags) { - VIR_DEBUG("conn=%p, flags=%x", conn, flags); + VIR_DEBUG("conn=%p, flags=0x%x", conn, flags); virResetLastError(); @@ -776,7 +776,7 @@ virInterfaceChangeCommit(virConnectPtr conn, unsigned int flags) int virInterfaceChangeRollback(virConnectPtr conn, unsigned int flags) { - VIR_DEBUG("conn=%p, flags=%x", conn, flags); + VIR_DEBUG("conn=%p, flags=0x%x", conn, flags); virResetLastError(); diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c index c487eceba..c9f214648 100644 --- a/src/libvirt-lxc.c +++ b/src/libvirt-lxc.c @@ -68,7 +68,7 @@ virDomainLxcOpenNamespace(virDomainPtr domain, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "fdlist=%p flags=%x", fdlist, flags); + VIR_DOMAIN_DEBUG(domain, "fdlist=%p flags=0x%x", fdlist, flags); virResetLastError(); @@ -128,7 +128,7 @@ virDomainLxcEnterNamespace(virDomainPtr domain, size_t i; VIR_DOMAIN_DEBUG(domain, "nfdlist=%d, fdlist=%p, " - "noldfdlist=%p, oldfdlist=%p, flags=%x", + "noldfdlist=%p, oldfdlist=%p, flags=0x%x", nfdlist, fdlist, noldfdlist, oldfdlist, flags); virResetLastError(); @@ -190,7 +190,7 @@ virDomainLxcEnterSecurityLabel(virSecurityModelPtr model, virSecurityLabelPtr oldlabel, unsigned int flags) { - VIR_DEBUG("model=%p, label=%p, oldlabel=%p, flags=%x", + VIR_DEBUG("model=%p, label=%p, oldlabel=%p, flags=0x%x", model, label, oldlabel, flags); virResetLastError(); @@ -293,7 +293,7 @@ int virDomainLxcEnterCGroup(virDomainPtr domain, virConnectPtr conn; virCgroupPtr cgroup = NULL; - VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=0x%x", flags); virResetLastError(); diff --git a/src/libvirt-network.c b/src/libvirt-network.c index 5c5a0ee22..da3354300 100644 --- a/src/libvirt-network.c +++ b/src/libvirt-network.c @@ -91,7 +91,7 @@ virConnectListAllNetworks(virConnectPtr conn, virNetworkPtr **nets, unsigned int flags) { - VIR_DEBUG("conn=%p, nets=%p, flags=%x", conn, nets, flags); + VIR_DEBUG("conn=%p, nets=%p, flags=0x%x", conn, nets, flags); virResetLastError(); @@ -790,7 +790,7 @@ char * virNetworkGetXMLDesc(virNetworkPtr network, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("network=%p, flags=%x", network, flags); + VIR_DEBUG("network=%p, flags=0x%x", network, flags); virResetLastError(); @@ -1199,7 +1199,7 @@ virNetworkGetDHCPLeases(virNetworkPtr network, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("network=%p, mac='%s' leases=%p, flags=%x", + VIR_DEBUG("network=%p, mac='%s' leases=%p, flags=0x%x", network, NULLSTR(mac), leases, flags); virResetLastError(); diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c index f85c16bbc..493b21f56 100644 --- a/src/libvirt-nodedev.c +++ b/src/libvirt-nodedev.c @@ -44,7 +44,7 @@ VIR_LOG_INIT("libvirt.nodedev"); int virNodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int flags) { - VIR_DEBUG("conn=%p, cap=%s, flags=%x", conn, NULLSTR(cap), flags); + VIR_DEBUG("conn=%p, cap=%s, flags=0x%x", conn, NULLSTR(cap), flags); virResetLastError(); @@ -114,7 +114,7 @@ virConnectListAllNodeDevices(virConnectPtr conn, virNodeDevicePtr **devices, unsigned int flags) { - VIR_DEBUG("conn=%p, devices=%p, flags=%x", conn, devices, flags); + VIR_DEBUG("conn=%p, devices=%p, flags=0x%x", conn, devices, flags); virResetLastError(); @@ -163,7 +163,7 @@ virNodeListDevices(virConnectPtr conn, char **const names, int maxnames, unsigned int flags) { - VIR_DEBUG("conn=%p, cap=%s, names=%p, maxnames=%d, flags=%x", + VIR_DEBUG("conn=%p, cap=%s, names=%p, maxnames=%d, flags=0x%x", conn, NULLSTR(cap), names, maxnames, flags); virResetLastError(); @@ -246,7 +246,7 @@ virNodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, const char *wwpn, unsigned int flags) { - VIR_DEBUG("conn=%p, wwnn=%s, wwpn=%s, flags=%x", conn, NULLSTR(wwnn), NULLSTR(wwpn), flags); + VIR_DEBUG("conn=%p, wwnn=%s, wwpn=%s, flags=0x%x", conn, NULLSTR(wwnn), NULLSTR(wwpn), flags); virResetLastError(); @@ -285,7 +285,7 @@ virNodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, char * virNodeDeviceGetXMLDesc(virNodeDevicePtr dev, unsigned int flags) { - VIR_DEBUG("dev=%p, conn=%p, flags=%x", dev, dev ? dev->conn : NULL, flags); + VIR_DEBUG("dev=%p, conn=%p, flags=0x%x", dev, dev ? dev->conn : NULL, flags); virResetLastError(); @@ -570,7 +570,7 @@ virNodeDeviceDetachFlags(virNodeDevicePtr dev, const char *driverName, unsigned int flags) { - VIR_DEBUG("dev=%p, conn=%p driverName=%s flags=%x", + VIR_DEBUG("dev=%p, conn=%p driverName=%s flags=0x%x", dev, dev ? dev->conn : NULL, driverName ? driverName : "(default)", flags); @@ -698,7 +698,7 @@ virNodeDeviceCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, NULLSTR(xmlDesc), flags); + VIR_DEBUG("conn=%p, xmlDesc=%s, flags=0x%x", conn, NULLSTR(xmlDesc), flags); virResetLastError(); diff --git a/src/libvirt-nwfilter.c b/src/libvirt-nwfilter.c index 30c7c1040..43e2b164e 100644 --- a/src/libvirt-nwfilter.c +++ b/src/libvirt-nwfilter.c @@ -83,7 +83,7 @@ virConnectListAllNWFilters(virConnectPtr conn, virNWFilterPtr **filters, unsigned int flags) { - VIR_DEBUG("conn=%p, filters=%p, flags=%x", conn, filters, flags); + VIR_DEBUG("conn=%p, filters=%p, flags=0x%x", conn, filters, flags); virResetLastError(); @@ -460,7 +460,7 @@ char * virNWFilterGetXMLDesc(virNWFilterPtr nwfilter, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("nwfilter=%p, flags=%x", nwfilter, flags); + VIR_DEBUG("nwfilter=%p, flags=0x%x", nwfilter, flags); virResetLastError(); diff --git a/src/libvirt-qemu.c b/src/libvirt-qemu.c index fed08fc38..43f63839e 100644 --- a/src/libvirt-qemu.c +++ b/src/libvirt-qemu.c @@ -70,7 +70,7 @@ virDomainQemuMonitorCommand(virDomainPtr domain, const char *cmd, { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "cmd=%s, result=%p, flags=%x", + VIR_DOMAIN_DEBUG(domain, "cmd=%s, result=%p, flags=0x%x", cmd, result, flags); virResetLastError(); @@ -134,7 +134,7 @@ virDomainQemuAttach(virConnectPtr conn, unsigned int flags) { pid_t pid = pid_value; - VIR_DEBUG("conn=%p, pid=%u, flags=%x", conn, pid_value, flags); + VIR_DEBUG("conn=%p, pid=%u, flags=0x%x", conn, pid_value, flags); virResetLastError(); @@ -193,7 +193,7 @@ virDomainQemuAgentCommand(virDomainPtr domain, virConnectPtr conn; char *ret; - VIR_DOMAIN_DEBUG(domain, "cmd=%s, timeout=%d, flags=%x", + VIR_DOMAIN_DEBUG(domain, "cmd=%s, timeout=%d, flags=0x%x", cmd, timeout, flags); virResetLastError(); @@ -272,7 +272,7 @@ virConnectDomainQemuMonitorEventRegister(virConnectPtr conn, unsigned int flags) { VIR_DOMAIN_DEBUG(dom, - "conn=%p, event=%s, cb=%p, opaque=%p, freecb=%p, flags=%x", + "conn=%p, event=%s, cb=%p, opaque=%p, freecb=%p, flags=0x%x", conn, NULLSTR(event), cb, opaque, freecb, flags); virResetLastError(); diff --git a/src/libvirt-secret.c b/src/libvirt-secret.c index d9244c252..447d93f33 100644 --- a/src/libvirt-secret.c +++ b/src/libvirt-secret.c @@ -122,7 +122,7 @@ virConnectListAllSecrets(virConnectPtr conn, virSecretPtr **secrets, unsigned int flags) { - VIR_DEBUG("conn=%p, secrets=%p, flags=%x", conn, secrets, flags); + VIR_DEBUG("conn=%p, secrets=%p, flags=0x%x", conn, secrets, flags); virResetLastError(); @@ -333,7 +333,7 @@ virSecretLookupByUsage(virConnectPtr conn, virSecretPtr virSecretDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) { - VIR_DEBUG("conn=%p, xml=%s, flags=%x", conn, NULLSTR(xml), flags); + VIR_DEBUG("conn=%p, xml=%s, flags=0x%x", conn, NULLSTR(xml), flags); virResetLastError(); @@ -487,7 +487,7 @@ virSecretGetXMLDesc(virSecretPtr secret, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("secret=%p, flags=%x", secret, flags); + VIR_DEBUG("secret=%p, flags=0x%x", secret, flags); virResetLastError(); @@ -528,7 +528,7 @@ virSecretSetValue(virSecretPtr secret, const unsigned char *value, { virConnectPtr conn; - VIR_DEBUG("secret=%p, value=%p, value_size=%zu, flags=%x", secret, value, + VIR_DEBUG("secret=%p, value=%p, value_size=%zu, flags=0x%x", secret, value, value_size, flags); virResetLastError(); @@ -572,7 +572,7 @@ virSecretGetValue(virSecretPtr secret, size_t *value_size, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("secret=%p, value_size=%p, flags=%x", secret, value_size, flags); + VIR_DEBUG("secret=%p, value_size=%p, flags=0x%x", secret, value_size, flags); virResetLastError(); diff --git a/src/libvirt-storage.c b/src/libvirt-storage.c index 2cefc3c91..9ab0fe28e 100644 --- a/src/libvirt-storage.c +++ b/src/libvirt-storage.c @@ -106,7 +106,7 @@ virConnectListAllStoragePools(virConnectPtr conn, virStoragePoolPtr **pools, unsigned int flags) { - VIR_DEBUG("conn=%p, pools=%p, flags=%x", conn, pools, flags); + VIR_DEBUG("conn=%p, pools=%p, flags=0x%x", conn, pools, flags); virResetLastError(); @@ -319,7 +319,7 @@ virConnectFindStoragePoolSources(virConnectPtr conn, const char *srcSpec, unsigned int flags) { - VIR_DEBUG("conn=%p, type=%s, src=%s, flags=%x", + VIR_DEBUG("conn=%p, type=%s, src=%s, flags=0x%x", conn, NULLSTR(type), NULLSTR(srcSpec), flags); virResetLastError(); @@ -517,7 +517,7 @@ virStoragePoolCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, NULLSTR(xmlDesc), flags); + VIR_DEBUG("conn=%p, xmlDesc=%s, flags=0x%x", conn, NULLSTR(xmlDesc), flags); virResetLastError(); @@ -560,7 +560,7 @@ virStoragePoolDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) { - VIR_DEBUG("conn=%p, xml=%s, flags=%x", conn, NULLSTR(xml), flags); + VIR_DEBUG("conn=%p, xml=%s, flags=0x%x", conn, NULLSTR(xml), flags); virResetLastError(); @@ -601,7 +601,7 @@ virStoragePoolBuild(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("pool=%p, flags=%x", pool, flags); + VIR_DEBUG("pool=%p, flags=0x%x", pool, flags); virResetLastError(); @@ -677,7 +677,7 @@ virStoragePoolCreate(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("pool=%p, flags=%x", pool, flags); + VIR_DEBUG("pool=%p, flags=0x%x", pool, flags); virResetLastError(); @@ -759,7 +759,7 @@ virStoragePoolDelete(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("pool=%p, flags=%x", pool, flags); + VIR_DEBUG("pool=%p, flags=0x%x", pool, flags); virResetLastError(); @@ -855,7 +855,7 @@ virStoragePoolRefresh(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("pool=%p, flags=%x", pool, flags); + VIR_DEBUG("pool=%p, flags=0x%x", pool, flags); virResetLastError(); @@ -1019,7 +1019,7 @@ virStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("pool=%p, flags=%x", pool, flags); + VIR_DEBUG("pool=%p, flags=0x%x", pool, flags); virResetLastError(); @@ -1144,7 +1144,7 @@ virStoragePoolListAllVolumes(virStoragePoolPtr pool, virStorageVolPtr **vols, unsigned int flags) { - VIR_DEBUG("pool=%p, vols=%p, flags=%x", pool, vols, flags); + VIR_DEBUG("pool=%p, vols=%p, flags=0x%x", pool, vols, flags); virResetLastError(); @@ -1455,7 +1455,7 @@ virStorageVolCreateXML(virStoragePoolPtr pool, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("pool=%p, xmlDesc=%s, flags=%x", pool, NULLSTR(xmlDesc), flags); + VIR_DEBUG("pool=%p, xmlDesc=%s, flags=0x%x", pool, NULLSTR(xmlDesc), flags); virResetLastError(); @@ -1507,7 +1507,7 @@ virStorageVolCreateXMLFrom(virStoragePoolPtr pool, virStorageVolPtr clonevol, unsigned int flags) { - VIR_DEBUG("pool=%p, xmlDesc=%s, clonevol=%p, flags=%x", + VIR_DEBUG("pool=%p, xmlDesc=%s, clonevol=%p, flags=0x%x", pool, NULLSTR(xmlDesc), clonevol, flags); virResetLastError(); @@ -1569,7 +1569,7 @@ virStorageVolDownload(virStorageVolPtr vol, unsigned long long length, unsigned int flags) { - VIR_DEBUG("vol=%p, stream=%p, offset=%llu, length=%llu, flags=%x", + VIR_DEBUG("vol=%p, stream=%p, offset=%llu, length=%llu, flags=0x%x", vol, stream, offset, length, flags); virResetLastError(); @@ -1648,7 +1648,7 @@ virStorageVolUpload(virStorageVolPtr vol, unsigned long long length, unsigned int flags) { - VIR_DEBUG("vol=%p, stream=%p, offset=%llu, length=%llu, flags=%x", + VIR_DEBUG("vol=%p, stream=%p, offset=%llu, length=%llu, flags=0x%x", vol, stream, offset, length, flags); virResetLastError(); @@ -1699,7 +1699,7 @@ virStorageVolDelete(virStorageVolPtr vol, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("vol=%p, flags=%x", vol, flags); + VIR_DEBUG("vol=%p, flags=0x%x", vol, flags); virResetLastError(); @@ -1748,7 +1748,7 @@ virStorageVolWipe(virStorageVolPtr vol, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("vol=%p, flags=%x", vol, flags); + VIR_DEBUG("vol=%p, flags=0x%x", vol, flags); virResetLastError(); @@ -1795,7 +1795,7 @@ virStorageVolWipePattern(virStorageVolPtr vol, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("vol=%p, algorithm=%u, flags=%x", vol, algorithm, flags); + VIR_DEBUG("vol=%p, algorithm=%u, flags=0x%x", vol, algorithm, flags); virResetLastError(); @@ -1940,7 +1940,7 @@ virStorageVolGetInfoFlags(virStorageVolPtr vol, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("vol=%p, info=%p, flags=%x", vol, info, flags); + VIR_DEBUG("vol=%p, info=%p, flags=0x%x", vol, info, flags); virResetLastError(); @@ -1983,7 +1983,7 @@ virStorageVolGetXMLDesc(virStorageVolPtr vol, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("vol=%p, flags=%x", vol, flags); + VIR_DEBUG("vol=%p, flags=0x%x", vol, flags); virResetLastError(); @@ -2086,7 +2086,7 @@ virStorageVolResize(virStorageVolPtr vol, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("vol=%p capacity=%llu flags=%x", vol, capacity, flags); + VIR_DEBUG("vol=%p capacity=%llu flags=0x%x", vol, capacity, flags); virResetLastError(); diff --git a/src/libvirt-stream.c b/src/libvirt-stream.c index 83f2d201a..3204b7b17 100644 --- a/src/libvirt-stream.c +++ b/src/libvirt-stream.c @@ -55,7 +55,7 @@ virStreamNew(virConnectPtr conn, { virStreamPtr st; - VIR_DEBUG("conn=%p, flags=%x", conn, flags); + VIR_DEBUG("conn=%p, flags=0x%x", conn, flags); virResetLastError(); @@ -349,7 +349,7 @@ virStreamRecvFlags(virStreamPtr stream, size_t nbytes, unsigned int flags) { - VIR_DEBUG("stream=%p, data=%p, nbytes=%zu flags=%x", + VIR_DEBUG("stream=%p, data=%p, nbytes=%zu flags=0x%x", stream, data, nbytes, flags); virResetLastError(); @@ -415,7 +415,7 @@ virStreamSendHole(virStreamPtr stream, long long length, unsigned int flags) { - VIR_DEBUG("stream=%p, length=%lld flags=%x", + VIR_DEBUG("stream=%p, length=%lld flags=0x%x", stream, length, flags); virResetLastError(); @@ -458,7 +458,7 @@ virStreamRecvHole(virStreamPtr stream, long long *length, unsigned int flags) { - VIR_DEBUG("stream=%p, length=%p flags=%x", + VIR_DEBUG("stream=%p, length=%p flags=0x%x", stream, length, flags); virResetLastError(); diff --git a/src/libvirt.c b/src/libvirt.c index 52462e3ab..6d66fa43e 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1242,7 +1242,7 @@ virConnectOpenAuth(const char *name, if (virInitialize() < 0) goto error; - VIR_DEBUG("name=%s, auth=%p, flags=%x", NULLSTR(name), auth, flags); + VIR_DEBUG("name=%s, auth=%p, flags=0x%x", NULLSTR(name), auth, flags); virResetLastError(); ret = virConnectOpenInternal(name, auth, flags); if (!ret) diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index 41e7bcb7c..c3fc18a8a 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -328,7 +328,7 @@ static int virLockManagerLockDaemonInit(unsigned int version, const char *configFile, unsigned int flags) { - VIR_DEBUG("version=%u configFile=%s flags=%x", version, NULLSTR(configFile), flags); + VIR_DEBUG("version=%u configFile=%s flags=0x%x", version, NULLSTR(configFile), flags); virCheckFlags(0, -1); diff --git a/src/locking/lock_driver_nop.c b/src/locking/lock_driver_nop.c index 93a988ef7..b5eb2952e 100644 --- a/src/locking/lock_driver_nop.c +++ b/src/locking/lock_driver_nop.c @@ -33,7 +33,7 @@ static int virLockManagerNopInit(unsigned int version ATTRIBUTE_UNUSED, const char *configFile ATTRIBUTE_UNUSED, unsigned int flags_unused ATTRIBUTE_UNUSED) { - VIR_DEBUG("version=%u configFile=%s flags=%x", + VIR_DEBUG("version=%u configFile=%s flags=0x%x", version, NULLSTR(configFile), flags_unused); return 0; diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 7513df4d7..345cf0a77 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -427,7 +427,7 @@ static int virLockManagerSanlockInit(unsigned int version, { virLockManagerSanlockDriverPtr driver; - VIR_DEBUG("version=%u configFile=%s flags=%x", + VIR_DEBUG("version=%u configFile=%s flags=0x%x", version, NULLSTR(configFile), flags); virCheckFlags(0, -1); diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index a002ea836..6efaea9cd 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -129,7 +129,7 @@ virLockManagerPluginPtr virLockManagerPluginNew(const char *name, char *modfile = NULL; char *configFile = NULL; - VIR_DEBUG("name=%s driverName=%s configDir=%s flags=%x", + VIR_DEBUG("name=%s driverName=%s configDir=%s flags=0x%x", name, driverName, configDir, flags); if (virAsprintf(&configFile, "%s/%s-%s.conf", @@ -301,7 +301,7 @@ virLockManagerPtr virLockManagerNew(virLockDriverPtr driver, unsigned int flags) { virLockManagerPtr lock; - VIR_DEBUG("driver=%p type=%u nparams=%zu params=%p flags=%x", + VIR_DEBUG("driver=%p type=%u nparams=%zu params=%p flags=0x%x", driver, type, nparams, params, flags); virLockManagerLogParams(nparams, params); @@ -328,7 +328,7 @@ int virLockManagerAddResource(virLockManagerPtr lock, virLockManagerParamPtr params, unsigned int flags) { - VIR_DEBUG("lock=%p type=%u name=%s nparams=%zu params=%p flags=%x", + VIR_DEBUG("lock=%p type=%u name=%s nparams=%zu params=%p flags=0x%x", lock, type, name, nparams, params, flags); virLockManagerLogParams(nparams, params); @@ -346,7 +346,7 @@ int virLockManagerAcquire(virLockManagerPtr lock, virDomainLockFailureAction action, int *fd) { - VIR_DEBUG("lock=%p state='%s' flags=%x action=%d fd=%p", + VIR_DEBUG("lock=%p state='%s' flags=0x%x action=%d fd=%p", lock, NULLSTR(state), flags, action, fd); CHECK_MANAGER(drvAcquire, -1); @@ -362,7 +362,7 @@ int virLockManagerRelease(virLockManagerPtr lock, char **state, unsigned int flags) { - VIR_DEBUG("lock=%p state=%p flags=%x", lock, state, flags); + VIR_DEBUG("lock=%p state=%p flags=0x%x", lock, state, flags); CHECK_MANAGER(drvRelease, -1); @@ -374,7 +374,7 @@ int virLockManagerInquire(virLockManagerPtr lock, char **state, unsigned int flags) { - VIR_DEBUG("lock=%p state=%p flags=%x", lock, state, flags); + VIR_DEBUG("lock=%p state=%p flags=0x%x", lock, state, flags); CHECK_MANAGER(drvInquire, -1); diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 6309abe4b..ec6d6a86b 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -983,11 +983,11 @@ static int lxcContainerMountBasicFS(bool userns_enabled, */ bindOverReadonly = !!(mnt_mflags & MS_RDONLY); - VIR_DEBUG("Mount %s on %s type=%s flags=%x", + VIR_DEBUG("Mount %s on %s type=%s flags=0x%x", mnt_src, mnt->dst, mnt->type, mnt_mflags & ~MS_RDONLY); if (mount(mnt_src, mnt->dst, mnt->type, mnt_mflags & ~MS_RDONLY, NULL) < 0) { virReportSystemError(errno, - _("Failed to mount %s on %s type %s flags=%x"), + _("Failed to mount %s on %s type %s flags=0x%x"), mnt_src, mnt->dst, NULLSTR(mnt->type), mnt_mflags & ~MS_RDONLY); goto cleanup; @@ -997,7 +997,7 @@ static int lxcContainerMountBasicFS(bool userns_enabled, mount(mnt_src, mnt->dst, NULL, MS_BIND|MS_REMOUNT|mnt_mflags|MS_RDONLY, NULL) < 0) { virReportSystemError(errno, - _("Failed to re-mount %s on %s flags=%x"), + _("Failed to re-mount %s on %s flags=0x%x"), mnt_src, mnt->dst, MS_BIND|MS_REMOUNT|MS_RDONLY); goto cleanup; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 1b9d21521..c5e67df93 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -2143,7 +2143,7 @@ virLXCControllerSetupDevPTS(virLXCControllerPtr ctrl) ptsgid, (mount_options ? mount_options : "")) < 0) goto cleanup; - VIR_DEBUG("Mount devpts on %s type=tmpfs flags=%x, opts=%s", + VIR_DEBUG("Mount devpts on %s type=tmpfs flags=0x%x, opts=%s", devpts, MS_NOSUID, opts); if (mount("devpts", devpts, "devpts", MS_NOSUID, opts) < 0) { virReportSystemError(errno, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b9f761d53..4855c9047 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10938,7 +10938,7 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, int nstats; int ret = -1; - VIR_DEBUG("params=%p, flags=%x", params, flags); + VIR_DEBUG("params=%p, flags=0x%x", params, flags); virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 492815b60..32904b7b9 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1917,7 +1917,7 @@ qemuMigrationBeginPhase(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, vm=%p, xmlin=%s, dname=%s," " cookieout=%p, cookieoutlen=%p," - " nmigrate_disks=%zu, migrate_disks=%p, flags=%lx", + " nmigrate_disks=%zu, migrate_disks=%p, flags=0x%lx", driver, vm, NULLSTR(xmlin), NULLSTR(dname), cookieout, cookieoutlen, nmigrate_disks, migrate_disks, flags); @@ -2887,7 +2887,7 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, st=%p, def=%p, " - "origname=%s, flags=%lx", + "origname=%s, flags=0x%lx", driver, dconn, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, st, *def, origname, flags); @@ -2961,7 +2961,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, uri_in=%s, uri_out=%p, " "def=%p, origname=%s, listenAddress=%s, " - "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, flags=%lx", + "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, flags=0x%lx", driver, dconn, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, NULLSTR(uri_in), uri_out, *def, origname, NULLSTR(listenAddress), @@ -3144,7 +3144,7 @@ qemuMigrationConfirmPhase(virQEMUDriverPtr driver, qemuDomainJobInfoPtr jobInfo = NULL; VIR_DEBUG("driver=%p, conn=%p, vm=%p, cookiein=%s, cookieinlen=%d, " - "flags=%x, retcode=%d", + "flags=0x%x, retcode=%d", driver, conn, vm, NULLSTR(cookiein), cookieinlen, flags, retcode); @@ -3601,7 +3601,7 @@ qemuMigrationRun(virQEMUDriverPtr driver, int rc; VIR_DEBUG("driver=%p, vm=%p, cookiein=%s, cookieinlen=%d, " - "cookieout=%p, cookieoutlen=%p, flags=%lx, resource=%lu, " + "cookieout=%p, cookieoutlen=%p, flags=0x%lx, resource=%lu, " "spec=%p (dest=%d, fwd=%d), dconn=%p, graphicsuri=%s, " "nmigrate_disks=%zu, migrate_disks=%p", driver, vm, NULLSTR(cookiein), cookieinlen, @@ -3955,7 +3955,7 @@ static int doNativeMigrate(virQEMUDriverPtr driver, qemuMigrationSpec spec; VIR_DEBUG("driver=%p, vm=%p, uri=%s, cookiein=%s, cookieinlen=%d, " - "cookieout=%p, cookieoutlen=%p, flags=%lx, resource=%lu, " + "cookieout=%p, cookieoutlen=%p, flags=0x%lx, resource=%lu, " "graphicsuri=%s, nmigrate_disks=%zu migrate_disks=%p", driver, vm, uri, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, resource, @@ -4033,7 +4033,7 @@ static int doTunnelMigrate(virQEMUDriverPtr driver, int fds[2] = { -1, -1 }; VIR_DEBUG("driver=%p, vm=%p, st=%p, cookiein=%s, cookieinlen=%d, " - "cookieout=%p, cookieoutlen=%p, flags=%lx, resource=%lu, " + "cookieout=%p, cookieoutlen=%p, flags=0x%lx, resource=%lu, " "graphicsuri=%s, nmigrate_disks=%zu, migrate_disks=%p", driver, vm, st, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, resource, @@ -4099,7 +4099,7 @@ static int doPeer2PeerMigrate2(virQEMUDriverPtr driver, qemuMonitorMigrationParams migParams = { 0 }; VIR_DEBUG("driver=%p, sconn=%p, dconn=%p, vm=%p, dconnuri=%s, " - "flags=%lx, dname=%s, resource=%lu", + "flags=0x%lx, dname=%s, resource=%lu", driver, sconn, dconn, vm, NULLSTR(dconnuri), flags, NULLSTR(dname), resource); @@ -4273,7 +4273,7 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, sconn=%p, dconn=%p, dconnuri=%s, vm=%p, xmlin=%s, " "dname=%s, uri=%s, graphicsuri=%s, listenAddress=%s, " "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, " - "bandwidth=%llu, useParams=%d, flags=%lx", + "bandwidth=%llu, useParams=%d, flags=0x%lx", driver, sconn, dconn, NULLSTR(dconnuri), vm, NULLSTR(xmlin), NULLSTR(dname), NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress), nmigrate_disks, migrate_disks, nbdPort, @@ -4622,7 +4622,7 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, sconn=%p, vm=%p, xmlin=%s, dconnuri=%s, uri=%s, " "graphicsuri=%s, listenAddress=%s, nmigrate_disks=%zu, " - "migrate_disks=%p, nbdPort=%d, flags=%lx, dname=%s, " + "migrate_disks=%p, nbdPort=%d, flags=0x%lx, dname=%s, " "resource=%lu", driver, sconn, vm, NULLSTR(xmlin), NULLSTR(dconnuri), NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress), @@ -4972,7 +4972,7 @@ qemuMigrationPerform(virQEMUDriverPtr driver, "uri=%s, graphicsuri=%s, listenAddress=%s, " "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, " "cookiein=%s, cookieinlen=%d, cookieout=%p, cookieoutlen=%p, " - "flags=%lx, dname=%s, resource=%lu, v3proto=%d", + "flags=0x%lx, dname=%s, resource=%lu, v3proto=%d", driver, conn, vm, NULLSTR(xmlin), NULLSTR(dconnuri), NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress), nmigrate_disks, migrate_disks, nbdPort, @@ -5150,7 +5150,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver, bool doKill = true; VIR_DEBUG("driver=%p, dconn=%p, vm=%p, cookiein=%s, cookieinlen=%d, " - "cookieout=%p, cookieoutlen=%p, flags=%lx, retcode=%d", + "cookieout=%p, cookieoutlen=%p, flags=0x%lx, retcode=%d", driver, dconn, vm, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, retcode); diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 69f14d028..363ad76cf 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2649,7 +2649,7 @@ qemuMonitorMigrateToFd(qemuMonitorPtr mon, int fd) { int ret; - VIR_DEBUG("fd=%d flags=%x", fd, flags); + VIR_DEBUG("fd=%d flags=0x%x", fd, flags); QEMU_CHECK_MONITOR(mon); @@ -2679,7 +2679,7 @@ qemuMonitorMigrateToHost(qemuMonitorPtr mon, { int ret; char *uri = NULL; - VIR_DEBUG("hostname=%s port=%d flags=%x", hostname, port, flags); + VIR_DEBUG("hostname=%s port=%d flags=0x%x", hostname, port, flags); QEMU_CHECK_MONITOR(mon); @@ -2708,7 +2708,7 @@ qemuMonitorMigrateToCommand(qemuMonitorPtr mon, char *argstr; char *dest = NULL; int ret = -1; - VIR_DEBUG("argv=%p flags=%x", argv, flags); + VIR_DEBUG("argv=%p flags=0x%x", argv, flags); QEMU_CHECK_MONITOR(mon); @@ -3330,7 +3330,7 @@ qemuMonitorDriveMirror(qemuMonitorPtr mon, unsigned int flags) { VIR_DEBUG("device=%s, file=%s, format=%s, bandwidth=%lld, " - "granularity=%#x, buf_size=%lld, flags=%x", + "granularity=%#x, buf_size=%lld, flags=0x%x", device, file, NULLSTR(format), bandwidth, granularity, buf_size, flags); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e6cc41e13..c104985aa 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6028,7 +6028,7 @@ qemuProcessKill(virDomainObjPtr vm, unsigned int flags) { int ret; - VIR_DEBUG("vm=%p name=%s pid=%lld flags=%x", + VIR_DEBUG("vm=%p name=%s pid=%lld flags=0x%x", vm, vm->def->name, (long long) vm->pid, flags); @@ -6109,7 +6109,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); VIR_DEBUG("Shutting down vm=%p name=%s id=%d pid=%lld, " - "reason=%s, asyncJob=%s, flags=%x", + "reason=%s, asyncJob=%s, flags=0x%x", vm, vm->def->name, vm->def->id, (long long) vm->pid, virDomainShutoffReasonTypeToString(reason), diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 7f814cd4f..00e8086d5 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5646,7 +5646,7 @@ remoteStreamRecvFlags(virStreamPtr st, size_t nbytes, unsigned int flags) { - VIR_DEBUG("st=%p data=%p nbytes=%zu flags=%x", + VIR_DEBUG("st=%p data=%p nbytes=%zu flags=0x%x", st, data, nbytes, flags); struct private_data *priv = st->conn->privateData; virNetClientStreamPtr privst = st->privateData; @@ -5690,7 +5690,7 @@ remoteStreamSendHole(virStreamPtr st, long long length, unsigned int flags) { - VIR_DEBUG("st=%p length=%lld flags=%x", + VIR_DEBUG("st=%p length=%lld flags=0x%x", st, length, flags); struct private_data *priv = st->conn->privateData; virNetClientStreamPtr privst = st->privateData; @@ -5724,7 +5724,7 @@ remoteStreamRecvHole(virStreamPtr st, virNetClientStreamPtr privst = st->privateData; int rv; - VIR_DEBUG("st=%p length=%p flags=%x", + VIR_DEBUG("st=%p length=%p flags=0x%x", st, length, flags); virCheckFlags(0, -1); diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c index c9d57ec6b..d81a05542 100644 --- a/src/rpc/virnetclientprogram.c +++ b/src/rpc/virnetclientprogram.c @@ -221,25 +221,25 @@ int virNetClientProgramDispatch(virNetClientProgramPtr prog, /* Check version, etc. */ if (msg->header.prog != prog->program) { - VIR_ERROR(_("program mismatch in event (actual %x, expected %x)"), + VIR_ERROR(_("program mismatch in event (actual 0x%x, expected 0x%x)"), msg->header.prog, prog->program); return -1; } if (msg->header.vers != prog->version) { - VIR_ERROR(_("version mismatch in event (actual %x, expected %x)"), + VIR_ERROR(_("version mismatch in event (actual 0x%x, expected 0x%x)"), msg->header.vers, prog->version); return -1; } if (msg->header.status != VIR_NET_OK) { - VIR_ERROR(_("status mismatch in event (actual %x, expected %x)"), + VIR_ERROR(_("status mismatch in event (actual 0x%x, expected 0x%x)"), msg->header.status, VIR_NET_OK); return -1; } if (msg->header.type != VIR_NET_MESSAGE) { - VIR_ERROR(_("type mismatch in event (actual %x, expected %x)"), + VIR_ERROR(_("type mismatch in event (actual 0x%x, expected 0x%x)"), msg->header.type, VIR_NET_MESSAGE); return -1; } @@ -247,7 +247,7 @@ int virNetClientProgramDispatch(virNetClientProgramPtr prog, event = virNetClientProgramGetEvent(prog, msg->header.proc); if (!event) { - VIR_ERROR(_("No event expected with procedure %x"), + VIR_ERROR(_("No event expected with procedure 0x%x"), msg->header.proc); return -1; } diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c index 54729c84f..2f037db0d 100644 --- a/src/rpc/virnetclientstream.c +++ b/src/rpc/virnetclientstream.c @@ -475,7 +475,7 @@ int virNetClientStreamRecvPacket(virNetClientStreamPtr st, int rv = -1; size_t want; - VIR_DEBUG("st=%p client=%p data=%p nbytes=%zu nonblock=%d flags=%x", + VIR_DEBUG("st=%p client=%p data=%p nbytes=%zu nonblock=%d flags=0x%x", st, client, data, nbytes, nonblock, flags); virCheckFlags(VIR_STREAM_RECV_STOP_AT_HOLE, -1); diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 85857bc3e..fa4e5daab 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -198,7 +198,7 @@ virNetServerClientCalculateHandleMode(virNetServerClientPtr client) #if WITH_GNUTLS } #endif - VIR_DEBUG("mode=%o", mode); + VIR_DEBUG("mode=0%o", mode); return mode; } diff --git a/src/security/security_manager.c b/src/security/security_manager.c index e43c99d4f..60cfc92e7 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -82,7 +82,7 @@ virSecurityManagerNewDriver(virSecurityDriverPtr drv, if (virSecurityManagerInitialize() < 0) return NULL; - VIR_DEBUG("drv=%p (%s) virtDriver=%s flags=%x", + VIR_DEBUG("drv=%p (%s) virtDriver=%s flags=0x%x", drv, drv->name, virtDriver, flags); virCheckFlags(VIR_SECURITY_MANAGER_NEW_MASK, NULL); diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c index f54ba15ae..be40379a9 100644 --- a/src/util/virfdstream.c +++ b/src/util/virfdstream.c @@ -1227,7 +1227,7 @@ virFDStreamOpenFileInternal(virStreamPtr st, struct stat sb; virFDStreamThreadDataPtr threadData = NULL; - VIR_DEBUG("st=%p path=%s oflags=%x offset=%llu length=%llu mode=%o", + VIR_DEBUG("st=%p path=%s oflags=0x%x offset=%llu length=%llu mode=0%o", st, path, oflags, offset, length, mode); oflags |= O_NOCTTY | O_BINARY; diff --git a/src/util/virfile.c b/src/util/virfile.c index e746d871b..a03a23fab 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -244,7 +244,7 @@ virFileWrapperFdNew(int *fd, const char *name, unsigned int flags) } else if ((mode & O_ACCMODE) == O_WRONLY) { output = true; } else if ((mode & O_ACCMODE) != O_RDONLY) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected mode %x for %s"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected mode 0x%x for %s"), mode & O_ACCMODE, name); goto error; } @@ -3593,7 +3593,7 @@ virFileSetupDev(const char *path, goto cleanup; } - VIR_DEBUG("Mount devfs on %s type=tmpfs flags=%lx, opts=%s", + VIR_DEBUG("Mount devfs on %s type=tmpfs flags=0x%lx, opts=%s", path, mount_flags, mount_options); if (mount("devfs", path, mount_fs, mount_flags, mount_options) < 0) { virReportSystemError(errno, diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 4de38d592..66d1c72c9 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -868,7 +868,7 @@ virFirewallApplyGroup(virFirewallPtr firewall, bool ignoreErrors = (group->actionFlags & VIR_FIREWALL_TRANSACTION_IGNORE_ERRORS); size_t i; - VIR_INFO("Starting transaction for firewall=%p group=%p flags=%x", + VIR_INFO("Starting transaction for firewall=%p group=%p flags=0x%x", firewall, group, group->actionFlags); firewall->currentGroup = idx; group->addingRollback = false; diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 7aa0f1dc3..41af0cdb6 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -617,7 +617,7 @@ int virLockSpaceAcquireResource(virLockSpacePtr lockspace, int ret = -1; virLockSpaceResourcePtr res; - VIR_DEBUG("lockspace=%p resname=%s flags=%x owner=%lld", + VIR_DEBUG("lockspace=%p resname=%s flags=0x%x owner=%lld", lockspace, resname, flags, (unsigned long long)owner); virCheckFlags(VIR_LOCK_SPACE_ACQUIRE_SHARED | diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index 83a695f6f..ca62a8e02 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -103,7 +103,7 @@ virRotatingFileWriterEntryNew(const char *path, virRotatingFileWriterEntryPtr entry; struct stat sb; - VIR_DEBUG("Opening %s mode=%02o", path, mode); + VIR_DEBUG("Opening %s mode=0%02o", path, mode); if (VIR_ALLOC(entry) < 0) return NULL; -- 2.13.5