- Devel - libvirt List Archives

[libvirt] [perl PATCH v2 0/3] maint: Rename autobuild.sh to prepare-release.sh
by Andrea Bolognani 04 May '18

04 May '18

Changes from [v1]: * rename the script instead of dropping it; * perform some further clean ups. [v1] https://www.redhat.com/archives/libvir-list/2018-May/msg00221.html Andrea Bolognani (3): maint: Rename autobuild.sh to prepare-release.sh prepare-release: Drop references to Test::AutoBuild prepare-release: Drop references to Debian packages autobuild.sh => prepare-release.sh | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) rename autobuild.sh => prepare-release.sh (67%) -- 2.17.0

2 10

[libvirt] [PATCH 0/2] adding virHas/GetLastErrorCode/Domain to paritally replace virGetLastError
by ramyelkest 04 May '18

04 May '18

Many places in the code call virGetLastError() just to check the raised error code, or domain. However virGetLastError() can return NULL, so the code has to check for that as well. So Instead we create functions virGetLastErrorCode and virGetLastErrorDomain (in addition to the existing virGetLastErrorMessage) that always return a valid error code/domain/message, to simplify callers. Also created virHasLastErrorCode for completion This is my first commit, for: https://wiki.libvirt.org/page/BiteSizedTasks#Add_and_use_virGetLastErrorCod… Notes: * There are a few instances of virGetLastErrorCode() left where we use multiple fields from the error, which makes sense to keep it. * I didn't manage to use virGetLastErrorDomain() (due to the above) so I'm inclined to remove it. * virHasLastError is more or less only a semantic improvement over virGetLastError, so I'm happy to revert it if needed Signed-off-by: Ramy Elkest <ramyelkest(a)gmail.com> ramyelkest (2): util: adding virHasLastError and virGetLastErrorCode/Domain all: replacing virGetLastError with virHas/GetLastErrorCode/Domain include/libvirt/virterror.h | 3 ++ src/libvirt_public.syms | 7 +++++ src/locking/lock_driver_lockd.c | 3 +- src/lxc/lxc_controller.c | 4 +-- src/qemu/qemu_agent.c | 3 +- src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 12 ++++---- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_migration.c | 4 +-- src/qemu/qemu_monitor.c | 5 ++-- src/qemu/qemu_monitor_json.c | 2 +- src/qemu/qemu_process.c | 2 +- src/remote/remote_driver.c | 3 +- src/rpc/virnetclient.c | 2 +- src/util/virerror.c | 63 +++++++++++++++++++++++++++++++++++++++++ src/util/virfilecache.c | 3 +- src/util/virxml.c | 4 +-- tests/commandtest.c | 2 +- tests/testutils.c | 6 ++-- tests/virhostcputest.c | 2 +- tests/virstoragetest.c | 8 +++--- tools/virsh-domain-monitor.c | 7 ++--- tools/virsh-domain.c | 4 +-- tools/virsh-util.c | 3 +- tools/vsh.c | 2 +- 26 files changed, 110 insertions(+), 51 deletions(-) -- 2.7.4

2 4

[libvirt] [jenkins-ci PATCH] guests: Update vault
by Pavel Hrdina 04 May '18

04 May '18

Renaming node in Jenkins changes the secret as well so we cannot reuse the same secret as for the old node. This updates the libvirt-fedora-28 secret to correct one. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under trivial rule. guests/vars/vault.yml | 90 +++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/guests/vars/vault.yml b/guests/vars/vault.yml index 403bd9b..5bf89dc 100644 --- a/guests/vars/vault.yml +++ b/guests/vars/vault.yml @@ -1,46 +1,46 @@ $ANSIBLE_VAULT;1.1;AES256 -37663961316238333332643164623861363938613135376161343231383739663836313130363538 -3136326161376136376332636534643437626530316439650a636134636561333962376564626635 -31306539613534653133383161313834633133316361303539646234356335386639303332323063 -3937626336326131650a373737396639373063316131633634393961393634663961613532353134 -32623065373438336561643538666536666665323536643730386364653162323939616131313634 -38653936663937613765663465353166656363356336636362353432636537633836623930653437 -30353239303435613536636333386436336638636462626537623766343237376331643334633433 -37353531616466386234376639306261303561373035383338383366646537373231386362313562 -66663965366438383833653631386236356163653835303664666539326362383362343838653333 -39623535616361653838626164306666626634373237626638373131303439356164646361613838 -64333165393935636162613638626461313661623963626664366361366364643136313236306636 -61633665393630356133306338343563636332386539626366383133326662633638306330323437 -34613034326465346338633538363231386430363932656430346634663437333734363234346533 -35303962333032626435343030653338656133323932386264346562323133326164623961623466 -62643763333563336362666439653038653335373531303930313239393166623539386239323337 -39393337313563656131646130633330313230366462306636363535386663666131613662363566 -63643030633262336263316134636136616430636536363464386436616530336264396264393762 -36646531636238343763376438666163376166613231306363633536623166356437386333383665 -37353962383238346132633230373666366638386162663263663134303936633034643737386362 -36393537373864323632376632376134303866393966336536376139393334613163356234623863 -36353837616535313266326538376663316366616561613833393037316264396532306430623338 -33636339623861313536323835326464636265386536646263643765306432626462363533373434 -32343961613563613734633736396139623463653230303337333862393836393533363637626662 -35376236613436323736643533613436646136373436363862383933323231663237343838313262 -34343337343031326139366636346632303738366439346433633738313464366438366235356462 -65376165396532623566663335396332333635346661613431343237366166376462393732373532 -62616631643564653865386133663666313366313336323432316236336165386234323165366461 -35343238336235386364363732343862393039326234653539643861383832393465343536353739 -33633134333836393965343935316564653866363130343234633566643463343331306135386334 -39316166616463383964613432373437623964343164383638666531303064313063663330366566 -33643930396232626266396634366564633163333837373062636131623463613061656138363534 -39383830626136636563663233376237626565643661656430336462626436386235643239646365 -34303938323237626362613765326138376130666466373033626338363161383432623465353131 -39373230336330666337393161306437313035373164366330333533636662313266336333626261 -37353638623362643138356434323864346265613835306665383564323139333539336231323534 -38323664396438663664343436333133656336663633396234303034633163643534346139663632 -34633364373066303363306366653566353338326566616138643761343166343536333239653966 -39626639383762653439643631663161303333323330313063336532303531393830646532343261 -65363434373538653337306233333238653465313266643838333862616337323063626432393939 -34663838363931353561396164623138366538376230333738373962356337366533643866343863 -37633366323334323936303962653462353831386262336233336339633366336164623766653862 -32653262373433343136386363386231373938636661373363393331663365636333633164353563 -38643966373261356131666432313934313038363034306162373262353666303936666564303935 -62383432633763623864323263616632396166363165336331363434316430626334616537376132 -63666665336362373265363462343666356434323365633632626632666130356431 +66646139336431653964363035353762363664313738393832356132333835616363373032656335 +3439633266356532316564643762623935643736613839390a616631363336393962633464326264 +31373235323236303134356165386638663865353331353362386538386233363438623035343462 +3864656136376430360a646235373734636666373934616463363234316262376534633865616632 +32643566633531323162366134333562363463336237646130393965646335316561393565663664 +36343164373564336233363963393031363937336137303433396265323261663632373534613365 +31613838363562366564646333646638303837626638323065326237623665646264633233633537 +39373432363962396463323532353434623631383763346234343462333565383333366439393835 +30356437393232363432313334616462346164393437303330343562356461626464633935376239 +39626464316662333736643962623961343662396236306239333335373033366535623730353538 +66346164333839626563366666373432363331343030663537663536623965303333393534316538 +66623737363431303632363237323562306134376336393564366138626435343539613239623539 +39653331623466333535356166653036356564373138623461643862346161383062623738626266 +32613337323038646134336333613266386332353431656263353463656162393732343730393736 +34373033653933656565613063316463373535333836353234333536643639323037373333376338 +65666632623161326538333263626264373535633462306361633835323439663536326433616263 +66373532633865653834323565333536313731643837393834666464626565373938336537363633 +33323335633261643638643038623631633362633366393564316632383030656262383931656262 +65306265316264373732623466393935666633353730346632336262663766333833393961353565 +36383336313062363930633335346430306138656538633637623266383461323735643635613531 +38613265353736303336616638303333343739313033383363303638346266663830613534666464 +33383538303562643232626333303065313364386336366165316263363135396637623739316261 +32376332373539616334646130366262343837323832623965376566343366336563386639326333 +36653365383162623333373766393166656463393331663035616636386238396365663535383334 +39663634386133613138333730366331653262383761633462633239666132343239643735303732 +37343239383038343332656565313465666261646436333536363532376361636461336133336465 +65663561336430336664636262356362636635623961386462313437373863366134343164643762 +64653236616435326432363137646362646433316535393135353333336331313832623461623536 +35653739613834323564313163383563383633343336316533356535623838313663623464353238 +66333862623762316363636439613430363038633062663439383032393934313266316131323836 +30396163303038323564663639656161353336356435633635306538313032626566306366666135 +36383234353161313534343962336536313763306337393239626330396363396235643239306436 +31386631383666363365313434366538616130636164363536343364653861666662343065346663 +31356430653831653962333333396436626630333831343537366636336462373865643164326637 +65623237373561616164333238336463666239306564626538383666303562623632303630303335 +36386665346135623334646336663831666136323231376131383263343631643962643962336466 +38376264376662383263373562313263613866316138653862643833666134316338343863363631 +32663961366635353461303633366364333836636639386537396565333737353164616165323238 +66656666323265323361613162353835313763656637633464363131343361366435313565326664 +63663064336231633865663665666564366264366638356265396236326436623133653836376665 +30383436353663663637363337313232373430356261316465326261656161356436373265653939 +63356538663134386438666638386563393961373265363532653733373263623932613737613234 +61643536663036633132623161343935376633313364616436626561396262303765393662346632 +62353432646234383764366235623062636536666537323831316133636537306334616266363164 +64613735653731626231313931633839326663343262316362383763653832356163 -- 2.14.3

1 0

[libvirt] [PATCH] Qemu driver: Support network-backed pflash disks.
by Prerna Saxena 04 May '18

04 May '18

This implements support for firmware loader & NVRAM disks over network-backed disks. As discussed in https://www.redhat.com/archives/libvir-list/2018-March/msg01721.html, the patch embeds the <source> spec for disks in <loader> and <nvram> elements as well. Currently, the source type is annotated by introducing a new attribute "backing" for both 'loader' and 'nvram' elements. Hence, a sample XML with new annotation looks like this: <loader readonly='yes' type='pflash' backing='file'> <source file='/usr/share/OVMF/OVMF_CODE.fd'/> </loader> <nvram backing='network'> <source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool/0'> <host name='example.com' port='6000'/> </source> The patche automatically re-formats any older-stype declaration into this new style. Templates can be used to create a new NVRAM only if the nvram backing = 'file'.

3 4

[libvirt] [dbus PATCH v2 0/2] improve annotation of properties
by Pavel Hrdina 04 May '18

04 May '18

Pavel Hrdina (2): Change the default annotation for emitting changed properties to false Annotate properties that will never change during the object lifecycle data/org.libvirt.Connect.xml | 3 +++ data/org.libvirt.Domain.xml | 2 ++ data/org.libvirt.Network.xml | 3 +++ 3 files changed, 8 insertions(+) -- 2.14.3

2 3

[libvirt] [dbus PATCH 0/4] various fixes
by Pavel Hrdina 04 May '18

04 May '18

Pavel Hrdina (4): configure: Bump required libvirt version Revert "Implement BridgeName property for Network interface." Annotate properties for which we will not emit changed signal Annotate properties that will never change during the object lifecycle configure.ac | 2 +- data/org.libvirt.Connect.xml | 5 +++++ data/org.libvirt.Domain.xml | 10 ++++++++++ data/org.libvirt.Network.xml | 9 +++++---- src/network.c | 23 ----------------------- tests/test_network.py | 1 - 6 files changed, 21 insertions(+), 29 deletions(-) -- 2.14.3

2 9

[libvirt] [dbus PATCH] Implement SetGuestVcpus method for Domain Interface
by Katerina Koukiou 04 May '18

04 May '18

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- data/org.libvirt.Domain.xml | 7 +++++ src/domain.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index db43b1c..eae6d97 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -463,6 +463,13 @@ <arg name="params" type="a{sv}" direction="in"/> <arg name="flags" type="u" direction="in"/> </method> + <method name="SetGuestVcpus"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetGuestVcpus"/> + <arg name="vcpumap" type="ab" direction="in"/> + <arg name="state" type="i" direction="in"/> + <arg name="flags" type="u" direction="in"/> + </method> <method name="SetInterfaceParameters"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetInterfaceP…"/> diff --git a/src/domain.c b/src/domain.c index e305fa3..bbc4ead 100644 --- a/src/domain.c +++ b/src/domain.c @@ -72,6 +72,39 @@ VIRT_DBUS_ENUM_IMPL(virtDBusDomainMetadata, "title", "element") +static gchar * +virtDBusDomainConvertBoolArrayToGuestVcpumap(GVariantIter *iter) +{ + g_autoptr(GVariantIter) tmpIter = NULL; + gboolean set; + gint intervalCnt = 0; + guint intervalStart = 0; + gboolean setPrev = 0; + g_autofree GString *ret = NULL; + + ret = g_string_new(""); + for (guint i = 0; ; i++) { + gboolean next = g_variant_iter_loop(iter, "b", &set); + + if (set && !setPrev) + intervalStart = i; + else if ((!set && setPrev) || next) { + if (intervalCnt > 0) + g_string_append_printf(ret, ","); + if (intervalStart != i - 1) + g_string_append_printf(ret, "%d-%d", intervalStart, i - 1); + else + g_string_append_printf(ret, "%d", intervalStart); + intervalCnt++; + } + setPrev = set; + if (!next) + break; + } + + return ret->str; +} + struct _virtDBusDomainFSInfoList { virDomainFSInfoPtr *info; gint count; @@ -2490,6 +2523,34 @@ virtDBusDomainSetBlockIOTune(GVariant *inArgs, } } +static void +virtDBusDomainSetGuestVcpus(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs G_GNUC_UNUSED, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect = userData; + g_autoptr(virDomain) domain = NULL; + g_autoptr(GVariantIter) iter = NULL; + gint state; + guint flags; + g_autofree gchar *ret = NULL; + + g_variant_get(inArgs, "(abiu)", &iter, &state, &flags); + + domain = virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + ret = virtDBusDomainConvertBoolArrayToGuestVcpumap(iter); + + if (virDomainSetGuestVcpus(domain, ret, state, flags) < 0) + virtDBusUtilSetLastVirtError(error); +} + static void virtDBusDomainSetInterfaceParameters(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -2988,6 +3049,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { { "SendProcessSignal", virtDBusDomainSendProcessSignal }, { "SetBlkioParameters", virtDBusDomainSetBlkioParameters }, { "SetBlockIOTune", virtDBusDomainSetBlockIOTune }, + { "SetGuestVcpus", virtDBusDomainSetGuestVcpus }, { "SetInterfaceParameters", virtDBusDomainSetInterfaceParameters }, { "SetVcpus", virtDBusDomainSetVcpus }, { "SetMemory", virtDBusDomainSetMemory }, -- 2.15.0

2 1

[libvirt] [PATCH 03/12] virsh: Create macros for VSH_OT_STRING "domain" option
by Lin Ma 04 May '18

04 May '18

Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/virsh-domain-monitor.c | 3 +++ tools/virsh-domain.c | 3 +++ tools/virsh-snapshot.c | 3 +++ tools/virsh.h | 8 ++++++++ 4 files changed, 17 insertions(+) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 8e071779b4..8ad651626b 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -43,6 +43,9 @@ #define VIRSH_COMMON_OPT_DOMAIN_FULL(cflags) \ VIRSH_COMMON_OPT_DOMAIN(N_("domain name, id or uuid"), cflags) +#define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(cflags) \ + VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), cflags) + VIR_ENUM_DECL(virshDomainIOError) VIR_ENUM_IMPL(virshDomainIOError, VIR_DOMAIN_DISK_ERROR_LAST, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 6601f94a12..8a63761fab 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -68,6 +68,9 @@ #define VIRSH_COMMON_OPT_DOMAIN_FULL(cflags) \ VIRSH_COMMON_OPT_DOMAIN(N_("domain name, id or uuid"), cflags) +#define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(cflags) \ + VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), cflags) + #define VIRSH_COMMON_OPT_DOMAIN_PERSISTENT \ {.name = "persistent", \ .type = VSH_OT_BOOL, \ diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index e4908eea70..3d86ac84d1 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -45,6 +45,9 @@ #define VIRSH_COMMON_OPT_DOMAIN_FULL(cflags) \ VIRSH_COMMON_OPT_DOMAIN(N_("domain name, id or uuid"), cflags) +#define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(cflags) \ + VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), cflags) + /* Helper for snapshot-create and snapshot-create-as */ static bool virshSnapshotCreate(vshControl *ctl, virDomainPtr dom, const char *buffer, diff --git a/tools/virsh.h b/tools/virsh.h index f2213ebb57..9dcf104cc4 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -107,6 +107,14 @@ .help = _helpstr \ } +# define VIRSH_COMMON_OPT_DOMAIN_OT_STRING(_helpstr, cflags) \ + {.name = "domain", \ + .type = VSH_OT_STRING, \ + .help = _helpstr, \ + .completer = virshDomainNameCompleter, \ + .completer_flags = cflags, \ + } + typedef struct _virshControl virshControl; typedef virshControl *virshControlPtr; -- 2.15.1

2 1

[libvirt] [PATCH 06/12] virsh: Create macros for VSH_OT_ARGV "domain" option
by Lin Ma 04 May '18

04 May '18

Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/virsh-domain-monitor.c | 3 +++ tools/virsh-domain.c | 3 +++ tools/virsh-snapshot.c | 3 +++ tools/virsh.h | 9 +++++++++ 4 files changed, 18 insertions(+) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 8ad651626b..e4a21534cb 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -46,6 +46,9 @@ #define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(cflags) \ VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), cflags) +#define VIRSH_COMMON_OPT_DOMAIN_OT_ARGV_FULL(cflags) \ + VIRSH_COMMON_OPT_DOMAIN_OT_ARGV(N_("domain name, id or uuid"), cflags) + VIR_ENUM_DECL(virshDomainIOError) VIR_ENUM_IMPL(virshDomainIOError, VIR_DOMAIN_DISK_ERROR_LAST, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 689f9d686b..89aefbf86a 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -71,6 +71,9 @@ #define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(cflags) \ VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), cflags) +#define VIRSH_COMMON_OPT_DOMAIN_OT_ARGV_FULL(cflags) \ + VIRSH_COMMON_OPT_DOMAIN_OT_ARGV(N_("domain name, id or uuid"), cflags) + #define VIRSH_COMMON_OPT_DOMAIN_PERSISTENT \ {.name = "persistent", \ .type = VSH_OT_BOOL, \ diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 3d86ac84d1..0c86b6c950 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -48,6 +48,9 @@ #define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(cflags) \ VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), cflags) +#define VIRSH_COMMON_OPT_DOMAIN_OT_ARGV_FULL(cflags) \ + VIRSH_COMMON_OPT_DOMAIN_OT_ARGV(N_("domain name, id or uuid"), cflags) + /* Helper for snapshot-create and snapshot-create-as */ static bool virshSnapshotCreate(vshControl *ctl, virDomainPtr dom, const char *buffer, diff --git a/tools/virsh.h b/tools/virsh.h index 9dcf104cc4..a33d108b2d 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -115,6 +115,15 @@ .completer_flags = cflags, \ } +# define VIRSH_COMMON_OPT_DOMAIN_OT_ARGV(_helpstr, cflags) \ + {.name = "domain", \ + .type = VSH_OT_ARGV, \ + .flags = VSH_OFLAG_NONE, \ + .help = _helpstr, \ + .completer = virshDomainNameCompleter, \ + .completer_flags = cflags, \ + } + typedef struct _virshControl virshControl; typedef virshControl *virshControlPtr; -- 2.15.1

2 1

[libvirt] [PATCH 02/12] virsh: Conditionally Ignore the first entry in list of completions
by Lin Ma 04 May '18

04 May '18

The first entry in the returned array is the substitution for TEXT. It causes unnecessary output if other commands or options share the same prefix, e.g. $ virsh des<TAB><TAB> des desc destroy or $ virsh domblklist --d<TAB><TAB> --d --details --domain This patch fixes the above issue. Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/vsh.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/vsh.c b/tools/vsh.c index 73ec007e56..38058c874a 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -3458,6 +3458,7 @@ cmdComplete(vshControl *ctl, const vshCmd *cmd) const vshCmdOpt *opt = NULL; char **matches = NULL, **iter; virBuffer buf = VIR_BUFFER_INITIALIZER; + int n; if (vshCommandOptStringQuiet(ctl, cmd, "string", &arg) <= 0) goto cleanup; @@ -3493,8 +3494,11 @@ cmdComplete(vshControl *ctl, const vshCmd *cmd) if (!(matches = vshReadlineCompletion(arg, 0, 0))) goto cleanup; - for (iter = matches; *iter; iter++) + for (n =0, iter = matches; *iter; iter++, n++) { + if (n == 0 && matches[1]) + continue; printf("%s\n", *iter); + } ret = true; cleanup: -- 2.15.1

2 1

[libvirt] [PATCH 11/12] domain_event: Introduce function virDomainEventGetName
by Lin Ma 04 May '18

04 May '18

It will be used in next patch for event name completion. Signed-off-by: Lin Ma <lma(a)suse.com> --- src/conf/domain_event.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_event.h | 3 +++ src/libvirt_private.syms | 1 + 3 files changed, 66 insertions(+) diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 97520706c9..f8bd457b34 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -1968,6 +1968,68 @@ virDomainEventDispatchDefaultFunc(virConnectPtr conn, } +const char * +virDomainEventGetName(int event) +{ + virResetLastError(); + + switch (event) { + case VIR_DOMAIN_EVENT_ID_LIFECYCLE: + return VIR_DOMAIN_EVENT_LIFECYCLE; + case VIR_DOMAIN_EVENT_ID_REBOOT: + return VIR_DOMAIN_EVENT_REBOOT; + case VIR_DOMAIN_EVENT_ID_RTC_CHANGE: + return VIR_DOMAIN_EVENT_RTC_CHANGE; + case VIR_DOMAIN_EVENT_ID_WATCHDOG: + return VIR_DOMAIN_EVENT_WATCHDOG; + case VIR_DOMAIN_EVENT_ID_IO_ERROR: + return VIR_DOMAIN_EVENT_IO_ERROR; + case VIR_DOMAIN_EVENT_ID_GRAPHICS: + return VIR_DOMAIN_EVENT_GRAPHICS; + case VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON: + return VIR_DOMAIN_EVENT_IO_ERROR_REASON; + case VIR_DOMAIN_EVENT_ID_CONTROL_ERROR: + return VIR_DOMAIN_EVENT_CONTROL_ERROR; + case VIR_DOMAIN_EVENT_ID_BLOCK_JOB: + return VIR_DOMAIN_EVENT_BLOCK_JOB; + case VIR_DOMAIN_EVENT_ID_DISK_CHANGE: + return VIR_DOMAIN_EVENT_DISK_CHANGE; + case VIR_DOMAIN_EVENT_ID_TRAY_CHANGE: + return VIR_DOMAIN_EVENT_TRAY_CHANGE; + case VIR_DOMAIN_EVENT_ID_PMWAKEUP: + return VIR_DOMAIN_EVENT_PMWAKEUP; + case VIR_DOMAIN_EVENT_ID_PMSUSPEND: + return VIR_DOMAIN_EVENT_PMSUSPEND; + case VIR_DOMAIN_EVENT_ID_BALLOON_CHANGE: + return VIR_DOMAIN_EVENT_BALLOON_CHANGE; + case VIR_DOMAIN_EVENT_ID_PMSUSPEND_DISK: + return VIR_DOMAIN_EVENT_PMSUSPEND_DISK; + case VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED: + return VIR_DOMAIN_EVENT_DEVICE_REMOVED; + case VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2: + return VIR_DOMAIN_EVENT_BLOCK_JOB_2; + case VIR_DOMAIN_EVENT_ID_TUNABLE: + return VIR_DOMAIN_EVENT_TUNABLE; + case VIR_DOMAIN_EVENT_ID_AGENT_LIFECYCLE: + return VIR_DOMAIN_EVENT_AGENT_LIFECYCLE; + case VIR_DOMAIN_EVENT_ID_DEVICE_ADDED: + return VIR_DOMAIN_EVENT_DEVICE_ADDED; + case VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION: + return VIR_DOMAIN_EVENT_MIGRATION_ITERATION; + case VIR_DOMAIN_EVENT_ID_JOB_COMPLETED: + return VIR_DOMAIN_EVENT_JOB_COMPLETED; + case VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED: + return VIR_DOMAIN_EVENT_DEVICE_REMOVAL_FAILED; + case VIR_DOMAIN_EVENT_ID_METADATA_CHANGE: + return VIR_DOMAIN_EVENT_METADATA_CHANGE; + case VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD: + return VIR_DOMAIN_EVENT_BLOCK_THRESHOLD; + default: + return NULL; + } +} + + virObjectEventPtr virDomainQemuMonitorEventNew(int id, const char *name, diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index 3992a29c58..9c3a1e3b88 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -327,4 +327,7 @@ virDomainQemuMonitorEventNew(int id, const char *details) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); +const char * +virDomainEventGetName(int event); + #endif diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 92b5e0fa2b..0b6c414b66 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -641,6 +641,7 @@ virDomainEventWatchdogNewFromDom; virDomainEventWatchdogNewFromObj; virDomainQemuMonitorEventNew; virDomainQemuMonitorEventStateRegisterID; +virDomainEventGetName; # conf/domain_nwfilter.h -- 2.15.1

2 1

[libvirt] [PATCH 12/12] virsh: Add event name completion to 'event' command
by Lin Ma 04 May '18

04 May '18

Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/virsh-completer.c | 36 ++++++++++++++++++++++++++++++++++++ tools/virsh-completer.h | 3 +++ tools/virsh-domain.c | 1 + 3 files changed, 40 insertions(+) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index e3b8234b41..a188a8d7ab 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -30,6 +30,7 @@ #include "viralloc.h" #include "virstring.h" #include "virxml.h" +extern const char *virDomainEventGetName(int event); char ** @@ -522,3 +523,38 @@ virshSnapshotNameCompleter(vshControl *ctl, virshDomainFree(dom); return NULL; } + + +char ** +virshEventNameCompleter(vshControl *ctl, + const vshCmd *cmd ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virshControlPtr priv = ctl->privData; + size_t i = 0; + char **ret = NULL; + + virCheckFlags(0, NULL); + + if (!priv->conn || virConnectIsAlive(priv->conn) <= 0) + return NULL; + + if (VIR_ALLOC_N(ret, VIR_DOMAIN_EVENT_ID_LAST + 1) < 0) + goto error; + + for (i = 0; i < VIR_DOMAIN_EVENT_ID_LAST; i++) { + const char *name = virDomainEventGetName(i); + + if (name == NULL) + goto error; + + if (VIR_STRDUP(ret[i], name) < 0) + goto error; + } + + return ret; + +error: + VIR_FREE(ret); + return NULL; +} diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h index fa443d3ad7..27d78dc7ac 100644 --- a/tools/virsh-completer.h +++ b/tools/virsh-completer.h @@ -69,5 +69,8 @@ char ** virshSecretUUIDCompleter(vshControl *ctl, char ** virshSnapshotNameCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); +char ** virshEventNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); #endif diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e21ba0117b..ce72d414b9 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -13369,6 +13369,7 @@ static const vshCmdOptDef opts_event[] = { }, {.name = "event", .type = VSH_OT_ARGV, + .completer = virshEventNameCompleter, .help = N_("which event type to wait for") }, {.name = NULL} -- 2.15.1

2 1

[libvirt] [PATCH 10/12] virsh: Introduce some VIR_DOMAIN_EVENT_* macros representing domain event names
by Lin Ma 04 May '18

04 May '18

Signed-off-by: Lin Ma <lma(a)suse.com> --- include/libvirt/libvirt-domain.h | 201 +++++++++++++++++++++++++++++++++++++++ tools/virsh-domain.c | 50 +++++----- 2 files changed, 226 insertions(+), 25 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 12fd34037e..f7dd510f7f 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -4424,6 +4424,207 @@ typedef enum { } virDomainEventID; +/** + * VIR_DOMAIN_EVENT_LIFECYCLE: + * + * Macro for the event name "lifecycle" + */ + +# define VIR_DOMAIN_EVENT_LIFECYCLE "lifecycle" + +/** + * VIR_DOMAIN_EVENT_REBOOT: + * + * Macro for the event name "reboot" + */ + +# define VIR_DOMAIN_EVENT_REBOOT "reboot" + +/** + * VIR_DOMAIN_EVENT_RTC_CHANGE: + * + * Macro for the event name "rtc-change" + */ + +# define VIR_DOMAIN_EVENT_RTC_CHANGE "rtc-change" + +/** + * VIR_DOMAIN_EVENT_WATCHDOG: + * + * Macro for the event name "watchdog" + */ + +# define VIR_DOMAIN_EVENT_WATCHDOG "watchdog" + +/** + * VIR_DOMAIN_EVENT_IO_ERROR: + * + * Macro for the event name "io-error" + */ + +# define VIR_DOMAIN_EVENT_IO_ERROR "io-error" + +/** + * VIR_DOMAIN_EVENT_GRAPHICS: + * + * Macro for the event name "graphics" + */ + +# define VIR_DOMAIN_EVENT_GRAPHICS "graphics" + +/** + * VIR_DOMAIN_EVENT_IO_ERROR_REASON: + * + * Macro for the event name "io-error-reason" + */ + +# define VIR_DOMAIN_EVENT_IO_ERROR_REASON "io-error-reason" + +/** + * VIR_DOMAIN_EVENT_CONTROL_ERROR: + * + * Macro for the event name "control-error" + */ + +# define VIR_DOMAIN_EVENT_CONTROL_ERROR "control-error" + +/** + * VIR_DOMAIN_EVENT_BLOCK_JOB: + * + * Macro for the event name "block-job" + */ + +# define VIR_DOMAIN_EVENT_BLOCK_JOB "block-job" + +/** + * VIR_DOMAIN_EVENT_DISK_CHANGE: + * + * Macro for the event name "disk-change" + */ + +# define VIR_DOMAIN_EVENT_DISK_CHANGE "disk-change" + +/** + * VIR_DOMAIN_EVENT_TRAY_CHANGE: + * + * Macro for the event name "tray-change" + */ + +# define VIR_DOMAIN_EVENT_TRAY_CHANGE "tray-change" + +/** + * VIR_DOMAIN_EVENT_PMWAKEUP: + * + * Macro for the event name "pm-wakeup" + */ + +# define VIR_DOMAIN_EVENT_PMWAKEUP "pm-wakeup" + +/** + * VIR_DOMAIN_EVENT_PMSUSPEND: + * + * Macro for the event name "pm-suspend" + */ + +# define VIR_DOMAIN_EVENT_PMSUSPEND "pm-suspend" + +/** + * VIR_DOMAIN_EVENT_BALLOON_CHANGE: + * + * Macro for the event name "balloon-change" + */ + +# define VIR_DOMAIN_EVENT_BALLOON_CHANGE "balloon-change" + +/** + * VIR_DOMAIN_EVENT_PMSUSPEND_DISK: + * + * Macro for the event name "pm-suspend-disk" + */ + +# define VIR_DOMAIN_EVENT_PMSUSPEND_DISK "pm-suspend-disk" + +/** + * VIR_DOMAIN_EVENT_DEVICE_REMOVED: + * + * Macro for the event name "device-removed" + */ + +# define VIR_DOMAIN_EVENT_DEVICE_REMOVED "device-removed" + +/** + * VIR_DOMAIN_EVENT_BLOCK_JOB_2: + * + * Macro for the event name "block-job-2" + */ + +# define VIR_DOMAIN_EVENT_BLOCK_JOB_2 "block-job-2" + +/** + * VIR_DOMAIN_EVENT_TUNABLE: + * + * Macro for the event name "tunable" + */ + +# define VIR_DOMAIN_EVENT_TUNABLE "tunable" + +/** + * VIR_DOMAIN_EVENT_AGENT_LIFECYCLE: + * + * Macro for the event name "agent-lifecycle" + */ + +# define VIR_DOMAIN_EVENT_AGENT_LIFECYCLE "agent-lifecycle" + +/** + * VIR_DOMAIN_EVENT_DEVICE_ADDED: + * + * Macro for the event name "device-added" + */ + +# define VIR_DOMAIN_EVENT_DEVICE_ADDED "device-added" + +/** + * VIR_DOMAIN_EVENT_MIGRATION_ITERATION: + * + * Macro for the event name "migration-iteration" + */ + +# define VIR_DOMAIN_EVENT_MIGRATION_ITERATION "migration-iteration" + +/** + * VIR_DOMAIN_EVENT_JOB_COMPLETED: + * + * Macro for the event name "job-completed" + */ + +# define VIR_DOMAIN_EVENT_JOB_COMPLETED "job-completed" + +/** + * VIR_DOMAIN_EVENT_DEVICE_REMOVAL_FAILED: + * + * Macro for the event name "device-removal-failed" + */ + +# define VIR_DOMAIN_EVENT_DEVICE_REMOVAL_FAILED "device-removal-failed" + +/** + * VIR_DOMAIN_EVENT_METADATA_CHANGE: + * + * Macro for the event name "metadata-change" + */ + +# define VIR_DOMAIN_EVENT_METADATA_CHANGE "metadata-change" + +/** + * VIR_DOMAIN_EVENT_BLOCK_THRESHOLD: + * + * Macro for the event name "block-threshold" + */ + +# define VIR_DOMAIN_EVENT_BLOCK_THRESHOLD "block-threshold" + + /* Use VIR_DOMAIN_EVENT_CALLBACK() to cast the 'cb' parameter */ int virConnectDomainEventRegisterAny(virConnectPtr conn, virDomainPtr dom, /* Optional, to filter */ diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index b35c9adaaa..e21ba0117b 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -13283,53 +13283,53 @@ virshEventBlockThresholdPrint(virConnectPtr conn ATTRIBUTE_UNUSED, static vshEventCallback vshEventCallbacks[] = { - { "lifecycle", + { VIR_DOMAIN_EVENT_LIFECYCLE, VIR_DOMAIN_EVENT_CALLBACK(virshEventLifecyclePrint), }, - { "reboot", virshEventGenericPrint, }, - { "rtc-change", + { VIR_DOMAIN_EVENT_REBOOT, virshEventGenericPrint, }, + { VIR_DOMAIN_EVENT_RTC_CHANGE, VIR_DOMAIN_EVENT_CALLBACK(virshEventRTCChangePrint), }, - { "watchdog", + { VIR_DOMAIN_EVENT_WATCHDOG, VIR_DOMAIN_EVENT_CALLBACK(virshEventWatchdogPrint), }, - { "io-error", + { VIR_DOMAIN_EVENT_IO_ERROR, VIR_DOMAIN_EVENT_CALLBACK(virshEventIOErrorPrint), }, - { "graphics", + { VIR_DOMAIN_EVENT_GRAPHICS, VIR_DOMAIN_EVENT_CALLBACK(virshEventGraphicsPrint), }, - { "io-error-reason", + { VIR_DOMAIN_EVENT_IO_ERROR_REASON, VIR_DOMAIN_EVENT_CALLBACK(virshEventIOErrorReasonPrint), }, - { "control-error", virshEventGenericPrint, }, - { "block-job", + { VIR_DOMAIN_EVENT_CONTROL_ERROR, virshEventGenericPrint, }, + { VIR_DOMAIN_EVENT_BLOCK_JOB, VIR_DOMAIN_EVENT_CALLBACK(virshEventBlockJobPrint), }, - { "disk-change", + { VIR_DOMAIN_EVENT_DISK_CHANGE, VIR_DOMAIN_EVENT_CALLBACK(virshEventDiskChangePrint), }, - { "tray-change", + { VIR_DOMAIN_EVENT_TRAY_CHANGE, VIR_DOMAIN_EVENT_CALLBACK(virshEventTrayChangePrint), }, - { "pm-wakeup", + { VIR_DOMAIN_EVENT_PMWAKEUP, VIR_DOMAIN_EVENT_CALLBACK(virshEventPMChangePrint), }, - { "pm-suspend", + { VIR_DOMAIN_EVENT_PMSUSPEND, VIR_DOMAIN_EVENT_CALLBACK(virshEventPMChangePrint), }, - { "balloon-change", + { VIR_DOMAIN_EVENT_BALLOON_CHANGE, VIR_DOMAIN_EVENT_CALLBACK(virshEventBalloonChangePrint), }, - { "pm-suspend-disk", + { VIR_DOMAIN_EVENT_PMSUSPEND_DISK, VIR_DOMAIN_EVENT_CALLBACK(virshEventPMChangePrint), }, - { "device-removed", + { VIR_DOMAIN_EVENT_DEVICE_REMOVED, VIR_DOMAIN_EVENT_CALLBACK(virshEventDeviceRemovedPrint), }, - { "block-job-2", + { VIR_DOMAIN_EVENT_BLOCK_JOB_2, VIR_DOMAIN_EVENT_CALLBACK(virshEventBlockJobPrint), }, - { "tunable", + { VIR_DOMAIN_EVENT_TUNABLE, VIR_DOMAIN_EVENT_CALLBACK(virshEventTunablePrint), }, - { "agent-lifecycle", + { VIR_DOMAIN_EVENT_AGENT_LIFECYCLE, VIR_DOMAIN_EVENT_CALLBACK(virshEventAgentLifecyclePrint), }, - { "device-added", + { VIR_DOMAIN_EVENT_DEVICE_ADDED, VIR_DOMAIN_EVENT_CALLBACK(virshEventDeviceAddedPrint), }, - { "migration-iteration", + { VIR_DOMAIN_EVENT_MIGRATION_ITERATION, VIR_DOMAIN_EVENT_CALLBACK(virshEventMigrationIterationPrint), }, - { "job-completed", + { VIR_DOMAIN_EVENT_JOB_COMPLETED, VIR_DOMAIN_EVENT_CALLBACK(virshEventJobCompletedPrint), }, - { "device-removal-failed", + { VIR_DOMAIN_EVENT_DEVICE_REMOVAL_FAILED, VIR_DOMAIN_EVENT_CALLBACK(virshEventDeviceRemovalFailedPrint), }, - { "metadata-change", + { VIR_DOMAIN_EVENT_METADATA_CHANGE, VIR_DOMAIN_EVENT_CALLBACK(virshEventMetadataChangePrint), }, - { "block-threshold", + { VIR_DOMAIN_EVENT_BLOCK_THRESHOLD, VIR_DOMAIN_EVENT_CALLBACK(virshEventBlockThresholdPrint), }, }; verify(VIR_DOMAIN_EVENT_ID_LAST == ARRAY_CARDINALITY(vshEventCallbacks)); -- 2.15.1

2 1

[libvirt] [dbus PATCH v2] Implement SetGuestVcpus method for Domain Interface
by Katerina Koukiou 04 May '18

04 May '18

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- Fixed conditions since v1 was creating incorrect vcpumap. If all vcpus will be passed False the API will not work, since '' is not valid cpumap but this scenario should not be used. data/org.libvirt.Domain.xml | 7 +++++ src/domain.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index db43b1c..eae6d97 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -463,6 +463,13 @@ <arg name="params" type="a{sv}" direction="in"/> <arg name="flags" type="u" direction="in"/> </method> + <method name="SetGuestVcpus"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetGuestVcpus"/> + <arg name="vcpumap" type="ab" direction="in"/> + <arg name="state" type="i" direction="in"/> + <arg name="flags" type="u" direction="in"/> + </method> <method name="SetInterfaceParameters"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetInterfaceP…"/> diff --git a/src/domain.c b/src/domain.c index e305fa3..28cbe76 100644 --- a/src/domain.c +++ b/src/domain.c @@ -72,6 +72,39 @@ VIRT_DBUS_ENUM_IMPL(virtDBusDomainMetadata, "title", "element") +static gchar * +virtDBusDomainConvertBoolArrayToGuestVcpumap(GVariantIter *iter) +{ + g_autoptr(GVariantIter) tmpIter = NULL; + gint intervalCnt = 0; + guint intervalStart = 0; + gboolean set; + gboolean setPrev = 0; + g_autofree GString *ret = NULL; + + ret = g_string_new(""); + for (guint i = 0; ; i++) { + gboolean next = g_variant_iter_loop(iter, "b", &set); + + if (next && set && !setPrev) + intervalStart = i; + else if ((!next && setPrev) || (!set && setPrev)) { + if (intervalCnt > 0) + g_string_append_printf(ret, ","); + if (intervalStart != i - 1) + g_string_append_printf(ret, "%d-%d", intervalStart, i - 1); + else + g_string_append_printf(ret, "%d", intervalStart); + intervalCnt++; + } + setPrev = set; + if (!next) + break; + } + + return ret->str; +} + struct _virtDBusDomainFSInfoList { virDomainFSInfoPtr *info; gint count; @@ -2490,6 +2523,34 @@ virtDBusDomainSetBlockIOTune(GVariant *inArgs, } } +static void +virtDBusDomainSetGuestVcpus(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs G_GNUC_UNUSED, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect = userData; + g_autoptr(virDomain) domain = NULL; + g_autoptr(GVariantIter) iter = NULL; + gint state; + guint flags; + g_autofree gchar *ret = NULL; + + g_variant_get(inArgs, "(abiu)", &iter, &state, &flags); + + domain = virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + ret = virtDBusDomainConvertBoolArrayToGuestVcpumap(iter); + + if (virDomainSetGuestVcpus(domain, ret, state, flags) < 0) + virtDBusUtilSetLastVirtError(error); +} + static void virtDBusDomainSetInterfaceParameters(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -2988,6 +3049,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { { "SendProcessSignal", virtDBusDomainSendProcessSignal }, { "SetBlkioParameters", virtDBusDomainSetBlkioParameters }, { "SetBlockIOTune", virtDBusDomainSetBlockIOTune }, + { "SetGuestVcpus", virtDBusDomainSetGuestVcpus }, { "SetInterfaceParameters", virtDBusDomainSetInterfaceParameters }, { "SetVcpus", virtDBusDomainSetVcpus }, { "SetMemory", virtDBusDomainSetMemory }, -- 2.15.0

1 0

[libvirt] [PATCH 08/12] vshReadlineOptionsGenerator: Add already provided VSH_OT_ARGV options to list
by Lin Ma 04 May '18

04 May '18

It's helpful for users while they type certain kind of VSH_OT_ARGV options. e.g. $ virsh domstats --domain sles12sp3 --d<TAB> Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/vsh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/vsh.c b/tools/vsh.c index 5a9916cbb0..9cfd4d92b8 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2685,7 +2685,7 @@ vshReadlineOptionsGenerator(const char *text, } while (opt) { - if (STREQ(opt->def->name, name)) { + if (STREQ(opt->def->name, name) && opt->def->type != VSH_OT_ARGV) { exists = true; break; } -- 2.15.1

1 0

[libvirt] [PATCH 07/12] virsh: Apply macro for current VSH_OT_ARGV "domain" options
by Lin Ma 04 May '18

04 May '18

Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/virsh-domain-monitor.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index e4a21534cb..1e1ee60198 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -2000,11 +2000,7 @@ static const vshCmdOptDef opts_domstats[] = { .type = VSH_OT_BOOL, .help = N_("add backing chain information to block stats"), }, - {.name = "domain", - .type = VSH_OT_ARGV, - .flags = VSH_OFLAG_NONE, - .help = N_("list of domains to get stats for"), - }, + VIRSH_COMMON_OPT_DOMAIN_OT_ARGV(N_("list of domains to get stats for"), 0), {.name = NULL} }; -- 2.15.1

1 0

[libvirt] [PATCH 05/12] vshReadlineParse: Ignore vshReadlineOptionsGenerator for VSH_OT_ARGV options
by Lin Ma 04 May '18

04 May '18

Currently the VSH_OT_ARGV options don't support complete, But some of VSH_OT_ARGV options are gonna support complete in upcoming patches. Once applied the upcoming completion patches for VSH_OT_ARGV options, If we don't ignore VSH_OT_ARGV here, The vshReadlineOptionsGenerator will be called, Hence complete output will consist of the result by command completer + the result by option completer, It's confusing. e.g. $ virsh domstats --domain <TAB><TAB> --backing --interface --list-paused --perf --vcpu --balloon leap42.3 --list-persistent --raw win10 --block --list-active --list-running sles12sp3 --cpu-total --list-inactive --list-shutoff sles15 --enforce --list-other --list-transient --state After this patch and the upcoming completion patches: $ virsh domstats --domain <TAB><TAB> leap42.3 sles12sp3 sles15 win10 Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/vsh.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/vsh.c b/tools/vsh.c index 38058c874a..5a9916cbb0 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2824,7 +2824,9 @@ vshReadlineParse(const char *text, int state) if (!cmd) { list = vshReadlineCommandGenerator(text); } else { - if (!opt || (opt->type != VSH_OT_DATA && opt->type != VSH_OT_STRING)) + if (!opt || (opt->type != VSH_OT_DATA && + opt->type != VSH_OT_STRING && + opt->type != VSH_OT_ARGV)) list = vshReadlineOptionsGenerator(text, cmd, partial); if (opt && opt->completer) { -- 2.15.1

1 0

[libvirt] [PATCH 04/12] virsh: Apply macro for current VSH_OT_STRING "domain" options
by Lin Ma 04 May '18

04 May '18

These VSH_OT_STRING "domain" options support domain name completion now. Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/virsh-domain.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 8a63761fab..689f9d686b 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9601,10 +9601,8 @@ static const vshCmdInfo info_qemu_monitor_event[] = { }; static const vshCmdOptDef opts_qemu_monitor_event[] = { - {.name = "domain", - .type = VSH_OT_STRING, - .help = N_("filter by domain name, id or uuid") - }, + VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("filter by domain name, id or uuid"), + 0), {.name = "event", .type = VSH_OT_STRING, .help = N_("filter by event name") @@ -10157,11 +10155,7 @@ static const vshCmdOptDef opts_domxmltonative[] = { .flags = VSH_OFLAG_REQ, .help = N_("target config data type format") }, - {.name = "domain", - .type = VSH_OT_STRING, - .flags = VSH_OFLAG_REQ_OPT, - .help = N_("domain name, id or uuid") - }, + VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(0), {.name = "xml", .type = VSH_OT_STRING, .help = N_("xml data file to export from") @@ -13348,10 +13342,8 @@ static const vshCmdInfo info_event[] = { }; static const vshCmdOptDef opts_event[] = { - {.name = "domain", - .type = VSH_OT_STRING, - .help = N_("filter by domain name, id, or uuid") - }, + VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("filter by domain name, id or uuid"), + 0), {.name = "event", .type = VSH_OT_STRING, .help = N_("which event type to wait for") -- 2.15.1

1 0

[libvirt] [PATCH 01/12] virsh: Add domain name completion to 'migrate-postcopy' command
by Lin Ma 04 May '18

04 May '18

Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/virsh-domain.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 2b775fc4cc..6601f94a12 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11219,11 +11219,7 @@ static const vshCmdInfo info_migrate_postcopy[] = { }; static const vshCmdOptDef opts_migrate_postcopy[] = { - {.name = "domain", - .type = VSH_OT_DATA, - .flags = VSH_OFLAG_REQ, - .help = N_("domain name, id or uuid") - }, + VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = NULL} }; -- 2.15.1

1 0

[libvirt] [sandbox PATCH] maint: Drop autobuild.sh
by Andrea Bolognani 04 May '18

04 May '18

The Test-AutoBuild project, that this script is supposed to be used with, hasn't seen any activity in ~7 years; these days, libvirt-sandbox CI builds are happening on the Jenkins-based CentOS CI environment under the libvirt umbrella[1], and in that context the script is not used at all. [1] https://ci.centos.org/view/libvirt/ Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- autobuild.sh | 71 ------------------------------------------------------------ 1 file changed, 71 deletions(-) delete mode 100755 autobuild.sh diff --git a/autobuild.sh b/autobuild.sh deleted file mode 100755 index c176fea..0000000 --- a/autobuild.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh - -set -e -set -v - -# Make things clean. -test -n "$1" && RESULTS=$1 || RESULTS=results.log -: ${AUTOBUILD_INSTALL_ROOT=$HOME/builder} - -test -f Makefile && make -k distclean || : - -rm -rf build -mkdir build -cd build - -../autogen.sh --prefix=$AUTOBUILD_INSTALL_ROOT \ - --enable-gtk-doc - -make -make install - -# set -o pipefail is a bashism; this use of exec is the POSIX alternative -exec 3>&1 -st=$( - exec 4>&1 >&3 - { make check syntax-check 2>&1 3>&- 4>&-; echo $? >&4; } | tee "$RESULTS" -) -exec 3>&- -test "$st" = 0 - -rm -f *.tar.gz -make dist - -if [ -n "$AUTOBUILD_COUNTER" ]; then - EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER" -else - NOW=`date +"%s"` - EXTRA_RELEASE=".$USER$NOW" -fi - -if [ -f /usr/bin/rpmbuild ]; then - rpmbuild --nodeps \ - --define "extra_release $EXTRA_RELEASE" \ - --define "_sourcedir `pwd`" \ - -ba --clean libvirt-sandbox.spec -fi - -exit 0 -if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then - make distclean - - PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig" \ - CC="i686-pc-mingw32-gcc" \ - ../configure \ - --build=$(uname -m)-pc-linux \ - --host=i686-pc-mingw32 \ - --prefix="$AUTOBUILD_INSTALL_ROOT/i686-pc-mingw32/sys-root/mingw" - - make - make install - - #set -o pipefail - #make check 2>&1 | tee "$RESULTS" - - if [ -f /usr/bin/rpmbuild ]; then - rpmbuild --nodeps \ - --define "extra_release $EXTRA_RELEASE" \ - --define "_sourcedir `pwd`" \ - -ba --clean mingw32-libvirt-sandbox.spec - fi -fi -- 2.14.3

2 5

[libvirt] [PATCH v3 0/6] Add support for VM Generation ID (vmgenid)
by John Ferlan 04 May '18

04 May '18

v2: https://www.redhat.com/archives/libvir-list/2018-April/msg02234.html Changes since v2: * Essentially handle comments from code review of original series from comments received for patch 6: https://www.redhat.com/archives/libvir-list/2018-April/msg02240.html It's a somewhat simplified approach removing the ABI checks and the adjustment to the genid value as part of domain def copy. * (NEW) Patch 5 - add a 'genid' domain capability (similar to how Cole added support for vmcoreinfo). Since the apps need a way to determine whether this is enabled, this seems to be the best way. John Ferlan (6): conf: Add VM Generation ID parse/format support qemu: Add VM Generation ID device capability qemu: Alter VM Generation ID for specific startup/launch transitions qemu: Add VM Generation ID to qemu command line domcaps: Add 'genid' to domain capabilities docs: Add news article for VM Generation ID docs/formatdomain.html.in | 27 +++++++++++ docs/formatdomaincaps.html.in | 7 ++- docs/news.xml | 13 ++++++ docs/schemas/domaincaps.rng | 7 +++ docs/schemas/domaincommon.rng | 8 ++++ src/conf/domain_capabilities.c | 3 ++ src/conf/domain_capabilities.h | 1 + src/conf/domain_conf.c | 54 ++++++++++++++++++++++ src/conf/domain_conf.h | 5 ++ src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 24 ++++++++++ src/qemu/qemu_driver.c | 17 +++++-- src/qemu/qemu_process.c | 46 +++++++++++++++++- src/qemu/qemu_process.h | 1 + tests/domaincapsschemadata/basic.xml | 1 + tests/domaincapsschemadata/bhyve_basic.x86_64.xml | 1 + tests/domaincapsschemadata/bhyve_fbuf.x86_64.xml | 1 + tests/domaincapsschemadata/bhyve_uefi.x86_64.xml | 1 + tests/domaincapsschemadata/full.xml | 1 + tests/domaincapsschemadata/libxl-xenfv-usb.xml | 1 + tests/domaincapsschemadata/libxl-xenfv.xml | 1 + tests/domaincapsschemadata/libxl-xenpv-usb.xml | 1 + tests/domaincapsschemadata/libxl-xenpv.xml | 1 + tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml | 1 + .../qemu_2.12.0-virt.aarch64.xml | 1 + tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml | 1 + tests/domaincapsschemadata/qemu_2.12.0.s390x.xml | 1 + tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml | 1 + .../qemu_2.6.0-virt.aarch64.xml | 1 + tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml | 1 + tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml | 1 + tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_2.7.0.s390x.xml | 1 + .../domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_2.8.0.s390x.xml | 1 + tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml | 1 + .../domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml | 1 + .../domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../qemuxml2argvdata/genid-auto.x86_64-latest.args | 30 ++++++++++++ tests/qemuxml2argvdata/genid-auto.xml | 32 +++++++++++++ tests/qemuxml2argvdata/genid.x86_64-latest.args | 30 ++++++++++++ tests/qemuxml2argvdata/genid.xml | 32 +++++++++++++ tests/qemuxml2argvtest.c | 4 ++ tests/qemuxml2xmloutdata/genid-active.xml | 32 +++++++++++++ tests/qemuxml2xmloutdata/genid-auto-active.xml | 32 +++++++++++++ tests/qemuxml2xmloutdata/genid-auto-inactive.xml | 32 +++++++++++++ tests/qemuxml2xmloutdata/genid-inactive.xml | 32 +++++++++++++ tests/qemuxml2xmltest.c | 5 +- 53 files changed, 500 insertions(+), 7 deletions(-) create mode 100644 tests/qemuxml2argvdata/genid-auto.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/genid-auto.xml create mode 100644 tests/qemuxml2argvdata/genid.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/genid.xml create mode 100644 tests/qemuxml2xmloutdata/genid-active.xml create mode 100644 tests/qemuxml2xmloutdata/genid-auto-active.xml create mode 100644 tests/qemuxml2xmloutdata/genid-auto-inactive.xml create mode 100644 tests/qemuxml2xmloutdata/genid-inactive.xml -- 2.14.3

1 6

[libvirt] [PATCH] tests: domaincapstest: Fix after iothreads addition
by Cole Robinson 04 May '18

04 May '18

Introduced in 8525b9694. Some files weren't updated. I'm just guessing on the bhyve ones Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- Pushes as a build breaker tests/domaincapsschemadata/bhyve_basic.x86_64.xml | 1 + tests/domaincapsschemadata/bhyve_fbuf.x86_64.xml | 1 + tests/domaincapsschemadata/bhyve_uefi.x86_64.xml | 1 + tests/domaincapsschemadata/libxl-xenfv-usb.xml | 1 + tests/domaincapsschemadata/libxl-xenpv-usb.xml | 1 + 5 files changed, 5 insertions(+) diff --git a/tests/domaincapsschemadata/bhyve_basic.x86_64.xml b/tests/domaincapsschemadata/bhyve_basic.x86_64.xml index 70e36e97e9..055d05b568 100644 --- a/tests/domaincapsschemadata/bhyve_basic.x86_64.xml +++ b/tests/domaincapsschemadata/bhyve_basic.x86_64.xml @@ -2,6 +2,7 @@ <path>/usr/sbin/bhyve</path> <domain>bhyve</domain> <arch>x86_64</arch> + <iothreads supported='no'/> <os supported='yes'> <loader supported='no'/> </os> diff --git a/tests/domaincapsschemadata/bhyve_fbuf.x86_64.xml b/tests/domaincapsschemadata/bhyve_fbuf.x86_64.xml index 19b76da456..b22ca43ba0 100644 --- a/tests/domaincapsschemadata/bhyve_fbuf.x86_64.xml +++ b/tests/domaincapsschemadata/bhyve_fbuf.x86_64.xml @@ -2,6 +2,7 @@ <path>/usr/sbin/bhyve</path> <domain>bhyve</domain> <arch>x86_64</arch> + <iothreads supported='no'/> <os supported='yes'> <loader supported='yes'> <value>/foo/bar</value> diff --git a/tests/domaincapsschemadata/bhyve_uefi.x86_64.xml b/tests/domaincapsschemadata/bhyve_uefi.x86_64.xml index c278df038a..625a55e70c 100644 --- a/tests/domaincapsschemadata/bhyve_uefi.x86_64.xml +++ b/tests/domaincapsschemadata/bhyve_uefi.x86_64.xml @@ -2,6 +2,7 @@ <path>/usr/sbin/bhyve</path> <domain>bhyve</domain> <arch>x86_64</arch> + <iothreads supported='no'/> <os supported='yes'> <loader supported='yes'> <value>/foo/bar</value> diff --git a/tests/domaincapsschemadata/libxl-xenfv-usb.xml b/tests/domaincapsschemadata/libxl-xenfv-usb.xml index dfa992cb71..3f245e8961 100644 --- a/tests/domaincapsschemadata/libxl-xenfv-usb.xml +++ b/tests/domaincapsschemadata/libxl-xenfv-usb.xml @@ -4,6 +4,7 @@ <machine>xenfv</machine> <arch>x86_64</arch> <vcpu max='128'/> + <iothreads supported='no'/> <os supported='yes'> <loader supported='yes'> <value>/usr/lib/xen/boot/hvmloader</value> diff --git a/tests/domaincapsschemadata/libxl-xenpv-usb.xml b/tests/domaincapsschemadata/libxl-xenpv-usb.xml index 8277a9efdd..2bcd588c0f 100644 --- a/tests/domaincapsschemadata/libxl-xenpv-usb.xml +++ b/tests/domaincapsschemadata/libxl-xenpv-usb.xml @@ -4,6 +4,7 @@ <machine>xenpv</machine> <arch>x86_64</arch> <vcpu max='512'/> + <iothreads supported='no'/> <os supported='yes'> <loader supported='no'/> </os> -- 2.17.0

2 2

[libvirt] [PATCH 0/3] conf: <vmcoreinfo> tweaks
by Cole Robinson 03 May '18

03 May '18

Patch #1 changes the vmcoreinfo XML schema slightly to be more future proof, this is technically an API break but I'm not sure it matters, see the patch for more details. Patch #3 adds vmcoreinfo reporting to domain capabilities. The schema doesn't follow the typical pattern so if anyone has other ideas please comment Cole Robinson (3): conf: format/parse <vmcoreinfo> as tristate conf: Add a comment warning about boolean feature XML domain_capabilities: Report <vmcoreinfo> support docs/formatdomaincaps.html.in | 5 +++++ docs/schemas/domaincaps.rng | 7 +++++++ docs/schemas/domaincommon.rng | 6 +++++- src/conf/domain_capabilities.c | 2 ++ src/conf/domain_capabilities.h | 1 + src/conf/domain_conf.c | 6 ++++-- src/qemu/qemu_capabilities.c | 3 +++ tests/domaincapsschemadata/basic.xml | 1 + tests/domaincapsschemadata/bhyve_basic.x86_64.xml | 1 + tests/domaincapsschemadata/bhyve_fbuf.x86_64.xml | 1 + tests/domaincapsschemadata/bhyve_uefi.x86_64.xml | 1 + tests/domaincapsschemadata/full.xml | 1 + tests/domaincapsschemadata/libxl-xenfv-usb.xml | 1 + tests/domaincapsschemadata/libxl-xenfv.xml | 1 + tests/domaincapsschemadata/libxl-xenpv-usb.xml | 1 + tests/domaincapsschemadata/libxl-xenpv.xml | 1 + tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml | 1 + tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml | 1 + tests/domaincapsschemadata/qemu_2.12.0.s390x.xml | 1 + tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml | 1 + tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml | 1 + tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml | 1 + tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_2.7.0.s390x.xml | 1 + tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_2.8.0.s390x.xml | 1 + tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml | 1 + tests/qemuxml2xmloutdata/vmcoreinfo.xml | 2 +- 33 files changed, 53 insertions(+), 4 deletions(-) -- 2.17.0

2 7

[libvirt] [PATCH v5 0/2] Avoid slash characteres for 'domrename' command.
by Julio Faracco 03 May '18

03 May '18

The commits enhace the 'domrename' command of QEMU and Test drivers to avoid slashes chars inside the new domain name. Julio Faracco (2): qemu: avoid slash characters to the new domain name. test: avoid slash characters to the new domain name. src/qemu/qemu_driver.c | 6 ++++++ src/test/test_driver.c | 6 ++++++ 2 files changed, 12 insertions(+) -- 2.17.0

2 6

[libvirt] [PATCH 0/6] Complete cleanup of domain object usage
by John Ferlan 03 May '18

03 May '18

This should be the "last time" (famous last words) needing to alter this processing. I hope to get more than one pair of eyes looking at the series. I've looked at it long enough to feel comfortable with the changes, but I also know I probably have looked at it so long that I could have missed something! The first 3 patches set up the necessary infrastructure. Patches 4 & 5 are just something I found in libxl while doing this - they could be extracted and considered separately if need be; however, since I was thinking about @vm referencing - it just seemed to fit. Since I altered @vm it only seemed right to do the same for @conn. While it could be said that neither condition could happen - I figured better safe than sorry and I think it follows how this type of logic has been handled elsewhere in qemu. Patch 6 is where all the magic happens. I tried a few different ways to rework and split the Add/Remove processing, but either way I was left with rather ugly patches that required touching the same places, so I capitulated and combined them since there really is a delicate balance between those paths that have added a virObjectRef after the virDomainObjListAdd and those that just use virObjectUnlock on the returned ListAdd objects. Converting the latter to use Ref caused more "busy work" and equally large patches. The busy work was mosting around the processing required during ListAdd if something happened which resulted in ListRemove needing to be called. The "general change" is that instead of having ListAdd return an object with 2 refs and 1 lock it will now return an object with 3 refs and 1 lock. With that returned object, some drivers would perform an ObjectRef while others did not. For those that did not, they would use ObjectUnlock when done with the object so that when leaving whatever Create routine there was there would be at least 2 Refs on the object. The change here is to have them all be consistent. What follows is a "general description" of what was done for each. For bhyve, openvz, test, uml, and vmware (e.g. domain drivers that do not use virObjectRef on the returned virDomainObjListAdd object): Create/Add processing: -> Use EndAPI instead of ObjectUnlock -> Remove setting vm = NULL if the ListRemove was called to allow EndAPI processing to perform last Unref and Unlock NB: ListRemove would remove 2 refs and unlock, so it "worked", but would "consume" the returned object Undefine/Destroy processing: -> Alter ListRemove and ObjectLock to just be ListRemove allowing the EndAPI processing from a FindBy* to perform last Unref and Unlock For libxl, lxc, qemu, and vz (e.g. domain drivers that use virObjectRef on the returned virDomainObjListAdd object): Create/Add processing: -> Remove the ObjectRef -> Remove the ObjectLock when needing to call ListRemove to allow EndAPI processing to perform the last Unref and Unlock NB: ListRemove no longer Unlock's the returned object Undefine/Destroy processing: -> Alter ListRemove and ObjectLock to just be ListRemove allowing the EndAPI processing from a FindBy* to perform last Unref and Unlock NB: For the AutoDestroy type logic, no change is required since in the long run the object was left with the correct number of refs after create processing ran. The issue is more the direct mgmt of object during Add/Remove rather than mgmt of object once defined. John Ferlan (6): conf: Split FindBy{UUID|Name} into locked helpers conf: Use virDomainObjListFindBy*Locked for virDomainObjListAdd conf: Move and use virDomainObjListRemoveLocked libxl: Add refcnt for args->vm during migration libxl: Add refcnt for args->conn during migration conf: Clean up object referencing for Add and Remove src/bhyve/bhyve_driver.c | 21 ++---- src/conf/virdomainobjlist.c | 165 ++++++++++++++++++++++++++++---------------- src/libxl/libxl_driver.c | 64 ++++------------- src/libxl/libxl_migration.c | 41 ++++------- src/lxc/lxc_driver.c | 21 ++---- src/lxc/lxc_process.c | 17 +++-- src/openvz/openvz_conf.c | 2 +- src/openvz/openvz_driver.c | 20 ++---- src/qemu/qemu_domain.c | 17 +---- src/qemu/qemu_driver.c | 6 +- src/qemu/qemu_migration.c | 3 +- src/test/test_driver.c | 56 +++++---------- src/uml/uml_driver.c | 37 +++------- src/vmware/vmware_conf.c | 3 +- src/vmware/vmware_driver.c | 17 ++--- src/vz/vz_driver.c | 1 - src/vz/vz_sdk.c | 3 - 17 files changed, 192 insertions(+), 302 deletions(-) -- 2.13.6

3 20

[libvirt] [PATCH 0/3] Ditch qemu-img help scraping
by Ján Tomko 03 May '18

03 May '18

Ján Tomko (3): tests: delete most qemu-img test cases assuming FMT_OPTIONS tests: assume FMT_COMPAT for qemu-img tests storage: remove qemu-img help scraping src/storage/storage_util.c | 73 ++------------------- src/storage/storage_util.h | 1 - .../qcow2-convert-nobacking.argv | 2 - .../storagevolxml2argvdata/qcow2-from-logical.argv | 2 - .../qcow2-nobacking-convert-prealloc.argv | 2 - .../qcow2-nobacking-prealloc.argv | 2 - .../qcow2-nocapacity-convert-prealloc.argv | 2 +- tests/storagevolxml2argvdata/qcow2-nocapacity.argv | 2 +- tests/storagevolxml2argvdata/qcow2.argv | 2 - tests/storagevolxml2argvtest.c | 74 ++++++---------------- 10 files changed, 24 insertions(+), 138 deletions(-) delete mode 100644 tests/storagevolxml2argvdata/qcow2-convert-nobacking.argv delete mode 100644 tests/storagevolxml2argvdata/qcow2-from-logical.argv delete mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc.argv delete mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-prealloc.argv delete mode 100644 tests/storagevolxml2argvdata/qcow2.argv -- 2.13.6

2 9

[libvirt] [PATCH] configure: remove bogus LIBVIRT_GETTEXT macro reference
by Daniel P. Berrangé 03 May '18

03 May '18

The LIBVIRT_GETTEXT macro was an artifact of patch development and was later renamed to LIBVIRT_CHECK_NLS. This cruft causes configure to print out ./configure: line 75084: LIBVIRT_GETTEXT: command not found but fortunately this is non-fatal Reported-by: Martin Kletzander <mkletzan(a)redhat.com> Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as trivial fix configure.ac | 2 -- 1 file changed, 2 deletions(-) diff --git a/configure.ac b/configure.ac index 419a1aa2f5..cc005ea9e8 100644 --- a/configure.ac +++ b/configure.ac @@ -734,8 +734,6 @@ if test "$enable_test_locking" = "yes"; then fi AM_CONDITIONAL([WITH_CIL],[test "$enable_test_locking" = "yes"]) -LIBVIRT_GETTEXT - dnl Cygwin, MinGW and MSVC checks LIBVIRT_WIN_CHECK_COMMON LIBVIRT_WIN_CHECK_CYGWIN -- 2.14.3

1 0

[libvirt] [PATCH 00/14] nwfilter: refactor the driver to make it independent of virt drivers
by Daniel P. Berrangé 03 May '18

03 May '18

Today the nwfilter driver is entangled with the virt drivers in both directions. At various times when rebuilding filters nwfilter will call out to the virt driver to iterate over running guest's NICs. This has caused very complicated lock ordering rules to be required. If we are to split the virt drivers out into separate daemons we need to get rid of this coupling since we don't want the separate daemons calling each other, as that risks deadlock if all of the RPC workers are busy. The obvious way to solve this is to have the nwfilter driver remember all the filters it has active, avoiding the need to iterate over running guests. NB, these patches are all ready for review, but the last patch really should not be merged at this time. I need to do more work to be able to serialize the filter state to disk, so the nwfilter driver can keep track of it across daemon restarts. All except the last patch should be ok to merge though. Daniel P. Berrangé (14): nwfilter: remove pointless virNWFilterHashTable struct nwfilter: remove methods that are trivial wrappers for virHash APIs nwfilter: remove virNWFilterHashTable typedefs entirely nwfilter: make virNWFilterIPAddrLearnReq type private nwfilter: remove obsolete code related to firewalld nwfilter: fix leaking of filter parameters upon error nwfilter: introduce virNWFilterBinding to decouple from virDomainNet nwfilter: pass vm name in when instantiating filters nwfilter: convert the gentech driver code to use virNWFilterBinding nwfilter: convert IP address learning code to virNWFilterBinding nwfilter: convert DHCP address snooping code to virNWFilterBinding nwfilter: report an error if nic needs filtering by no driver is present nwfilter: keep track of active filter bindings nwfilter: remove virt driver callback layer for rebuilding filters src/conf/domain_conf.c | 8 +- src/conf/domain_conf.h | 2 +- src/conf/domain_nwfilter.c | 14 +- src/conf/domain_nwfilter.h | 6 +- src/conf/nwfilter_conf.c | 224 ++++++++--------- src/conf/nwfilter_conf.h | 67 ++--- src/conf/nwfilter_ipaddrmap.c | 15 +- src/conf/nwfilter_params.c | 127 +++------- src/conf/nwfilter_params.h | 33 +-- src/conf/virnwfilterobj.c | 4 +- src/conf/virnwfilterobj.h | 4 +- src/libvirt_private.syms | 8 +- src/lxc/lxc_driver.c | 28 --- src/lxc/lxc_process.c | 2 +- src/nwfilter/nwfilter_dhcpsnoop.c | 153 +++++------- src/nwfilter/nwfilter_dhcpsnoop.h | 7 +- src/nwfilter/nwfilter_driver.c | 97 +++++--- src/nwfilter/nwfilter_driver.h | 2 - src/nwfilter/nwfilter_gentech_driver.c | 432 ++++++++++++++++++--------------- src/nwfilter/nwfilter_gentech_driver.h | 28 +-- src/nwfilter/nwfilter_learnipaddr.c | 113 ++++----- src/nwfilter/nwfilter_learnipaddr.h | 25 +- src/nwfilter/nwfilter_tech_driver.h | 2 +- src/qemu/qemu_driver.c | 25 -- src/qemu/qemu_hotplug.c | 6 +- src/qemu/qemu_interface.c | 4 +- src/qemu/qemu_process.c | 2 +- src/uml/uml_conf.c | 2 +- src/uml/uml_driver.c | 29 --- tests/nwfilterxml2firewalltest.c | 36 +-- 30 files changed, 642 insertions(+), 863 deletions(-) -- 2.14.3

4 30

[libvirt] [PATCH v3 0/3] Support tpm-crb TPM interface for QEMU
by Stefan Berger 03 May '18

03 May '18

This patch series adds support for the recently added tpm-crb TPM interface for QEMU (2.12). Stefan Stefan Berger (3): tpm: Enable TPM CRB interface in the domain XML and test it qemu: Extend the capabilities with tpm-crb device tests: add test case for tpm-crb QEMU device command line docs/formatdomain.html.in | 6 +++- docs/schemas/domaincommon.rng | 5 +++- src/conf/domain_conf.c | 5 ++-- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 5 ++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 16 +++++++++- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemuxml2argvdata/tpm-passthrough-crb.args | 26 ++++++++++++++++ tests/qemuxml2argvdata/tpm-passthrough-crb.xml | 32 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ tests/qemuxml2xmloutdata/tpm-passthrough-crb.xml | 36 +++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 13 files changed, 131 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/tpm-passthrough-crb.args create mode 100644 tests/qemuxml2argvdata/tpm-passthrough-crb.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-passthrough-crb.xml -- 2.5.5

2 10

[libvirt] [perl PATCH] maint: Drop autobuild.sh
by Andrea Bolognani 03 May '18

03 May '18

The Test-AutoBuild project, that this script is supposed to be used with, hasn't seen any activity in ~7 years; these days, libvirt-perl CI builds are happening on the Jenkins-based CentOS CI environment under the libvirt umbrella[1], and in that context the script is not used at all. [1] https://ci.centos.org/view/libvirt/ Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- autobuild.sh | 74 ------------------------------------------------------------ 1 file changed, 74 deletions(-) delete mode 100755 autobuild.sh diff --git a/autobuild.sh b/autobuild.sh deleted file mode 100755 index 8a6d102..0000000 --- a/autobuild.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh -# -# This script is used to Test::AutoBuild (http://www.autobuild.org) -# to perform automated builds of the Sys-Virt module - -NAME=Sys-Virt - -set -e - -test -n "$1" && RESULTS=$1 || RESULTS=results.log -: ${AUTOBUILD_INSTALL_ROOT=$HOME/builder} - -make -k realclean ||: -rm -rf MANIFEST blib pm_to_blib - -export TEST_MAINTAINER=1 - -perl Makefile.PL PREFIX=$AUTOBUILD_INSTALL_ROOT - -rm -f MANIFEST - -# Build the RPM. -make -make manifest - -if [ -z "$USE_COVER" ]; then - perl -MDevel::Cover -e '' 1>/dev/null 2>&1 && USE_COVER=1 || USE_COVER=0 -fi - -if [ -z "$SKIP_TESTS" -o "$SKIP_TESTS" = "0" ]; then - if [ "$USE_COVER" = "1" ]; then - cover -delete - export HARNESS_PERL_SWITCHES=-MDevel::Cover - fi - - # set -o pipefail is a bashism; this use of exec is the POSIX alternative - exec 3>&1 - st=$( - exec 4>&1 >&3 - { make test 2>&1 3>&- 4>&-; echo $? >&4; } | tee "$RESULTS" - ) - exec 3>&- - test "$st" = 0 - - if [ "$USE_COVER" = "1" ]; then - cover - mkdir blib/coverage - cp -a cover_db/*.html cover_db/*.css blib/coverage - mv blib/coverage/coverage.html blib/coverage/index.html - fi -fi - -make install - -rm -f $NAME-*.tar.gz -make dist - -if [ -f /usr/bin/rpmbuild ]; then - if [ -n "$AUTOBUILD_COUNTER" ]; then - EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER" - else - NOW=`date +"%s"` - EXTRA_RELEASE=".$USER$NOW" - fi - rpmbuild --nodeps -ta --define "extra_release $EXTRA_RELEASE" --clean $NAME-*.tar.gz -fi - -# Skip debian pkg for now -exit 0 - -if [ -f /usr/bin/fakeroot ]; then - fakeroot debian/rules clean - fakeroot debian/rules DESTDIR=$HOME/packages/debian binary -fi -- 2.14.3

2 1

[libvirt] [python PATCH] maint: Drop autobuild.sh
by Andrea Bolognani 03 May '18

03 May '18

The Test-AutoBuild project, that this script is supposed to be used with, hasn't seen any activity in ~7 years; these days, libvirt-python CI builds are happening on the Jenkins-based CentOS CI environment under the libvirt umbrella[1], and in that context the script is not used at all. [1] https://ci.centos.org/view/libvirt/ Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- autobuild.sh | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100755 autobuild.sh diff --git a/autobuild.sh b/autobuild.sh deleted file mode 100755 index 5dffe96..0000000 --- a/autobuild.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -set -ve - -: ${AUTOBUILD_INSTALL_ROOT="$HOME/builder"} - -rm -rf MANIFEST dist build - - -python2 setup.py sdist - -python2 setup.py build -python2 setup.py test -python2 setup.py install --root="$AUTOBUILD_INSTALL_ROOT" - -if test -f /usr/bin/python3 ; then - python3 setup.py build - python3 setup.py test - python3 setup.py install --root="$AUTOBUILD_INSTALL_ROOT" -fi - -type -p /usr/bin/rpmbuild > /dev/null 2>&1 || exit 0 - -if [ -n "$AUTOBUILD_COUNTER" ]; then - EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER" -else - NOW=`date +"%s"` - EXTRA_RELEASE=".$USER$NOW" -fi -rpmbuild --nodeps --define "extra_release $EXTRA_RELEASE" -ta --clean dist/*.tar.gz -- 2.14.3

2 1

[libvirt] [jenkins-ci PATCH 0/4] Introduce Fedora 28; drop Fedora 26
by Andrea Bolognani 03 May '18

03 May '18

It's that time of the year again :) Andrea Bolognani (4): guests: Add libvirt-fedora-28 projects: Add libvirt-fedora-28 projects: Remove libvirt-fedora-26 guests: Remove libvirt-fedora-26 .../host_vars/{libvirt-fedora-26 => libvirt-fedora-28}/install.yml | 2 +- guests/host_vars/{libvirt-fedora-26 => libvirt-fedora-28}/main.yml | 0 guests/inventory | 2 +- jobs/defaults.yaml | 4 ++-- projects/libvirt-dbus.yaml | 4 ++-- projects/libvirt-sandbox.yaml | 4 ++-- projects/libvirt-tck.yaml | 4 ++-- projects/libvirt.yaml | 4 ++-- projects/virt-manager.yaml | 6 +++--- 9 files changed, 15 insertions(+), 15 deletions(-) rename guests/host_vars/{libvirt-fedora-26 => libvirt-fedora-28}/install.yml (74%) rename guests/host_vars/{libvirt-fedora-26 => libvirt-fedora-28}/main.yml (100%) -- 2.14.3

2 6

[libvirt] [PATCH v3 0/9] tests: Fix 'make check' on FreeBSD
by Andrea Bolognani 03 May '18

03 May '18

Changes from [v2]: * introduce a wrapper around canonicalize_file_name() instead of moving to realpath(); * fix more usages of mode_t with va_arg(). Changes from [v1]: * drop the virnetsockettest changes, since the relationship between the errors seen on FreeBSD and IPv4 clients connecting to IPv6 sockets has turned out to be just a red herring; * fix the mocking instead of dropping test cases that don't work without it. [v2] https://www.redhat.com/archives/libvir-list/2018-April/msg02685.html [v1] https://www.redhat.com/archives/libvir-list/2018-April/msg02611.html Andrea Bolognani (9): util: Introduce virFileCanonicalizePath() tests: Mock virFileCanonicalizePath() all: Use virFileCanonicalizePath() instead of canonicalize_file_name() tests: Stop mocking canonicalize_file_name() syntax-check: Prohibit canonicalize_file_name() tests: Fix mode_t usage with va_arg() tests: Build virpcimock on non-Linux tests: Extend NUMA mocking tests: Drop DO_TEST_LINUX() cfg.mk | 10 ++++ src/libvirt_private.syms | 1 + src/storage/storage_backend_fs.c | 2 +- src/util/virfile.c | 15 +++++- src/util/virfile.h | 1 + src/util/virpci.c | 2 +- tests/nssmock.c | 2 +- tests/qemuxml2argvmock.c | 38 ++++++++++---- tests/qemuxml2argvtest.c | 46 ++++++----------- tests/vircgroupmock.c | 2 +- tests/virpcimock.c | 104 ++++++++++++++++++++++----------------- tests/virstoragetest.c | 10 ++-- tests/virtestmock.c | 8 +-- 13 files changed, 141 insertions(+), 100 deletions(-) -- 2.14.3

2 20

[libvirt] [PATCH] storagefile: conditional build of virStorageFileLoadBackendModule
by Daniel P. Berrangé 03 May '18

03 May '18

The virStorageFileLoadBackendModule method is only used if either fs or gluster storage is built in, which doesn't happen on mingw leading to warning of an unused static function. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as mingw build fix src/util/virstoragefilebackend.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/virstoragefilebackend.c b/src/util/virstoragefilebackend.c index ac087dabac..eb3055ed67 100644 --- a/src/util/virstoragefilebackend.c +++ b/src/util/virstoragefilebackend.c @@ -45,7 +45,9 @@ VIR_LOG_INIT("storage.storage_source_backend"); static virStorageFileBackendPtr virStorageFileBackends[VIR_STORAGE_BACKENDS_MAX]; static size_t virStorageFileBackendsCount; -#define STORAGE_FILE_MODULE_DIR LIBDIR "/libvirt/storage-file" +#if WITH_STORAGE_DIR || WITH_STORAGE_FS || WITH_STORAGE_GLUSTER + +# define STORAGE_FILE_MODULE_DIR LIBDIR "/libvirt/storage-file" static int virStorageFileLoadBackendModule(const char *name, @@ -69,7 +71,7 @@ virStorageFileLoadBackendModule(const char *name, return ret; } - +#endif /* WITH_STORAGE_DIR || WITH_STORAGE_FS || WITH_STORAGE_GLUSTER */ static int virStorageFileBackendOnceInit(void) { -- 2.14.3

1 0

[libvirt] [dbus RFC PATCH 0/6] Remove all enum->string and string->enum code
by Katerina Koukiou 03 May '18

03 May '18

As mentioned in the patches commit message... Converting ENUMS to str can be user friendly though it can be problematic between libvirt versions. In particular when some translated type will introduce a new constant to the ENUM libvirt-dbus will fail with: size of array ‘_GStaticAssertCompileTimeAssertion_5’ is negative Since it's not main use case of livirt-dbus API to be invoked interactively by user, having all ENUM types passed as unsigned int is preferable to avoid the previous issue. Katerina Koukiou (6): Abandon usage of all *TypeToString functions in domain.c Abandon usage of all *TypeToString functions in connect.c Abandon usage of all *TypeToString functions in network.c Change DomainEvent argument from string to unsigned int Change NetworkEvent argument from string to unsigned int Remove virtDBusUtilEnum{From,From}String functions data/org.libvirt.Connect.xml | 6 +- data/org.libvirt.Domain.xml | 14 ++-- data/org.libvirt.Network.xml | 6 +- src/connect.c | 18 +---- src/domain.c | 172 ++++--------------------------------------- src/events.c | 40 +--------- src/network.c | 66 +---------------- src/util.c | 27 ------- src/util.h | 28 ------- tests/libvirttest.py | 20 +++++ tests/test_connect.py | 24 ++++-- tests/test_domain.py | 36 ++++++--- tests/test_network.py | 20 +++-- 13 files changed, 107 insertions(+), 370 deletions(-) -- 2.15.0

1 7

[libvirt] [qemu RFC v3 0/3] qapi: add "firmware.json"
by Laszlo Ersek 03 May '18

03 May '18

This version seeks to address the RFCv2 feedback. Changes are noted per patch. Cc: "Daniel P. Berrange" <berrange(a)redhat.com> Cc: David Gibson <dgibson(a)redhat.com> Cc: Eric Blake <eblake(a)redhat.com> Cc: Gerd Hoffmann <kraxel(a)redhat.com> Cc: Kashyap Chamarthy <kchamart(a)redhat.com> Cc: Markus Armbruster <armbru(a)redhat.com> Cc: Paolo Bonzini <pbonzini(a)redhat.com> Cc: Thomas Huth <thuth(a)redhat.com> Thanks, Laszlo Laszlo Ersek (3): qapi: add SysEmuTarget to "common.json" qapi: change the type of TargetInfo.arch from string to enum SysEmuTarget qapi: add "firmware.json" Makefile | 9 + Makefile.objs | 4 + qapi/common.json | 19 ++ qapi/firmware.json | 554 ++++++++++++++++++++++++++++++++++++++++++++++++++ qapi/misc.json | 6 +- qapi/qapi-schema.json | 1 + arch_init.c | 18 +- qmp.c | 5 + .gitignore | 4 + 9 files changed, 617 insertions(+), 3 deletions(-) create mode 100644 qapi/firmware.json -- 2.14.1.3.gb7cf6e02401b

3 10

[libvirt] [PATCH] tests: unlink libxl-driver.log
by Daniel P. Berrangé 03 May '18

03 May '18

The libxlxml2domconfigtest causes a libxl-driver.log file to be created which breaks make distchck if libxl is enabled. Delete the log file at the end of the test. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a build fix for make distcheck tests/libxlxml2domconfigtest.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index d9287b59a8..0d2a7385e5 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -211,6 +211,8 @@ mymain(void) DO_TEST("multiple-ip"); DO_TEST("fullvirt-cpuid"); + unlink("libxl-driver.log"); + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.14.3

1 0

[libvirt] [dbus PATCH v2 0/9] NodeAPIs for Connect Interface
by Katerina Koukiou 03 May '18

03 May '18

Changes from v1: * Added tests were the test driver exported the relevant API * Removed NodeGetCellsFreeMemory which will be sent in seperate patchset * Adjusted other comments from review Katerina Koukiou (9): Implement NodeGetCPUStats method for Connect Interface Implement NodeGetFreeMemory method for Connect Interface Implement NodeGetInfo method for Connect Interface Implement NodeGetMemoryParameters method in Connect Interface Implement NodeGetMemoryStats method for Connect Interface Implement NodeGetSecurityModel method for Domain Interface Implement NodeSetMemoryParameters method for Connect Interface Implement NodeSuspendForDuration method for Connect Interface Implement NodeGetCPUMap method for Connect Interface data/org.libvirt.Connect.xml | 54 ++++++++ src/connect.c | 303 +++++++++++++++++++++++++++++++++++++++++++ tests/test_connect.py | 16 +++ 3 files changed, 373 insertions(+) -- 2.15.0

2 18

[libvirt] [PATCH 0/5] Improve translation handling
by Daniel P. Berrangé 03 May '18

03 May '18

This series aims to improve the way we handle translations. The key problems with our current approach - The pot & po files stored in GIT contain huge set of annotations about source file names & line numbers. These are out of date as soon as a change is commited to git following a translation refresh. This makes diffs impossible to meaningfully review, as they are 98% noise, 2% signal. - The po file messages are sorted by source location, so when we move code between files, or rename files, the po file message order changes for no good reason. This makes diffs even more impossible to review. - The po files contain entries for all messages even if most have no translation, bloating size of po/ data stored in git - Whenever 'make dist' is run, it alters all the pot and po files, so developers need to then reset their content to match git HEAD manually. This is caused by having auto-generated content (source file locations) mixed in with the static content (the actual translated strings) Overall the *.po files we store consume 100MB, and when I refresh content from Zanata, it results in git commits that are many 10's of MB in size and impossible todo any meaningful review on. After this series, we only minimized po files in git, with the redundated & outdated source locations info stripped. This stripped info is re-added automatically during build to create the real .po files, that we distribute, and/or upload to translators in Zanata. As a result the po directory is only 19MB in size, and when refreshing from Zanata, we have git commits that clearly show *only* the altered translations, nothing else. The importance of this cannot be overstated - by having these clear diffs I discovered a serious bug in the Zanata client that has been screwing up translations in every project that uses Zanata by adding bogus "fuzzy" annotations. Note that what I've posted here is a cut-down version of what will actually be pushed. I have cut out the 99 other patches that actally change the .po files. There's no meaningful way to review those commits because of the noise in the original .po files we're replacing. I have gone through manual steps, however, to validate that the .po files we generate from the new .mini.po files are identical to the original .po files we used to store, aside from the bogus fuzzy annotations due to broken Zanata. The diffstat shown below covers the full set of patches on the branch at: https://github.com/berrange/libvirt/commits/i18n-4 The killer statistic is: 418787 insertions(+), 4388281 deletions(-) Daniel P. Berrangé (5): po: provide custom make rules for po file management po: remove language list from zanata configuration po: add rules for integration with zanata po: stop storing libvirt.pot in git po: minimize & canonicalize translations stored in git .gitignore | 9 +- ABOUT-NLS | 1 + autogen.sh | 3 +- bootstrap.conf | 38 - build-aux/minimize-po.pl | 37 + configure.ac | 33 +- m4/virt-nls.m4 | 70 + po/Makefile.am | 107 + po/{POTFILES.in => POTFILES} | 0 po/README.md | 75 + po/af.mini.po | 20 + po/af.po | 46395 ------------------------------ po/am.mini.po | 20 + po/am.po | 46395 ------------------------------ po/anp.mini.po | 20 + po/anp.po | 46395 ------------------------------ po/ar.mini.po | 762 + po/ar.po | 46685 ------------------------------ po/{as.po => as.mini.po} | 54246 ++++++++++------------------------- po/ast.mini.po | 20 + po/ast.po | 46395 ------------------------------ po/bal.mini.po | 20 + po/bal.po | 46395 ------------------------------ po/be.mini.po | 21 + po/be.po | 46396 ------------------------------ po/bg.mini.po | 1204 + po/bg.po | 46733 ------------------------------ po/bn.mini.po | 761 + po/bn.po | 46684 ------------------------------ po/bn_IN.mini.po | 9131 ++++++ po/bn_IN.po | 46729 ------------------------------ po/bo.mini.po | 20 + po/bo.po | 46395 ------------------------------ po/br.mini.po | 20 + po/br.po | 46395 ------------------------------ po/brx.mini.po | 20 + po/brx.po | 46395 ------------------------------ po/bs.mini.po | 767 + po/bs.po | 46693 ------------------------------ po/ca.mini.po | 1618 ++ po/ca.po | 46555 ------------------------------ po/cs.mini.po | 4146 +++ po/cs.po | 46751 ------------------------------ po/cy.mini.po | 762 + po/cy.po | 46701 ------------------------------ po/da.mini.po | 982 + po/da.po | 46704 ------------------------------ po/de.mini.po | 22654 +++++++++++++++ po/de.po | 47656 ------------------------------- po/de_CH.mini.po | 20 + po/de_CH.po | 46395 ------------------------------ po/el.mini.po | 724 + po/el.po | 46857 ------------------------------ po/en_GB.mini.po | 22271 +++++++++++++++ po/en_GB.po | 47573 ------------------------------- po/eo.mini.po | 20 + po/eo.po | 46395 ------------------------------ po/es.mini.po | 22622 +++++++++++++++ po/es.po | 47748 ------------------------------- po/et.mini.po | 761 + po/et.po | 46684 ------------------------------ po/eu.mini.po | 761 + po/eu.po | 46684 ------------------------------ po/fa.mini.po | 20 + po/fa.po | 46395 ------------------------------ po/fi.mini.po | 1281 + po/fi.po | 46744 ------------------------------ po/fil.mini.po | 20 + po/fr.mini.po | 4258 +++ po/fr.po | 46907 ------------------------------ po/fur.mini.po | 20 + po/ga.mini.po | 21 + po/gl.mini.po | 761 + po/gl.po | 46700 ------------------------------ po/{gu.po => gu.mini.po} | 54191 ++++++++++------------------------- po/he.mini.po | 761 + po/he.po | 46684 ------------------------------ po/hi.mini.po | 13772 +++++++++ po/hi.po | 47013 ------------------------------- po/hr.mini.po | 21 + po/hr.po | 46396 ------------------------------ po/hu.mini.po | 987 + po/hu.po | 46709 ------------------------------ po/ia.mini.po | 20 + po/ia.po | 46395 ------------------------------ po/id.mini.po | 728 + po/id.po | 46691 ------------------------------ po/ilo.mini.po | 20 + po/ilo.po | 46395 ------------------------------ po/is.mini.po | 761 + po/is.po | 46684 ------------------------------ po/it.mini.po | 6588 +++++ po/it.po | 46663 ------------------------------ po/{ja.po => ja.mini.po} | 54737 ++++++++++------------------------- po/ka.mini.po | 761 + po/ka.po | 46684 ------------------------------ po/kk.mini.po | 20 + po/kk.po | 46395 ------------------------------ po/km.mini.po | 20 + po/km.po | 46395 ------------------------------ po/{kn.po => kn.mini.po} | 54156 ++++++++++------------------------- po/ko.mini.po | 12838 +++++++++ po/ko.po | 46723 ------------------------------ po/kw.mini.po | 21 + po/kw.po | 46396 ------------------------------ po/kw(a)kkcor.mini.po | 21 + po/kw(a)kkcor.po | 46396 ------------------------------ po/kw(a)uccor.mini.po | 21 + po/kw(a)uccor.po | 46396 ------------------------------ po/kw_GB.mini.po | 21 + po/kw_GB.po | 46396 ------------------------------ po/ky.mini.po | 20 + po/ky.po | 46395 ------------------------------ po/libvirt.pot | 46394 ------------------------------ po/lt.mini.po | 762 + po/lt.po | 46685 ------------------------------ po/lv.mini.po | 762 + po/lv.po | 46685 ------------------------------ po/mai.mini.po | 20 + po/mai.po | 46395 ------------------------------ po/mk.mini.po | 1138 + po/mk.po | 46724 ------------------------------ po/{ml.po => ml.mini.po} | 53963 ++++++++++------------------------- po/mn.mini.po | 20 + po/mn.po | 46395 ------------------------------ po/{mr.po => mr.mini.po} | 55484 +++++++++++------------------------- po/ms.mini.po | 189 + po/ms.po | 46580 ------------------------------ po/my.mini.po | 20 + po/nb.mini.po | 492 + po/nb.po | 46667 ------------------------------ po/nds.mini.po | 20 + po/nds.po | 46395 ------------------------------ po/ne.mini.po | 20 + po/ne.po | 46395 ------------------------------ po/nl.mini.po | 9868 +++++++ po/nl.po | 47062 ------------------------------- po/nn.mini.po | 761 + po/nn.po | 46684 ------------------------------ po/nso.mini.po | 761 + po/nso.po | 46684 ------------------------------ po/{or.po => or.mini.po} | 53161 +++++++++------------------------- po/{pa.po => pa.mini.po} | 53711 ++++++++++------------------------- po/pl.mini.po | 10274 +++++++ po/pl.po | 47166 ------------------------------- po/pt.mini.po | 1243 + po/pt.po | 46587 ------------------------------ po/pt_BR.mini.po | 22821 +++++++++++++++ po/pt_BR.po | 47565 ------------------------------- po/ro.mini.po | 762 + po/ro.po | 46685 ------------------------------ po/{ru.po => ru.mini.po} | 54065 ++++++++++------------------------- po/si.mini.po | 761 + po/si.po | 46684 ------------------------------ po/sk.mini.po | 761 + po/sk.po | 46684 ------------------------------ po/sl.mini.po | 762 + po/sl.po | 46685 ------------------------------ po/sq.mini.po | 24 + po/sq.po | 46399 ------------------------------ po/sr.mini.po | 2203 ++ po/sr.po | 46910 ------------------------------ po/sr(a)latin.mini.po | 2204 ++ po/sr(a)latin.po | 46911 ------------------------------ po/sv.mini.po | 2559 ++ po/sv.po | 46696 ------------------------------ po/{ta.po => ta.mini.po} | 54968 +++++++++++------------------------- po/{te.po => te.mini.po} | 53427 ++++++++++------------------------- po/tg.mini.po | 20 + po/tg.po | 46395 ------------------------------ po/th.mini.po | 761 + po/th.po | 46684 ------------------------------ po/tr.mini.po | 761 + po/tr.po | 46684 ------------------------------ po/tw.mini.po | 20 + po/tw.po | 46395 ------------------------------ po/{uk.po => uk.mini.po} | 62575 +++++++++++++++++------------------------ po/ur.mini.po | 761 + po/ur.po | 46684 ------------------------------ po/vi.mini.po | 8674 ++++++ po/vi.po | 47171 ------------------------------- po/wba.mini.po | 20 + po/wba.po | 46395 ------------------------------ po/yo.mini.po | 20 + po/yo.po | 46395 ------------------------------ po/zanata.xml | 99 - po/zh_CN.mini.po | 23613 ++++++++++++++++ po/zh_CN.po | 46701 ------------------------------ po/zh_HK.mini.po | 20 + po/zh_HK.po | 46395 ------------------------------ po/zh_TW.mini.po | 958 + po/zh_TW.po | 46725 ------------------------------ po/zu.mini.po | 761 + po/zu.po | 46684 ------------------------------ src/internal.h | 16 +- src/libvirt-admin.c | 2 + src/libvirt.c | 2 + src/util/virgettext.c | 3 +- tools/virt-host-validate.c | 4 +- 199 files changed, 418787 insertions(+), 4388281 deletions(-) -- 2.14.3

3 14

[libvirt] [PATCH 0/6] Split the storage file driver impls from the storage driver backends
by Daniel P. Berrangé 03 May '18

03 May '18

The storage driver backends currently register storage file backends as a side effect of initialization. This is fine right now while both run in the same libvirtd process, but in future the storage file backends will need to run in the hypervisor daemon which will be separate from the storage daemon. This small series splits them, makin the storage file backends be registered "on demand" Daniel P. Berrangé (6): util: create new virmodule.{c,h} files for dlopen support code storage: split gluster storage file code from storage driver backend storage: split fs storage file code from storage driver backend storage: fix virStorageFileGetBackingStoreStr error handling util: refactor storage file checks to allow error reporting storage: create separate loadable modules for storage file drivers libvirt.spec.in | 4 + src/driver.c | 133 +----------- src/driver.h | 3 - src/libvirt_driver_modules.syms | 1 - src/libvirt_private.syms | 3 + src/qemu/qemu_domain.c | 21 +- src/qemu/qemu_driver.c | 21 +- src/storage/Makefile.inc.am | 44 ++++ src/storage/storage_backend.c | 3 +- src/storage/storage_backend_fs.c | 210 +------------------ src/storage/storage_backend_gluster.c | 305 +--------------------------- src/storage/storage_backend_gluster.h | 2 +- src/storage/storage_file_fs.c | 251 +++++++++++++++++++++++ src/storage/storage_file_fs.h | 29 +++ src/storage/storage_file_gluster.c | 366 ++++++++++++++++++++++++++++++++++ src/storage/storage_file_gluster.h | 27 +++ src/util/Makefile.inc.am | 2 + src/util/virmodule.c | 163 +++++++++++++++ src/util/virmodule.h | 29 +++ src/util/virstoragefile.c | 123 ++++++++---- src/util/virstoragefile.h | 9 +- src/util/virstoragefilebackend.c | 72 +++++-- src/util/virstoragefilebackend.h | 9 +- 23 files changed, 1098 insertions(+), 732 deletions(-) create mode 100644 src/storage/storage_file_fs.c create mode 100644 src/storage/storage_file_fs.h create mode 100644 src/storage/storage_file_gluster.c create mode 100644 src/storage/storage_file_gluster.h create mode 100644 src/util/virmodule.c create mode 100644 src/util/virmodule.h -- 2.14.3

2 17

[libvirt] [PATCH] docs: Grammar and spelling fixes
by Ville Skyttä 03 May '18

03 May '18

Signed-off-by: Ville Skyttä <ville.skytta(a)iki.fi> --- docs/aclpolkit.html.in | 2 +- docs/api.html.in | 2 +- docs/contribute.html.in | 2 +- docs/downloads.html.in | 2 +- docs/drvbhyve.html.in | 2 +- docs/drvesx.html.in | 2 +- docs/drvlxc.html.in | 2 +- docs/errors.html.in | 2 +- docs/firewall.html.in | 2 +- docs/formatdomain.html.in | 12 ++++++------ docs/formatdomaincaps.html.in | 2 +- docs/internals/rpc.html.in | 2 +- docs/locking-sanlock.html.in | 2 +- docs/news.xml | 2 +- docs/storage.html.in | 2 +- docs/support.html.in | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/aclpolkit.html.in b/docs/aclpolkit.html.in index 0e3c8e9..98d06da 100644 --- a/docs/aclpolkit.html.in +++ b/docs/aclpolkit.html.in @@ -396,7 +396,7 @@ polkit.addRule(function(action, subject) { To achieve this we need to write a rule which checks whether the <code>connect_driver</code> attribute is <code>LXC</code> and the <code>domain_name</code> - attribute is <code>demo</code>, and match on a action + attribute is <code>demo</code>, and match on action name of <code>org.libvirt.api.domain.getattr</code>. Using the javascript rules format, this ends up written as diff --git a/docs/api.html.in b/docs/api.html.in index 27abed6..288b9ec 100644 --- a/docs/api.html.in +++ b/docs/api.html.in @@ -155,7 +155,7 @@ </ul> </li> <li>Enumeration [virConnectList..., virConnectNumOf...] - Used to enumerate a set of object available to an given + Used to enumerate a set of object available to a given hypervisor connection such as: <ul> <li> diff --git a/docs/contribute.html.in b/docs/contribute.html.in index 158c91c..42a1b2f 100644 --- a/docs/contribute.html.in +++ b/docs/contribute.html.in @@ -80,7 +80,7 @@ and future growth of the project, that there are a people who evangalise the work created by the project. This can take many forms, writing blog posts (about usage of features, - personal user experiances, areas for future work, and more), + personal user experiences, areas for future work, and more), syndicating docs and blogs via social media, giving user group and/or conference talks about libvirt.</li> <li>User assistance. Since documentation diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 8cca203..2956a4f 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -457,7 +457,7 @@ (first release in the middle of Jan, then skip the Feb release), giving a total of 11 releases a year. The Python and Perl modules will aim to release at the same time as the core libvirt module. Other modules have - independant ad-hoc releases with no fixed time schedle. + independent ad-hoc releases with no fixed time schedule. <h2><a id="numbering">Release numbering</a></h2> diff --git a/docs/drvbhyve.html.in b/docs/drvbhyve.html.in index 63260af..bde8298 100644 --- a/docs/drvbhyve.html.in +++ b/docs/drvbhyve.html.in @@ -239,7 +239,7 @@ to let a guest boot or start a guest using: <pre>start --console domname</pre> -NB: An bootloader configured to require user interaction will prevent +NB: A bootloader configured to require user interaction will prevent the domain from starting (and thus <code>virsh console</code> or <code>start --console</code> from functioning) until the user interacts with it manually on the VM host. Because users typically do not have access to the VM host, diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index 417aca4..901d659 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -437,7 +437,7 @@ ethernet0.checkMACAddress = "false" <dl> <dt><code>auto</code></dt> <dd> - This isn't a actual controller model. If specified the ESX driver + This isn't an actual controller model. If specified the ESX driver tries to detect the SCSI controller model referenced in the <code>.vmdk</code> file and use it. Autodetection fails when a SCSI controller has multiple disks attached and the SCSI controller diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index 44c4960..6ee9ee8 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -429,7 +429,7 @@ be considered secure against exploits of the host OS. The sVirt SELinux driver provides a way to secure containers even when the "user" namespace is not used. The cost is that writing a policy to allow execution of arbitrary OS is not practical. The SELinux sVirt policy is typically -tailored to work with an simpler application confinement use case, +tailored to work with a simpler application confinement use case, as provided by the "libvirt-sandbox" project. diff --git a/docs/errors.html.in b/docs/errors.html.in index 8f4f7d4..ea42728 100644 --- a/docs/errors.html.in +++ b/docs/errors.html.in @@ -29,7 +29,7 @@ set specifically to a connection with call it with the error information</li><li>otherwise call <a href="html/libvirt-virterror.html#virDefaultErrorFunc">virDefaultErrorFunc</a> which is the default error function of the library issuing the error on stderr</li><li>save the error in the connection for later retrieval with <a href="html/libvirt-virterror.html#virConnGetLastError">virConnGetLastError</a></li></ol></li> - <li>otherwise like when failing to create an hypervisor connection: + <li>otherwise like when failing to create a hypervisor connection: <ol><li>if there is a global callback set with <a href="html/libvirt-virterror.html#virSetErrorFunc">virSetErrorFunc</a>, call it with the error information</li><li>otherwise call <a href="html/libvirt-virterror.html#virDefaultErrorFunc">virDefaultErrorFunc</a> which is the default error function of the library issuing the error diff --git a/docs/firewall.html.in b/docs/firewall.html.in index 11c3c81..0a50687 100644 --- a/docs/firewall.html.in +++ b/docs/firewall.html.in @@ -11,7 +11,7 @@ <ul> <li>The virtual network driver - This provides a isolated bridge device (ie no physical NICs + This provides an isolated bridge device (ie no physical NICs enslaved). Guest TAP devices are attached to this bridge. Guests can talk to each other and the host, and optionally the wider world. diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8e864f7..b65fea0 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -622,7 +622,7 @@ <code>order</code> allows to specify the order to add the online vcpus. For hypervisors/platforms that require to insert multiple vcpus at once - the order may be duplicated accross all vcpus that need to be + the order may be duplicated across all vcpus that need to be enabled at once. Specifying order is not necessary, vcpus are then added in an arbitrary order. If order info is used, it must be used for all online vcpus. Hypervisors may clear or update ordering information @@ -4058,7 +4058,7 @@ pcie-switch-upstream-port, and of course for this to work properly, you will need to decrease the pcie-expander-bus' busNr accordingly so that there are enough unused bus - numbers above it to accomodate giving out one bus number for + numbers above it to accommodate giving out one bus number for the upstream-port and one for each downstream-port (in addition to the pcie-root-port and the pcie-expander-bus itself). @@ -4212,7 +4212,7 @@ <dd>This is the fully qualified path of the file associated with the lockspace. The offset specifies where the lease is stored within the file. If the lock manager does not - require a offset, just pass 0. + require an offset, just pass 0. </dd> </dl> @@ -4867,7 +4867,7 @@ (Since 0.10.0). For example, in order to work properly with both an 802.1Qbh switch and an Open vSwitch switch, you may choose to specify no type, but both - an <code>profileid</code> (in case the switch is 802.1Qbh) and + a <code>profileid</code> (in case the switch is 802.1Qbh) and an <code>interfaceid</code> (in case the switch is Open vSwitch) (you may also omit the other attributes, such as managerid, typeid, or profileid, to be filled in from the @@ -6174,7 +6174,7 @@ qemu-kvm -net nic,model=? /dev/null set to an empty string, then VNC access is disabled. The <code>keymap</code> attribute specifies the keymap to use. It is possible to set a limit on the validity of the password by giving - an timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> + a timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> assumed to be in UTC. The <code>connected</code> attribute allows control of connected client during password changes. VNC accepts <code>keep</code> value only since 0.9.3. @@ -6216,7 +6216,7 @@ qemu-kvm -net nic,model=? /dev/null <code>passwd</code> attribute is set to an empty string, then SPICE access is disabled. The <code>keymap</code> attribute specifies the keymap to use. It is possible to set a limit on - the validity of the password by giving an timestamp + the validity of the password by giving a timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> assumed to be in UTC. diff --git a/docs/formatdomaincaps.html.in b/docs/formatdomaincaps.html.in index 6bfcaf6..027e115 100644 --- a/docs/formatdomaincaps.html.in +++ b/docs/formatdomaincaps.html.in @@ -81,7 +81,7 @@ <h3><a id="elementsCPUAllocation">CPU Allocation</a></h3> - Before any devices capability occurs, there might be a info on domain + Before any devices capability occurs, there might be info on domain wide capabilities, e.g. virtual CPUs: <pre> diff --git a/docs/internals/rpc.html.in b/docs/internals/rpc.html.in index fca9cb7..048192f 100644 --- a/docs/internals/rpc.html.in +++ b/docs/internals/rpc.html.in @@ -133,7 +133,7 @@ </dd> <dt><code>serial</code></dt> <dd> - This is an number that starts from 1 and increases + This is a number that starts from 1 and increases each time a method call packet is sent. A reply or stream packet will have a serial number matching the original method call packet serial. Events always diff --git a/docs/locking-sanlock.html.in b/docs/locking-sanlock.html.in index 9b36561..3ee9849 100644 --- a/docs/locking-sanlock.html.in +++ b/docs/locking-sanlock.html.in @@ -76,7 +76,7 @@ SANLOCKOPTS="-w 0" configuration file for each libvirt driver that is using sanlock. For QEMU, we will edit <code>/etc/libvirt/qemu-sanlock.conf</code> There is one mandatory parameter that needs to be set, - the <code>host_id</code>. This is a integer between + the <code>host_id</code>. This is an integer between 1 and 2000, which must be set to a unique value on each host running virtual machines. diff --git a/docs/news.xml b/docs/news.xml index d67d5a7..8018141 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -1206,7 +1206,7 @@ <description> The <code>vgaconf</code> attribute was added to <code>video</code>'s <code>driver</code> element. Possible values are: <code>on</code>, - <code>off</code>, and <code>io</code>. It controlls the way how + <code>off</code>, and <code>io</code>. It controls the way how bhyve exposes video devices to its guests; various guest OSes might require different settings to boot properly. </description> diff --git a/docs/storage.html.in b/docs/storage.html.in index 3f1aec1..1906aa6 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -759,7 +759,7 @@ This provides a pool based on Virtuozzo storage. Virtuozzo Storage is a highly available distributed software-defined storage with built-in replication and disaster recovery. More detailed information about - Virtuozzo storage and its managment can be found here: + Virtuozzo storage and its management can be found here: <a href="https://openvz.org/Virtuozzo_Storage">Virtuozzo Storage</a>). diff --git a/docs/support.html.in b/docs/support.html.in index 1a9438f..38f2f90 100644 --- a/docs/support.html.in +++ b/docs/support.html.in @@ -199,7 +199,7 @@ return an error indicating it is not supported. Likewise libvirt will make reasonable efforts to keep API calls working across hypervisor releases even if the underlying implementation changes. In cases where - this is impossible, an suitable error will be reported. The list of + this is impossible, a suitable error will be reported. The list of APIs which have implementations <a href="hvsupport.html">is detailed separately</a>. -- 2.14.1

2 1

[libvirt] [PATCH] rpm: set wireshark plugin directory from pkg-config
by Daniel P. Berrangé 03 May '18

03 May '18

The wireshark plugin directory moved again in Fedora 29, and will move again every time wireshark do a new minor release. Call out to pkg-config to find the right directory to use in the RPM file list. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a rawhide build fix libvirt.spec.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 549efcbd3a..d6058f8054 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -184,6 +184,11 @@ %if 0%{?fedora} %define with_wireshark 0%{!?_without_wireshark:1} %endif +%if 0%{?fedora} || 0%{?rhel} > 7 + %define wireshark_plugindir %(pkg-config --variable plugindir wireshark) +%else + %define wireshark_plugindir %{_libdir}/wireshark/plugins +%endif # Enable libssh transport for new enough distros %if 0%{?fedora} @@ -1386,7 +1391,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.a %if %{with_wireshark} -rm -f $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/libvirt.la +rm -f $RPM_BUILD_ROOT%{wireshark_plugindir}/libvirt.la %endif install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/ @@ -2097,7 +2102,7 @@ exit 0 %if %{with_wireshark} %files wireshark -%{_libdir}/wireshark/plugins/libvirt.so +%{wireshark_plugindir}/libvirt.so %endif %files nss -- 2.14.3

1 0

[libvirt] [GSoC] Introduction - nodejs bindings
by Ramy Elkest 03 May '18

03 May '18

Hi all, As a quick introduction, I'm Ramy Elkest, a student at Georgia Tech and one of the lucky ones selected by libvirt for this year's Google Summer of Code. During the next months I'll be working with my mentors Martin Kletzander and Erik Skultety to introduce nodejs to libvirt's family of bindings. In short, the aim is to generate the nodejs bindings from the XMLs (as we do for python). On a very high level my current approach is as follows: - Re-use libvirt-python's generator (mainly the parser) possibly re-written in node (TBD) - Draw from existing projects (eg. node-libvirt) to generate preliminary templates There are a few things to look into before jumping in: - Code generation framework (or lack of) - Node Abstractions for Node (NAN) vs. Node-API (N-API) If you have preliminary thoughts / background info about any of the above, I'd love to hear it. I'm usually around on irc, "relkest". Ramy

2 1

[libvirt] [PATCH] rpm: libvirt-daemon-driver-libxl must obsolete libvirt-daemon-driver-xen
by Daniel P. Berrangé 03 May '18

03 May '18

Snce the xen driver was deleted we need to ensure that the old libvirt-daemon-driver-xen sub-RPM gets removed on upgrade. We achieve this my making libvirt-daemon-driver-libxl obsolete it. We don't add a Provides: too, because libvirt-daemon-driver-libxl is not a functionally identical replacement, since we don't want to satisfy deps for 3rd party apps that have a Requires on the libvirt-daemon-driver-xen RPM. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as trivial fix libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 5090dfa2aa..549efcbd3a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -841,6 +841,7 @@ VirtualBox Summary: Libxl driver plugin for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} +Obsoletes: libvirt-daemon-driver-xen < 4.3.0 %description daemon-driver-libxl The Libxl driver plugin for the libvirtd daemon, providing -- 2.14.3

1 0

[libvirt] [PATCH] docs: Grammar and spelling fixes
by Ville Skyttä 03 May '18

03 May '18

--- docs/aclpolkit.html.in | 2 +- docs/api.html.in | 2 +- docs/contribute.html.in | 2 +- docs/downloads.html.in | 2 +- docs/drvbhyve.html.in | 2 +- docs/drvesx.html.in | 2 +- docs/drvlxc.html.in | 2 +- docs/errors.html.in | 2 +- docs/firewall.html.in | 2 +- docs/formatdomain.html.in | 12 ++++++------ docs/formatdomaincaps.html.in | 2 +- docs/internals/rpc.html.in | 2 +- docs/locking-sanlock.html.in | 2 +- docs/news.xml | 2 +- docs/storage.html.in | 2 +- docs/support.html.in | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/aclpolkit.html.in b/docs/aclpolkit.html.in index 0e3c8e9..98d06da 100644 --- a/docs/aclpolkit.html.in +++ b/docs/aclpolkit.html.in @@ -396,7 +396,7 @@ polkit.addRule(function(action, subject) { To achieve this we need to write a rule which checks whether the <code>connect_driver</code> attribute is <code>LXC</code> and the <code>domain_name</code> - attribute is <code>demo</code>, and match on a action + attribute is <code>demo</code>, and match on action name of <code>org.libvirt.api.domain.getattr</code>. Using the javascript rules format, this ends up written as diff --git a/docs/api.html.in b/docs/api.html.in index 27abed6..288b9ec 100644 --- a/docs/api.html.in +++ b/docs/api.html.in @@ -155,7 +155,7 @@ </ul> </li> <li>Enumeration [virConnectList..., virConnectNumOf...] - Used to enumerate a set of object available to an given + Used to enumerate a set of object available to a given hypervisor connection such as: <ul> <li> diff --git a/docs/contribute.html.in b/docs/contribute.html.in index 158c91c..42a1b2f 100644 --- a/docs/contribute.html.in +++ b/docs/contribute.html.in @@ -80,7 +80,7 @@ and future growth of the project, that there are a people who evangalise the work created by the project. This can take many forms, writing blog posts (about usage of features, - personal user experiances, areas for future work, and more), + personal user experiences, areas for future work, and more), syndicating docs and blogs via social media, giving user group and/or conference talks about libvirt.</li> <li>User assistance. Since documentation diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 8cca203..2956a4f 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -457,7 +457,7 @@ (first release in the middle of Jan, then skip the Feb release), giving a total of 11 releases a year. The Python and Perl modules will aim to release at the same time as the core libvirt module. Other modules have - independant ad-hoc releases with no fixed time schedle. + independent ad-hoc releases with no fixed time schedule. <h2><a id="numbering">Release numbering</a></h2> diff --git a/docs/drvbhyve.html.in b/docs/drvbhyve.html.in index 63260af..bde8298 100644 --- a/docs/drvbhyve.html.in +++ b/docs/drvbhyve.html.in @@ -239,7 +239,7 @@ to let a guest boot or start a guest using: <pre>start --console domname</pre> -NB: An bootloader configured to require user interaction will prevent +NB: A bootloader configured to require user interaction will prevent the domain from starting (and thus <code>virsh console</code> or <code>start --console</code> from functioning) until the user interacts with it manually on the VM host. Because users typically do not have access to the VM host, diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index 417aca4..901d659 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -437,7 +437,7 @@ ethernet0.checkMACAddress = "false" <dl> <dt><code>auto</code></dt> <dd> - This isn't a actual controller model. If specified the ESX driver + This isn't an actual controller model. If specified the ESX driver tries to detect the SCSI controller model referenced in the <code>.vmdk</code> file and use it. Autodetection fails when a SCSI controller has multiple disks attached and the SCSI controller diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index 44c4960..6ee9ee8 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -429,7 +429,7 @@ be considered secure against exploits of the host OS. The sVirt SELinux driver provides a way to secure containers even when the "user" namespace is not used. The cost is that writing a policy to allow execution of arbitrary OS is not practical. The SELinux sVirt policy is typically -tailored to work with an simpler application confinement use case, +tailored to work with a simpler application confinement use case, as provided by the "libvirt-sandbox" project. diff --git a/docs/errors.html.in b/docs/errors.html.in index 8f4f7d4..ea42728 100644 --- a/docs/errors.html.in +++ b/docs/errors.html.in @@ -29,7 +29,7 @@ set specifically to a connection with call it with the error information</li><li>otherwise call <a href="html/libvirt-virterror.html#virDefaultErrorFunc">virDefaultErrorFunc</a> which is the default error function of the library issuing the error on stderr</li><li>save the error in the connection for later retrieval with <a href="html/libvirt-virterror.html#virConnGetLastError">virConnGetLastError</a></li></ol></li> - <li>otherwise like when failing to create an hypervisor connection: + <li>otherwise like when failing to create a hypervisor connection: <ol><li>if there is a global callback set with <a href="html/libvirt-virterror.html#virSetErrorFunc">virSetErrorFunc</a>, call it with the error information</li><li>otherwise call <a href="html/libvirt-virterror.html#virDefaultErrorFunc">virDefaultErrorFunc</a> which is the default error function of the library issuing the error diff --git a/docs/firewall.html.in b/docs/firewall.html.in index 11c3c81..0a50687 100644 --- a/docs/firewall.html.in +++ b/docs/firewall.html.in @@ -11,7 +11,7 @@ <ul> <li>The virtual network driver - This provides a isolated bridge device (ie no physical NICs + This provides an isolated bridge device (ie no physical NICs enslaved). Guest TAP devices are attached to this bridge. Guests can talk to each other and the host, and optionally the wider world. diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8e864f7..b65fea0 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -622,7 +622,7 @@ <code>order</code> allows to specify the order to add the online vcpus. For hypervisors/platforms that require to insert multiple vcpus at once - the order may be duplicated accross all vcpus that need to be + the order may be duplicated across all vcpus that need to be enabled at once. Specifying order is not necessary, vcpus are then added in an arbitrary order. If order info is used, it must be used for all online vcpus. Hypervisors may clear or update ordering information @@ -4058,7 +4058,7 @@ pcie-switch-upstream-port, and of course for this to work properly, you will need to decrease the pcie-expander-bus' busNr accordingly so that there are enough unused bus - numbers above it to accomodate giving out one bus number for + numbers above it to accommodate giving out one bus number for the upstream-port and one for each downstream-port (in addition to the pcie-root-port and the pcie-expander-bus itself). @@ -4212,7 +4212,7 @@ <dd>This is the fully qualified path of the file associated with the lockspace. The offset specifies where the lease is stored within the file. If the lock manager does not - require a offset, just pass 0. + require an offset, just pass 0. </dd> </dl> @@ -4867,7 +4867,7 @@ (Since 0.10.0). For example, in order to work properly with both an 802.1Qbh switch and an Open vSwitch switch, you may choose to specify no type, but both - an <code>profileid</code> (in case the switch is 802.1Qbh) and + a <code>profileid</code> (in case the switch is 802.1Qbh) and an <code>interfaceid</code> (in case the switch is Open vSwitch) (you may also omit the other attributes, such as managerid, typeid, or profileid, to be filled in from the @@ -6174,7 +6174,7 @@ qemu-kvm -net nic,model=? /dev/null set to an empty string, then VNC access is disabled. The <code>keymap</code> attribute specifies the keymap to use. It is possible to set a limit on the validity of the password by giving - an timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> + a timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> assumed to be in UTC. The <code>connected</code> attribute allows control of connected client during password changes. VNC accepts <code>keep</code> value only since 0.9.3. @@ -6216,7 +6216,7 @@ qemu-kvm -net nic,model=? /dev/null <code>passwd</code> attribute is set to an empty string, then SPICE access is disabled. The <code>keymap</code> attribute specifies the keymap to use. It is possible to set a limit on - the validity of the password by giving an timestamp + the validity of the password by giving a timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> assumed to be in UTC. diff --git a/docs/formatdomaincaps.html.in b/docs/formatdomaincaps.html.in index 6bfcaf6..027e115 100644 --- a/docs/formatdomaincaps.html.in +++ b/docs/formatdomaincaps.html.in @@ -81,7 +81,7 @@ <h3><a id="elementsCPUAllocation">CPU Allocation</a></h3> - Before any devices capability occurs, there might be a info on domain + Before any devices capability occurs, there might be info on domain wide capabilities, e.g. virtual CPUs: <pre> diff --git a/docs/internals/rpc.html.in b/docs/internals/rpc.html.in index fca9cb7..048192f 100644 --- a/docs/internals/rpc.html.in +++ b/docs/internals/rpc.html.in @@ -133,7 +133,7 @@ </dd> <dt><code>serial</code></dt> <dd> - This is an number that starts from 1 and increases + This is a number that starts from 1 and increases each time a method call packet is sent. A reply or stream packet will have a serial number matching the original method call packet serial. Events always diff --git a/docs/locking-sanlock.html.in b/docs/locking-sanlock.html.in index 9b36561..3ee9849 100644 --- a/docs/locking-sanlock.html.in +++ b/docs/locking-sanlock.html.in @@ -76,7 +76,7 @@ SANLOCKOPTS="-w 0" configuration file for each libvirt driver that is using sanlock. For QEMU, we will edit <code>/etc/libvirt/qemu-sanlock.conf</code> There is one mandatory parameter that needs to be set, - the <code>host_id</code>. This is a integer between + the <code>host_id</code>. This is an integer between 1 and 2000, which must be set to a unique value on each host running virtual machines. diff --git a/docs/news.xml b/docs/news.xml index d67d5a7..8018141 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -1206,7 +1206,7 @@ <description> The <code>vgaconf</code> attribute was added to <code>video</code>'s <code>driver</code> element. Possible values are: <code>on</code>, - <code>off</code>, and <code>io</code>. It controlls the way how + <code>off</code>, and <code>io</code>. It controls the way how bhyve exposes video devices to its guests; various guest OSes might require different settings to boot properly. </description> diff --git a/docs/storage.html.in b/docs/storage.html.in index 3f1aec1..1906aa6 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -759,7 +759,7 @@ This provides a pool based on Virtuozzo storage. Virtuozzo Storage is a highly available distributed software-defined storage with built-in replication and disaster recovery. More detailed information about - Virtuozzo storage and its managment can be found here: + Virtuozzo storage and its management can be found here: <a href="https://openvz.org/Virtuozzo_Storage">Virtuozzo Storage</a>). diff --git a/docs/support.html.in b/docs/support.html.in index 1a9438f..38f2f90 100644 --- a/docs/support.html.in +++ b/docs/support.html.in @@ -199,7 +199,7 @@ return an error indicating it is not supported. Likewise libvirt will make reasonable efforts to keep API calls working across hypervisor releases even if the underlying implementation changes. In cases where - this is impossible, an suitable error will be reported. The list of + this is impossible, a suitable error will be reported. The list of APIs which have implementations <a href="hvsupport.html">is detailed separately</a>. -- 2.14.1

2 1

[libvirt] [PATCH v2 REBASE] lib: provide error message in new blockjob event
by Nikolay Shirokovskiy 03 May '18

03 May '18

If block job is completed with error qemu additionally provides error message. This patch introduces new event VIR_DOMAIN_EVENT_ID_BLOCK_JOB_ERROR to pass error message to client. This error message has no semantics and should not be interpreted. API and RPC layer also have reserved 'code' field to pass semantics loaded error code value in the future. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- Diff from v1 [1]: - replace block job event version 3 with block job error event - add code field to API/RPC to pass error code in the future Peter, I decided not to use enum/union as this looks like to much effort to extend code generation for this simple case. Using typed params looks unsuitable too. [1] https://www.redhat.com/archives/libvir-list/2017-October/msg01369.html examples/object-events/event-test.c | 20 ++++++++ include/libvirt/libvirt-domain.h | 25 ++++++++++ src/conf/domain_event.c | 92 +++++++++++++++++++++++++++++++++++++ src/conf/domain_event.h | 13 ++++++ src/libvirt_private.syms | 2 + src/qemu/qemu_blockjob.c | 10 +++- src/qemu/qemu_blockjob.h | 3 +- src/qemu/qemu_domain.c | 4 +- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 9 ++-- src/qemu/qemu_process.c | 1 + src/remote/remote_daemon_dispatch.c | 48 +++++++++++++++++++ src/remote/remote_driver.c | 34 ++++++++++++++ src/remote/remote_protocol.x | 17 ++++++- src/remote_protocol-structs | 9 ++++ tools/virsh-domain.c | 24 ++++++++++ 16 files changed, 304 insertions(+), 8 deletions(-) diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c index 8499e0b..23d5a3f 100644 --- a/examples/object-events/event-test.c +++ b/examples/object-events/event-test.c @@ -936,6 +936,25 @@ myDomainEventBlockJobCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int +myDomainEventBlockJobErrorCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *dev, + int type, + unsigned int code, + const char *message, + void *opaque) +{ + const char *eventName = opaque; + + printf("%s EVENT: Domain %s(%d) block job error callback '%s' disk '%s', " + "type '%s' code '%u' message '%s'", + __func__, virDomainGetName(dom), virDomainGetID(dom), eventName, + dev, blockJobTypeToStr(type), code, NULLSTR(message)); + return 0; +} + + +static int myDomainEventBlockThresholdCallback(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainPtr dom, const char *dev, @@ -1082,6 +1101,7 @@ struct domainEventData domainEvents[] = { DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED, myDomainEventDeviceRemovalFailedCallback), DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_METADATA_CHANGE, myDomainEventMetadataChangeCallback), DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD, myDomainEventBlockThresholdCallback), + DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_BLOCK_JOB_ERROR, myDomainEventBlockJobErrorCallback), }; struct storagePoolEventData { diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 12fd340..ee55ab9 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -4370,6 +4370,30 @@ typedef void (*virConnectDomainEventBlockThresholdCallback)(virConnectPtr conn, unsigned long long excess, void *opaque); + +/** + * virConnectDomainEventBlockJobErrorCallback: + * @conn: connection object + * @dom: domain on which the event occurred + * @dev: name associated with the affected disk or storage backing chain + * element + * @type: type of block job (virDomainBlockJobType) + * @code: always 0, reserved for future use + * @message: error message with no semantics, can be NULL + * @opaque: application specified data + * + * The callback occurs when block job is completed with error and provides + * error message in @message. + * + */ +typedef void (*virConnectDomainEventBlockJobErrorCallback)(virConnectPtr conn, + virDomainPtr dom, + const char *dev, + int type, + unsigned int code, + const char *message, + void *opaque); + /** * VIR_DOMAIN_EVENT_CALLBACK: * @@ -4412,6 +4436,7 @@ typedef enum { VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED = 22, /* virConnectDomainEventDeviceRemovalFailedCallback */ VIR_DOMAIN_EVENT_ID_METADATA_CHANGE = 23, /* virConnectDomainEventMetadataChangeCallback */ VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD = 24, /* virConnectDomainEventBlockThresholdCallback */ + VIR_DOMAIN_EVENT_ID_BLOCK_JOB_ERROR = 25, /* virConnectDomainEventBlockJobErrorCallback */ # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_EVENT_ID_LAST diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 9752070..54f4cf4 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -47,6 +47,7 @@ static virClassPtr virDomainEventWatchdogClass; static virClassPtr virDomainEventIOErrorClass; static virClassPtr virDomainEventGraphicsClass; static virClassPtr virDomainEventBlockJobClass; +static virClassPtr virDomainEventBlockJobErrorClass; static virClassPtr virDomainEventDiskChangeClass; static virClassPtr virDomainEventTrayChangeClass; static virClassPtr virDomainEventBalloonChangeClass; @@ -69,6 +70,7 @@ static void virDomainEventWatchdogDispose(void *obj); static void virDomainEventIOErrorDispose(void *obj); static void virDomainEventGraphicsDispose(void *obj); static void virDomainEventBlockJobDispose(void *obj); +static void virDomainEventBlockJobErrorDispose(void *obj); static void virDomainEventDiskChangeDispose(void *obj); static void virDomainEventTrayChangeDispose(void *obj); static void virDomainEventBalloonChangeDispose(void *obj); @@ -151,6 +153,17 @@ struct _virDomainEventBlockJob { typedef struct _virDomainEventBlockJob virDomainEventBlockJob; typedef virDomainEventBlockJob *virDomainEventBlockJobPtr; +struct _virDomainEventBlockJobError { + virDomainEvent parent; + + char *dev; + int type; + unsigned int code; + char *message; +}; +typedef struct _virDomainEventBlockJobError virDomainEventBlockJobError; +typedef virDomainEventBlockJobError *virDomainEventBlockJobErrorPtr; + struct _virDomainEventGraphics { virDomainEvent parent; @@ -309,6 +322,8 @@ virDomainEventsOnceInit(void) return -1; if (!VIR_CLASS_NEW(virDomainEventBlockJob, virDomainEventClass)) return -1; + if (!VIR_CLASS_NEW(virDomainEventBlockJobError, virDomainEventClass)) + return -1; if (!VIR_CLASS_NEW(virDomainEventDiskChange, virDomainEventClass)) return -1; if (!VIR_CLASS_NEW(virDomainEventTrayChange, virDomainEventClass)) @@ -420,6 +435,16 @@ virDomainEventBlockJobDispose(void *obj) } static void +virDomainEventBlockJobErrorDispose(void *obj) +{ + virDomainEventBlockJobErrorPtr event = obj; + VIR_DEBUG("obj=%p", event); + + VIR_FREE(event->dev); + VIR_FREE(event->message); +} + +static void virDomainEventDiskChangeDispose(void *obj) { virDomainEventDiskChangePtr event = obj; @@ -977,6 +1002,59 @@ virDomainEventBlockJob2NewFromDom(virDomainPtr dom, dst, type, status); } +static virObjectEventPtr +virDomainEventBlockJobErrorNew(int id, + const char *name, + unsigned char *uuid, + const char *dev, + int type, + unsigned int code, + const char *message) +{ + virDomainEventBlockJobErrorPtr ev; + + if (virDomainEventsInitialize() < 0) + return NULL; + + if (!(ev = virDomainEventNew(virDomainEventBlockJobErrorClass, + VIR_DOMAIN_EVENT_ID_BLOCK_JOB_ERROR, + id, name, uuid))) + return NULL; + + if (VIR_STRDUP(ev->dev, dev) < 0) { + virObjectUnref(ev); + return NULL; + } + ignore_value(VIR_STRDUP_QUIET(ev->message, message)); + ev->type = type; + ev->code = code; + + return (virObjectEventPtr)ev; +} + +virObjectEventPtr +virDomainEventBlockJobErrorNewFromObj(virDomainObjPtr obj, + const char *dev, + int type, + unsigned int code, + const char *message) +{ + return virDomainEventBlockJobErrorNew(obj->def->id, obj->def->name, + obj->def->uuid, dev, type, code, + message); +} + +virObjectEventPtr +virDomainEventBlockJobErrorNewFromDom(virDomainPtr dom, + const char *dev, + int type, + unsigned int code, + const char *message) +{ + return virDomainEventBlockJobErrorNew(dom->id, dom->name, dom->uuid, + dev, type, code, message); +} + virObjectEventPtr virDomainEventControlErrorNewFromDom(virDomainPtr dom) { @@ -1787,6 +1865,20 @@ virDomainEventDispatchDefaultFunc(virConnectPtr conn, goto cleanup; } + case VIR_DOMAIN_EVENT_ID_BLOCK_JOB_ERROR: + { + virDomainEventBlockJobErrorPtr blockJobErrorEvent; + + blockJobErrorEvent = (virDomainEventBlockJobErrorPtr)event; + ((virConnectDomainEventBlockJobErrorCallback)cb)(conn, dom, + blockJobErrorEvent->dev, + blockJobErrorEvent->type, + blockJobErrorEvent->code, + blockJobErrorEvent->message, + cbopaque); + goto cleanup; + } + case VIR_DOMAIN_EVENT_ID_DISK_CHANGE: { virDomainEventDiskChangePtr diskChangeEvent; diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index 3992a29..456026c 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -138,6 +138,19 @@ virDomainEventBlockJob2NewFromDom(virDomainPtr dom, int status); virObjectEventPtr +virDomainEventBlockJobErrorNewFromObj(virDomainObjPtr obj, + const char *dev, + int type, + unsigned int code, + const char *message); +virObjectEventPtr +virDomainEventBlockJobErrorNewFromDom(virDomainPtr dom, + const char *dev, + int type, + unsigned int code, + const char *message); + +virObjectEventPtr virDomainEventDiskChangeNewFromObj(virDomainObjPtr obj, const char *oldSrcPath, const char *newSrcPath, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b31f599..303f28c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -589,6 +589,8 @@ virDomainEventBalloonChangeNewFromDom; virDomainEventBalloonChangeNewFromObj; virDomainEventBlockJob2NewFromDom; virDomainEventBlockJob2NewFromObj; +virDomainEventBlockJobErrorNewFromDom; +virDomainEventBlockJobErrorNewFromObj; virDomainEventBlockJobNewFromDom; virDomainEventBlockJobNewFromObj; virDomainEventBlockThresholdNewFromDom; diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 617e4ee..4df4ed6 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -70,7 +70,8 @@ qemuBlockJobUpdate(virQEMUDriverPtr driver, if (status != -1) { qemuBlockJobEventProcess(driver, vm, disk, asyncJob, diskPriv->blockJobType, - diskPriv->blockJobStatus); + diskPriv->blockJobStatus, + diskPriv->blockJobError); diskPriv->blockJobStatus = -1; if (error) VIR_STEAL_PTR(*error, diskPriv->blockJobError); @@ -100,10 +101,12 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver, virDomainDiskDefPtr disk, qemuDomainAsyncJob asyncJob, int type, - int status) + int status, + const char *error) { virObjectEventPtr event = NULL; virObjectEventPtr event2 = NULL; + virObjectEventPtr errorEvent = NULL; const char *path; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virDomainDiskDefPtr persistDisk = NULL; @@ -123,6 +126,8 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver, path = virDomainDiskGetSource(disk); event = virDomainEventBlockJobNewFromObj(vm, path, type, status); event2 = virDomainEventBlockJob2NewFromObj(vm, disk->dst, type, status); + if (error) + errorEvent = virDomainEventBlockJobErrorNewFromObj(vm, disk->dst, type, 0, error); /* If we completed a block pull or commit, then update the XML * to match. */ @@ -213,6 +218,7 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver, qemuDomainEventQueue(driver, event); qemuDomainEventQueue(driver, event2); + qemuDomainEventQueue(driver, errorEvent); virObjectUnref(cfg); } diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h index e71d691..18bcaaa 100644 --- a/src/qemu/qemu_blockjob.h +++ b/src/qemu/qemu_blockjob.h @@ -36,7 +36,8 @@ void qemuBlockJobEventProcess(virQEMUDriverPtr driver, virDomainDiskDefPtr disk, qemuDomainAsyncJob asyncJob, int type, - int status); + int status, + const char *error); void qemuBlockJobSyncBegin(virDomainDiskDefPtr disk); void qemuBlockJobSyncEnd(virQEMUDriverPtr driver, diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e2a8450..883652d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -11951,12 +11951,14 @@ qemuProcessEventFree(struct qemuProcessEvent *event) case QEMU_PROCESS_EVENT_GUESTPANIC: qemuMonitorEventPanicInfoFree(event->data); break; + case QEMU_PROCESS_EVENT_MONITOR_EOF: + VIR_FREE(event->error); + ATTRIBUTE_FALLTHROUGH; case QEMU_PROCESS_EVENT_WATCHDOG: case QEMU_PROCESS_EVENT_DEVICE_DELETED: case QEMU_PROCESS_EVENT_NIC_RX_FILTER_CHANGED: case QEMU_PROCESS_EVENT_SERIAL_CHANGED: case QEMU_PROCESS_EVENT_BLOCK_JOB: - case QEMU_PROCESS_EVENT_MONITOR_EOF: VIR_FREE(event->data); break; case QEMU_PROCESS_EVENT_LAST: diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 2c27dfb..f3b262f 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -456,6 +456,7 @@ struct qemuProcessEvent { int action; int status; void *data; + char *error; }; void qemuProcessEventFree(struct qemuProcessEvent *event); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5673d9f..cefbe52 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4748,7 +4748,8 @@ processBlockJobEvent(virQEMUDriverPtr driver, virDomainObjPtr vm, const char *diskAlias, int type, - int status) + int status, + char *error) { virDomainDiskDefPtr disk; @@ -4761,7 +4762,8 @@ processBlockJobEvent(virQEMUDriverPtr driver, } if ((disk = qemuProcessFindDomainDiskByAlias(vm, diskAlias))) - qemuBlockJobEventProcess(driver, vm, disk, QEMU_ASYNC_JOB_NONE, type, status); + qemuBlockJobEventProcess(driver, vm, disk, QEMU_ASYNC_JOB_NONE, + type, status, error); endjob: qemuDomainObjEndJob(driver, vm); @@ -4846,7 +4848,8 @@ static void qemuProcessEventHandler(void *data, void *opaque) processBlockJobEvent(driver, vm, processEvent->data, processEvent->action, - processEvent->status); + processEvent->status, + processEvent->error); break; case QEMU_PROCESS_EVENT_MONITOR_EOF: processMonitorEOFEvent(driver, vm); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 6a5262a..12b156f 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1026,6 +1026,7 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED, processEvent->vm = virObjectRef(vm); processEvent->action = type; processEvent->status = status; + ignore_value(VIR_STRDUP_QUIET(processEvent->error, error)); if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) { ignore_value(virObjectUnref(vm)); diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index a8a5932..07c9dbb 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -1342,6 +1342,53 @@ remoteRelayDomainEventBlockThreshold(virConnectPtr conn, } +static int +remoteRelayDomainEventBlockJobError(virConnectPtr conn, + virDomainPtr dom, + const char *dev, + int type, + unsigned int code, + const char *message, + void *opaque) +{ + daemonClientEventCallbackPtr callback = opaque; + remote_domain_event_block_job_error_msg msg; + + if (callback->callbackID < 0 || + !remoteRelayDomainEventCheckACL(callback->client, conn, dom)) + return -1; + + VIR_DEBUG("Relaying domain block job error event %s %d %s %i %u %s, callback %d", + dom->name, dom->id, dev, type, code, NULLSTR(message), + callback->callbackID); + + memset(&msg, 0, sizeof(msg)); + msg.callbackID = callback->callbackID; + if (VIR_STRDUP(msg.dev, dev) < 0) + return -1; + if (message) { + if (VIR_ALLOC(msg.message) < 0 || + VIR_STRDUP(*(msg.message), message) < 0) + goto error; + } + msg.type = type; + msg.code = code; + make_nonnull_domain(&msg.dom, dom); + + remoteDispatchObjectEventSend(callback->client, remoteProgram, + REMOTE_PROC_DOMAIN_EVENT_BLOCK_JOB_ERROR, + (xdrproc_t)xdr_remote_domain_event_block_job_error_msg, + &msg); + return 0; + + error: + VIR_FREE(msg.dev); + VIR_FREE(msg.message); + + return -1; +} + + static virConnectDomainEventGenericCallback domainEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventLifecycle), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventReboot), @@ -1368,6 +1415,7 @@ static virConnectDomainEventGenericCallback domainEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventDeviceRemovalFailed), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventMetadataChange), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventBlockThreshold), + VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventBlockJobError), }; verify(ARRAY_CARDINALITY(domainEventCallbacks) == VIR_DOMAIN_EVENT_ID_LAST); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index d3b588c..0d30bf3 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -405,6 +405,11 @@ remoteConnectNotifyEventConnectionClosed(virNetClientProgramPtr prog ATTRIBUTE_U virNetClientPtr client ATTRIBUTE_UNUSED, void *evdata, void *opaque); +static void +remoteDomainBuildEventBlockJobError(virNetClientProgramPtr prog, + virNetClientPtr client, + void *evdata, void *opaque); + static virNetClientProgramEvent remoteEvents[] = { { REMOTE_PROC_DOMAIN_EVENT_LIFECYCLE, remoteDomainBuildEventLifecycle, @@ -611,6 +616,10 @@ static virNetClientProgramEvent remoteEvents[] = { remoteDomainBuildEventBlockThreshold, sizeof(remote_domain_event_block_threshold_msg), (xdrproc_t)xdr_remote_domain_event_block_threshold_msg }, + { REMOTE_PROC_DOMAIN_EVENT_BLOCK_JOB_ERROR, + remoteDomainBuildEventBlockJobError, + sizeof(remote_domain_event_block_job_error_msg), + (xdrproc_t)xdr_remote_domain_event_block_job_error_msg }, }; static void @@ -5533,6 +5542,31 @@ remoteDomainBuildEventBlockThreshold(virNetClientProgramPtr prog ATTRIBUTE_UNUSE } +static void +remoteDomainBuildEventBlockJobError(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, + virNetClientPtr client ATTRIBUTE_UNUSED, + void *evdata, void *opaque) +{ + virConnectPtr conn = opaque; + remote_domain_event_block_job_error_msg *msg = evdata; + struct private_data *priv = conn->privateData; + virDomainPtr dom; + virObjectEventPtr event = NULL; + + dom = get_nonnull_domain(conn, msg->dom); + if (!dom) + return; + + event = virDomainEventBlockJobErrorNewFromDom(dom, msg->dev, msg->type, + msg->code, + msg->message ? *msg->message : NULL); + + virObjectUnref(dom); + + remoteEventQueue(priv, event, msg->callbackID); +} + + static int remoteStreamSend(virStreamPtr st, const char *data, diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 296a087..051a773 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -3103,6 +3103,15 @@ struct remote_domain_event_block_job_2_msg { int status; }; +struct remote_domain_event_block_job_error_msg { + int callbackID; + remote_nonnull_domain dom; + remote_nonnull_string dev; + int type; + int code; + remote_string message; +}; + struct remote_domain_event_block_threshold_msg { int callbackID; remote_nonnull_domain dom; @@ -6135,5 +6144,11 @@ enum remote_procedure { * @priority: high * @acl: storage_pool:getattr */ - REMOTE_PROC_STORAGE_POOL_LOOKUP_BY_TARGET_PATH = 391 + REMOTE_PROC_STORAGE_POOL_LOOKUP_BY_TARGET_PATH = 391, + + /** + * @generate: none + * @acl: none + */ + REMOTE_PROC_DOMAIN_EVENT_BLOCK_JOB_ERROR = 392 }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index fe163db..567f307 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2541,6 +2541,14 @@ struct remote_domain_event_block_job_2_msg { int type; int status; }; +struct remote_domain_event_block_job_error_msg { + int callbackID; + remote_nonnull_domain dom; + remote_nonnull_string dev; + int type; + int code; + remote_string message; +}; struct remote_domain_event_block_threshold_msg { int callbackID; remote_nonnull_domain dom; @@ -3269,4 +3277,5 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_MANAGED_SAVE_DEFINE_XML = 389, REMOTE_PROC_DOMAIN_SET_LIFECYCLE_ACTION = 390, REMOTE_PROC_STORAGE_POOL_LOOKUP_BY_TARGET_PATH = 391, + REMOTE_PROC_DOMAIN_EVENT_BLOCK_JOB_ERROR = 392, }; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 2b775fc..40d3c82 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -13286,6 +13286,28 @@ virshEventBlockThresholdPrint(virConnectPtr conn ATTRIBUTE_UNUSED, } +static void +virshEventBlockJobErrorPrint(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *dev, + int type, + unsigned int code ATTRIBUTE_UNUSED, + const char *message, + void *opaque) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + + virBufferAsprintf(&buf, _("event '%s' for domain %s: %s for %s, " + "error: %s\n"), + ((virshDomEventData *) opaque)->cb->name, + virDomainGetName(dom), + virshDomainBlockJobToString(type), + dev, + NULLSTR(message)); + virshEventPrint(opaque, &buf); +} + + static vshEventCallback vshEventCallbacks[] = { { "lifecycle", VIR_DOMAIN_EVENT_CALLBACK(virshEventLifecyclePrint), }, @@ -13335,6 +13357,8 @@ static vshEventCallback vshEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(virshEventMetadataChangePrint), }, { "block-threshold", VIR_DOMAIN_EVENT_CALLBACK(virshEventBlockThresholdPrint), }, + { "block-job-error", + VIR_DOMAIN_EVENT_CALLBACK(virshEventBlockJobErrorPrint), }, }; verify(VIR_DOMAIN_EVENT_ID_LAST == ARRAY_CARDINALITY(vshEventCallbacks)); -- 1.8.3.1

1 1

[libvirt] [PATCH] news: Mention changes TLS non-shared-storage migration
by Peter Krempa 03 May '18

03 May '18

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/news.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index caeda159a8..af57751e0c 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -157,6 +157,18 @@ </change> </section> <section title="Bug fixes"> + <change> + <summary> + qemu: TLS migration now enforces use of TLS for the NBD connection + </summary> + <description> + When the VIR_MIGRATE_TLS flag was used with the migration API libvirt + did not ensure that the NBD connection was using TLS as well. The code + now rejects such migration as the TLS transport for NBD is not ready + yet, but prevents a false sense of security that TLS would be used. + The support TLS for NBD will be added soon. + </description> + </change> </section> </release> <release version="v4.1.0" date="2018-03-05"> -- 2.16.2

2 3

[libvirt] [PATCH 00/35] qemu: Add formatting of JSON objects for -blockdev (blockdev-add saga)
by Peter Krempa 03 May '18

03 May '18

Diff to the RFC posting: - host_device and host_cdrom handling was added - modified code to format and parse node-names to status XML so that we can add other node names easier (for quorum, throttling, etc) - added test case for host_device Kevin, please sanity check the outputs whether they make sense. Thanks. Peter Krempa (35): storage: Properly track that backing chain members are readonly qemu: domain: Format storage source node names into private data util: storage: Add shadow copies of few disk properties to virStorageSource qemu: domain: Carefuly transfer configuration from disk to storage source qemu: block: Extract formatting of props for 'file' backend qemu: block: Handle iomode property for json 'file' driver utils: storage: Mark that a virStorageSource is going to be used as a floppy qemu: Move virtual FAT disk validation from command line builder qemu: block: Add support for accessing directories via the 'vvfat' driver util: file: Use only one #ifdef for __linux__ util: file: Add helper to determine whether a path is a CDROM qemu: domain: Store whether a virStorageSource is a host CDROM drive qemu: block: Properly handle block storage in JSON generator qemu: block: Propagate 'legacy' parameter when formatting disk backing qemu: block: Validate node-names for use with qemu qemu: block: Format cache modes for disk storage backends qemu: block: Format 'read-only' attribute for JSON disk protocol qemu: block: Always set discard for storage nodes qemu: block: Add support for creating 'format' layer for blockdev-add tests: qemublock: Rename variables in anticipation of new tests tests: Makefile: Sanitize entry for qemublocktest qemu: domain: Export qemuDomainDeviceDefValidateDisk qemu: domain: Tolerate NULL 'cfg' in qemuDomainPrepareDiskSourceChain tests: qemublock: Add testing of blockdev JSON property generator tests: qemublock: Add basic 'raw' file test tests: qemublock: Add tests for all other format without special options tests: qemublock: Add tests for basic backing chain formats tests: qemublock: Add test-case for the 'vvfat' driver in qemu tests: qemublock: Add test cases for 'aio' options of 'file' storage tests: qemublock: Add test for raw luks disk format tests: qemublock: basic qcow2 tests tests: qemublock: Add test combining authentication and encryption tests: qemublock: Test handling of 'unmap' and 'detect-zeroes' options tests: qemublock: Test handling of all cache modes tests: qemublock: Test handling of block devices src/conf/domain_conf.c | 3 + src/libvirt_private.syms | 1 + src/qemu/qemu_block.c | 430 ++++++++++++++++++++- src/qemu/qemu_block.h | 6 +- src/qemu/qemu_command.c | 16 +- src/qemu/qemu_domain.c | 61 ++- src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 3 + src/util/virfile.c | 61 ++- src/util/virfile.h | 2 + src/util/virstoragefile.c | 5 + src/util/virstoragefile.h | 13 + tests/Makefile.am | 11 +- tests/qemublocktest.c | 314 ++++++++++++++- .../xml2json/block-raw-noopts.json | 12 + .../xml2json/block-raw-noopts.xml | 12 + .../qemublocktestdata/xml2json/dir-fat-cache.json | 22 ++ tests/qemublocktestdata/xml2json/dir-fat-cache.xml | 13 + .../qemublocktestdata/xml2json/dir-fat-floppy.json | 14 + .../qemublocktestdata/xml2json/dir-fat-floppy.xml | 14 + .../xml2json/dir-fat-readonly.json | 14 + .../xml2json/dir-fat-readonly.xml | 13 + .../xml2json/file-backing_basic-aio_threads.json | 62 +++ .../xml2json/file-backing_basic-aio_threads.xml | 47 +++ .../file-backing_basic-cache-directsync.json | 91 +++++ .../file-backing_basic-cache-directsync.xml | 47 +++ .../xml2json/file-backing_basic-cache-none.json | 91 +++++ .../xml2json/file-backing_basic-cache-none.xml | 47 +++ .../xml2json/file-backing_basic-cache-unsafe.json | 91 +++++ .../xml2json/file-backing_basic-cache-unsafe.xml | 47 +++ .../file-backing_basic-cache-writeback.json | 91 +++++ .../file-backing_basic-cache-writeback.xml | 47 +++ .../file-backing_basic-cache-writethrough.json | 91 +++++ .../file-backing_basic-cache-writethrough.xml | 47 +++ .../xml2json/file-backing_basic-detect.json | 60 +++ .../xml2json/file-backing_basic-detect.xml | 47 +++ .../xml2json/file-backing_basic-noopts.json | 51 +++ .../xml2json/file-backing_basic-noopts.xml | 46 +++ .../xml2json/file-backing_basic-unmap-detect.json | 64 +++ .../xml2json/file-backing_basic-unmap-detect.xml | 47 +++ .../xml2json/file-backing_basic-unmap-discard.json | 0 .../xml2json/file-backing_basic-unmap-ignore.json | 64 +++ .../xml2json/file-backing_basic-unmap-ignore.xml | 47 +++ .../xml2json/file-backing_basic-unmap.json | 63 +++ .../xml2json/file-backing_basic-unmap.xml | 47 +++ .../xml2json/file-bochs-noopts.json | 12 + .../xml2json/file-bochs-noopts.xml | 12 + .../xml2json/file-cloop-noopts.json | 12 + .../xml2json/file-cloop-noopts.xml | 12 + .../xml2json/file-dmg-noopts.json | 12 + .../qemublocktestdata/xml2json/file-dmg-noopts.xml | 12 + .../xml2json/file-ploop-noopts.json | 12 + .../xml2json/file-ploop-noopts.xml | 12 + .../file-qcow2-backing-chain-encryption.json | 34 ++ .../file-qcow2-backing-chain-encryption.xml | 31 ++ .../xml2json/file-qcow2-backing-chain-noopts.json | 130 +++++++ .../xml2json/file-qcow2-backing-chain-noopts.xml | 113 ++++++ .../file-qcow2-backing-chain-unterminated.json | 25 ++ .../file-qcow2-backing-chain-unterminated.xml | 24 ++ .../xml2json/file-raw-aio_native.json | 21 + .../xml2json/file-raw-aio_native.xml | 12 + .../qemublocktestdata/xml2json/file-raw-luks.json | 13 + tests/qemublocktestdata/xml2json/file-raw-luks.xml | 15 + .../xml2json/file-raw-noopts.json | 12 + .../qemublocktestdata/xml2json/file-raw-noopts.xml | 12 + .../xml2json/file-vdi-noopts.json | 12 + .../qemublocktestdata/xml2json/file-vdi-noopts.xml | 12 + .../xml2json/file-vhd-noopts.json | 12 + .../qemublocktestdata/xml2json/file-vhd-noopts.xml | 12 + .../xml2json/file-vpc-noopts.json | 12 + .../qemublocktestdata/xml2json/file-vpc-noopts.xml | 12 + .../network-qcow2-backing-chain-cache-unsafe.json | 57 +++ .../network-qcow2-backing-chain-cache-unsafe.xml | 31 ++ ...etwork-qcow2-backing-chain-encryption_auth.json | 51 +++ ...network-qcow2-backing-chain-encryption_auth.xml | 40 ++ .../xml2json/nodename-long-format.xml | 12 + .../xml2json/nodename-long-protocol.xml | 12 + tests/qemustatusxml2xmldata/modern-in.xml | 4 + 78 files changed, 3155 insertions(+), 40 deletions(-) create mode 100644 tests/qemublocktestdata/xml2json/block-raw-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/block-raw-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/dir-fat-cache.json create mode 100644 tests/qemublocktestdata/xml2json/dir-fat-cache.xml create mode 100644 tests/qemublocktestdata/xml2json/dir-fat-floppy.json create mode 100644 tests/qemublocktestdata/xml2json/dir-fat-floppy.xml create mode 100644 tests/qemublocktestdata/xml2json/dir-fat-readonly.json create mode 100644 tests/qemublocktestdata/xml2json/dir-fat-readonly.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-detect.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-detect.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-unmap-discard.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-unmap.xml create mode 100644 tests/qemublocktestdata/xml2json/file-bochs-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-bochs-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/file-cloop-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-cloop-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/file-dmg-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-dmg-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/file-ploop-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-ploop-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.json create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.xml create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unterminated.json create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unterminated.xml create mode 100644 tests/qemublocktestdata/xml2json/file-raw-aio_native.json create mode 100644 tests/qemublocktestdata/xml2json/file-raw-aio_native.xml create mode 100644 tests/qemublocktestdata/xml2json/file-raw-luks.json create mode 100644 tests/qemublocktestdata/xml2json/file-raw-luks.xml create mode 100644 tests/qemublocktestdata/xml2json/file-raw-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-raw-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/file-vdi-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-vdi-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/file-vhd-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-vhd-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/file-vpc-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-vpc-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-unsafe.json create mode 100644 tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-unsafe.xml create mode 100644 tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth.json create mode 100644 tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth.xml create mode 100644 tests/qemublocktestdata/xml2json/nodename-long-format.xml create mode 100644 tests/qemublocktestdata/xml2json/nodename-long-protocol.xml -- 2.16.2

3 82

[libvirt] [PATCHv3 0/3] query-cpu-model-baseline QMP command
by Chris Venteicher 03 May '18

03 May '18

This is part of resolution of: https://bugzilla.redhat.com/show_bug.cgi?id=1511999 Signed-off-by: Chris Venteicher <cventeic(a)redhat.com> diff to v1: - Replaced c++ style comments with c style - qemuMonitorJSONGetCPUModelInfo{ToJSON,FromJSON} use To/From form - qemuMonitorJSONGetCPUModelInfo{ToJSON,FromJSON} return pointers not integers - VIR_STEAL_PTR form used - switch statement uses virReportEnumRangeError - qemuMonitorJSONHasError(reply, "GenericError") treated as no info, not fatal error - virJSONValueFree(cpu_props) during error case diff to v2: - qemuMonitorJSONGetCPUModelInfo{ToJSON,FromJSON} works on {"name": "IvyBridge", "props": {}} rather than {"model": {"name": "IvyBridge", "props": {}}} - additional cleanups and fixes Chris Venteicher (3): qemu_monitor_json: Populate CPUModelInfo struct from json qemu_monitor_json: Build Json CPU Model Info qemu_monitor: query-cpu-model-baseline QMP command src/qemu/qemu_monitor.c | 13 ++++ src/qemu/qemu_monitor.h | 5 ++ src/qemu/qemu_monitor_json.c | 179 +++++++++++++++++++++++++++++++++++++------ src/qemu/qemu_monitor_json.h | 7 ++ 4 files changed, 182 insertions(+), 22 deletions(-) -- 2.14.1

4 8

[libvirt] [PATCH] util: Clean up consumers of virJSONValueArraySize
by John Ferlan 03 May '18

03 May '18

Rather than have virJSONValueArraySize return a -1 when the input is not an array and then splat an error message, let's check for an array before calling and then change the return to be a size_t instead of ssize_t. That means using the helper virJSONValueIsArray as well as using a more generic error message such as "Malformed <something> array". In some cases we can remove stack variables and when we cannot, those variables should be size_t not ssize_t. Alter a few references of if (!value) to be if (value == 0) instead as well. Some callers can already assume an array is being worked on based on the previous call, so there's less to do. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Based off a review of the Coverity work from Peter: https://www.redhat.com/archives/libvir-list/2018-April/msg01613.html src/locking/lock_daemon.c | 7 ++-- src/logging/log_handler.c | 7 ++-- src/network/bridge_driver.c | 7 ++-- src/qemu/qemu_agent.c | 35 ++++++++++-------- src/qemu/qemu_monitor_json.c | 85 ++++++++++++++++++++----------------------- src/rpc/virnetdaemon.c | 7 +--- src/rpc/virnetserver.c | 15 +++----- src/rpc/virnetserverservice.c | 7 ++-- src/util/virjson.c | 5 +-- src/util/virjson.h | 2 +- src/util/virlockspace.c | 16 ++++---- src/util/virstoragefile.c | 3 +- tests/testutilsqemuschema.c | 18 +++------ tools/nss/libvirt_nss.c | 3 +- 14 files changed, 97 insertions(+), 120 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 7afff42246..78c33bd29c 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -248,7 +248,6 @@ virLockDaemonNewPostExecRestart(virJSONValuePtr object, bool privileged) virJSONValuePtr child; virJSONValuePtr lockspaces; size_t i; - ssize_t n; const char *serverNames[] = { "virtlockd" }; if (VIR_ALLOC(lockd) < 0) @@ -281,13 +280,13 @@ virLockDaemonNewPostExecRestart(virJSONValuePtr object, bool privileged) goto error; } - if ((n = virJSONValueArraySize(lockspaces)) < 0) { + if (!virJSONValueIsArray(lockspaces)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Malformed lockspaces data from JSON file")); + _("Malformed lockspaces array")); goto error; } - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(lockspaces); i++) { virLockSpacePtr lockspace; child = virJSONValueArrayGet(lockspaces, i); diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c index 40dfa8ecae..5364e06dff 100644 --- a/src/logging/log_handler.c +++ b/src/logging/log_handler.c @@ -292,7 +292,6 @@ virLogHandlerNewPostExecRestart(virJSONValuePtr object, { virLogHandlerPtr handler; virJSONValuePtr files; - ssize_t n; size_t i; if (!(handler = virLogHandlerNew(privileged, @@ -308,13 +307,13 @@ virLogHandlerNewPostExecRestart(virJSONValuePtr object, goto error; } - if ((n = virJSONValueArraySize(files)) < 0) { + if (!virJSONValueIsArray(files)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Malformed files data from JSON file")); + _("Malformed files array")); goto error; } - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(files); i++) { virLogHandlerLogFilePtr file; virJSONValuePtr child = virJSONValueArrayGet(files, i); diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 2e9191f75d..fa9ebe2d68 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -4124,7 +4124,7 @@ networkGetDHCPLeases(virNetworkPtr net, size_t i, j; size_t nleases = 0; int rv = -1; - ssize_t size = 0; + size_t size = 0; int custom_lease_file_len = 0; bool need_results = !!leases; long long currtime = 0; @@ -4179,11 +4179,12 @@ networkGetDHCPLeases(virNetworkPtr net, goto error; } - if ((size = virJSONValueArraySize(leases_array)) < 0) { + if (!virJSONValueIsArray(leases_array)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("couldn't fetch array of leases")); + _("Malformed lease_entries array")); goto error; } + size = virJSONValueArraySize(leases_array); } currtime = (long long) time(NULL); diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 488a19d4a6..ef869bf15e 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1490,7 +1490,7 @@ qemuAgentGetVCPUs(qemuAgentPtr mon, virJSONValuePtr cmd; virJSONValuePtr reply = NULL; virJSONValuePtr data = NULL; - ssize_t ndata; + size_t ndata; if (!(cmd = qemuAgentMakeCommand("guest-get-vcpus", NULL))) return -1; @@ -1505,6 +1505,12 @@ qemuAgentGetVCPUs(qemuAgentPtr mon, goto cleanup; } + if (!virJSONValueIsArray(data)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed guest-get-vcpus data array")); + goto cleanup; + } + ndata = virJSONValueArraySize(data); if (VIR_ALLOC_N(*info, ndata) < 0) @@ -1869,15 +1875,14 @@ qemuAgentGetFSInfo(qemuAgentPtr mon, virDomainFSInfoPtr **info, goto cleanup; } - if (virJSONValueGetType(data) != VIR_JSON_TYPE_ARRAY) { + if (!virJSONValueIsArray(data)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("guest-get-fsinfo return information was not " - "an array")); + _("Malformed guest-get-fsinfo data array")); goto cleanup; } ndata = virJSONValueArraySize(data); - if (!ndata) { + if (ndata == 0) { ret = 0; *info = NULL; goto cleanup; @@ -1928,14 +1933,14 @@ qemuAgentGetFSInfo(qemuAgentPtr mon, virDomainFSInfoPtr **info, goto cleanup; } - if (virJSONValueGetType(entry) != VIR_JSON_TYPE_ARRAY) { + if (!virJSONValueIsArray(entry)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("guest-get-fsinfo 'disk' data was not an array")); + _("Malformed guest-get-fsinfo 'disk' data array")); goto cleanup; } ndisk = virJSONValueArraySize(entry); - if (!ndisk) + if (ndisk == 0) continue; if (VIR_ALLOC_N(info_ret[i]->devAlias, ndisk) < 0) goto cleanup; @@ -2035,7 +2040,6 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, { int ret = -1; size_t i, j; - ssize_t size = -1; virJSONValuePtr cmd = NULL; virJSONValuePtr reply = NULL; virJSONValuePtr ret_array = NULL; @@ -2065,17 +2069,16 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, goto cleanup; } - if ((size = virJSONValueArraySize(ret_array)) < 0) { + if (!virJSONValueIsArray(ret_array)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("qemu agent didn't return an array of interfaces")); goto cleanup; } - for (i = 0; i < size; i++) { + for (i = 0; i < virJSONValueArraySize(ret_array); i++) { virJSONValuePtr tmp_iface = virJSONValueArrayGet(ret_array, i); virJSONValuePtr ip_addr_arr = NULL; const char *hwaddr, *ifname_s, *name = NULL; - ssize_t ip_addr_arr_size; virDomainInterfacePtr iface = NULL; /* Shouldn't happen but doesn't hurt to check neither */ @@ -2131,14 +2134,16 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, if (!ip_addr_arr) continue; - if ((ip_addr_arr_size = virJSONValueArraySize(ip_addr_arr)) < 0) - /* Mmm, empty 'ip-address'? */ + if (!virJSONValueIsArray(ip_addr_arr)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed ip-addresses array")); goto error; + } /* If current iface already exists, continue with the count */ addrs_count = iface->naddrs; - for (j = 0; j < ip_addr_arr_size; j++) { + for (j = 0; j < virJSONValueArraySize(ip_addr_arr); j++) { const char *type, *addr; virJSONValuePtr ip_addr_obj = virJSONValueArrayGet(ip_addr_arr, j); virDomainIPAddressPtr ip_addr; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 24d37eb41d..98aec3ff10 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1627,9 +1627,9 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr data, struct qemuMonitorQueryCpusEntry *cpus = NULL; int ret = -1; size_t i; - ssize_t ncpus; + size_t ncpus; - if ((ncpus = virJSONValueArraySize(data)) <= 0) + if ((ncpus = virJSONValueArraySize(data)) == 0) return -2; if (VIR_ALLOC_N(cpus, ncpus) < 0) @@ -3595,7 +3595,7 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValuePtr msg, int ret = -1; const char *tmp; virJSONValuePtr returnArray, entry, table, element; - ssize_t nTable; + size_t nTable; size_t i; virNetDevRxFilterPtr fil = virNetDevRxFilterNew(); @@ -3656,12 +3656,13 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValuePtr msg, goto cleanup; } if ((!(table = virJSONValueObjectGet(entry, "unicast-table"))) || - ((nTable = virJSONValueArraySize(table)) < 0)) { + (!virJSONValueIsArray(table))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing or invalid 'unicast-table' array " "in query-rx-filter response")); goto cleanup; } + nTable = virJSONValueArraySize(table); if (VIR_ALLOC_N(fil->unicast.table, nTable)) goto cleanup; for (i = 0; i < nTable; i++) { @@ -3697,12 +3698,13 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValuePtr msg, goto cleanup; } if ((!(table = virJSONValueObjectGet(entry, "multicast-table"))) || - ((nTable = virJSONValueArraySize(table)) < 0)) { + (!virJSONValueIsArray(table))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing or invalid 'multicast-table' array " "in query-rx-filter response")); goto cleanup; } + nTable = virJSONValueArraySize(table); if (VIR_ALLOC_N(fil->multicast.table, nTable)) goto cleanup; for (i = 0; i < nTable; i++) { @@ -3731,12 +3733,13 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValuePtr msg, goto cleanup; } if ((!(table = virJSONValueObjectGet(entry, "vlan-table"))) || - ((nTable = virJSONValueArraySize(table)) < 0)) { + (!virJSONValueIsArray(table))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing or invalid 'vlan-table' array " "in query-rx-filter response")); goto cleanup; } + nTable = virJSONValueArraySize(table); if (VIR_ALLOC_N(fil->vlan.table, nTable)) goto cleanup; for (i = 0; i < nTable; i++) { @@ -4575,7 +4578,7 @@ qemuMonitorJSONGetAllBlockJobInfo(qemuMonitorPtr mon) virJSONValuePtr cmd = NULL; virJSONValuePtr reply = NULL; virJSONValuePtr data; - ssize_t nr_results; + size_t nr_results; size_t i; virHashTablePtr blockJobs = NULL; @@ -4591,12 +4594,7 @@ qemuMonitorJSONGetAllBlockJobInfo(qemuMonitorPtr mon) goto cleanup; } - if ((nr_results = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("unable to determine array size")); - goto cleanup; - } - + nr_results = virJSONValueArraySize(data); if (!(blockJobs = virHashCreate(nr_results, virHashValueFree))) goto cleanup; @@ -5114,7 +5112,7 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; qemuMonitorMachineInfoPtr *infolist = NULL; - ssize_t n = 0; + size_t n = 0; size_t i; *machines = NULL; @@ -5206,7 +5204,7 @@ qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; qemuMonitorCPUDefInfoPtr *cpulist = NULL; - int n = 0; + size_t n = 0; size_t i; *cpus = NULL; @@ -5257,7 +5255,7 @@ qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon, if (virJSONValueObjectHasKey(child, "unavailable-features")) { virJSONValuePtr blockers; size_t j; - int len; + size_t len; blockers = virJSONValueObjectGetArray(child, "unavailable-features"); @@ -5494,7 +5492,7 @@ int qemuMonitorJSONGetCommands(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **commandlist = NULL; - ssize_t n = 0; + size_t n = 0; size_t i; *commands = NULL; @@ -5550,7 +5548,7 @@ int qemuMonitorJSONGetEvents(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **eventlist = NULL; - ssize_t n = 0; + size_t n = 0; size_t i; *events = NULL; @@ -5614,7 +5612,7 @@ qemuMonitorJSONGetCommandLineOptionParameters(qemuMonitorPtr mon, virJSONValuePtr data = NULL; virJSONValuePtr array = NULL; char **paramlist = NULL; - ssize_t n = 0; + size_t n = 0; size_t i; *params = NULL; @@ -5646,17 +5644,17 @@ qemuMonitorJSONGetCommandLineOptionParameters(qemuMonitorPtr mon, "return data")); goto cleanup; } - qemuMonitorSetOptions(mon, array); - } - if ((n = virJSONValueArraySize(array)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-command-line-options reply data was not " - "an array")); - goto cleanup; + if (!virJSONValueIsArray(array)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed query-cmmand-line-options array")); + goto cleanup; + } + + qemuMonitorSetOptions(mon, array); } - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(array); i++) { virJSONValuePtr child = virJSONValueArrayGet(array, i); const char *tmp; @@ -5681,12 +5679,12 @@ qemuMonitorJSONGetCommandLineOptionParameters(qemuMonitorPtr mon, if (found) *found = true; - if ((n = virJSONValueArraySize(data)) < 0) { + if (!virJSONValueIsArray(data)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-command-line-options parameter data was not " - "an array")); + _("Malformed query-cmmand-line-options parameters array")); goto cleanup; } + n = virJSONValueArraySize(data); /* null-terminated list */ if (VIR_ALLOC_N(paramlist, n + 1) < 0) @@ -5776,7 +5774,7 @@ int qemuMonitorJSONGetObjectTypes(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **typelist = NULL; - ssize_t n = 0; + size_t n = 0; size_t i; *types = NULL; @@ -5832,7 +5830,7 @@ int qemuMonitorJSONGetObjectListPaths(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; qemuMonitorJSONListPathPtr *pathlist = NULL; - ssize_t n = 0; + size_t n = 0; size_t i; *paths = NULL; @@ -6062,7 +6060,7 @@ int qemuMonitorJSONGetDeviceProps(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **proplist = NULL; - ssize_t n = 0; + size_t n = 0; size_t i; *props = NULL; @@ -6161,7 +6159,7 @@ qemuMonitorJSONGetMigrationCapabilities(qemuMonitorPtr mon, virJSONValuePtr caps; char **list = NULL; size_t i; - ssize_t n; + size_t n; *capabilities = NULL; @@ -6272,7 +6270,7 @@ qemuMonitorJSONGetGICCapabilities(qemuMonitorPtr mon, virJSONValuePtr caps; virGICCapability *list = NULL; size_t i; - ssize_t n; + size_t n; *capabilities = NULL; @@ -6493,7 +6491,7 @@ qemuMonitorJSONGetStringArray(qemuMonitorPtr mon, const char *qmpCmd, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **list = NULL; - ssize_t n = 0; + size_t n = 0; size_t i; *array = NULL; @@ -6890,14 +6888,11 @@ qemuMonitorJSONParseCPUx86Features(virJSONValuePtr data) virCPUDataPtr cpudata = NULL; virCPUx86CPUID cpuid; size_t i; - ssize_t n; - - n = virJSONValueArraySize(data); if (!(cpudata = virCPUDataNew(VIR_ARCH_X86_64))) goto error; - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(data); i++) { if (qemuMonitorJSONParseCPUx86FeatureWord(virJSONValueArrayGet(data, i), &cpuid) < 0 || virCPUx86DataAddCPUID(cpudata, &cpuid) < 0) @@ -6958,7 +6953,7 @@ qemuMonitorJSONCheckCPUx86(qemuMonitorPtr mon) virJSONValuePtr reply = NULL; virJSONValuePtr data; size_t i; - ssize_t n; + size_t n; int ret = -1; if (!(cmd = qemuMonitorJSONMakeCommand("qom-list", @@ -7096,7 +7091,7 @@ qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; qemuMonitorIOThreadInfoPtr *infolist = NULL; - ssize_t n = 0; + size_t n = 0; size_t i; *iothreads = NULL; @@ -7178,7 +7173,6 @@ qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data = NULL; qemuMonitorMemoryDeviceInfoPtr meminfo = NULL; - ssize_t n; size_t i; if (!(cmd = qemuMonitorJSONMakeCommand("query-memory-devices", NULL))) @@ -7196,9 +7190,8 @@ qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitorPtr mon, goto cleanup; data = virJSONValueObjectGetArray(reply, "return"); - n = virJSONValueArraySize(data); - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(data); i++) { virJSONValuePtr elem = virJSONValueArrayGet(data, i); const char *type; @@ -7664,7 +7657,7 @@ qemuMonitorJSONGetHotpluggableCPUs(qemuMonitorPtr mon, size_t *nentries) { struct qemuMonitorQueryHotpluggableCpusEntry *info = NULL; - ssize_t ninfo = 0; + size_t ninfo = 0; int ret = -1; size_t i; virJSONValuePtr data; diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c index eb0b822545..31b687de12 100644 --- a/src/rpc/virnetdaemon.c +++ b/src/rpc/virnetdaemon.c @@ -322,12 +322,7 @@ virNetDaemonNewPostExecRestart(virJSONValuePtr object, goto error; } else if (virJSONValueIsArray(servers)) { size_t i; - ssize_t n = virJSONValueArraySize(servers); - if (n < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Server count %zd should be positive"), n); - goto error; - } + size_t n = virJSONValueArraySize(servers); if (n > nDefServerNames) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Server count %zd greater than default name count %zu"), diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index f4105b1394..5aeb188900 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -411,7 +411,6 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, virJSONValuePtr clients; virJSONValuePtr services; size_t i; - ssize_t n; unsigned int min_workers; unsigned int max_workers; unsigned int priority_workers; @@ -492,14 +491,13 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, goto error; } - n = virJSONValueArraySize(services); - if (n < 0) { + if (!virJSONValueIsArray(services)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Malformed services data in JSON document")); + _("Malformed services array")); goto error; } - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(services); i++) { virNetServerServicePtr service; virJSONValuePtr child = virJSONValueArrayGet(services, i); if (!child) { @@ -525,14 +523,13 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, goto error; } - n = virJSONValueArraySize(clients); - if (n < 0) { + if (!virJSONValueIsArray(clients)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Malformed clients data in JSON document")); + _("Malformed clients array")); goto error; } - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(clients); i++) { virNetServerClientPtr client; virJSONValuePtr child = virJSONValueArrayGet(clients, i); if (!child) { diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index fb19d09dda..23fc23cab4 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -325,7 +325,7 @@ virNetServerServicePtr virNetServerServiceNewPostExecRestart(virJSONValuePtr obj virNetServerServicePtr svc; virJSONValuePtr socks; size_t i; - ssize_t n; + size_t n; unsigned int max; if (virNetServerServiceInitialize() < 0) @@ -358,12 +358,13 @@ virNetServerServicePtr virNetServerServiceNewPostExecRestart(virJSONValuePtr obj goto error; } - if ((n = virJSONValueArraySize(socks)) < 0) { + if (!virJSONValueIsArray(socks)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("socks field in JSON was not an array")); + _("Malformed socks array")); goto error; } + n = virJSONValueArraySize(socks); if (VIR_ALLOC_N(svc->socks, n) < 0) goto error; svc->nsocks = n; diff --git a/src/util/virjson.c b/src/util/virjson.c index dfe00d9280..bb4e3c257b 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -971,12 +971,9 @@ virJSONValueIsArray(virJSONValuePtr array) } -ssize_t +size_t virJSONValueArraySize(const virJSONValue *array) { - if (array->type != VIR_JSON_TYPE_ARRAY) - return -1; - return array->data.array.nvalues; } diff --git a/src/util/virjson.h b/src/util/virjson.h index 0f098892b4..e4a82bdbc8 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -81,7 +81,7 @@ virJSONValuePtr virJSONValueObjectGetByType(virJSONValuePtr object, bool virJSONValueIsObject(virJSONValuePtr object); bool virJSONValueIsArray(virJSONValuePtr array); -ssize_t virJSONValueArraySize(const virJSONValue *array); +size_t virJSONValueArraySize(const virJSONValue *array); virJSONValuePtr virJSONValueArrayGet(virJSONValuePtr object, unsigned int element); virJSONValuePtr virJSONValueArraySteal(virJSONValuePtr object, unsigned int element); typedef int (*virJSONArrayIteratorFunc)(size_t pos, diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 41af0cdb6d..3364c843aa 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -293,7 +293,6 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr object) { virLockSpacePtr lockspace; virJSONValuePtr resources; - ssize_t n; size_t i; VIR_DEBUG("object=%p", object); @@ -324,19 +323,19 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr object) goto error; } - if ((n = virJSONValueArraySize(resources)) < 0) { + if (!virJSONValueIsArray(resources)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Malformed resources value in JSON document")); + _("Malformed resources array")); goto error; } - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(resources); i++) { virJSONValuePtr child = virJSONValueArrayGet(resources, i); virLockSpaceResourcePtr res; const char *tmp; virJSONValuePtr owners; size_t j; - ssize_t m; + size_t m; if (VIR_ALLOC(res) < 0) goto error; @@ -396,18 +395,19 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr object) goto error; } - if ((m = virJSONValueArraySize(owners)) < 0) { + if (!virJSONValueIsArray(owners)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Malformed owners value in JSON document")); + _("Malformed owners array")); virLockSpaceResourceFree(res); goto error; } - res->nOwners = m; + m = virJSONValueArraySize(owners); if (VIR_ALLOC_N(res->owners, res->nOwners) < 0) { virLockSpaceResourceFree(res); goto error; } + res->nOwners = m; for (j = 0; j < res->nOwners; j++) { unsigned long long int owner; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 531540ac91..117ba8430c 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2924,8 +2924,7 @@ virStorageSourceParseBackingJSONGluster(virStorageSourcePtr src, return -1; nservers = virJSONValueArraySize(server); - - if (nservers < 1) { + if (nservers == 0) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("at least 1 server is necessary in " "JSON backing definition for gluster volume")); diff --git a/tests/testutilsqemuschema.c b/tests/testutilsqemuschema.c index 21f5d119e8..46bbc4f1e5 100644 --- a/tests/testutilsqemuschema.c +++ b/tests/testutilsqemuschema.c @@ -101,11 +101,9 @@ testQEMUSchemaStealObjectMemberByName(const char *name, { virJSONValuePtr member; virJSONValuePtr ret = NULL; - size_t n; size_t i; - n = virJSONValueArraySize(members); - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(members); i++) { member = virJSONValueArrayGet(members, i); if (STREQ_NULLABLE(name, virJSONValueObjectGetString(member, "name"))) { @@ -188,7 +186,6 @@ testQEMUSchemaValidateObjectMergeVariant(virJSONValuePtr root, virHashTablePtr schema, virBufferPtr debug) { - size_t n; size_t i; virJSONValuePtr variants = NULL; virJSONValuePtr variant; @@ -203,8 +200,7 @@ testQEMUSchemaValidateObjectMergeVariant(virJSONValuePtr root, return -2; } - n = virJSONValueArraySize(variants); - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(variants); i++) { variant = virJSONValueArrayGet(variants, i); if (STREQ_NULLABLE(variantname, @@ -342,7 +338,6 @@ testQEMUSchemaValidateEnum(virJSONValuePtr obj, const char *objstr; virJSONValuePtr values = NULL; virJSONValuePtr value; - size_t n; size_t i; if (virJSONValueGetType(obj) != VIR_JSON_TYPE_STRING) { @@ -358,8 +353,7 @@ testQEMUSchemaValidateEnum(virJSONValuePtr obj, return -2; } - n = virJSONValueArraySize(values); - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(values); i++) { value = virJSONValueArrayGet(values, i); if (STREQ_NULLABLE(objstr, virJSONValueGetString(value))) { @@ -383,7 +377,6 @@ testQEMUSchemaValidateArray(virJSONValuePtr objs, const char *elemtypename = virJSONValueObjectGetString(root, "element-type"); virJSONValuePtr elementschema; virJSONValuePtr obj; - size_t n; size_t i; if (virJSONValueGetType(objs) != VIR_JSON_TYPE_ARRAY) { @@ -401,8 +394,7 @@ testQEMUSchemaValidateArray(virJSONValuePtr objs, virBufferAddLit(debug, "[\n"); virBufferAdjustIndent(debug, 3); - n = virJSONValueArraySize(objs); - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(objs); i++) { obj = virJSONValueArrayGet(objs, i); if (testQEMUSchemaValidateRecurse(obj, elementschema, schema, debug) < 0) @@ -423,8 +415,8 @@ testQEMUSchemaValidateAlternate(virJSONValuePtr obj, { virJSONValuePtr members; virJSONValuePtr member; - size_t n; size_t i; + size_t n; const char *membertype; virJSONValuePtr memberschema; int indent; diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c index 62fe589bed..ec73ea575a 100644 --- a/tools/nss/libvirt_nss.c +++ b/tools/nss/libvirt_nss.c @@ -309,8 +309,7 @@ findLease(const char *name, } VIR_DIR_CLOSE(dir); - if ((nleases = virJSONValueArraySize(leases_array)) < 0) - goto cleanup; + nleases = virJSONValueArraySize(leases_array); DEBUG("Read %zd leases", nleases); #if !defined(LIBVIRT_NSS_GUEST) -- 2.13.6

1 1