From nobody Thu May 2 17:04:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 150633764041495.78824940542756; Mon, 25 Sep 2017 04:07:20 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 95DE13B723; Mon, 25 Sep 2017 11:07:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D764E6C409; Mon, 25 Sep 2017 11:07:17 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EC19E180884A; Mon, 25 Sep 2017 11:07:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v8PAk3fv009284 for ; Mon, 25 Sep 2017 06:46:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3980E5C737; Mon, 25 Sep 2017 10:46:03 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E0605C3FD; Mon, 25 Sep 2017 10:45:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 95DE13B723 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: "Daniel P. Berrange" To: libvir-list@redhat.com Date: Mon, 25 Sep 2017 11:45:51 +0100 Message-Id: <20170925104551.31016-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] Print hex values with '0x' prefix and octal with '0' in debug messages X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 25 Sep 2017 11:07:19 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Seeing a log message saying 'flags=3D93' 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 --- 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@kkcor.po | 4 +- po/kw@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@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: =20 # In debug statements, print flags as bitmask and mode_t as octal. sc_flags_debug: - @prohibit=3D'\driver->domainMigratePrepare2 (dconn, &cookie, &cookielen, uri, &uri_out, destflags, dname, bandwidth, dom_xml); @@ -2989,7 +2989,7 @@ virDomainMigrateVersion3Full(virDomainPtr domain, =20 VIR_DOMAIN_DEBUG(domain, "dconn=3D%p, xmlin=3D%s, dname=3D%s, uri=3D%s, bandwi= dth=3D%llu, " - "params=3D%p, nparams=3D%d, useParams=3D%d, flags=3D%= x", + "params=3D%p, nparams=3D%d, useParams=3D%d, flags=3D0= x%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 =3D flags & ~(VIR_MIGRATE_ABORT_ON_ERROR | VIR_MIGRATE_AUTO_CONVERGE); =20 - VIR_DEBUG("Prepare3 %p flags=3D%x", dconn, destflags); + VIR_DEBUG("Prepare3 %p flags=3D0x%x", dconn, destflags); cookiein =3D cookieout; cookieinlen =3D cookieoutlen; cookieout =3D NULL; @@ -3423,7 +3423,7 @@ virDomainMigrateUnmanagedParams(virDomainPtr domain, int nparams, unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, "dconnuri=3D%s, params=3D%p, nparams=3D%d, fl= ags=3D%x", + VIR_DOMAIN_DEBUG(domain, "dconnuri=3D%s, params=3D%p, nparams=3D%d, fl= ags=3D0x%x", NULLSTR(dconnuri), params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); =20 @@ -3537,7 +3537,7 @@ virDomainMigrate(virDomainPtr domain, virDomainPtr ddomain =3D NULL; =20 VIR_DOMAIN_DEBUG(domain, - "dconn=3D%p, flags=3D%lx, dname=3D%s, uri=3D%s, bandw= idth=3D%lu", + "dconn=3D%p, flags=3D0x%lx, dname=3D%s, uri=3D%s, ban= dwidth=3D%lu", dconn, flags, NULLSTR(dname), NULLSTR(uri), bandwidth= ); =20 virResetLastError(); @@ -3692,7 +3692,7 @@ virDomainMigrate2(virDomainPtr domain, virDomainPtr ddomain =3D NULL; =20 VIR_DOMAIN_DEBUG(domain, - "dconn=3D%p, flags=3D%lx, dname=3D%s, uri=3D%s, bandw= idth=3D%lu", + "dconn=3D%p, flags=3D0x%lx, dname=3D%s, uri=3D%s, ban= dwidth=3D%lu", dconn, flags, NULLSTR(dname), NULLSTR(uri), bandwidth= ); =20 virResetLastError(); @@ -3865,7 +3865,7 @@ virDomainMigrate3(virDomainPtr domain, const char *dxml =3D NULL; unsigned long long bandwidth =3D 0; =20 - VIR_DOMAIN_DEBUG(domain, "dconn=3D%p, params=3D%p, nparms=3D%u flags= =3D%x", + VIR_DOMAIN_DEBUG(domain, "dconn=3D%p, params=3D%p, nparms=3D%u flags= =3D0x%x", dconn, params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); =20 @@ -4085,7 +4085,7 @@ virDomainMigrateToURI(virDomainPtr domain, const char *dconnuri =3D NULL; const char *miguri =3D NULL; =20 - VIR_DOMAIN_DEBUG(domain, "duri=3D%p, flags=3D%lx, dname=3D%s, bandwidt= h=3D%lu", + VIR_DOMAIN_DEBUG(domain, "duri=3D%p, flags=3D0x%lx, dname=3D%s, bandwi= dth=3D%lu", NULLSTR(duri), flags, NULLSTR(dname), bandwidth); =20 virResetLastError(); @@ -4157,7 +4157,7 @@ virDomainMigrateToURI2(virDomainPtr domain, unsigned long bandwidth) { VIR_DOMAIN_DEBUG(domain, "dconnuri=3D%s, miguri=3D%s, dxml=3D%s, " - "flags=3D%lx, dname=3D%s, bandwidth=3D%lu", + "flags=3D0x%lx, dname=3D%s, bandwidth=3D%lu", NULLSTR(dconnuri), NULLSTR(miguri), NULLSTR(dxml), flags, NULLSTR(dname), bandwidth); =20 @@ -4230,7 +4230,7 @@ virDomainMigrateToURI3(virDomainPtr domain, unsigned int nparams, unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, "dconnuri=3D%s, params=3D%p, nparms=3D%u flag= s=3D%x", + VIR_DOMAIN_DEBUG(domain, "dconnuri=3D%s, params=3D%p, nparms=3D%u flag= s=3D0x%x", NULLSTR(dconnuri), params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); =20 @@ -4275,7 +4275,7 @@ virDomainMigratePrepare(virConnectPtr dconn, unsigned long bandwidth) { VIR_DEBUG("dconn=3D%p, cookie=3D%p, cookielen=3D%p, uri_in=3D%s, uri_o= ut=3D%p, " - "flags=3D%lx, dname=3D%s, bandwidth=3D%lu", dconn, cookie, c= ookielen, + "flags=3D0x%lx, dname=3D%s, bandwidth=3D%lu", dconn, cookie,= cookielen, NULLSTR(uri_in), uri_out, flags, NULLSTR(dname), bandwidth); =20 virResetLastError(); @@ -4316,7 +4316,7 @@ virDomainMigratePerform(virDomainPtr domain, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "cookie=3D%p, cookielen=3D%d, uri=3D%s, flags= =3D%lx, " + VIR_DOMAIN_DEBUG(domain, "cookie=3D%p, cookielen=3D%d, uri=3D%s, flags= =3D0x%lx, " "dname=3D%s, bandwidth=3D%lu", cookie, cookielen, uri= , flags, NULLSTR(dname), bandwidth); =20 @@ -4358,7 +4358,7 @@ virDomainMigrateFinish(virConnectPtr dconn, unsigned long flags) { VIR_DEBUG("dconn=3D%p, dname=3D%s, cookie=3D%p, cookielen=3D%d, uri=3D= %s, " - "flags=3D%lx", dconn, NULLSTR(dname), cookie, cookielen, + "flags=3D0x%lx", dconn, NULLSTR(dname), cookie, cookielen, NULLSTR(uri), flags); =20 virResetLastError(); @@ -4400,7 +4400,7 @@ virDomainMigratePrepare2(virConnectPtr dconn, const char *dom_xml) { VIR_DEBUG("dconn=3D%p, cookie=3D%p, cookielen=3D%p, uri_in=3D%s, uri_o= ut=3D%p," - "flags=3D%lx, dname=3D%s, bandwidth=3D%lu, dom_xml=3D%s", dc= onn, + "flags=3D0x%lx, dname=3D%s, bandwidth=3D%lu, dom_xml=3D%s", = dconn, cookie, cookielen, NULLSTR(uri_in), uri_out, flags, NULLSTR(= dname), bandwidth, NULLSTR(dom_xml)); =20 @@ -4442,7 +4442,7 @@ virDomainMigrateFinish2(virConnectPtr dconn, int retcode) { VIR_DEBUG("dconn=3D%p, dname=3D%s, cookie=3D%p, cookielen=3D%d, uri=3D= %s, " - "flags=3D%lx, retcode=3D%d", dconn, NULLSTR(dname), cookie, + "flags=3D0x%lx, retcode=3D%d", dconn, NULLSTR(dname), cookie, cookielen, NULLSTR(uri), flags, retcode); =20 virResetLastError(); @@ -4481,7 +4481,7 @@ virDomainMigratePrepareTunnel(virConnectPtr conn, unsigned long bandwidth, const char *dom_xml) { - VIR_DEBUG("conn=3D%p, stream=3D%p, flags=3D%lx, dname=3D%s, " + VIR_DEBUG("conn=3D%p, stream=3D%p, flags=3D0x%lx, dname=3D%s, " "bandwidth=3D%lu, dom_xml=3D%s", conn, st, flags, NULLSTR(dname), bandwidth, NULLSTR(dom_xml)); =20 @@ -4529,7 +4529,7 @@ virDomainMigrateBegin3(virDomainPtr domain, virConnectPtr conn; =20 VIR_DOMAIN_DEBUG(domain, "xmlin=3D%s cookieout=3D%p, cookieoutlen=3D%p= , " - "flags=3D%lx, dname=3D%s, bandwidth=3D%lu", + "flags=3D0x%lx, dname=3D%s, bandwidth=3D%lu", NULLSTR(xmlin), cookieout, cookieoutlen, flags, NULLSTR(dname), bandwidth); =20 @@ -4577,7 +4577,7 @@ virDomainMigratePrepare3(virConnectPtr dconn, const char *dom_xml) { VIR_DEBUG("dconn=3D%p, cookiein=3D%p, cookieinlen=3D%d, cookieout=3D%p= , " - "cookieoutlen=3D%p, uri_in=3D%s, uri_out=3D%p, flags=3D%lx, = dname=3D%s, " + "cookieoutlen=3D%p, uri_in=3D%s, uri_out=3D%p, flags=3D0x%lx= , dname=3D%s, " "bandwidth=3D%lu, dom_xml=3D%s", dconn, cookiein, cookieinlen, cookieout, cookieoutlen, NULLS= TR(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=3D%p, stream=3D%p, cookiein=3D%p, cookieinlen=3D%d, co= okieout=3D%p, " - "cookieoutlen=3D%p, flags=3D%lx, dname=3D%s, bandwidth=3D%lu= , " + "cookieoutlen=3D%p, flags=3D0x%lx, dname=3D%s, bandwidth=3D%= lu, " "dom_xml=3D%s", conn, st, cookiein, cookieinlen, cookieout, cookieoutlen, fl= ags, NULLSTR(dname), bandwidth, NULLSTR(dom_xml)); @@ -4681,7 +4681,7 @@ virDomainMigratePerform3(virDomainPtr domain, =20 VIR_DOMAIN_DEBUG(domain, "xmlin=3D%s cookiein=3D%p, cookieinlen=3D%d, " "cookieout=3D%p, cookieoutlen=3D%p, dconnuri=3D%s, " - "uri=3D%s, flags=3D%lx, dname=3D%s, bandwidth=3D%lu", + "uri=3D%s, flags=3D0x%lx, dname=3D%s, bandwidth=3D%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=3D%p, dname=3D%s, cookiein=3D%p, cookieinlen=3D%d, co= okieout=3D%p," - "cookieoutlen=3D%p, dconnuri=3D%s, uri=3D%s, flags=3D%lx, re= tcode=3D%d", + "cookieoutlen=3D%p, dconnuri=3D%s, uri=3D%s, flags=3D0x%lx, = retcode=3D%d", dconn, NULLSTR(dname), cookiein, cookieinlen, cookieout, cookieoutlen, NULLSTR(dconnuri), NULLSTR(uri), flags, cancel= led); =20 @@ -4773,7 +4773,7 @@ virDomainMigrateConfirm3(virDomainPtr domain, virConnectPtr conn; =20 VIR_DOMAIN_DEBUG(domain, - "cookiein=3D%p, cookieinlen=3D%d, flags=3D%lx, cancel= led=3D%d", + "cookiein=3D%p, cookieinlen=3D%d, flags=3D0x%lx, canc= elled=3D%d", cookiein, cookieinlen, flags, cancelled); =20 virResetLastError(); @@ -4816,7 +4816,7 @@ virDomainMigrateBegin3Params(virDomainPtr domain, virConnectPtr conn; =20 VIR_DOMAIN_DEBUG(domain, "params=3D%p, nparams=3D%d, " - "cookieout=3D%p, cookieoutlen=3D%p, flags=3D%x", + "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%x", params, nparams, cookieout, cookieoutlen, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); =20 @@ -4862,7 +4862,7 @@ virDomainMigratePrepare3Params(virConnectPtr dconn, unsigned int flags) { VIR_DEBUG("dconn=3D%p, params=3D%p, nparams=3D%d, cookiein=3D%p, cooki= einlen=3D%d, " - "cookieout=3D%p, cookieoutlen=3D%p, uri_out=3D%p, flags=3D%x= ", + "cookieout=3D%p, cookieoutlen=3D%p, uri_out=3D%p, flags=3D0x= %x", dconn, params, nparams, cookiein, cookieinlen, cookieout, cookieoutlen, uri_out, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); @@ -4907,7 +4907,7 @@ virDomainMigratePrepareTunnel3Params(virConnectPtr co= nn, unsigned int flags) { VIR_DEBUG("conn=3D%p, stream=3D%p, params=3D%p, nparams=3D%d, cookiein= =3D%p, " - "cookieinlen=3D%d, cookieout=3D%p, cookieoutlen=3D%p, flags= =3D%x", + "cookieinlen=3D%d, cookieout=3D%p, cookieoutlen=3D%p, flags= =3D0x%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; =20 VIR_DOMAIN_DEBUG(domain, "dconnuri=3D%s, params=3D%p, nparams=3D%d, co= okiein=3D%p, " - "cookieinlen=3D%d, cookieout=3D%p, cookieoutlen=3D%p,= flags=3D%x", + "cookieinlen=3D%d, cookieout=3D%p, cookieoutlen=3D%p,= flags=3D0x%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=3D%p, params=3D%p, nparams=3D%d, cookiein=3D%p, cooki= einlen=3D%d, " - "cookieout=3D%p, cookieoutlen=3D%p, flags=3D%x, cancelled=3D= %d", + "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%x, cancelled= =3D%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; =20 VIR_DOMAIN_DEBUG(domain, "params=3D%p, nparams=3D%d, cookiein=3D%p, " - "cookieinlen=3D%d, flags=3D%x, cancelled=3D%d", + "cookieinlen=3D%d, flags=3D0x%x, cancelled=3D%d", params, nparams, cookiein, cookieinlen, flags, cancel= led); VIR_TYPED_PARAMS_DEBUG(params, nparams); =20 @@ -5208,7 +5208,7 @@ virDomainGetSchedulerParametersFlags(virDomainPtr dom= ain, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "params=3D%p, nparams=3D%p, flags=3D%x", + VIR_DOMAIN_DEBUG(domain, "params=3D%p, nparams=3D%p, flags=3D0x%x", params, nparams, flags); =20 virResetLastError(); @@ -5323,7 +5323,7 @@ virDomainSetSchedulerParametersFlags(virDomainPtr dom= ain, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "params=3D%p, nparams=3D%d, flags=3D%x", + VIR_DOMAIN_DEBUG(domain, "params=3D%p, nparams=3D%d, flags=3D0x%x", params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); =20 @@ -5472,7 +5472,7 @@ virDomainBlockStatsFlags(virDomainPtr dom, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(dom, "disk=3D%s, params=3D%p, nparams=3D%d, flags=3D%= x", + VIR_DOMAIN_DEBUG(dom, "disk=3D%s, params=3D%p, nparams=3D%d, flags=3D0= x%x", disk, params, nparams ? *nparams : -1, flags); =20 virResetLastError(); @@ -5593,7 +5593,7 @@ virDomainSetInterfaceParameters(virDomainPtr domain, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "device=3D%s, params=3D%p, nparams=3D%d, flag= s=3D%x", + VIR_DOMAIN_DEBUG(domain, "device=3D%s, params=3D%p, nparams=3D%d, flag= s=3D0x%x", device, params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); =20 @@ -5661,7 +5661,7 @@ virDomainGetInterfaceParameters(virDomainPtr domain, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "device=3D%s, params=3D%p, nparams=3D%d, flag= s=3D%x", + VIR_DOMAIN_DEBUG(domain, "device=3D%s, params=3D%p, nparams=3D%d, flag= s=3D0x%x", device, params, (nparams) ? *nparams : -1, flags); =20 virResetLastError(); @@ -5739,7 +5739,7 @@ virDomainMemoryStats(virDomainPtr dom, virDomainMemor= yStatPtr stats, virConnectPtr conn; unsigned long nr_stats_ret =3D 0; =20 - VIR_DOMAIN_DEBUG(dom, "stats=3D%p, nr_stats=3D%u, flags=3D%x", + VIR_DOMAIN_DEBUG(dom, "stats=3D%p, nr_stats=3D%u, flags=3D0x%x", stats, nr_stats, flags); =20 virResetLastError(); @@ -5823,7 +5823,7 @@ virDomainBlockPeek(virDomainPtr dom, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(dom, "disk=3D%s, offset=3D%lld, size=3D%zi, buffer=3D= %p, flags=3D%x", + VIR_DOMAIN_DEBUG(dom, "disk=3D%s, offset=3D%lld, size=3D%zi, buffer=3D= %p, flags=3D0x%x", disk, offset, size, buffer, flags); =20 virResetLastError(); @@ -5890,7 +5890,7 @@ virDomainBlockResize(virDomainPtr dom, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(dom, "disk=3D%s, size=3D%llu, flags=3D%x", disk, size= , flags); + VIR_DOMAIN_DEBUG(dom, "disk=3D%s, size=3D%llu, flags=3D0x%x", disk, si= ze, flags); =20 virResetLastError(); =20 @@ -5959,7 +5959,7 @@ virDomainMemoryPeek(virDomainPtr dom, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(dom, "start=3D%lld, size=3D%zi, buffer=3D%p, flags=3D= %x", + VIR_DOMAIN_DEBUG(dom, "start=3D%lld, size=3D%zi, buffer=3D%p, flags=3D= 0x%x", start, size, buffer, flags); =20 virResetLastError(); @@ -6092,7 +6092,7 @@ virDomainGetBlockInfo(virDomainPtr domain, const char= *disk, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "info=3D%p, flags=3D%x", info, flags); + VIR_DOMAIN_DEBUG(domain, "info=3D%p, flags=3D0x%x", info, flags); =20 virResetLastError(); =20 @@ -6192,7 +6192,7 @@ virDomainDefineXML(virConnectPtr conn, const char *xm= l) virDomainPtr virDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int = flags) { - VIR_DEBUG("conn=3D%p, xml=3D%s flags=3D%x", conn, NULLSTR(xml), flags); + VIR_DEBUG("conn=3D%p, xml=3D%s flags=3D0x%x", conn, NULLSTR(xml), flag= s); =20 virResetLastError(); =20 @@ -6295,7 +6295,7 @@ virDomainUndefineFlags(virDomainPtr domain, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "flags=3D%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=3D0x%x", flags); =20 virResetLastError(); =20 @@ -6473,7 +6473,7 @@ virConnectListAllDomains(virConnectPtr conn, virDomainPtr **domains, unsigned int flags) { - VIR_DEBUG("conn=3D%p, domains=3D%p, flags=3D%x", conn, domains, flags); + VIR_DEBUG("conn=3D%p, domains=3D%p, flags=3D0x%x", conn, domains, flag= s); =20 virResetLastError(); =20 @@ -6577,7 +6577,7 @@ virDomainCreateWithFlags(virDomainPtr domain, unsigne= d int flags) { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "flags=3D%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=3D0x%x", flags); =20 virResetLastError(); =20 @@ -6650,7 +6650,7 @@ virDomainCreateWithFiles(virDomainPtr domain, unsigne= d int nfiles, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "nfiles=3D%u, files=3D%p, flags=3D%x", + VIR_DOMAIN_DEBUG(domain, "nfiles=3D%u, files=3D%p, flags=3D0x%x", nfiles, files, flags); =20 virResetLastError(); @@ -6774,7 +6774,7 @@ int virDomainInjectNMI(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "flags=3D%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=3D0x%x", flags); =20 virResetLastError(); =20 @@ -6821,7 +6821,7 @@ virDomainSendKey(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "codeset=3D%u, holdtime=3D%u, nkeycodes=3D%u,= flags=3D%x", + VIR_DOMAIN_DEBUG(domain, "codeset=3D%u, holdtime=3D%u, nkeycodes=3D%u,= flags=3D0x%x", codeset, holdtime, nkeycodes, flags); =20 virResetLastError(); @@ -6897,7 +6897,7 @@ virDomainSendProcessSignal(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - VIR_DOMAIN_DEBUG(domain, "pid=3D%lld, signum=3D%u flags=3D%x", + VIR_DOMAIN_DEBUG(domain, "pid=3D%lld, signum=3D%u flags=3D0x%x", pid_value, signum, flags); =20 virResetLastError(); @@ -7024,7 +7024,7 @@ virDomainSetVcpusFlags(virDomainPtr domain, unsigned = int nvcpus, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "nvcpus=3D%u, flags=3D%x", nvcpus, flags); + VIR_DOMAIN_DEBUG(domain, "nvcpus=3D%u, flags=3D0x%x", nvcpus, flags); =20 virResetLastError(); =20 @@ -7092,7 +7092,7 @@ virDomainGetVcpusFlags(virDomainPtr domain, unsigned = int flags) { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "flags=3D%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=3D0x%x", flags); =20 virResetLastError(); =20 @@ -7216,7 +7216,7 @@ virDomainPinVcpuFlags(virDomainPtr domain, unsigned i= nt vcpu, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "vcpu=3D%u, cpumap=3D%p, maplen=3D%d, flags= =3D%x", + VIR_DOMAIN_DEBUG(domain, "vcpu=3D%u, cpumap=3D%p, maplen=3D%d, flags= =3D0x%x", vcpu, cpumap, maplen, flags); =20 virResetLastError(); @@ -7274,7 +7274,7 @@ virDomainGetVcpuPinInfo(virDomainPtr domain, int ncpu= maps, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "ncpumaps=3D%d, cpumaps=3D%p, maplen=3D%d, fl= ags=3D%x", + VIR_DOMAIN_DEBUG(domain, "ncpumaps=3D%d, cpumaps=3D%p, maplen=3D%d, fl= ags=3D0x%x", ncpumaps, cpumaps, maplen, flags); =20 virResetLastError(); @@ -7351,7 +7351,7 @@ virDomainPinEmulator(virDomainPtr domain, unsigned ch= ar *cpumap, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "cpumap=3D%p, maplen=3D%d, flags=3D%x", + VIR_DOMAIN_DEBUG(domain, "cpumap=3D%p, maplen=3D%d, flags=3D0x%x", cpumap, maplen, flags); =20 virResetLastError(); @@ -7406,7 +7406,7 @@ virDomainGetEmulatorPinInfo(virDomainPtr domain, unsi= gned char *cpumap, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "cpumap=3D%p, maplen=3D%d, flags=3D%x", + VIR_DOMAIN_DEBUG(domain, "cpumap=3D%p, maplen=3D%d, flags=3D0x%x", cpumap, maplen, flags); =20 virResetLastError(); @@ -7573,7 +7573,7 @@ virDomainGetIOThreadInfo(virDomainPtr dom, virDomainIOThreadInfoPtr **info, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "info=3D%p flags=3D%x", info, flags); + VIR_DOMAIN_DEBUG(dom, "info=3D%p flags=3D0x%x", info, flags); =20 virResetLastError(); =20 @@ -7721,7 +7721,7 @@ virDomainAddIOThread(virDomainPtr domain, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "iothread_id=3D%u, flags=3D%x", + VIR_DOMAIN_DEBUG(domain, "iothread_id=3D%u, flags=3D0x%x", iothread_id, flags); =20 virResetLastError(); @@ -7780,7 +7780,7 @@ virDomainDelIOThread(virDomainPtr domain, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "iothread_id=3D%u, flags=3D%x", iothread_id, = flags); + VIR_DOMAIN_DEBUG(domain, "iothread_id=3D%u, flags=3D0x%x", iothread_id= , flags); =20 virResetLastError(); =20 @@ -7932,7 +7932,7 @@ virDomainSetMetadata(virDomainPtr domain, virConnectPtr conn; =20 VIR_DOMAIN_DEBUG(domain, - "type=3D%d, metadata=3D'%s', key=3D'%s', uri=3D'%s', = flags=3D%x", + "type=3D%d, metadata=3D'%s', key=3D'%s', uri=3D'%s', = flags=3D0x%x", type, NULLSTR(metadata), NULLSTR(key), NULLSTR(uri), flags); =20 @@ -8014,7 +8014,7 @@ virDomainGetMetadata(virDomainPtr domain, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "type=3D%d, uri=3D'%s', flags=3D%x", + VIR_DOMAIN_DEBUG(domain, "type=3D%d, uri=3D'%s', flags=3D0x%x", type, NULLSTR(uri), flags); =20 virResetLastError(); @@ -8138,7 +8138,7 @@ virDomainAttachDeviceFlags(virDomainPtr domain, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "xml=3D%s, flags=3D%x", xml, flags); + VIR_DOMAIN_DEBUG(domain, "xml=3D%s, flags=3D0x%x", xml, flags); =20 virResetLastError(); =20 @@ -8264,7 +8264,7 @@ virDomainDetachDeviceFlags(virDomainPtr domain, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "xml=3D%s, flags=3D%x", xml, flags); + VIR_DOMAIN_DEBUG(domain, "xml=3D%s, flags=3D0x%x", xml, flags); =20 virResetLastError(); =20 @@ -8320,7 +8320,7 @@ virDomainUpdateDeviceFlags(virDomainPtr domain, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "xml=3D%s, flags=3D%x", xml, flags); + VIR_DOMAIN_DEBUG(domain, "xml=3D%s, flags=3D0x%x", xml, flags); =20 virResetLastError(); =20 @@ -8665,7 +8665,7 @@ virDomainGetJobStats(virDomainPtr domain, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "type=3D%p, params=3D%p, nparams=3D%p, flags= =3D%x", + VIR_DOMAIN_DEBUG(domain, "type=3D%p, params=3D%p, nparams=3D%p, flags= =3D0x%x", type, params, nparams, flags); =20 virResetLastError(); @@ -8754,7 +8754,7 @@ virDomainMigrateSetMaxDowntime(virDomainPtr domain, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "downtime=3D%llu, flags=3D%x", downtime, flag= s); + VIR_DOMAIN_DEBUG(domain, "downtime=3D%llu, flags=3D0x%x", downtime, fl= ags); =20 virResetLastError(); =20 @@ -8795,7 +8795,7 @@ virDomainMigrateGetMaxDowntime(virDomainPtr domain, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "downtime =3D %p, flags=3D%x", downtime, flag= s); + VIR_DOMAIN_DEBUG(domain, "downtime =3D %p, flags=3D0x%x", downtime, fl= ags); =20 virResetLastError(); =20 @@ -8835,7 +8835,7 @@ virDomainMigrateGetCompressionCache(virDomainPtr doma= in, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "cacheSize=3D%p, flags=3D%x", cacheSize, flag= s); + VIR_DOMAIN_DEBUG(domain, "cacheSize=3D%p, flags=3D0x%x", cacheSize, fl= ags); =20 virResetLastError(); =20 @@ -8879,7 +8879,7 @@ virDomainMigrateSetCompressionCache(virDomainPtr doma= in, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "cacheSize=3D%llu, flags=3D%x", cacheSize, fl= ags); + VIR_DOMAIN_DEBUG(domain, "cacheSize=3D%llu, flags=3D0x%x", cacheSize, = flags); =20 virResetLastError(); =20 @@ -8921,7 +8921,7 @@ virDomainMigrateSetMaxSpeed(virDomainPtr domain, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "bandwidth=3D%lu, flags=3D%x", bandwidth, fla= gs); + VIR_DOMAIN_DEBUG(domain, "bandwidth=3D%lu, flags=3D0x%x", bandwidth, f= lags); =20 virResetLastError(); =20 @@ -8961,7 +8961,7 @@ virDomainMigrateGetMaxSpeed(virDomainPtr domain, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "bandwidth =3D %p, flags=3D%x", bandwidth, fl= ags); + VIR_DOMAIN_DEBUG(domain, "bandwidth =3D %p, flags=3D0x%x", bandwidth, = flags); =20 virResetLastError(); =20 @@ -9228,7 +9228,7 @@ virDomainManagedSave(virDomainPtr dom, unsigned int f= lags) { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(dom, "flags=3D%x", flags); + VIR_DOMAIN_DEBUG(dom, "flags=3D0x%x", flags); =20 virResetLastError(); =20 @@ -9275,7 +9275,7 @@ virDomainHasManagedSaveImage(virDomainPtr dom, unsign= ed int flags) { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(dom, "flags=3D%x", flags); + VIR_DOMAIN_DEBUG(dom, "flags=3D0x%x", flags); =20 virResetLastError(); =20 @@ -9313,7 +9313,7 @@ virDomainManagedSaveRemove(virDomainPtr dom, unsigned= int flags) { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(dom, "flags=3D%x", flags); + VIR_DOMAIN_DEBUG(dom, "flags=3D0x%x", flags); =20 virResetLastError(); =20 @@ -9360,7 +9360,7 @@ virDomainManagedSaveGetXMLDesc(virDomainPtr domain, u= nsigned int flags) { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "flags=3D%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=3D0x%x", flags); =20 virResetLastError(); =20 @@ -9418,7 +9418,7 @@ virDomainManagedSaveDefineXML(virDomainPtr domain, co= nst char *dxml, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "flags=3D%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=3D0x%x", flags); =20 virResetLastError(); =20 @@ -9484,7 +9484,7 @@ virDomainOpenConsole(virDomainPtr dom, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(dom, "dev_name=3D%s, st=3D%p, flags=3D%x", + VIR_DOMAIN_DEBUG(dom, "dev_name=3D%s, st=3D%p, flags=3D0x%x", NULLSTR(dev_name), st, flags); =20 virResetLastError(); @@ -9548,7 +9548,7 @@ virDomainOpenChannel(virDomainPtr dom, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(dom, "name=3D%s, st=3D%p, flags=3D%x", + VIR_DOMAIN_DEBUG(dom, "name=3D%s, st=3D%p, flags=3D0x%x", NULLSTR(name), st, flags); =20 virResetLastError(); @@ -9604,7 +9604,7 @@ int virDomainGetPerfEvents(virDomainPtr domain, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "params=3D%p, nparams=3D%p flags=3D%x", + VIR_DOMAIN_DEBUG(domain, "params=3D%p, nparams=3D%p flags=3D0x%x", params, nparams, flags); =20 virResetLastError(); @@ -9654,7 +9654,7 @@ int virDomainSetPerfEvents(virDomainPtr domain, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "params=3D%p, nparams=3D%d flags=3D%x", + VIR_DOMAIN_DEBUG(domain, "params=3D%p, nparams=3D%d flags=3D0x%x", params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); =20 @@ -9736,7 +9736,7 @@ virDomainBlockJobAbort(virDomainPtr dom, const char *= disk, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(dom, "disk=3D%s, flags=3D%x", disk, flags); + VIR_DOMAIN_DEBUG(dom, "disk=3D%s, flags=3D0x%x", disk, flags); =20 virResetLastError(); =20 @@ -9798,7 +9798,7 @@ virDomainGetBlockJobInfo(virDomainPtr dom, const char= *disk, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(dom, "disk=3D%s, info=3D%p, flags=3D%x", disk, info, = flags); + VIR_DOMAIN_DEBUG(dom, "disk=3D%s, info=3D%p, flags=3D0x%x", disk, info= , flags); =20 virResetLastError(); =20 @@ -9861,7 +9861,7 @@ virDomainBlockJobSetSpeed(virDomainPtr dom, const cha= r *disk, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(dom, "disk=3D%s, bandwidth=3D%lu, flags=3D%x", + VIR_DOMAIN_DEBUG(dom, "disk=3D%s, bandwidth=3D%lu, flags=3D0x%x", disk, bandwidth, flags); =20 virResetLastError(); @@ -9935,7 +9935,7 @@ virDomainBlockPull(virDomainPtr dom, const char *disk, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(dom, "disk=3D%s, bandwidth=3D%lu, flags=3D%x", + VIR_DOMAIN_DEBUG(dom, "disk=3D%s, bandwidth=3D%lu, flags=3D0x%x", disk, bandwidth, flags); =20 virResetLastError(); @@ -10080,7 +10080,7 @@ virDomainBlockRebase(virDomainPtr dom, const char *= disk, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(dom, "disk=3D%s, base=3D%s, bandwidth=3D%lu, flags=3D= %x", + VIR_DOMAIN_DEBUG(dom, "disk=3D%s, base=3D%s, bandwidth=3D%lu, flags=3D= 0x%x", disk, NULLSTR(base), bandwidth, flags); =20 virResetLastError(); @@ -10204,7 +10204,7 @@ virDomainBlockCopy(virDomainPtr dom, const char *di= sk, virConnectPtr conn; =20 VIR_DOMAIN_DEBUG(dom, - "disk=3D%s, destxml=3D%s, params=3D%p, nparams=3D%d, = flags=3D%x", + "disk=3D%s, destxml=3D%s, params=3D%p, nparams=3D%d, = flags=3D0x%x", disk, destxml, params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); =20 @@ -10347,7 +10347,7 @@ virDomainBlockCommit(virDomainPtr dom, const char *= disk, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(dom, "disk=3D%s, base=3D%s, top=3D%s, bandwidth=3D%lu= , flags=3D%x", + VIR_DOMAIN_DEBUG(dom, "disk=3D%s, base=3D%s, top=3D%s, bandwidth=3D%lu= , flags=3D0x%x", disk, NULLSTR(base), NULLSTR(top), bandwidth, flags); =20 virResetLastError(); @@ -10406,7 +10406,7 @@ virDomainOpenGraphics(virDomainPtr dom, unsigned int flags) { struct stat sb; - VIR_DOMAIN_DEBUG(dom, "idx=3D%u, fd=3D%d, flags=3D%x", + VIR_DOMAIN_DEBUG(dom, "idx=3D%u, fd=3D%d, flags=3D0x%x", idx, fd, flags); =20 virResetLastError(); @@ -10478,7 +10478,7 @@ virDomainOpenGraphicsFD(virDomainPtr dom, unsigned int idx, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "idx=3D%u, flags=3D%x", idx, flags); + VIR_DOMAIN_DEBUG(dom, "idx=3D%u, flags=3D0x%x", idx, flags); =20 virResetLastError(); =20 @@ -10538,7 +10538,7 @@ virDomainSetBlockIoTune(virDomainPtr dom, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(dom, "disk=3D%s, params=3D%p, nparams=3D%d, flags=3D%= x", + VIR_DOMAIN_DEBUG(dom, "disk=3D%s, params=3D%p, nparams=3D%d, flags=3D0= x%x", disk, params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); =20 @@ -10613,7 +10613,7 @@ virDomainGetBlockIoTune(virDomainPtr dom, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(dom, "disk=3D%s, params=3D%p, nparams=3D%d, flags=3D%= x", + VIR_DOMAIN_DEBUG(dom, "disk=3D%s, params=3D%p, nparams=3D%d, flags=3D0= x%x", NULLSTR(disk), params, (nparams) ? *nparams : -1, fla= gs); =20 virResetLastError(); @@ -10740,7 +10740,7 @@ virDomainGetCPUStats(virDomainPtr domain, virConnectPtr conn; =20 VIR_DOMAIN_DEBUG(domain, - "params=3D%p, nparams=3D%d, start_cpu=3D%d, ncpus=3D%= u, flags=3D%x", + "params=3D%p, nparams=3D%d, start_cpu=3D%d, ncpus=3D%= u, flags=3D0x%x", params, nparams, start_cpu, ncpus, flags); virResetLastError(); =20 @@ -10831,7 +10831,7 @@ virDomainGetDiskErrors(virDomainPtr dom, unsigned int maxerrors, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "errors=3D%p, maxerrors=3D%u, flags=3D%x", + VIR_DOMAIN_DEBUG(dom, "errors=3D%p, maxerrors=3D%u, flags=3D0x%x", errors, maxerrors, flags); =20 virResetLastError(); @@ -10877,7 +10877,7 @@ virDomainGetHostname(virDomainPtr domain, unsigned = int flags) { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "flags=3D%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=3D0x%x", flags); =20 virResetLastError(); =20 @@ -10925,7 +10925,7 @@ virDomainFSTrim(virDomainPtr dom, unsigned long long minimum, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "mountPoint=3D%s, minimum=3D%llu, flags=3D%x", + VIR_DOMAIN_DEBUG(dom, "mountPoint=3D%s, minimum=3D%llu, flags=3D0x%x", mountPoint, minimum, flags); =20 virResetLastError(); @@ -10969,7 +10969,7 @@ virDomainFSFreeze(virDomainPtr dom, unsigned int nmountpoints, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "mountpoints=3D%p, nmountpoints=3D%d, flags=3D%x= ", + VIR_DOMAIN_DEBUG(dom, "mountpoints=3D%p, nmountpoints=3D%d, flags=3D0x= %x", mountpoints, nmountpoints, flags); =20 virResetLastError(); @@ -11015,7 +11015,7 @@ virDomainFSThaw(virDomainPtr dom, unsigned int nmountpoints, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "flags=3D%x", flags); + VIR_DOMAIN_DEBUG(dom, "flags=3D0x%x", flags); =20 virResetLastError(); =20 @@ -11063,7 +11063,7 @@ virDomainGetTime(virDomainPtr dom, unsigned int *nseconds, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "seconds=3D%p, nseconds=3D%p, flags=3D%x", + VIR_DOMAIN_DEBUG(dom, "seconds=3D%p, nseconds=3D%p, flags=3D0x%x", seconds, nseconds, flags); =20 virResetLastError(); @@ -11113,7 +11113,7 @@ virDomainSetTime(virDomainPtr dom, unsigned int nseconds, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "seconds=3D%lld, nseconds=3D%u, flags=3D%x", + VIR_DOMAIN_DEBUG(dom, "seconds=3D%lld, nseconds=3D%u, flags=3D0x%x", seconds, nseconds, flags); =20 virResetLastError(); @@ -11159,7 +11159,7 @@ virDomainSetUserPassword(virDomainPtr dom, const char *password, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "user=3D%s, password=3D%s, flags=3D%x", + VIR_DOMAIN_DEBUG(dom, "user=3D%s, password=3D%s, flags=3D0x%x", NULLSTR(user), NULLSTR(password), flags); =20 virResetLastError(); @@ -11212,7 +11212,7 @@ virConnectGetDomainCapabilities(virConnectPtr conn, unsigned int flags) { VIR_DEBUG("conn=3D%p, emulatorbin=3D%s, arch=3D%s, " - "machine=3D%s, virttype=3D%s, flags=3D%x", + "machine=3D%s, virttype=3D%s, flags=3D0x%x", conn, NULLSTR(emulatorbin), NULLSTR(arch), NULLSTR(machine), NULLSTR(virttype), flags); =20 @@ -11643,7 +11643,7 @@ virDomainGetFSInfo(virDomainPtr dom, virDomainFSInfoPtr **info, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "info=3D%p, flags=3D%x", info, flags); + VIR_DOMAIN_DEBUG(dom, "info=3D%p, flags=3D0x%x", info, flags); =20 virResetLastError(); =20 @@ -11761,7 +11761,7 @@ virDomainInterfaceAddresses(virDomainPtr dom, unsigned int source, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "ifaces=3D%p, source=3D%d, flags=3D%x", ifaces, = source, flags); + VIR_DOMAIN_DEBUG(dom, "ifaces=3D%p, source=3D%d, flags=3D0x%x", ifaces= , source, flags); =20 virResetLastError(); =20 @@ -11845,7 +11845,7 @@ virDomainGetGuestVcpus(virDomainPtr domain, unsigned int *nparams, unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, "params=3D%p, nparams=3D%p, flags=3D%x", + VIR_DOMAIN_DEBUG(domain, "params=3D%p, nparams=3D%p, flags=3D0x%x", params, nparams, flags); =20 virResetLastError(); @@ -11903,7 +11903,7 @@ virDomainSetGuestVcpus(virDomainPtr domain, int state, unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, "cpumap=3D'%s' state=3D%x flags=3D%x", + VIR_DOMAIN_DEBUG(domain, "cpumap=3D'%s' state=3D%x flags=3D0x%x", NULLSTR(cpumap), state, flags); =20 virResetLastError(); @@ -11952,7 +11952,7 @@ virDomainSetVcpu(virDomainPtr domain, int state, unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, "vcpumap=3D'%s' state=3D%i flags=3D%x", + VIR_DOMAIN_DEBUG(domain, "vcpumap=3D'%s' state=3D%i flags=3D0x%x", NULLSTR(vcpumap), state, flags); =20 virResetLastError(); @@ -12007,7 +12007,7 @@ virDomainSetBlockThreshold(virDomainPtr domain, unsigned long long threshold, unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, "dev=3D'%s' threshold=3D%llu flags=3D%x", + VIR_DOMAIN_DEBUG(domain, "dev=3D'%s' threshold=3D%llu flags=3D0x%x", NULLSTR(dev), threshold, flags); =20 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=3D%p, flags=3D%x", conn, flags); + VIR_DEBUG("conn=3D%p, flags=3D0x%x", conn, flags); =20 virResetLastError(); =20 @@ -475,7 +475,7 @@ virNodeGetCPUStats(virConnectPtr conn, virNodeCPUStatsPtr params, int *nparams, unsigned int flags) { - VIR_DEBUG("conn=3D%p, cpuNum=3D%d, params=3D%p, nparams=3D%d, flags=3D= %x", + VIR_DEBUG("conn=3D%p, cpuNum=3D%d, params=3D%p, nparams=3D%d, flags=3D= 0x%x", conn, cpuNum, params, nparams ? *nparams : -1, flags); =20 virResetLastError(); @@ -562,7 +562,7 @@ virNodeGetMemoryStats(virConnectPtr conn, virNodeMemoryStatsPtr params, int *nparams, unsigned int flags) { - VIR_DEBUG("conn=3D%p, cellNum=3D%d, params=3D%p, nparams=3D%d, flags= =3D%x", + VIR_DEBUG("conn=3D%p, cellNum=3D%d, params=3D%p, nparams=3D%d, flags= =3D0x%x", conn, cellNum, params, nparams ? *nparams : -1, flags); =20 virResetLastError(); @@ -655,7 +655,7 @@ virNodeSuspendForDuration(virConnectPtr conn, unsigned long long duration, unsigned int flags) { - VIR_DEBUG("conn=3D%p, target=3D%d, duration=3D%lld, flags=3D%x", + VIR_DEBUG("conn=3D%p, target=3D%d, duration=3D%lld, flags=3D0x%x", conn, target, duration, flags); =20 virResetLastError(); @@ -708,7 +708,7 @@ virNodeGetMemoryParameters(virConnectPtr conn, int *nparams, unsigned int flags) { - VIR_DEBUG("conn=3D%p, params=3D%p, nparams=3D%p, flags=3D%x", + VIR_DEBUG("conn=3D%p, params=3D%p, nparams=3D%p, flags=3D0x%x", conn, params, nparams, flags); =20 virResetLastError(); @@ -767,7 +767,7 @@ virNodeSetMemoryParameters(virConnectPtr conn, int nparams, unsigned int flags) { - VIR_DEBUG("conn=3D%p, params=3D%p, nparams=3D%d, flags=3D%x", + VIR_DEBUG("conn=3D%p, params=3D%p, nparams=3D%d, flags=3D0x%x", conn, params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); =20 @@ -968,7 +968,7 @@ virConnectCompareCPU(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("conn=3D%p, xmlDesc=3D%s, flags=3D%x", conn, NULLSTR(xmlDesc= ), flags); + VIR_DEBUG("conn=3D%p, xmlDesc=3D%s, flags=3D0x%x", conn, NULLSTR(xmlDe= sc), flags); =20 virResetLastError(); =20 @@ -1012,7 +1012,7 @@ int virConnectGetCPUModelNames(virConnectPtr conn, const char *arch, char ***m= odels, unsigned int flags) { - VIR_DEBUG("conn=3D%p, arch=3D%s, models=3D%p, flags=3D%x", + VIR_DEBUG("conn=3D%p, arch=3D%s, models=3D%p, flags=3D0x%x", conn, NULLSTR(arch), models, flags); virResetLastError(); =20 @@ -1069,7 +1069,7 @@ virConnectBaselineCPU(virConnectPtr conn, { size_t i; =20 - VIR_DEBUG("conn=3D%p, xmlCPUs=3D%p, ncpus=3D%u, flags=3D%x", + VIR_DEBUG("conn=3D%p, xmlCPUs=3D%p, ncpus=3D%u, flags=3D0x%x", conn, xmlCPUs, ncpus, flags); if (xmlCPUs) { for (i =3D 0; i < ncpus; i++) @@ -1294,7 +1294,7 @@ virNodeGetCPUMap(virConnectPtr conn, unsigned int *online, unsigned int flags) { - VIR_DEBUG("conn=3D%p, cpumap=3D%p, online=3D%p, flags=3D%x", + VIR_DEBUG("conn=3D%p, cpumap=3D%p, online=3D%p, flags=3D0x%x", conn, cpumap, online, flags); =20 virResetLastError(); @@ -1384,7 +1384,7 @@ virNodeGetFreePages(virConnectPtr conn, unsigned int flags) { VIR_DEBUG("conn=3D%p, npages=3D%u, pages=3D%p, startCell=3D%u, " - "cellCount=3D%u, counts=3D%p, flags=3D%x", + "cellCount=3D%u, counts=3D%p, flags=3D0x%x", conn, npages, pages, startCell, cellCount, counts, flags); =20 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=3D%p, ifaces=3D%p, flags=3D%x", conn, ifaces, flags); + VIR_DEBUG("conn=3D%p, ifaces=3D%p, flags=3D0x%x", conn, ifaces, flags); =20 virResetLastError(); =20 @@ -410,7 +410,7 @@ char * virInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("iface=3D%p, flags=3D%x", iface, flags); + VIR_DEBUG("iface=3D%p, flags=3D0x%x", iface, flags); =20 virResetLastError(); =20 @@ -460,7 +460,7 @@ virInterfaceGetXMLDesc(virInterfacePtr iface, unsigned = int flags) virInterfacePtr virInterfaceDefineXML(virConnectPtr conn, const char *xml, unsigned int fl= ags) { - VIR_DEBUG("conn=3D%p, xml=3D%s, flags=3D%x", conn, NULLSTR(xml), flags= ); + VIR_DEBUG("conn=3D%p, xml=3D%s, flags=3D0x%x", conn, NULLSTR(xml), fla= gs); =20 virResetLastError(); =20 @@ -550,7 +550,7 @@ int virInterfaceCreate(virInterfacePtr iface, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("iface=3D%p, flags=3D%x", iface, flags); + VIR_DEBUG("iface=3D%p, flags=3D0x%x", iface, flags); =20 virResetLastError(); =20 @@ -597,7 +597,7 @@ int virInterfaceDestroy(virInterfacePtr iface, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("iface=3D%p, flags=3D%x", iface, flags); + VIR_DEBUG("iface=3D%p, flags=3D0x%x", iface, flags); =20 virResetLastError(); =20 @@ -696,7 +696,7 @@ virInterfaceFree(virInterfacePtr iface) int virInterfaceChangeBegin(virConnectPtr conn, unsigned int flags) { - VIR_DEBUG("conn=3D%p, flags=3D%x", conn, flags); + VIR_DEBUG("conn=3D%p, flags=3D0x%x", conn, flags); =20 virResetLastError(); =20 @@ -736,7 +736,7 @@ virInterfaceChangeBegin(virConnectPtr conn, unsigned in= t flags) int virInterfaceChangeCommit(virConnectPtr conn, unsigned int flags) { - VIR_DEBUG("conn=3D%p, flags=3D%x", conn, flags); + VIR_DEBUG("conn=3D%p, flags=3D0x%x", conn, flags); =20 virResetLastError(); =20 @@ -776,7 +776,7 @@ virInterfaceChangeCommit(virConnectPtr conn, unsigned i= nt flags) int virInterfaceChangeRollback(virConnectPtr conn, unsigned int flags) { - VIR_DEBUG("conn=3D%p, flags=3D%x", conn, flags); + VIR_DEBUG("conn=3D%p, flags=3D0x%x", conn, flags); =20 virResetLastError(); =20 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; =20 - VIR_DOMAIN_DEBUG(domain, "fdlist=3D%p flags=3D%x", fdlist, flags); + VIR_DOMAIN_DEBUG(domain, "fdlist=3D%p flags=3D0x%x", fdlist, flags); =20 virResetLastError(); =20 @@ -128,7 +128,7 @@ virDomainLxcEnterNamespace(virDomainPtr domain, size_t i; =20 VIR_DOMAIN_DEBUG(domain, "nfdlist=3D%d, fdlist=3D%p, " - "noldfdlist=3D%p, oldfdlist=3D%p, flags=3D%x", + "noldfdlist=3D%p, oldfdlist=3D%p, flags=3D0x%x", nfdlist, fdlist, noldfdlist, oldfdlist, flags); =20 virResetLastError(); @@ -190,7 +190,7 @@ virDomainLxcEnterSecurityLabel(virSecurityModelPtr mode= l, virSecurityLabelPtr oldlabel, unsigned int flags) { - VIR_DEBUG("model=3D%p, label=3D%p, oldlabel=3D%p, flags=3D%x", + VIR_DEBUG("model=3D%p, label=3D%p, oldlabel=3D%p, flags=3D0x%x", model, label, oldlabel, flags); =20 virResetLastError(); @@ -293,7 +293,7 @@ int virDomainLxcEnterCGroup(virDomainPtr domain, virConnectPtr conn; virCgroupPtr cgroup =3D NULL; =20 - VIR_DOMAIN_DEBUG(domain, "flags=3D%x", flags); + VIR_DOMAIN_DEBUG(domain, "flags=3D0x%x", flags); =20 virResetLastError(); =20 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=3D%p, nets=3D%p, flags=3D%x", conn, nets, flags); + VIR_DEBUG("conn=3D%p, nets=3D%p, flags=3D0x%x", conn, nets, flags); =20 virResetLastError(); =20 @@ -790,7 +790,7 @@ char * virNetworkGetXMLDesc(virNetworkPtr network, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("network=3D%p, flags=3D%x", network, flags); + VIR_DEBUG("network=3D%p, flags=3D0x%x", network, flags); =20 virResetLastError(); =20 @@ -1199,7 +1199,7 @@ virNetworkGetDHCPLeases(virNetworkPtr network, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("network=3D%p, mac=3D'%s' leases=3D%p, flags=3D%x", + VIR_DEBUG("network=3D%p, mac=3D'%s' leases=3D%p, flags=3D0x%x", network, NULLSTR(mac), leases, flags); =20 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 flag= s) { - VIR_DEBUG("conn=3D%p, cap=3D%s, flags=3D%x", conn, NULLSTR(cap), flags= ); + VIR_DEBUG("conn=3D%p, cap=3D%s, flags=3D0x%x", conn, NULLSTR(cap), fla= gs); =20 virResetLastError(); =20 @@ -114,7 +114,7 @@ virConnectListAllNodeDevices(virConnectPtr conn, virNodeDevicePtr **devices, unsigned int flags) { - VIR_DEBUG("conn=3D%p, devices=3D%p, flags=3D%x", conn, devices, flags); + VIR_DEBUG("conn=3D%p, devices=3D%p, flags=3D0x%x", conn, devices, flag= s); =20 virResetLastError(); =20 @@ -163,7 +163,7 @@ virNodeListDevices(virConnectPtr conn, char **const names, int maxnames, unsigned int flags) { - VIR_DEBUG("conn=3D%p, cap=3D%s, names=3D%p, maxnames=3D%d, flags=3D%x", + VIR_DEBUG("conn=3D%p, cap=3D%s, names=3D%p, maxnames=3D%d, flags=3D0x%= x", conn, NULLSTR(cap), names, maxnames, flags); =20 virResetLastError(); @@ -246,7 +246,7 @@ virNodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, const char *wwpn, unsigned int flags) { - VIR_DEBUG("conn=3D%p, wwnn=3D%s, wwpn=3D%s, flags=3D%x", conn, NULLSTR= (wwnn), NULLSTR(wwpn), flags); + VIR_DEBUG("conn=3D%p, wwnn=3D%s, wwpn=3D%s, flags=3D0x%x", conn, NULLS= TR(wwnn), NULLSTR(wwpn), flags); =20 virResetLastError(); =20 @@ -285,7 +285,7 @@ virNodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, char * virNodeDeviceGetXMLDesc(virNodeDevicePtr dev, unsigned int flags) { - VIR_DEBUG("dev=3D%p, conn=3D%p, flags=3D%x", dev, dev ? dev->conn : NU= LL, flags); + VIR_DEBUG("dev=3D%p, conn=3D%p, flags=3D0x%x", dev, dev ? dev->conn : = NULL, flags); =20 virResetLastError(); =20 @@ -570,7 +570,7 @@ virNodeDeviceDetachFlags(virNodeDevicePtr dev, const char *driverName, unsigned int flags) { - VIR_DEBUG("dev=3D%p, conn=3D%p driverName=3D%s flags=3D%x", + VIR_DEBUG("dev=3D%p, conn=3D%p driverName=3D%s flags=3D0x%x", dev, dev ? dev->conn : NULL, driverName ? driverName : "(default)", flags); =20 @@ -698,7 +698,7 @@ virNodeDeviceCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("conn=3D%p, xmlDesc=3D%s, flags=3D%x", conn, NULLSTR(xmlDesc= ), flags); + VIR_DEBUG("conn=3D%p, xmlDesc=3D%s, flags=3D0x%x", conn, NULLSTR(xmlDe= sc), flags); =20 virResetLastError(); =20 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=3D%p, filters=3D%p, flags=3D%x", conn, filters, flags); + VIR_DEBUG("conn=3D%p, filters=3D%p, flags=3D0x%x", conn, filters, flag= s); =20 virResetLastError(); =20 @@ -460,7 +460,7 @@ char * virNWFilterGetXMLDesc(virNWFilterPtr nwfilter, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("nwfilter=3D%p, flags=3D%x", nwfilter, flags); + VIR_DEBUG("nwfilter=3D%p, flags=3D0x%x", nwfilter, flags); =20 virResetLastError(); =20 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 ch= ar *cmd, { virConnectPtr conn; =20 - VIR_DOMAIN_DEBUG(domain, "cmd=3D%s, result=3D%p, flags=3D%x", + VIR_DOMAIN_DEBUG(domain, "cmd=3D%s, result=3D%p, flags=3D0x%x", cmd, result, flags); =20 virResetLastError(); @@ -134,7 +134,7 @@ virDomainQemuAttach(virConnectPtr conn, unsigned int flags) { pid_t pid =3D pid_value; - VIR_DEBUG("conn=3D%p, pid=3D%u, flags=3D%x", conn, pid_value, flags); + VIR_DEBUG("conn=3D%p, pid=3D%u, flags=3D0x%x", conn, pid_value, flags); =20 virResetLastError(); =20 @@ -193,7 +193,7 @@ virDomainQemuAgentCommand(virDomainPtr domain, virConnectPtr conn; char *ret; =20 - VIR_DOMAIN_DEBUG(domain, "cmd=3D%s, timeout=3D%d, flags=3D%x", + VIR_DOMAIN_DEBUG(domain, "cmd=3D%s, timeout=3D%d, flags=3D0x%x", cmd, timeout, flags); =20 virResetLastError(); @@ -272,7 +272,7 @@ virConnectDomainQemuMonitorEventRegister(virConnectPtr = conn, unsigned int flags) { VIR_DOMAIN_DEBUG(dom, - "conn=3D%p, event=3D%s, cb=3D%p, opaque=3D%p, freecb= =3D%p, flags=3D%x", + "conn=3D%p, event=3D%s, cb=3D%p, opaque=3D%p, freecb= =3D%p, flags=3D0x%x", conn, NULLSTR(event), cb, opaque, freecb, flags); =20 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=3D%p, secrets=3D%p, flags=3D%x", conn, secrets, flags); + VIR_DEBUG("conn=3D%p, secrets=3D%p, flags=3D0x%x", conn, secrets, flag= s); =20 virResetLastError(); =20 @@ -333,7 +333,7 @@ virSecretLookupByUsage(virConnectPtr conn, virSecretPtr virSecretDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) { - VIR_DEBUG("conn=3D%p, xml=3D%s, flags=3D%x", conn, NULLSTR(xml), flags= ); + VIR_DEBUG("conn=3D%p, xml=3D%s, flags=3D0x%x", conn, NULLSTR(xml), fla= gs); =20 virResetLastError(); =20 @@ -487,7 +487,7 @@ virSecretGetXMLDesc(virSecretPtr secret, unsigned int f= lags) { virConnectPtr conn; =20 - VIR_DEBUG("secret=3D%p, flags=3D%x", secret, flags); + VIR_DEBUG("secret=3D%p, flags=3D0x%x", secret, flags); =20 virResetLastError(); =20 @@ -528,7 +528,7 @@ virSecretSetValue(virSecretPtr secret, const unsigned c= har *value, { virConnectPtr conn; =20 - VIR_DEBUG("secret=3D%p, value=3D%p, value_size=3D%zu, flags=3D%x", sec= ret, value, + VIR_DEBUG("secret=3D%p, value=3D%p, value_size=3D%zu, flags=3D0x%x", s= ecret, value, value_size, flags); =20 virResetLastError(); @@ -572,7 +572,7 @@ virSecretGetValue(virSecretPtr secret, size_t *value_si= ze, unsigned int flags) { virConnectPtr conn; =20 - VIR_DEBUG("secret=3D%p, value_size=3D%p, flags=3D%x", secret, value_si= ze, flags); + VIR_DEBUG("secret=3D%p, value_size=3D%p, flags=3D0x%x", secret, value_= size, flags); =20 virResetLastError(); =20 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=3D%p, pools=3D%p, flags=3D%x", conn, pools, flags); + VIR_DEBUG("conn=3D%p, pools=3D%p, flags=3D0x%x", conn, pools, flags); =20 virResetLastError(); =20 @@ -319,7 +319,7 @@ virConnectFindStoragePoolSources(virConnectPtr conn, const char *srcSpec, unsigned int flags) { - VIR_DEBUG("conn=3D%p, type=3D%s, src=3D%s, flags=3D%x", + VIR_DEBUG("conn=3D%p, type=3D%s, src=3D%s, flags=3D0x%x", conn, NULLSTR(type), NULLSTR(srcSpec), flags); =20 virResetLastError(); @@ -517,7 +517,7 @@ virStoragePoolCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("conn=3D%p, xmlDesc=3D%s, flags=3D%x", conn, NULLSTR(xmlDesc= ), flags); + VIR_DEBUG("conn=3D%p, xmlDesc=3D%s, flags=3D0x%x", conn, NULLSTR(xmlDe= sc), flags); =20 virResetLastError(); =20 @@ -560,7 +560,7 @@ virStoragePoolDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) { - VIR_DEBUG("conn=3D%p, xml=3D%s, flags=3D%x", conn, NULLSTR(xml), flags= ); + VIR_DEBUG("conn=3D%p, xml=3D%s, flags=3D0x%x", conn, NULLSTR(xml), fla= gs); =20 virResetLastError(); =20 @@ -601,7 +601,7 @@ virStoragePoolBuild(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("pool=3D%p, flags=3D%x", pool, flags); + VIR_DEBUG("pool=3D%p, flags=3D0x%x", pool, flags); =20 virResetLastError(); =20 @@ -677,7 +677,7 @@ virStoragePoolCreate(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("pool=3D%p, flags=3D%x", pool, flags); + VIR_DEBUG("pool=3D%p, flags=3D0x%x", pool, flags); =20 virResetLastError(); =20 @@ -759,7 +759,7 @@ virStoragePoolDelete(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("pool=3D%p, flags=3D%x", pool, flags); + VIR_DEBUG("pool=3D%p, flags=3D0x%x", pool, flags); =20 virResetLastError(); =20 @@ -855,7 +855,7 @@ virStoragePoolRefresh(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("pool=3D%p, flags=3D%x", pool, flags); + VIR_DEBUG("pool=3D%p, flags=3D0x%x", pool, flags); =20 virResetLastError(); =20 @@ -1019,7 +1019,7 @@ virStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("pool=3D%p, flags=3D%x", pool, flags); + VIR_DEBUG("pool=3D%p, flags=3D0x%x", pool, flags); =20 virResetLastError(); =20 @@ -1144,7 +1144,7 @@ virStoragePoolListAllVolumes(virStoragePoolPtr pool, virStorageVolPtr **vols, unsigned int flags) { - VIR_DEBUG("pool=3D%p, vols=3D%p, flags=3D%x", pool, vols, flags); + VIR_DEBUG("pool=3D%p, vols=3D%p, flags=3D0x%x", pool, vols, flags); =20 virResetLastError(); =20 @@ -1455,7 +1455,7 @@ virStorageVolCreateXML(virStoragePoolPtr pool, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("pool=3D%p, xmlDesc=3D%s, flags=3D%x", pool, NULLSTR(xmlDesc= ), flags); + VIR_DEBUG("pool=3D%p, xmlDesc=3D%s, flags=3D0x%x", pool, NULLSTR(xmlDe= sc), flags); =20 virResetLastError(); =20 @@ -1507,7 +1507,7 @@ virStorageVolCreateXMLFrom(virStoragePoolPtr pool, virStorageVolPtr clonevol, unsigned int flags) { - VIR_DEBUG("pool=3D%p, xmlDesc=3D%s, clonevol=3D%p, flags=3D%x", + VIR_DEBUG("pool=3D%p, xmlDesc=3D%s, clonevol=3D%p, flags=3D0x%x", pool, NULLSTR(xmlDesc), clonevol, flags); =20 virResetLastError(); @@ -1569,7 +1569,7 @@ virStorageVolDownload(virStorageVolPtr vol, unsigned long long length, unsigned int flags) { - VIR_DEBUG("vol=3D%p, stream=3D%p, offset=3D%llu, length=3D%llu, flags= =3D%x", + VIR_DEBUG("vol=3D%p, stream=3D%p, offset=3D%llu, length=3D%llu, flags= =3D0x%x", vol, stream, offset, length, flags); =20 virResetLastError(); @@ -1648,7 +1648,7 @@ virStorageVolUpload(virStorageVolPtr vol, unsigned long long length, unsigned int flags) { - VIR_DEBUG("vol=3D%p, stream=3D%p, offset=3D%llu, length=3D%llu, flags= =3D%x", + VIR_DEBUG("vol=3D%p, stream=3D%p, offset=3D%llu, length=3D%llu, flags= =3D0x%x", vol, stream, offset, length, flags); =20 virResetLastError(); @@ -1699,7 +1699,7 @@ virStorageVolDelete(virStorageVolPtr vol, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("vol=3D%p, flags=3D%x", vol, flags); + VIR_DEBUG("vol=3D%p, flags=3D0x%x", vol, flags); =20 virResetLastError(); =20 @@ -1748,7 +1748,7 @@ virStorageVolWipe(virStorageVolPtr vol, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("vol=3D%p, flags=3D%x", vol, flags); + VIR_DEBUG("vol=3D%p, flags=3D0x%x", vol, flags); =20 virResetLastError(); =20 @@ -1795,7 +1795,7 @@ virStorageVolWipePattern(virStorageVolPtr vol, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("vol=3D%p, algorithm=3D%u, flags=3D%x", vol, algorithm, flag= s); + VIR_DEBUG("vol=3D%p, algorithm=3D%u, flags=3D0x%x", vol, algorithm, fl= ags); =20 virResetLastError(); =20 @@ -1940,7 +1940,7 @@ virStorageVolGetInfoFlags(virStorageVolPtr vol, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("vol=3D%p, info=3D%p, flags=3D%x", vol, info, flags); + VIR_DEBUG("vol=3D%p, info=3D%p, flags=3D0x%x", vol, info, flags); =20 virResetLastError(); =20 @@ -1983,7 +1983,7 @@ virStorageVolGetXMLDesc(virStorageVolPtr vol, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("vol=3D%p, flags=3D%x", vol, flags); + VIR_DEBUG("vol=3D%p, flags=3D0x%x", vol, flags); =20 virResetLastError(); =20 @@ -2086,7 +2086,7 @@ virStorageVolResize(virStorageVolPtr vol, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("vol=3D%p capacity=3D%llu flags=3D%x", vol, capacity, flags); + VIR_DEBUG("vol=3D%p capacity=3D%llu flags=3D0x%x", vol, capacity, flag= s); =20 virResetLastError(); =20 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; =20 - VIR_DEBUG("conn=3D%p, flags=3D%x", conn, flags); + VIR_DEBUG("conn=3D%p, flags=3D0x%x", conn, flags); =20 virResetLastError(); =20 @@ -349,7 +349,7 @@ virStreamRecvFlags(virStreamPtr stream, size_t nbytes, unsigned int flags) { - VIR_DEBUG("stream=3D%p, data=3D%p, nbytes=3D%zu flags=3D%x", + VIR_DEBUG("stream=3D%p, data=3D%p, nbytes=3D%zu flags=3D0x%x", stream, data, nbytes, flags); =20 virResetLastError(); @@ -415,7 +415,7 @@ virStreamSendHole(virStreamPtr stream, long long length, unsigned int flags) { - VIR_DEBUG("stream=3D%p, length=3D%lld flags=3D%x", + VIR_DEBUG("stream=3D%p, length=3D%lld flags=3D0x%x", stream, length, flags); =20 virResetLastError(); @@ -458,7 +458,7 @@ virStreamRecvHole(virStreamPtr stream, long long *length, unsigned int flags) { - VIR_DEBUG("stream=3D%p, length=3D%p flags=3D%x", + VIR_DEBUG("stream=3D%p, length=3D%p flags=3D0x%x", stream, length, flags); =20 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; =20 - VIR_DEBUG("name=3D%s, auth=3D%p, flags=3D%x", NULLSTR(name), auth, fla= gs); + VIR_DEBUG("name=3D%s, auth=3D%p, flags=3D0x%x", NULLSTR(name), auth, f= lags); virResetLastError(); ret =3D virConnectOpenInternal(name, auth, flags); if (!ret) diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lock= d.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 ve= rsion, const char *configFile, unsigned int flags) { - VIR_DEBUG("version=3D%u configFile=3D%s flags=3D%x", version, NULLSTR(= configFile), flags); + VIR_DEBUG("version=3D%u configFile=3D%s flags=3D0x%x", version, NULLST= R(configFile), flags); =20 virCheckFlags(0, -1); =20 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 ATT= RIBUTE_UNUSED, const char *configFile ATTRIBUTE_UNUSED, unsigned int flags_unused ATTRIBUTE_UNUSE= D) { - VIR_DEBUG("version=3D%u configFile=3D%s flags=3D%x", + VIR_DEBUG("version=3D%u configFile=3D%s flags=3D0x%x", version, NULLSTR(configFile), flags_unused); =20 return 0; diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sa= nlock.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 versi= on, { virLockManagerSanlockDriverPtr driver; =20 - VIR_DEBUG("version=3D%u configFile=3D%s flags=3D%x", + VIR_DEBUG("version=3D%u configFile=3D%s flags=3D0x%x", version, NULLSTR(configFile), flags); virCheckFlags(0, -1); =20 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 c= har *name, char *modfile =3D NULL; char *configFile =3D NULL; =20 - VIR_DEBUG("name=3D%s driverName=3D%s configDir=3D%s flags=3D%x", + VIR_DEBUG("name=3D%s driverName=3D%s configDir=3D%s flags=3D0x%x", name, driverName, configDir, flags); =20 if (virAsprintf(&configFile, "%s/%s-%s.conf", @@ -301,7 +301,7 @@ virLockManagerPtr virLockManagerNew(virLockDriverPtr dr= iver, unsigned int flags) { virLockManagerPtr lock; - VIR_DEBUG("driver=3D%p type=3D%u nparams=3D%zu params=3D%p flags=3D%x", + VIR_DEBUG("driver=3D%p type=3D%u nparams=3D%zu params=3D%p flags=3D0x%= x", driver, type, nparams, params, flags); virLockManagerLogParams(nparams, params); =20 @@ -328,7 +328,7 @@ int virLockManagerAddResource(virLockManagerPtr lock, virLockManagerParamPtr params, unsigned int flags) { - VIR_DEBUG("lock=3D%p type=3D%u name=3D%s nparams=3D%zu params=3D%p fla= gs=3D%x", + VIR_DEBUG("lock=3D%p type=3D%u name=3D%s nparams=3D%zu params=3D%p fla= gs=3D0x%x", lock, type, name, nparams, params, flags); virLockManagerLogParams(nparams, params); =20 @@ -346,7 +346,7 @@ int virLockManagerAcquire(virLockManagerPtr lock, virDomainLockFailureAction action, int *fd) { - VIR_DEBUG("lock=3D%p state=3D'%s' flags=3D%x action=3D%d fd=3D%p", + VIR_DEBUG("lock=3D%p state=3D'%s' flags=3D0x%x action=3D%d fd=3D%p", lock, NULLSTR(state), flags, action, fd); =20 CHECK_MANAGER(drvAcquire, -1); @@ -362,7 +362,7 @@ int virLockManagerRelease(virLockManagerPtr lock, char **state, unsigned int flags) { - VIR_DEBUG("lock=3D%p state=3D%p flags=3D%x", lock, state, flags); + VIR_DEBUG("lock=3D%p state=3D%p flags=3D0x%x", lock, state, flags); =20 CHECK_MANAGER(drvRelease, -1); =20 @@ -374,7 +374,7 @@ int virLockManagerInquire(virLockManagerPtr lock, char **state, unsigned int flags) { - VIR_DEBUG("lock=3D%p state=3D%p flags=3D%x", lock, state, flags); + VIR_DEBUG("lock=3D%p state=3D%p flags=3D0x%x", lock, state, flags); =20 CHECK_MANAGER(drvInquire, -1); =20 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_enabl= ed, */ bindOverReadonly =3D !!(mnt_mflags & MS_RDONLY); =20 - VIR_DEBUG("Mount %s on %s type=3D%s flags=3D%x", + VIR_DEBUG("Mount %s on %s type=3D%s flags=3D0x%x", mnt_src, mnt->dst, mnt->type, mnt_mflags & ~MS_RDONLY); if (mount(mnt_src, mnt->dst, mnt->type, mnt_mflags & ~MS_RDONLY, N= ULL) < 0) { virReportSystemError(errno, - _("Failed to mount %s on %s type %s flags= =3D%x"), + _("Failed to mount %s on %s type %s flags= =3D0x%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=3D%x= "), + _("Failed to re-mount %s on %s flags=3D0x= %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; =20 - VIR_DEBUG("Mount devpts on %s type=3Dtmpfs flags=3D%x, opts=3D%s", + VIR_DEBUG("Mount devpts on %s type=3Dtmpfs flags=3D0x%x, opts=3D%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 =3D -1; =20 - VIR_DEBUG("params=3D%p, flags=3D%x", params, flags); + VIR_DEBUG("params=3D%p, flags=3D0x%x", params, flags); =20 virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); =20 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, =20 VIR_DEBUG("driver=3D%p, vm=3D%p, xmlin=3D%s, dname=3D%s," " cookieout=3D%p, cookieoutlen=3D%p," - " nmigrate_disks=3D%zu, migrate_disks=3D%p, flags=3D%lx", + " nmigrate_disks=3D%zu, migrate_disks=3D%p, flags=3D0x%lx", driver, vm, NULLSTR(xmlin), NULLSTR(dname), cookieout, cookieoutlen, nmigrate_disks, migrate_disks, flags); @@ -2887,7 +2887,7 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, =20 VIR_DEBUG("driver=3D%p, dconn=3D%p, cookiein=3D%s, cookieinlen=3D%d, " "cookieout=3D%p, cookieoutlen=3D%p, st=3D%p, def=3D%p, " - "origname=3D%s, flags=3D%lx", + "origname=3D%s, flags=3D0x%lx", driver, dconn, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, st, *def, origname, flags); =20 @@ -2961,7 +2961,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, VIR_DEBUG("driver=3D%p, dconn=3D%p, cookiein=3D%s, cookieinlen=3D%d, " "cookieout=3D%p, cookieoutlen=3D%p, uri_in=3D%s, uri_out=3D%= p, " "def=3D%p, origname=3D%s, listenAddress=3D%s, " - "nmigrate_disks=3D%zu, migrate_disks=3D%p, nbdPort=3D%d, fla= gs=3D%lx", + "nmigrate_disks=3D%zu, migrate_disks=3D%p, nbdPort=3D%d, fla= gs=3D0x%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 =3D NULL; =20 VIR_DEBUG("driver=3D%p, conn=3D%p, vm=3D%p, cookiein=3D%s, cookieinlen= =3D%d, " - "flags=3D%x, retcode=3D%d", + "flags=3D0x%x, retcode=3D%d", driver, conn, vm, NULLSTR(cookiein), cookieinlen, flags, retcode); =20 @@ -3601,7 +3601,7 @@ qemuMigrationRun(virQEMUDriverPtr driver, int rc; =20 VIR_DEBUG("driver=3D%p, vm=3D%p, cookiein=3D%s, cookieinlen=3D%d, " - "cookieout=3D%p, cookieoutlen=3D%p, flags=3D%lx, resource=3D= %lu, " + "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%lx, resource= =3D%lu, " "spec=3D%p (dest=3D%d, fwd=3D%d), dconn=3D%p, graphicsuri=3D= %s, " "nmigrate_disks=3D%zu, migrate_disks=3D%p", driver, vm, NULLSTR(cookiein), cookieinlen, @@ -3955,7 +3955,7 @@ static int doNativeMigrate(virQEMUDriverPtr driver, qemuMigrationSpec spec; =20 VIR_DEBUG("driver=3D%p, vm=3D%p, uri=3D%s, cookiein=3D%s, cookieinlen= =3D%d, " - "cookieout=3D%p, cookieoutlen=3D%p, flags=3D%lx, resource=3D= %lu, " + "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%lx, resource= =3D%lu, " "graphicsuri=3D%s, nmigrate_disks=3D%zu migrate_disks=3D%p", driver, vm, uri, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, resource, @@ -4033,7 +4033,7 @@ static int doTunnelMigrate(virQEMUDriverPtr driver, int fds[2] =3D { -1, -1 }; =20 VIR_DEBUG("driver=3D%p, vm=3D%p, st=3D%p, cookiein=3D%s, cookieinlen= =3D%d, " - "cookieout=3D%p, cookieoutlen=3D%p, flags=3D%lx, resource=3D= %lu, " + "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%lx, resource= =3D%lu, " "graphicsuri=3D%s, nmigrate_disks=3D%zu, migrate_disks=3D%p", driver, vm, st, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, resource, @@ -4099,7 +4099,7 @@ static int doPeer2PeerMigrate2(virQEMUDriverPtr drive= r, qemuMonitorMigrationParams migParams =3D { 0 }; =20 VIR_DEBUG("driver=3D%p, sconn=3D%p, dconn=3D%p, vm=3D%p, dconnuri=3D%s= , " - "flags=3D%lx, dname=3D%s, resource=3D%lu", + "flags=3D0x%lx, dname=3D%s, resource=3D%lu", driver, sconn, dconn, vm, NULLSTR(dconnuri), flags, NULLSTR(dname), resource); =20 @@ -4273,7 +4273,7 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver, VIR_DEBUG("driver=3D%p, sconn=3D%p, dconn=3D%p, dconnuri=3D%s, vm=3D%p= , xmlin=3D%s, " "dname=3D%s, uri=3D%s, graphicsuri=3D%s, listenAddress=3D%s,= " "nmigrate_disks=3D%zu, migrate_disks=3D%p, nbdPort=3D%d, " - "bandwidth=3D%llu, useParams=3D%d, flags=3D%lx", + "bandwidth=3D%llu, useParams=3D%d, flags=3D0x%lx", driver, sconn, dconn, NULLSTR(dconnuri), vm, NULLSTR(xmlin), NULLSTR(dname), NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress), nmigrate_disks, migrate_disks, nbdPo= rt, @@ -4622,7 +4622,7 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver, =20 VIR_DEBUG("driver=3D%p, sconn=3D%p, vm=3D%p, xmlin=3D%s, dconnuri=3D%s= , uri=3D%s, " "graphicsuri=3D%s, listenAddress=3D%s, nmigrate_disks=3D%zu,= " - "migrate_disks=3D%p, nbdPort=3D%d, flags=3D%lx, dname=3D%s, " + "migrate_disks=3D%p, nbdPort=3D%d, flags=3D0x%lx, dname=3D%s= , " "resource=3D%lu", driver, sconn, vm, NULLSTR(xmlin), NULLSTR(dconnuri), NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress), @@ -4972,7 +4972,7 @@ qemuMigrationPerform(virQEMUDriverPtr driver, "uri=3D%s, graphicsuri=3D%s, listenAddress=3D%s, " "nmigrate_disks=3D%zu, migrate_disks=3D%p, nbdPort=3D%d, " "cookiein=3D%s, cookieinlen=3D%d, cookieout=3D%p, cookieoutl= en=3D%p, " - "flags=3D%lx, dname=3D%s, resource=3D%lu, v3proto=3D%d", + "flags=3D0x%lx, dname=3D%s, resource=3D%lu, v3proto=3D%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 =3D true; =20 VIR_DEBUG("driver=3D%p, dconn=3D%p, vm=3D%p, cookiein=3D%s, cookieinle= n=3D%d, " - "cookieout=3D%p, cookieoutlen=3D%p, flags=3D%lx, retcode=3D%= d", + "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%lx, retcode= =3D%d", driver, dconn, vm, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, retcode); =20 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=3D%d flags=3D%x", fd, flags); + VIR_DEBUG("fd=3D%d flags=3D0x%x", fd, flags); =20 QEMU_CHECK_MONITOR(mon); =20 @@ -2679,7 +2679,7 @@ qemuMonitorMigrateToHost(qemuMonitorPtr mon, { int ret; char *uri =3D NULL; - VIR_DEBUG("hostname=3D%s port=3D%d flags=3D%x", hostname, port, flags); + VIR_DEBUG("hostname=3D%s port=3D%d flags=3D0x%x", hostname, port, flag= s); =20 QEMU_CHECK_MONITOR(mon); =20 @@ -2708,7 +2708,7 @@ qemuMonitorMigrateToCommand(qemuMonitorPtr mon, char *argstr; char *dest =3D NULL; int ret =3D -1; - VIR_DEBUG("argv=3D%p flags=3D%x", argv, flags); + VIR_DEBUG("argv=3D%p flags=3D0x%x", argv, flags); =20 QEMU_CHECK_MONITOR(mon); =20 @@ -3330,7 +3330,7 @@ qemuMonitorDriveMirror(qemuMonitorPtr mon, unsigned int flags) { VIR_DEBUG("device=3D%s, file=3D%s, format=3D%s, bandwidth=3D%lld, " - "granularity=3D%#x, buf_size=3D%lld, flags=3D%x", + "granularity=3D%#x, buf_size=3D%lld, flags=3D0x%x", device, file, NULLSTR(format), bandwidth, granularity, buf_size, flags); =20 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 flag= s) { int ret; =20 - VIR_DEBUG("vm=3D%p name=3D%s pid=3D%lld flags=3D%x", + VIR_DEBUG("vm=3D%p name=3D%s pid=3D%lld flags=3D0x%x", vm, vm->def->name, (long long) vm->pid, flags); =20 @@ -6109,7 +6109,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); =20 VIR_DEBUG("Shutting down vm=3D%p name=3D%s id=3D%d pid=3D%lld, " - "reason=3D%s, asyncJob=3D%s, flags=3D%x", + "reason=3D%s, asyncJob=3D%s, flags=3D0x%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=3D%p data=3D%p nbytes=3D%zu flags=3D%x", + VIR_DEBUG("st=3D%p data=3D%p nbytes=3D%zu flags=3D0x%x", st, data, nbytes, flags); struct private_data *priv =3D st->conn->privateData; virNetClientStreamPtr privst =3D st->privateData; @@ -5690,7 +5690,7 @@ remoteStreamSendHole(virStreamPtr st, long long length, unsigned int flags) { - VIR_DEBUG("st=3D%p length=3D%lld flags=3D%x", + VIR_DEBUG("st=3D%p length=3D%lld flags=3D0x%x", st, length, flags); struct private_data *priv =3D st->conn->privateData; virNetClientStreamPtr privst =3D st->privateData; @@ -5724,7 +5724,7 @@ remoteStreamRecvHole(virStreamPtr st, virNetClientStreamPtr privst =3D st->privateData; int rv; =20 - VIR_DEBUG("st=3D%p length=3D%p flags=3D%x", + VIR_DEBUG("st=3D%p length=3D%p flags=3D0x%x", st, length, flags); =20 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(virNetClientProgramPt= r prog, =20 /* Check version, etc. */ if (msg->header.prog !=3D 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; } =20 if (msg->header.vers !=3D 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; } =20 if (msg->header.status !=3D 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; } =20 if (msg->header.type !=3D 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 =3D virNetClientProgramGetEvent(prog, msg->header.proc); =20 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 =3D -1; size_t want; =20 - VIR_DEBUG("st=3D%p client=3D%p data=3D%p nbytes=3D%zu nonblock=3D%d fl= ags=3D%x", + VIR_DEBUG("st=3D%p client=3D%p data=3D%p nbytes=3D%zu nonblock=3D%d fl= ags=3D0x%x", st, client, data, nbytes, nonblock, flags); =20 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(virNetServerClien= tPtr client) #if WITH_GNUTLS } #endif - VIR_DEBUG("mode=3D%o", mode); + VIR_DEBUG("mode=3D0%o", mode); return mode; } =20 diff --git a/src/security/security_manager.c b/src/security/security_manage= r.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; =20 - VIR_DEBUG("drv=3D%p (%s) virtDriver=3D%s flags=3D%x", + VIR_DEBUG("drv=3D%p (%s) virtDriver=3D%s flags=3D0x%x", drv, drv->name, virtDriver, flags); =20 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 =3D NULL; =20 - VIR_DEBUG("st=3D%p path=3D%s oflags=3D%x offset=3D%llu length=3D%llu m= ode=3D%o", + VIR_DEBUG("st=3D%p path=3D%s oflags=3D0x%x offset=3D%llu length=3D%llu= mode=3D0%o", st, path, oflags, offset, length, mode); =20 oflags |=3D 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) =3D=3D O_WRONLY) { output =3D true; } else if ((mode & O_ACCMODE) !=3D 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; } =20 - VIR_DEBUG("Mount devfs on %s type=3Dtmpfs flags=3D%lx, opts=3D%s", + VIR_DEBUG("Mount devfs on %s type=3Dtmpfs flags=3D0x%lx, opts=3D%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 =3D (group->actionFlags & VIR_FIREWALL_TRANSACTION_I= GNORE_ERRORS); size_t i; =20 - VIR_INFO("Starting transaction for firewall=3D%p group=3D%p flags=3D%x= ", + VIR_INFO("Starting transaction for firewall=3D%p group=3D%p flags=3D0x= %x", firewall, group, group->actionFlags); firewall->currentGroup =3D idx; group->addingRollback =3D 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 lockspa= ce, int ret =3D -1; virLockSpaceResourcePtr res; =20 - VIR_DEBUG("lockspace=3D%p resname=3D%s flags=3D%x owner=3D%lld", + VIR_DEBUG("lockspace=3D%p resname=3D%s flags=3D0x%x owner=3D%lld", lockspace, resname, flags, (unsigned long long)owner); =20 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; =20 - VIR_DEBUG("Opening %s mode=3D%02o", path, mode); + VIR_DEBUG("Opening %s mode=3D0%02o", path, mode); =20 if (VIR_ALLOC(entry) < 0) return NULL; --=20 2.13.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list