- Devel - libvirt List Archives

[libvirt] [PATCH] Remove explicit dependency on ceph RPM
by Daniel P. Berrange 05 Sep '12

05 Sep '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The libvirt storage driver uses librbd.so for its functionality. RPM will automatically add a dependency on the library, so there is no need to have an explicit dependency on the ceph RPM itself. This allows newer Fedora distros to avoid pulling in the huge ceph RPM, in favour of just having the libraries installed --- libvirt.spec.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 9a1feed..523ac0a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -649,10 +649,6 @@ Requires: device-mapper # For multipath support Requires: device-mapper %endif -%if %{with_storage_rbd} -# For RBD support -Requires: ceph -%endif %if %{with_storage_sheepdog} # For Sheepdog support Requires: sheepdog -- 1.7.11.2

2 1

[libvirt] [PATCH] conf: describe security_driver behavior
by Martin Kletzander 05 Sep '12

05 Sep '12

As a request was raised for this, I added few lines in the "Notes" part of the "security_driver" comments about allowed values. --- The related bug for this patch is here: https://bugzilla.redhat.com/show_bug.cgi?id=853925 src/qemu/qemu.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index d3175fa..f0ba163 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -164,7 +164,10 @@ # # security_driver = [ "selinux", "apparmor" ] # -# Note: The DAC security driver is always enabled. +# Notes: The DAC security driver is always enabled, setting the +# security_driver to that value is not allowed as well as adding "dac" +# into the list of security drivers. Value "none" is special value and +# cannot be used in the list of security drivers. # #security_driver = "selinux" -- 1.7.12

2 2

[libvirt] [PATCH] docs: correct dompmwakeup description
by Martin Kletzander 05 Sep '12

05 Sep '12

The command 'dompmwakeup' can wakeup any pmsuspended domain, not only domains suspended previously by dompmsuspend and this patch fixed the man page and help string for that. --- tools/virsh-domain.c | 6 +++--- tools/virsh.pod | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index f0ec742..45c5c48 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2242,9 +2242,9 @@ cleanup: */ static const vshCmdInfo info_dom_pm_wakeup[] = { - {"help", N_("wakeup a domain suspended by dompmsuspend command")}, - {"desc", N_("Wakeup a domain previously suspended " - "by dompmsuspend command.")}, + {"help", N_("wakeup a domain from pmsuspended state")}, + {"desc", N_("Wakeup a domain that was previously suspended " + "by power management.")}, {NULL, NULL} }; diff --git a/tools/virsh.pod b/tools/virsh.pod index a26c420..dca5288 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1523,9 +1523,10 @@ domain's guest OS. =item B<dompmwakeup> I<domain> -Wakeup a domain suspended by dompmsuspend command. Injects a wakeup -into the guest that previously used dompmsuspend, rather than waiting -for the previously requested duration (if any) to elapse. +Wakeup a domain from pmsuspended state (either suspended by dompmsuspend or +from the guest itself). Injects a wakeup into the guest that is in pmsuspended +state, rather than waiting for the previously requested duration (if any) to +elapse. This operation doesn't not necessarily fail if the domain is running. =item B<ttyconsole> I<domain> -- 1.7.12

2 2

[libvirt] [PATCH 0/2] interface driver build cleanup and udev backend addition
by Doug Goldstein 05 Sep '12

05 Sep '12

Refactored the cross use of netcf and interface for the interface driver into only interface driver references. Made netcf the primary backend provider for the interface driver. Added a udev based read-only interface driver backend to be used when netcf support is not built in. Untested: * udev: Does it display devices that are part of a bond. * netcf: developed all this on distros without netcf support. Unknown: * Should virInterfaceGetXMLDesc() be implemented for the udev backend? It will as a result contain a lot less info than the netcf based backend would for the same device (e.g. does the device start on boot). Doug Goldstein (2): build: define WITH_INTERFACE for the driver interface: add udev based backend for virInterface configure.ac | 37 ++- daemon/Makefile.am | 2 +- daemon/libvirtd.c | 8 +- src/Makefile.am | 34 ++- .../{netcf_driver.c => interface_backend_netcf.c} | 2 +- src/interface/interface_backend_udev.c | 377 ++++++++++++++++++++ .../{netcf_driver.h => interface_driver.h} | 0 tests/virdrivermoduletest.c | 2 +- tools/virsh.c | 4 +- 9 files changed, 449 insertions(+), 17 deletions(-) rename src/interface/{netcf_driver.c => interface_backend_netcf.c} (99%) create mode 100644 src/interface/interface_backend_udev.c rename src/interface/{netcf_driver.h => interface_driver.h} (100%) -- 1.7.8.6

2 3

[libvirt] [PATCH] Pass a correct pointer type to localtime_r(3).
by Jasper Lievisse Adriaanse 05 Sep '12

05 Sep '12

>From b53dc971cc50b5ac397e4568449d25041477c8d6 Mon Sep 17 00:00:00 2001 From: Jasper Lievisse Adriaanse <jasper(a)humppa.nl> Date: Tue, 4 Sep 2012 16:47:26 +0200 Subject: [PATCH] Pass a correct pointer type to localtime_r(3). Fixes a warning: warning: passing argument 1 of 'localtime_r' from incompatible pointer type --- tools/virsh-domain.c | 3 ++- tools/virsh.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index f0ec742..535779c 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3711,6 +3711,7 @@ vshGenFileName(vshControl *ctl, virDomainPtr dom, const char *mime) struct tm time_info; const char *ext = NULL; char *ret = NULL; + time_t sec = (time_t) cur_time.tv_sec; if (!dom) { vshError(ctl, "%s", _("Invalid domain supplied")); @@ -3724,7 +3725,7 @@ vshGenFileName(vshControl *ctl, virDomainPtr dom, const char *mime) /* add mime type here */ gettimeofday(&cur_time, NULL); - localtime_r(&cur_time.tv_sec, &time_info); + localtime_r(&sec, &time_info); strftime(timestr, sizeof(timestr), "%Y-%m-%d-%H:%M:%S", &time_info); if (virAsprintf(&ret, "%s-%s%s", virDomainGetName(dom), diff --git a/tools/virsh.c b/tools/virsh.c index 5cf3237..5be2a3c 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2189,6 +2189,7 @@ vshOutputLogFile(vshControl *ctl, int log_level, const char *msg_format, const char *lvl = ""; struct timeval stTimeval; struct tm *stTm; + time_t sec = stTimeval.tv_sec; if (ctl->log_fd == -1) return; @@ -2199,7 +2200,7 @@ vshOutputLogFile(vshControl *ctl, int log_level, const char *msg_format, * [YYYY.MM.DD HH:MM:SS SIGNATURE PID] LOG_LEVEL message */ gettimeofday(&stTimeval, NULL); - stTm = localtime(&stTimeval.tv_sec); + stTm = localtime(&sec); virBufferAsprintf(&buf, "[%d.%02d.%02d %02d:%02d:%02d %s %d] ", (1900 + stTm->tm_year), (1 + stTm->tm_mon), -- 1.7.6 -- Cheers, Jasper "Stay Hungry. Stay Foolish"

3 7

[libvirt] patch for dnsmasq parameters is not complete
by Gene Czarcinski 04 Sep '12

04 Sep '12

Although the patch with "--domain xxx --local=/xxx/" for dnsmasq command line parameters is good as far as it goes, it is not complete. As it is, dnsmasq will no longer forward names in its name-domain, but it will forward reverse lookup (IP address) queries. I am going to need to look at the code more. Instead of "--domain virt --local=/virt/" or just "--local=//" they need to look something like: "--domain virt --local=/virt/ --local=/122.168.192.in-addr.arpa/" or "--local=// --local=/122.168.192.in-addr.arpa/". I have dome some virtual testing and manually configured dnsmasq in a virtual machine and adding the second "--local" works rather well. Coming up with a new patch that works, that will take a lot more effort. Gene

1 0

[libvirt] [PATCH] Don't link with -lrt on OpenBSD
by Jasper Lievisse Adriaanse 04 Sep '12

04 Sep '12

>From bdf3bce37531ec346474bc5c4f37a5d2985d1d35 Mon Sep 17 00:00:00 2001 From: Jasper Lievisse Adriaanse <jasper(a)humppa.nl> Date: Tue, 4 Sep 2012 17:03:43 +0200 Subject: [PATCH] Don't link with -lrt on OpenBSD --- configure.ac | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index e0d00d5..54d049d 100644 --- a/configure.ac +++ b/configure.ac @@ -188,7 +188,13 @@ RT_LIBS= LIBS="$LIBS $LIB_PTHREAD -lrt" AC_CHECK_FUNC([clock_gettime],[ AC_DEFINE([HAVE_CLOCK_GETTIME],[],[Defined if clock_gettime() exists in librt.so]) - RT_LIBS=-lrt + case "$host" in + *-*-openbsd*) + ;; + *) + RT_LIBS=-lrt + ;; + esac ]) LIBS=$old_libs AC_SUBST(RT_LIBS) -- 1.7.6 -- Cheers, Jasper "Stay Hungry. Stay Foolish"

2 4

[libvirt] [PATCH] Use sockpeercred on OpenBSD.
by Jasper Lievisse Adriaanse 04 Sep '12

04 Sep '12

>From 0f352c0577f76a64924636a8c9ba72de5862b6d6 Mon Sep 17 00:00:00 2001 From: Jasper Lievisse Adriaanse <jasper(a)humppa.nl> Date: Tue, 4 Sep 2012 16:59:55 +0200 Subject: [PATCH] Use sockpeercred on OpenBSD. --- src/rpc/virnetsocket.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 5a48300..27ead13 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -988,7 +988,11 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, gid_t *gid, pid_t *pid) { +#if defined (__OpenBSD__) + struct sockpeercred cr; +#else struct ucred cr; +#endif socklen_t cr_len = sizeof(cr); virMutexLock(&sock->lock); -- 1.7.6

2 2

[libvirt] [PATCH] Rename iolimit to blockio.
by Viktor Mihajlovski 04 Sep '12

04 Sep '12

After discussion with DB we decided to rename the new iolimit element as it creates the impression it would be there to limit (i.e. throttle) I/O instead of specifying immutable characteristics of a block device. This is also backed by the fact that the term I/O Limits has vanished from newer storage admin documentation. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- docs/formatdomain.html.in | 6 ++-- docs/schemas/domaincommon.rng | 6 ++-- src/conf/domain_conf.c | 30 +++++++++--------- src/conf/domain_conf.h | 2 +- src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 10 +++--- tests/qemuhelptest.c | 8 ++-- .../qemuxml2argv-disk-blockio.args | 9 +++++ .../qemuxml2argvdata/qemuxml2argv-disk-blockio.xml | 33 ++++++++++++++++++++ .../qemuxml2argv-disk-iolimits.args | 9 ----- .../qemuxml2argv-disk-iolimits.xml | 33 -------------------- tests/qemuxml2argvtest.c | 4 +- 13 files changed, 78 insertions(+), 78 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.xml delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-iolimits.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-iolimits.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 5cb5a56..503685f 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1288,7 +1288,7 @@ <driver name='qemu' type='raw'/> <source dev='/dev/sda'/> <geometry cyls='16383' heads='16' secs='63' trans='lba'/> - <iolimits logical_block_size='512' physical_block_size='4096'/> + <blockio logical_block_size='512' physical_block_size='4096'/> <target dev='hda' bus='ide'/> </disk> </devices> @@ -1657,8 +1657,8 @@ BIOS-Translation-Modus (none, lba or auto)</dd> </dl> </dd> - <dt><code>iolimits</code></dt> - <dd>If present, the <code>iolimits</code> element allows + <dt><code>blockio</code></dt> + <dd>If present, the <code>blockio</code> element allows to override any of the block device properties listed below. <span class="since">Since 0.10.2 (QEMU and KVM)</span> <dl> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index abd0e8f..c2c6184 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -890,7 +890,7 @@ <ref name="geometry"/> </optional> <optional> - <ref name="diskIoLimits"/> + <ref name="diskBlockIo"/> </optional> </interleave> </define> @@ -1116,8 +1116,8 @@ </optional> </element> </define> - <define name="diskIoLimits"> - <element name="iolimits"> + <define name="diskBlockIo"> + <element name="blockio"> <optional> <attribute name="logical_block_size"> <data type="integer"/> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c34a0a8..8952b69 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3439,8 +3439,8 @@ virDomainDiskDefParseXML(virCapsPtr caps, def->geometry.sectors = 0; def->geometry.trans = VIR_DOMAIN_DISK_TRANS_DEFAULT; - def->iolimits.logical_block_size = 0; - def->iolimits.physical_block_size = 0; + def->blockio.logical_block_size = 0; + def->blockio.physical_block_size = 0; ctxt->node = node; @@ -3580,12 +3580,12 @@ virDomainDiskDefParseXML(virCapsPtr caps, goto error; } } - } else if (xmlStrEqual(cur->name, BAD_CAST "iolimits")) { + } else if (xmlStrEqual(cur->name, BAD_CAST "blockio")) { logical_block_size = virXMLPropString(cur, "logical_block_size"); if (logical_block_size && virStrToLong_ui(logical_block_size, NULL, 0, - &def->iolimits.logical_block_size) < 0) { + &def->blockio.logical_block_size) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid logical block size '%s'"), logical_block_size); @@ -3595,7 +3595,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, virXMLPropString(cur, "physical_block_size"); if (physical_block_size && virStrToLong_ui(physical_block_size, NULL, 0, - &def->iolimits.physical_block_size) < 0) { + &def->blockio.physical_block_size) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid physical block size '%s'"), physical_block_size); @@ -11406,21 +11406,21 @@ static void virDomainDiskGeometryDefFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } } -static void virDomainDiskIolimitsDefFormat(virBufferPtr buf, - virDomainDiskDefPtr def) +static void virDomainDiskBlockIoDefFormat(virBufferPtr buf, + virDomainDiskDefPtr def) { - if (def->iolimits.logical_block_size > 0 || - def->iolimits.physical_block_size > 0) { - virBufferAddLit(buf," <iolimits"); - if (def->iolimits.logical_block_size > 0) { + if (def->blockio.logical_block_size > 0 || + def->blockio.physical_block_size > 0) { + virBufferAddLit(buf," <blockio"); + if (def->blockio.logical_block_size > 0) { virBufferAsprintf(buf, " logical_block_size='%u'", - def->iolimits.logical_block_size); + def->blockio.logical_block_size); } - if (def->iolimits.physical_block_size > 0) { + if (def->blockio.physical_block_size > 0) { virBufferAsprintf(buf, " physical_block_size='%u'", - def->iolimits.physical_block_size); + def->blockio.physical_block_size); } virBufferAddLit(buf, "/>\n"); } @@ -11599,7 +11599,7 @@ virDomainDiskDefFormat(virBufferPtr buf, } virDomainDiskGeometryDefFormat(buf, def); - virDomainDiskIolimitsDefFormat(buf, def); + virDomainDiskBlockIoDefFormat(buf, def); /* For now, mirroring is currently output-only: we only output it * for live domains, therefore we ignore it on input except for diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f9f4865..3995c2d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -572,7 +572,7 @@ struct _virDomainDiskDef { struct { unsigned int logical_block_size; unsigned int physical_block_size; - } iolimits; + } blockio; virDomainBlockIoTuneInfo blkdeviotune; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2ba7956..ed85b6f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -172,7 +172,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "bridge", /* 100 */ "lsi", "virtio-scsi-pci", - "iolimits", + "blockio", "disable-s3", "disable-s4", /* 105 */ @@ -1512,7 +1512,7 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) */ if (strstr(str, ".logical_block_size") && strstr(str, ".physical_block_size")) - qemuCapsSet(flags, QEMU_CAPS_IOLIMITS); + qemuCapsSet(flags, QEMU_CAPS_BLOCKIO); if (strstr(str, "PIIX4_PM.disable_s3=")) qemuCapsSet(flags, QEMU_CAPS_DISABLE_S3); if (strstr(str, "PIIX4_PM.disable_s4=")) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index a7b3a06..49d64e5 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -138,7 +138,7 @@ enum qemuCapsFlags { QEMU_CAPS_NETDEV_BRIDGE = 100, /* bridge helper support */ QEMU_CAPS_SCSI_LSI = 101, /* -device lsi */ QEMU_CAPS_VIRTIO_SCSI_PCI = 102, /* -device virtio-scsi-pci */ - QEMU_CAPS_IOLIMITS = 103, /* -device ...logical_block_size & co */ + QEMU_CAPS_BLOCKIO = 103, /* -device ...logical_block_size & co */ QEMU_CAPS_DISABLE_S3 = 104, /* S3 BIOS Advertisement on/off */ QEMU_CAPS_DISABLE_S4 = 105, /* S4 BIOS Advertisement on/off */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e739f34..a83d6de 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2637,13 +2637,13 @@ qemuBuildDriveDevStr(virDomainDefPtr def, virBufferAsprintf(&opt, ",id=%s", disk->info.alias); if (bootindex && qemuCapsGet(qemuCaps, QEMU_CAPS_BOOTINDEX)) virBufferAsprintf(&opt, ",bootindex=%d", bootindex); - if (qemuCapsGet(qemuCaps, QEMU_CAPS_IOLIMITS)) { - if (disk->iolimits.logical_block_size > 0) + if (qemuCapsGet(qemuCaps, QEMU_CAPS_BLOCKIO)) { + if (disk->blockio.logical_block_size > 0) virBufferAsprintf(&opt, ",logical_block_size=%u", - disk->iolimits.logical_block_size); - if (disk->iolimits.physical_block_size > 0) + disk->blockio.logical_block_size); + if (disk->blockio.physical_block_size > 0) virBufferAsprintf(&opt, ",physical_block_size=%u", - disk->iolimits.physical_block_size); + disk->blockio.physical_block_size); } if (virBufferError(&opt)) { diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index a391edd..0d884f4 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -541,7 +541,7 @@ mymain(void) QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO, QEMU_CAPS_CPU_HOST, - QEMU_CAPS_IOLIMITS); + QEMU_CAPS_BLOCKIO); DO_TEST("qemu-kvm-0.12.1.2-rhel62-beta", 12001, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -609,7 +609,7 @@ mymain(void) QEMU_CAPS_DRIVE_COPY_ON_READ, QEMU_CAPS_CPU_HOST, QEMU_CAPS_SCSI_CD, - QEMU_CAPS_IOLIMITS); + QEMU_CAPS_BLOCKIO); DO_TEST("qemu-1.0", 1000000, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -682,7 +682,7 @@ mymain(void) QEMU_CAPS_SCSI_CD, QEMU_CAPS_IDE_CD, QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_IOLIMITS); + QEMU_CAPS_BLOCKIO); DO_TEST("qemu-1.1.0", 1001000, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -763,7 +763,7 @@ mymain(void) QEMU_CAPS_NETDEV_BRIDGE, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI, - QEMU_CAPS_IOLIMITS); + QEMU_CAPS_BLOCKIO); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args new file mode 100644 index 0000000..5fb1367 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args @@ -0,0 +1,9 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1 \ +-device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ +-drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2 \ +-device ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,\ +logical_block_size=512,physical_block_size=512 \ +-usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.xml new file mode 100644 index 0000000..52c9704 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.xml @@ -0,0 +1,33 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='cdrom'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/idedisk.img'/> + <target dev='hdc' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='2'/> + <blockio logical_block_size='512' physical_block_size='512'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='ide' index='1'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-iolimits.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-iolimits.args deleted file mode 100644 index 5fb1367..0000000 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-iolimits.args +++ /dev/null @@ -1,9 +0,0 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1 \ --device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2 \ --device ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,\ -logical_block_size=512,physical_block_size=512 \ --usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-iolimits.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-iolimits.xml deleted file mode 100644 index 440984b..0000000 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-iolimits.xml +++ /dev/null @@ -1,33 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu</emulator> - <disk type='block' device='cdrom'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='1'/> - </disk> - <disk type='file' device='disk'> - <source file='/tmp/idedisk.img'/> - <target dev='hdc' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='2'/> - <iolimits logical_block_size='512' physical_block_size='512'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='ide' index='1'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c655957..47c3f6c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -793,9 +793,9 @@ mymain(void) QEMU_CAPS_IDE_CD); DO_TEST("disk-geometry", QEMU_CAPS_DRIVE); - DO_TEST("disk-iolimits", + DO_TEST("disk-blockio", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_IDE_CD, QEMU_CAPS_IOLIMITS); + QEMU_CAPS_IDE_CD, QEMU_CAPS_BLOCKIO); VIR_FREE(driver.stateDir); virCapabilitiesFree(driver.caps); -- 1.7.0.4

2 2

[libvirt] [PATCH] qemu: Do not require auth scheme in graphics events
by Jiri Denemark 04 Sep '12

04 Sep '12

Only VNC_{{DIS,}CONNECTED,INITIALIZED} and SPICE_INITIALIZED events are documented to support server/auth field and even there it is marked as optional. Emit "" auth scheme in case QEMU didn't send it. --- src/qemu/qemu_monitor_json.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 643431c..bab6ca2 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -685,8 +685,9 @@ static void qemuMonitorJSONHandleGraphics(qemuMonitorPtr mon, virJSONValuePtr da authScheme = virJSONValueObjectGetString(server, "auth"); if (!authScheme) { - VIR_WARN("missing auth scheme in graphics event"); - return; + /* not all events are required to contain auth scheme */ + VIR_DEBUG("missing auth scheme in graphics event"); + authScheme = ""; } localFamily = virJSONValueObjectGetString(server, "family"); -- 1.7.12

2 1