- Devel - libvirt List Archives

[libvirt] [PATCH] storage: use correct type for array count
by Eric Blake 31 Oct '13

31 Oct '13

Using size_t counts will let us use VIR_APPEND_ELEMENT and friends. * src/conf/storage_conf.h (_virStoragePoolObjList) (_virStorageVolDefList): Track list sizes with size_t. * src/storage/storage_backend_rbd.c (virStorageBackendRBDRefreshPool): Fix type fallout. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/conf/storage_conf.h | 4 ++-- src/storage/storage_backend_rbd.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 251e897..d13cb99 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -112,7 +112,7 @@ struct _virStorageVolDef { typedef struct _virStorageVolDefList virStorageVolDefList; typedef virStorageVolDefList *virStorageVolDefListPtr; struct _virStorageVolDefList { - unsigned int count; + size_t count; virStorageVolDefPtr *objs; }; @@ -341,7 +341,7 @@ struct _virStoragePoolObj { typedef struct _virStoragePoolObjList virStoragePoolObjList; typedef virStoragePoolObjList *virStoragePoolObjListPtr; struct _virStoragePoolObjList { - unsigned int count; + size_t count; virStoragePoolObjPtr *objs; }; diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 4e18bf9..b7a41c2 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -381,7 +381,7 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn, pool->volumes.objs[pool->volumes.count++] = vol; } - VIR_DEBUG("Found %d images in RBD pool %s", + VIR_DEBUG("Found %zu images in RBD pool %s", pool->volumes.count, pool->def->source.name); ret = 0; -- 1.8.3.1

2 2

[libvirt] QEMU 1.6 and drive discard parameter
by whitearchey 31 Oct '13

31 Oct '13

In QEMU 1.6 parameters of 'drive' option were removed: QemuOptsList qemu_drive_opts = { .name = "drive", .head = QTAILQ_HEAD_INITIALIZER(qemu_drive_opts.head), .desc = { /* * no elements => accept any params * validation will happen later */ { /* end of list */ } }, }; But libvirt still checks for QEMU_CAPS_DRIVE_DISCARD using QMP query-command-line-options: static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "machine", "mem-merge", QEMU_CAPS_MEM_MERGE }, { "drive", "discard", QEMU_CAPS_DRIVE_DISCARD }, { "realtime", "mlock", QEMU_CAPS_MLOCK }, }; ... qemuMonitorGetCommandLineOptionParameters(mon, virQEMUCapsCommandLine[i].option, &values) So, when I try to use discard option in domain xml I get this error: error : qemuBuildDriveStr:3986 : unsupported configuration: discard is not supported by this QEMU binary

3 3

Re: [libvirt] Unable to provision VM attaching it directly to a OVS bridge
by Lucas Brasilino 31 Oct '13

31 Oct '13

Moving this discussion from libvirt-users: Getting deeper and deeper :) $ egrep '^int vir*' util/virnetdevopenvswitch.c int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, int virNetDevOpenvswitchRemovePort(const char *brname ATTRIBUTE_UNUSED, const char *ifname) int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname) Libvirt by now basically support adding/removing port to a OVS bridge . Is there some planning on an OVS full support, like bridge creation/destroy, creating a VM attaching it to a OVS brige, etc, just like 'traditional' Linux bridge ? If so, Is anybody working on it ? regards Lucas Brasilino MSc Student @ Federal University of Pernambuco (UFPE) twitter: @lucas_brasilino 2013/10/29 Lucas Brasilino <lrbbs(a)cin.ufpe.br>: > Hi > > Getting deeper, the error is raised by 'virDomainCreateLinux()'. > Here comes the snippet of the XML argument passed to this call: > > (Pdb) print xmlDesc > <domain type='kvm'> > <name>vm2</name> > <uuid>3d713513-e8ee-994a-0eba-51128bd4b42e</uuid> > [...] > <interface type='bridge'> > <source bridge='databr0'/> > <mac address='00:00:00:00:00:03'/> > <model type='virtio'/> > </interface> > [...] > </domain> > > So libvirt network driver is surely trying to use 'databr0' as the > common Linux bridge implementation, not an Open vSwitch bridge. > > I tried to add an > > <virtualport='openvswitch'/> > > element in the XML created by virt-install and use 'virsh create' to > create it but > seems that libvirt's network driver does not support Open vSwitch when > creating VM's. > Is there some planning to support it ? > > Thanks! > > regards > Lucas Brasilino > MSc Student @ Federal University of Pernambuco (UFPE) > twitter: @lucas_brasilino > > 2013/10/28 Lucas Brasilino <lrbbs(a)cin.ufpe.br>: >> Reposting from virt-tools mailing list: >> >> Hi! >> >> I'm facing a problem that could be triggered by some lacking >> of support from libvirt on Open vSwitch (or could be my mistake). >> >> I have interests in researching on virtual networks and >> SDN. To keep things simple, I've decided to use libvirt/virt-tools to >> manage VM's since my focus is on the network, instead of using a >> full feature system like OpenStack. >> >> I'm quite new with libvirt/virt-tools, but I have a good experience with >> openvswitch and other virtualizations technologies (which I dropped in >> libvirt/kvm favor). >> >> I'm using Fedora 19 packages >> >> openvswitch (1.11.0-1.fc19.x86_64) >> libvirt (1.0.5.6-3.fc19.x86_64) >> virt-install (0.10.0-4.fc19.noarch) >> >> I've created an OVS bridge (databr0) outside libvirt, and then defined it >> inside libvirt with: >> >> <network> >> <name>databr0</name> >> <forward mode='bridge'/> >> <bridge name='databr0'/> >> <virtualport type='openvswitch'/> >> </network> >> >> And then 'net-autostart' and 'net-start' it with virsh. Now I've got: >> # virsh net-list >> Name State Autostart Persistent >> ---------------------------------------------------------- >> databr0 active yes yes >> >> When I try to provision an VM, if I use the virt-install option >> "--network=bridge:databr0,model=virtio,mac=00:00:00:00:00:03" >> I got the following error: >> >> # virt-install --connect qemu:///system --virt-type kvm --name vm2 >> --ram 768 --disk path=/home/lucas/local/vm/images/vm2.img --vnc >> --cdrom /home/lucas/local/vm/fc19-x86_64.iso >> --network=bridge:databr0,model=virtio,mac=00:00:00:00:00:03 >> --os-type=linux --os-variant fedora19 >> >> Starting install... >> ERROR Unable to add bridge databr0 port vnet0: Operation not supported >> Domain installation does not appear to have been successful. >> If it was, you can restart your domain by running: >> virsh --connect qemu:///system start vm2 >> otherwise, please restart your installation. >> >> I just managed to create a VM when I use '--nonetworks' option and after >> I do a 'virtsh edit vm2' and add: >> >> <interface type='bridge'> >> <mac address='00:00:00:00:00:03'/> >> <source bridge='databr0'/> >> <virtualport type='openvswitch'/> >> <model type='virtio'/> >> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' >> function='0x0'/> >> </interface> >> >> Well, I read elsewhere that openvswitch bridging isn't fully >> supported. Is it the case or I'm facing another kind of problem ? >> >> regards >> >> Att >> Lucas Brasilino >> MSc Student @ Federal University of Pernambuco (UFPE) >> twitter: @lucas_brasilino

2 3

[libvirt] [PATCH] LXC: mount /dev/pts/0 to /dev/console
by Gao feng 31 Oct '13

31 Oct '13

Now, /dev/console is linked to the /dev/pts/0, so for the process agetty, the tty device of agetty is pts/0. this will cause login container failed. since pts/0 is not in the /etc/securetty. so pam module pam_securetty will prevent the root user logging on the system. this patch doesn't make /dev/console a symbol but binds /dev/pts/0 to it. so the tty device of agetty will be console. root can login the system successfully. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 255c711..1cede41 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1049,12 +1049,19 @@ static int lxcContainerSetupDevices(char **ttyPaths, size_t nttyPaths) return -1; } VIR_FREE(tty); - if (i == 0 && - symlink(ttyPaths[i], "/dev/console") < 0) { - virReportSystemError(errno, - _("Failed to symlink %s to /dev/console"), - ttyPaths[i]); - return -1; + if (i == 0) { + if (virFileTouch("/dev/console", 0600) < 0) { + virReportSystemError(errno, "%s", + _("Failed to create /dev/console")); + return -1; + } + + if (mount(ttyPaths[0], "/dev/console", NULL, MS_BIND, NULL) < 0) { + virReportSystemError(errno, + _("Failed to symlink %s to /dev/console"), + ttyPaths[i]); + return -1; + } } } return 0; -- 1.8.3.1

2 3

[libvirt] [PATCH] qemu: fix well-formed migration URI formatting
by Michael Chapman 31 Oct '13

31 Oct '13

When adding an automatically allocated port to a well-formed migration URI, keep it well-formed: tcp://1.2.3.4/ -> tcp://1.2.3.4/:12345 # wrong tcp://1.2.3.4/ -> tcp://1.2.3.4:12345/ # fixed tcp://1.2.3.4 -> tcp://1.2.3.4:12345 # still works tcp:1.2.3.4 -> tcp:1.2.3.4:12345 # still works (old syntax) Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- src/qemu/qemu_migration.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 0439ba4..cb59620 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2535,6 +2535,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, char *uri_str = NULL; int ret = -1; virURIPtr uri = NULL; + bool well_formed_uri = true; VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, uri_in=%s, uri_out=%p, " @@ -2597,6 +2598,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, /* Convert uri_in to well-formed URI with // after tcp: */ if (!(STRPREFIX(uri_in, "tcp://"))) { + well_formed_uri = false; if (virAsprintf(&uri_str, "tcp://%s", p) < 0) goto cleanup; } @@ -2626,9 +2628,17 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, goto cleanup; } - /* Caller frees */ - if (virAsprintf(uri_out, "%s:%d", uri_in, port) < 0) - goto cleanup; + if (well_formed_uri) { + uri->port = port; + + /* Caller frees */ + if (!(*uri_out = virURIFormat(uri))) + goto cleanup; + } else { + /* Caller frees */ + if (virAsprintf(uri_out, "%s:%d", uri_in, port) < 0) + goto cleanup; + } } else { port = uri->port; -- 1.8.3.1

2 3

[libvirt] [PATCH]virsh: track alias option and improve error message when option duplicate its alias
by Chen Hanxiao 31 Oct '13

31 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> commit 2b172a8effa712aee97a21a64d2d02060958f9b2 allow alias to expand to opt=value pair. That means alias may not look alike since then. With this patch we will also track alias. If we type command with one option and another marked as its alias, we will get an error message like: error: option '--AA' duplicate its alias '--AAA' Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- tools/virsh.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index bad78c9..423e2d8 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1101,11 +1101,18 @@ vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cmd, const char *name, if (VIR_STRDUP(*optstr, value + 1) < 0) goto cleanup; } + *opts_seen |= 1 << i; continue; } if ((*opts_seen & (1 << i)) && opt->type != VSH_OT_ARGV) { - vshError(ctl, _("option --%s already seen"), name); - goto cleanup; + if ((*opts_seen & (1 << (i - 1)))) { + vshError(ctl, _("option '--%s' duplicates its alias '--%s'"), + cmd->opts[i].name, cmd->opts[i-1].name); + goto cleanup; + } else { + vshError(ctl, _("option '--%s' already seen"), name); + goto cleanup; + } } *opts_seen |= 1 << i; *opt_index = i; -- 1.8.2.1

3 4

[libvirt] [PATCH] maint: avoid further typedef accidents
by Eric Blake 31 Oct '13

31 Oct '13

To make it easier to forbid future attempts at a confusing typedef name ending in Ptr that isn't actually a pointer, insist that we follow our preferred style of 'typedef foo *fooPtr'. * cfg.mk (sc_forbid_const_pointer_typedef): Enforce consistent style, to prevent issue fixed in previous storage patch. * src/conf/capabilities.h (virCapsPtr): Fix offender. * src/security/security_stack.c (virSecurityStackItemPtr): Likewise. * tests/qemucapabilitiestest.c (testQemuDataPtr): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- cfg.mk | 4 ++++ src/conf/capabilities.h | 4 ++-- src/security/security_stack.c | 2 +- tests/qemucapabilitiestest.c | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cfg.mk b/cfg.mk index e9da282..1b2fd46 100644 --- a/cfg.mk +++ b/cfg.mk @@ -471,10 +471,14 @@ sc_correct_id_types: # "const fooPtr a" is the same as "foo * const a", even though it is # usually desired to have "foo const *a". It's easier to just prevent # the confusing mix of typedef vs. const placement. +# Also requires that all 'fooPtr' typedefs are actually pointers. sc_forbid_const_pointer_typedef: @prohibit='(^|[^"])const \w*Ptr' \ halt='"const fooPtr var" does not declare what you meant' \ $(_sc_search_regexp) + @prohibit='typedef [^(]+ [^*]\w*Ptr\b' \ + halt='use correct style and type for Ptr typedefs' \ + $(_sc_search_regexp) # Forbid sizeof foo or sizeof (foo), require sizeof(foo) sc_size_of_brackets: diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 5bc7bb5..ba99e1a 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -1,7 +1,7 @@ /* * capabilities.h: hypervisor capabilities * - * Copyright (C) 2006-2008, 2010, 2012 Red Hat, Inc. + * Copyright (C) 2006-2013 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -162,7 +162,7 @@ struct _virDomainXMLNamespace { }; typedef struct _virCaps virCaps; -typedef virCaps* virCapsPtr; +typedef virCaps *virCapsPtr; struct _virCaps { virObject parent; diff --git a/src/security/security_stack.c b/src/security/security_stack.c index ff0f06b..0d42b21 100644 --- a/src/security/security_stack.c +++ b/src/security/security_stack.c @@ -30,7 +30,7 @@ typedef struct _virSecurityStackData virSecurityStackData; typedef virSecurityStackData *virSecurityStackDataPtr; typedef struct _virSecurityStackItem virSecurityStackItem; -typedef virSecurityStackItem* virSecurityStackItemPtr; +typedef virSecurityStackItem *virSecurityStackItemPtr; struct _virSecurityStackItem { virSecurityManagerPtr securityManager; diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 28f12e7..d912171 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -27,7 +27,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE typedef struct _testQemuData testQemuData; -typedef testQemuData * testQemuDataPtr; +typedef testQemuData *testQemuDataPtr; struct _testQemuData { virDomainXMLOptionPtr xmlopt; const char *base; -- 1.8.3.1

2 2

Re: [libvirt] [libvirt-users] bridged networking using VLAN : guest with 2 NIC
by Laine Stump 31 Oct '13

31 Oct '13

On 10/30/2013 09:14 PM, Dan Sa wrote: > I created another Virtual Machine with DHCP enabled 192.168.0.0/16 > <http://192.168.0.0/16> DHCP Range 192.168.0.2 192.168.0.2 (as I want > same IP to all three guests) Forwarding : NAT to em2 > > now on host I see two instances of dnsmasq > > netstat -anlp | grep -w dnsmasq > tcp 0 0 192.168.0.1:53 <http://192.168.0.1:53> > 0.0.0.0:* LISTEN 1907/dnsmasq <<<< is this right ? > I created > tcp 0 0 192.168.122.1:53 <http://192.168.122.1:53> > 0.0.0.0:* LISTEN 6666/dnsmasq <<< default NAT > > > however I am seeing dnsmasq is not Active > > systemctl status dnsmasq.service > dnsmasq.service - DNS caching server. > Loaded: loaded (/usr/lib/systemd/system/dnsmasq.service; > enabled) > Active: failed (Result: exit-code) since Wed, 30 Oct 2013 > 12:30:39 -0600; 41min ago > > all my guest are on physical VLAN so how I should go about giving them > 192.168.0.2 address using dnsmasq ? 1) PLEASE stop top-posting new random information and guesses at solutions to the top of your old messages. You are quickly creating a cascade of text that is so large and rambling that nobody will have the ambition to unscramble it and make a reply. It is generally accepted good etiquette to post responses to earlier messages in-line with the original, so that the flow of the conversation can be easily followed by someone reading just the last message. (If there is no "flow" to the conversation, then something more fundamental has gone wrong.) 2) If you've now realized (as I told you in my first response) that you need to run a system instance of dhcpd or dnsmasq to service dhcp for the vlan of your guests, then what you have is a networking problem, not a virtualization problem. There are tutorials for setting up dnsmasq in various places on the web, or you can simply read the comments in /etc/dnsmasq.conf to figure out how to make it listen on just a specific interface, and how to tell it what addresses to serve for that interface. See below for more comments. > > thanks > dan > > > > > > > On Wed, Oct 30, 2013 at 11:20 AM, Dan Sa <dreamrider787(a)gmail.com > <mailto:dreamrider787@gmail.com>> wrote: > > UPDATE : > > Adding more information about dnsmasq on box running fedora (host) > > dispatcher.d]# nmcli nm status > RUNNING STATE WIFI-HARDWARE WIFI > WWAN-HARDWARE WWAN > running connecting enabled enabled > enabled disabled > > nmcli nm status > RUNNING STATE WIFI-HARDWARE WIFI > WWAN-HARDWARE WWAN > running disconnected enabled enabled > enabled disabled > > > systemctl --all|grep -i network > > NetworkManager.service loaded active running Network > Manager > > dnsmasq.d]# ls -al > total 8 > drwxr-xr-x 2 root root 4096 Nov 20 2012 . > drwxr-xr-x. 6 root root 4096 Oct 30 08:56 .. > > > dispatcher.d]# ls -al > total 32 > drwxr-xr-x. 2 root root 4096 Sep 23 12:59 . > drwxr-xr-x. 6 root root 4096 Oct 30 08:56 .. > -rwxr-xr-x 1 root root 175 Nov 15 2012 00-netreport > -rwxr-xr-x. 1 root root 335 Feb 14 2012 04-iscsi > -rwxr-xr-x. 1 root root 111 Jun 25 2012 10-sendmail > -rwxr-xr-x 1 root root 933 Jul 10 04:38 11-dhclient > -rwxr-xr-x. 1 root root 317 Apr 27 2012 20-chrony > -rwxr-xr-x 1 root root 138 Mar 19 2013 20-squid > > cat dnsmasq.conf > > all lines are commented only line active is > > # Include another lot of configuration options. > #conf-file=/etc/dnsmasq.more.conf > conf-dir=/etc/dnsmasq.d <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< > *All* of the above is just random data, which says nothing. Please try to spend more time figuring out what you are trying to do and what has gone wrong before just pasting random bits into a message to a mailing list. Remember that the people reading the messages on this list are doing it for free, and they also have day jobs they need to attend to. The less excess garbage is in a message, the less time they have to use up sifting through it for useful information. > > > > > > On Wed, Oct 30, 2013 at 10:10 AM, Dan Sa <dreamrider787(a)gmail.com > <mailto:dreamrider787@gmail.com>> wrote: > > BRCTL SHOW > bridge name bridge id STP enabled interfaces > br0 8000.00237de0a132 no em1 > vnet0 > guest1-lan 8000.00237de0a133 no em2.620 > vnet3 > guest1-wan 8000.0022642b6586 no p1p1.110 > guest2-lan 8000.00237de0a133 no em2.619 > guest2-wan 8000.0022642b6586 no p1p1.108 > guest3-lan 8000.00237de0a133 no em2.621 > guest3-wan 8000.0022642b6586 no p1p1.111 > > virbr0 8000.5254003e19b3 yes virbr0-nic > vnet2 > The above list of bridges connected to vlan interfaces implies that, for some reason, you are putting each interface of each guest on a separate vlan. Is this really what you think you want to do? Why? How will these guests connect to the rest of the network? Unless you have a requirement to isolate each guest entirely from every other guest and force each guest's traffic to travel through a different path out to the rest of the network, then I think you've misunderstood when/why vlans should be used. It is much more common to just setup a single network that many (or even all) guests will attach to, and generally you don't need a vlan tag to do this. (an earlier comment you made implying that a *host* bridge attached to a host vlan interface *was actually the guest interface* makes me believe you are confused about the function of each bit and how they all fit together. I think it would be useful for you to step back from all of this and just explain how you want your guests to connect to the rest of the network. Do you have a specific requirement for each to be connected to a separate vlan on the physical network? Or do they just need to be connected "somehow"? Do they need to be prevented from communicating with each other, or was this just a side effect of a mistaken network configuration? > > > On Wed, Oct 30, 2013 at 10:10 AM, Dan Sa > <dreamrider787(a)gmail.com <mailto:dreamrider787@gmail.com>> wrote: > > Laine, > > first thank you very much for your input, it cleared some > doubts ... please find below the information in the > desired format. > > Versions: > > 1) Virtual Machine Manager 0.9.5[root@dsl-test qemu]# uname -a > 2) Linux 3.9.10-100.fc17.x86_64 #1 SMP Sun Jul 14 > 01:31:27 UTC 2013 x86_64 x86_64 x86_64 GNU/Linux > 3) Fedora release 17 (Beefy Miracle) Kernel \r on an \m (\l) > Fedora 17 is > 1 year old, and thus no longer gets any updates, not even security updates. You need to upgrade to a newer release of Fedora (F20 is already in beta, so that may be a good choice) > 4) virsh --version 0.9.11.10 > Likewise, 0.9.11 is very old. *Many* improvements have been made since then, which is another good reason to upgrade your OS. > 5) rpm -qa | grep kvm > libvirt-daemon-kvm-0.9.11.10-1.fc17.x86_64 > qemu-kvm-1.0.1-6.fc17.x86_64 > > I have 3 Guest information for guest1 follows : (my > questions are after that) > > virsh dumpxml guest1 : > > virsh dumpxml guest1 > > <domain type='kvm' id='5'> > > <name>guest1</name> > > <uuid>bcc29de1-ba90-5dd8-81fe-7450852df7f6</uuid> > > <memory unit='KiB'>1048576</memory> > > <currentMemory unit='KiB'>1048576</currentMemory> > > <vcpu>4</vcpu> > > <os> > > <type arch='x86_64' machine='pc-0.15'>hvm</type> > > <boot dev='hd'/> > > </os> > > <features> > > <acpi/> > > <apic/> > > <pae/> > > </features> > > <cpu mode='custom' match='exact'> > > <model fallback='allow'>Penryn</model> > > <vendor>Intel</vendor> > > <feature policy='require' name='tm2'/> > > <feature policy='require' name='est'/> > > <feature policy='require' name='monitor'/> > > <feature policy='require' name='osxsave'/> > > <feature policy='require' name='ss'/> > > <feature policy='require' name='ds'/> > > <feature policy='require' name='vme'/> > > <feature policy='require' name='dtes64'/> > > <feature policy='require' name='ht'/> > > <feature policy='require' name='dca'/> > > <feature policy='require' name='pbe'/> > > <feature policy='require' name='xsave'/> > > <feature policy='require' name='tm'/> > > <feature policy='require' name='pdcm'/> > > <feature policy='require' name='vmx'/> > > <feature policy='require' name='ds_cpl'/> > > <feature policy='require' name='xtpr'/> > > <feature policy='require' name='acpi'/> > > </cpu> > > <clock offset='utc'/> > > <on_poweroff>destroy</on_poweroff> > > <on_reboot>restart</on_reboot> > > <on_crash>restart</on_crash> > > <devices> > > <emulator>/usr/bin/qemu-kvm</emulator> > > <disk type='file' device='disk'> > > <driver name='qemu' type='raw'/> > > <source file='/var/lib/libvirt/images/guest1.img'/> > > <target dev='vda' bus='virtio'/> > > <alias name='virtio-disk0'/> > > <address type='pci' domain='0x0000' bus='0x00' > slot='0x05' function='0x0'/> > > </disk> > > <controller type='usb' index='0'> > > <alias name='usb0'/> > > <address type='pci' domain='0x0000' bus='0x00' > slot='0x01' function='0x2'/> > > </controller> > > <controller type='virtio-serial' index='0'> > > <alias name='virtio-serial0'/> > > <address type='pci' domain='0x0000' bus='0x00' > slot='0x04' function='0x0'/> > > </controller> > > <interface type='network'> > > <mac address='52:54:00:ea:80:df'/> > > <source network='default'/> > > <target dev='vnet2'/> > > <alias name='net0'/> > > <address type='pci' domain='0x0000' bus='0x00' > slot='0x03' function='0x0'/> > > </interface> > > <interface type='bridge'> > > <mac address='52:54:00:d5:1d:01'/> > > <source bridge='guest1-lan'/> > > <target dev='vnet3'/> > > <model type='virtio'/> > > <alias name='net1'/> > > <address type='pci' domain='0x0000' bus='0x00' > slot='0x07' function='0x0'/> > > </interface> > > <serial type='pty'> > > <source path='/dev/pts/3'/> > > <target port='0'/> > > <alias name='serial0'/> > > </serial> > > <console type='pty' tty='/dev/pts/3'> > > <source path='/dev/pts/3'/> > > <target type='serial' port='0'/> > > <alias name='serial0'/> > > </console> > > <input type='mouse' bus='ps2'/> > > <graphics type='vnc' port='5901' autoport='yes'/> > > <video> > > <model type='cirrus' vram='9216' heads='1'/> > > <alias name='video0'/> > > <address type='pci' domain='0x0000' bus='0x00' > slot='0x02' function='0x0'/> > > </video> > > <memballoon model='virtio'> > > <alias name='balloon0'/> > > <address type='pci' domain='0x0000' bus='0x00' > slot='0x06' function='0x0'/> > > </memballoon> > > </devices> > > <seclabel type='none'/> > > </domain> > > > > > > Here is revised BRCTL Show after guest1 is running > > > BRCTL SHOW > > bridge name bridge id STP enabled interfaces > > br0 8000.00237de0a132 > no em1 > > vnet0 > > c1000z-lan 8000.00237de0a133 > no em2.620 > > vnet3 > > c1000z-wan 8000.0022642b6586 > no p1p1.110 > > c2000t-lan 8000.00237de0a133 > no em2.619 > > c2000t-wan 8000.0022642b6586 no > p1p1.108 > > pk5001a-lan 8000.00237de0a133 > no em2.621 > > pk5001a-wan 8000.0022642b6586 > no p1p1.111 > > virbr0 8000.5254003e19b3 yes > virbr0-nic > > vnet2 > The above is obviously *not* the output of brctl on the same host as the above-listed guest, since that guest connects to a bridge called "guest1-lan", which isn't even in the brctl output at all. > ---------------------------------------------------------------------------------------------------------- > > > on guest1-lan terminal I see following : > > > route -n > > destination gateway genmask flags > metric ref use iface > > 0.0.0.0 192.168.122.1 0.0.0.0 UG > 100 0 eth0 > > 192.168.122.0 0.0.0.0 255.255.255.0 U > 0 0 eth0 > > > DHCPDISCOVER on eth 1 to 255.255.255.255 port 67 interval > 6 then 14, 13, 15 > > and then sleeping > > > so you are right I am not getting DHCP IP and I have > "forward mode bridge" so libvirt is ignoring it > > I want 192.168.0.2 on this with gateway 192.168.0.1 > > > so looks like my problem is DHCP .... how can I able to > run DHCP for all three guest which are part of em2 > > interface like em2.629, em2.621 and em2/622 > Again, WHY do you need a separate vlan for each guest? I think you may be confused. > > awaiting your suggestions.... > 1) stop top-posting. 2) either explain why you need each guest on a separate vlan, or give up on that idea and just connect all guest interfaces to a single network (or possible 2 networks - on lan and one wan, which you seen to have some requirement for). 3) if you really do require the guests to each be on a separate vlan, and you don't have any other host on the network that already serves dhcp on those vlans, then read /etc/dnsmasq.conf to learn how to configure it. > > regards > > dan > > > > On Wed, Oct 30, 2013 at 9:56 AM, Dan Sa > <dreamrider787(a)gmail.com <mailto:dreamrider787@gmail.com>> > wrote: > > Laine, > > first thank you very much for your input, it cleared > some doubts ... please find below the information in > the desired format. > > Versions: > > 1) Virtual Machine Manager 0.9.5[root@dsl-test qemu]# > uname -a > 2) Linux 3.9.10-100.fc17.x86_64 #1 SMP Sun Jul 14 > 01:31:27 UTC 2013 x86_64 x86_64 x86_64 GNU/Linux > 3) Fedora release 17 (Beefy Miracle) Kernel \r on an > \m (\l) > 4) virsh --version 0.9.11.10 > 5) rpm -qa | grep kvm > libvirt-daemon-kvm-0.9.11.10-1.fc17.x86_64 > qemu-kvm-1.0.1-6.fc17.x86_64 > > I have 3 Guest and here is > > > > > On Wed, Oct 30, 2013 at 5:19 AM, Laine Stump > <laine(a)laine.org <mailto:laine@laine.org>> wrote: > > (There is no need or advantage to Cc'ing > individuals who are already > subscribed to the mailing list.) > > On 10/28/2013 05:34 PM, Dan Sa wrote: > > hello all, > > > > I have been trying to set-up bridged network > with VLAN and not able to > > succeed as many tutorials address only single NIC. > > > > I am trying to setup 2 guests (backtrack > instance) each guest has NIC1 > > and NIC2. following is snippet for guest1 > > > > I am not able to get 192.168.0.2 address back on > guest eth0. > > > See the comment below about <forward > mode='bridge'>. you'll need some > other entity on your vlan to run a dhcp server, > because libvirt won't be > doing it for you in this case. > > > > > > > > VIRT-MANAGER GUI : > > > > guest1-lan details radio button > > > > left side panel > > > > NIC1 ------------------> Virtual Network Interface > > Source Device : > Virtual Network "default" NAT > > Device Model : > Hypervisor default > > MAc Address : > xxxxxxxxxxxxxx > > > > NIC2 ------------------> Virtual Network Interface > > Source Device : > Specify Shared Device Name > > Bridge > name : guest1-lan > > Device Model : virto > > MAc Address : > xxxxxxxxxxxxxx > > The output of "virsh dumpxml $guestname" is much > more useful than a > transcription of the virt-manager screens. > > > > > HOST MACHINE : > > > > brctl show has br0 for bridge > > and virbr0 with 192.168.122.x address (created > by default virtual > > network NAT) > > > > > > /etc/sysconfig/network-scripts/ > > > > 1) Bridge BR0 (cat ifcfg-br0) > > > > DEVICE="br0" > > TYPE="Bridge" > > ONBOOT="yes" > > NM_CONTROLLED="no" > > BOOTPROTO="static" > > IPADDR="xx.xx.xx.xx" > > NETMASK="255.255.254.0" > > GATEWAY="xx.xx.xx.xx" > > DNS1="x.y.z.s" > > DNS2="x.y.q.s" > > > > 2) cat ifcfg-em1 > > NM_CONTROLLED="yes" > > HWADDR="02:12D:E2:B1:32" > > BOOTPROTO="static" > > DEVICE="em1" > > BRIDGE="br0" > > ONBOOT="yes" > > > > 3) ifcfg-em2 > > NM_CONTROLLED="yes" > > HWADDR="02:24:7e:d0:b1:42" > > BOOTPROTO="static" > > DEVICE="em2" > > ONBOOT="yes" > > > > 4) THIS IS GUEST (cat ifcfg-guest1-lan) > > I don't understand what you mean by "this is > guest". It isn't a part of > the guest; it is a bridge on the host that could > be *used* by a guest. > > > > DEVICE=guest1-lan > > TYPE=Bridge > > ONBOOT=yes > > BOOTPROTO=static > > DELAY=1 > > > > 5) GUEST VLAN (cat ifcfg-em2.620) > > > > DEVICE=em2.620 > > VLAN=yes > > ONBOOT=yes > > BRIDGE=guest1-lan > > > > BRCTL Show Command : > > > > br0 8000.00237de0a132 no em1 > > > vnet0 > > guest1-lan 8000.00237de0a133 no em2.620 > > virbr0 8000.5254003e19b3 yes virbr0-nic > > > From the above, it appears that there is only a > single guest running, > and that it is connected via the br0 bridge; > apparently you took this > output when neither of your dual-nic guests were > running, as they should > have each attached tun devices to both guest1-lan > and virbr0. > > > > > > > > VIRSH : > > > > virsh # net-list > > Name State Autostart > > ----------------------------------------- > > guest1-lan active yes > > default active yes > > > > > > virsh # iface-list > > Name State MAC Address > > -------------------------------------------- > > br0 active 00:23:7d:e0:a1:32 > > guest1-lan active 00:23:7d:e0:a1:33 > > > > > > iface-edit : > > > > virsh # iface-edit guest1-lan > > > > <interface type='bridge' name='guest1-lan'> > > <start mode='onboot'/> > > <bridge delay='1'> > > <interface type='vlan' name='em2.620'> > > <vlan tag='620'> > > <interface name='em2'/> > > </vlan> > > </interface> > > </bridge> > > </interface> > > > > > ------------------------------------------------------------------ > > > > /etc/libvirt/qemu/networks > > > (You shouldn't be looking at/modifying the files in > /etc/libvirt/qemu/networks directly. Instead, use > "virsh net-dumpxml > guest1-lan" (for example) to look at the network > config, and "virsh > net-edit guest1-lan" to modify it.) > > > > > > cat guest1-lan.xml > > <network> > > <name>guest1-lan</name> > > <uuid>a12747ec-21c9-0d21-ab06-064ba204bc52</uuid> > > <forward mode='bridge' dev="br0"/> > > <bridge name='guest1-lan' /> > > <ip address='192.168.0.1' netmask='255.255.255.0'> > > <dhcp> > > <range start='192.168.0.2' > end='192.168.0.254' /> > > </dhcp> > > </ip> > > > Any network with <forward mode='bridge'...> is an > "unmanaged" network > from libvirt's POV, and thus the <ip> element and > all its subelements > are ignored. If you use <forward mode='bridge'> > then libvirt assumes > that the bridge device is already configured by > the base OS config. > > As of libvirt-1.0.1, attempts to define an <ip> > element in a network > with <forward mode='bridge'> are flagged as an > error. (It would be > helpful in future reports if you indicate your 1) > libvirt version, 2) > qemu version, 3) distro and version, 4) kernel > version. Although not > always applicable, sometime it can help in framing > the issue. > > > > </network> > > > > > > cat default.xml > > > > <network> > > <name>default</name> > > <uuid>8778244b-1a0c-c15f-c348-26462a07a639</uuid> > > <forward mode='nat'/> > > <bridge name='virbr0' stp='on' delay='0' /> > > <mac address='52:54:00:3E:19:B3'/> > > <ip address='192.168.122.1' > netmask='255.255.255.0'> > > <dhcp> > > <range start='192.168.122.2' > end='192.168.122.254' /> > > </dhcp> > > </ip> > > </network> > > > > any guidance will be appriciated > > Since you're defining a vlan tag, I assume that > the physical network > attached to your host's em2 is actually using vlan > 620? If not, and you > just need a network that's private to your guests > and the host, I would > recommend simply defining a libvirt network with > no <forward> element at > all. This network *will* be managed by libvirt, so > libvirt will create a > bridge and give it an IP address, as well as > running a dnsmasq instance > to serve up IP addresses to guests, but the guests > won't be able to get > traffic anywhere beyond that bridge via their > interface connected to the > bridge. > > If you *are* using vlan 620 on the physical > network, then you'll need to > setup some other dhcp server somewhere on that > network (either run a > system instance of dnsmasq on the host that > listens on em2.620, or run > dnsmasq or dhcpd on some other physical host or > guest that listens on > its own vlan-tagged interface). > > > > > >

1 0

[libvirt] RFC: using a network device as a destination for a disk snapshot
by Eric Blake 31 Oct '13

31 Oct '13

Right now, when creating an external snapshot, the snapshot xml requires that the destination be in the local file system: http://libvirt.org/formatsnapshot.html <domainsnapshot> ... <disks> <disk name='vda' snapshot='external'> <driver type='qcow2'/> <source file='/path/to/new'/> </disk> ... But libvirt already allows for a network device with qcow2 contents, provided that there is no backing chain: # qemu-img info gluster://red/vol1/img2 image: gluster://red/vol1/img2 file format: qcow2 virtual size: 10M (10485760 bytes) disk size: 193K cluster_size: 65536 # virsh dumpxml dom <domain type='kvm'> ... <disk type='network' device='disk'> <driver name='qemu' type='qcow2'/> <source protocol='gluster' name='vol1/img2'> <host name='red'/> </source> <target dev='vdc' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/> </disk> ... I'm working on patches to the backing chain code to allow a gluster (or other network device) with qcow2 contents to have a backing file, but for the code to be useful, we also need to patch <domainsnapshot> xml to allow the destination file to be a gluster or other network device, rather than forcing it to be a local file name. Here's the XML I think we need to add to domainsnapshot: <domainsnapshot> ... <disks> <disk name='vda' snapshot='external' type='network'> <driver type='qcow2'/> <source protocol='gluster' name='vol1/img2'> <host name='red'/> </source> </disk> that is, add an optional /disk@type attribute (if absent, it defaults to type='file'), and where if present, the <source> subelement then takes on alternate forms in the same manner in which //domain/devices/disk handles alternates (here, allowing a protocol, name, and host specification). [Ultimately, we need to fix //domain/devices/disk to specify a full backing chain, but one step at a time...] -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

3 2

[libvirt] [PATCH 0/6] API documentation improvements
by Claudio Bley 31 Oct '13

31 Oct '13

Hi. It's been a while since I tackled this, but here it goes... This is version 4 of https://www.redhat.com/archives/libvir-list/2013-January/msg02094.html exclusive of the already applied patches, of course. Changes since v3: * skipped the ECMAScript code highlighting patch[1] in this series (postponed for now) * added link generation patch (#6) which I had proposed seperately back in Jan 2013, too. * added a reference to an affected API in patch #1 and #4 as per Eric's comments * changed the code block XSL processing to avoid cutting off characters at the beginning of a line [1] https://www.redhat.com/archives/libvir-list/2013-January/msg02104.html [2] https://www.redhat.com/archives/libvir-list/2013-January/msg00884.html Claudio Bley (6): docs: process code blocks similar to Markdown docs: add class "description" to div's containing descriptions docs: define style of code blocks inside descriptions libvirt.c: add 2 spaces of indentation to example code of virStreamSend libvirt.c: indent code of virDomainGetMemoryParameters's documentation docs: generate links from plain text documentation docs/libvirt.css | 7 +++ docs/newapi.xsl | 121 +++++++++++++++++++++++++++++++++++++++----------- src/libvirt.c | 130 +++++++++++++++++++++++++++--------------------------- 3 files changed, 167 insertions(+), 91 deletions(-) -- 1.7.9.5

3 18

[libvirt] [PATCH 0/2] Properly check the return value of virPortAllocatorAcquire
by Ján Tomko 31 Oct '13

31 Oct '13

Ján Tomko (2): Add exit_monitor label to qemuMigrationStartNBDServer Report an error if port range is exhausted src/qemu/qemu_migration.c | 25 ++++++++++++++++--------- src/qemu/qemu_process.c | 10 ++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) -- 1.8.1.5

2 5

[libvirt] [PATCH]docs: fix typos in formatnwfilter
by Chen Hanxiao 30 Oct '13

30 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> s/initated/initiated Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- docs/formatnwfilter.html.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in index 5e1c6bb..ec20300 100644 --- a/docs/formatnwfilter.html.in +++ b/docs/formatnwfilter.html.in @@ -2079,9 +2079,9 @@ To enable traffic for TCP ports 22 and 80 we will add 2 rules to enable this type of traffic. To allow the VM to send ping traffic we will add a rule for ICMP traffic. For simplicity reasons - we allow general ICMP traffic to be initated from the VM, not + we allow general ICMP traffic to be initiated from the VM, not just ICMP echo request and response messages. To then - disallow all other traffic to reach or be initated by the + disallow all other traffic to reach or be initiated by the VM we will then need to add a rule that drops all other traffic. Assuming our VM is called <i>test</i> and the interface we want to associate our filter with is called <i>eth0</i>, -- 1.8.2.1

2 1

[libvirt] [PATCH]lxc: improve readability of lxcContainer[Send|Waitfor]Continue
by Chen Hanxiao 30 Oct '13

30 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Currently, lxcContainer[Send|Waitfor]Continue only tell us 'fd', but we had to deal with the interaction between lxc_[container|controller|process]. This patch adds parameters to identify the caller. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 16 +++++++++------- src/lxc/lxc_container.h | 4 ++-- src/lxc/lxc_controller.c | 6 +++--- src/lxc/lxc_process.c | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index ed1fe29..c7371ca 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -351,19 +351,20 @@ cleanup: /** * lxcContainerSendContinue: * @control: control FD to child + * @caller: function invoker * * Sends the continue message via the socket pair stored in the vm * structure. * * Returns 0 on success or -1 in case of error */ -int lxcContainerSendContinue(int control) +int lxcContainerSendContinue(int control, const char *caller) { int rc = -1; lxc_message_t msg = LXC_CONTINUE_MSG; int writeCount = 0; - VIR_DEBUG("Send continue on fd %d", control); + VIR_DEBUG("Send continue on fd %d by %s", control, caller); writeCount = safewrite(control, &msg, sizeof(msg)); if (writeCount != sizeof(msg)) { goto error_out; @@ -377,6 +378,7 @@ error_out: /** * lxcContainerWaitForContinue: * @control: Control FD from parent + * @caller: function invoker * * This function will wait for the container continue message from the * parent process. It will send this message on the socket pair stored in @@ -384,14 +386,14 @@ error_out: * * Returns 0 on success or -1 in case of error */ -int lxcContainerWaitForContinue(int control) +int lxcContainerWaitForContinue(int control, const char *caller) { lxc_message_t msg; int readLen; - VIR_DEBUG("Wait continue on fd %d", control); + VIR_DEBUG("%s wait continue on fd %d", caller, control); readLen = saferead(control, &msg, sizeof(msg)); - VIR_DEBUG("Got continue on fd %d %d", control, readLen); + VIR_DEBUG("%s got continue on fd %d %d", caller, control, readLen); if (readLen != sizeof(msg)) { if (readLen >= 0) errno = EIO; @@ -1813,7 +1815,7 @@ static int lxcContainerChild(void *data) /* Wait for controller to finish setup tasks, including * things like move of network interfaces, uid/gid mapping */ - if (lxcContainerWaitForContinue(argv->monitor) < 0) { + if (lxcContainerWaitForContinue(argv->monitor, __func__) < 0) { virReportSystemError(errno, "%s", _("Failed to read the container continue message")); goto cleanup; @@ -1880,7 +1882,7 @@ static int lxcContainerChild(void *data) if (lxcContainerDropCapabilities(!!hasReboot) < 0) goto cleanup; - if (lxcContainerSendContinue(argv->handshakefd) < 0) { + if (lxcContainerSendContinue(argv->handshakefd, __func__) < 0) { virReportSystemError(errno, "%s", _("Failed to send continue signal to controller")); goto cleanup; diff --git a/src/lxc/lxc_container.h b/src/lxc/lxc_container.h index e74a7d7..77fb2a0 100644 --- a/src/lxc/lxc_container.h +++ b/src/lxc/lxc_container.h @@ -49,8 +49,8 @@ enum { # define LXC_DEV_MAJ_FUSE 10 # define LXC_DEV_MIN_FUSE 229 -int lxcContainerSendContinue(int control); -int lxcContainerWaitForContinue(int control); +int lxcContainerSendContinue(int control, const char *caller); +int lxcContainerWaitForContinue(int control, const char *caller); int lxcContainerStart(virDomainDefPtr def, virSecurityManagerPtr securityDriver, diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 851a773..25dbbec 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -319,7 +319,7 @@ static int virLXCControllerConsoleSetNonblocking(virLXCControllerConsolePtr cons static int virLXCControllerDaemonHandshake(virLXCControllerPtr ctrl) { - if (lxcContainerSendContinue(ctrl->handshakeFd) < 0) { + if (lxcContainerSendContinue(ctrl->handshakeFd, __func__) < 0) { virReportSystemError(errno, "%s", _("error sending continue signal to daemon")); return -1; @@ -2176,13 +2176,13 @@ virLXCControllerRun(virLXCControllerPtr ctrl) if (virLXCControllerMoveInterfaces(ctrl) < 0) goto cleanup; - if (lxcContainerSendContinue(control[0]) < 0) { + if (lxcContainerSendContinue(control[0], __func__) < 0) { virReportSystemError(errno, "%s", _("Unable to send container continue message")); goto cleanup; } - if (lxcContainerWaitForContinue(containerhandshake[0]) < 0) { + if (lxcContainerWaitForContinue(containerhandshake[0], __func__) < 0) { virReportSystemError(errno, "%s", _("error receiving signal from container")); goto cleanup; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index f088e8e..de20dd0 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1264,7 +1264,7 @@ int virLXCProcessStart(virConnectPtr conn, if (virAtomicIntInc(&driver->nactive) == 1 && driver->inhibitCallback) driver->inhibitCallback(true, driver->inhibitOpaque); - if (lxcContainerWaitForContinue(handshakefds[0]) < 0) { + if (lxcContainerWaitForContinue(handshakefds[0], __func__) < 0) { char out[1024]; if (!(virLXCProcessReadLogOutput(vm, logfile, pos, out, 1024) < 0)) { -- 1.8.2.1

4 7

[libvirt] [PATCH] MacOS: Re-add support for QEMU backend
by Doug Goldstein 30 Oct '13

30 Oct '13

The QEMU backend was disabled on Mac OS X without a reason in the code and due to refactors its difficult to understand when/why it was disabled. With QEMU being supported on Mac OS X there is no reason to disable QEMU on this platform. --- configure.ac | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 1c5b168..f519cbe 100644 --- a/configure.ac +++ b/configure.ac @@ -191,10 +191,6 @@ if test $with_freebsd = yes; then with_firewalld=no fi -if test $with_osx = yes; then - with_qemu=no -fi - AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"]) AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" = "yes"]) @@ -2393,7 +2389,7 @@ fi AM_CONDITIONAL([WITH_INTERFACE], [test "$with_interface" = "yes"]) -if test $with_freebsd = yes; then +if test $with_freebsd = yes || test $with_osx = yes; then default_qemu_user=root default_qemu_group=wheel else -- 1.8.1.5

2 2

[libvirt] [PATCH] Add '+' to uid/gid printing for label processing
by John Ferlan 30 Oct '13

30 Oct '13

To ensure proper processing by virGetUserID() and virGetGroupID() of a uid/gid add a "+" prior to the uid/gid to denote it's really a uid/gid for the label. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/security/security_dac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 019c789..cb7d322 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -60,7 +60,7 @@ virSecurityDACSetUserAndGroup(virSecurityManagerPtr mgr, priv->user = user; priv->group = group; - if (virAsprintf(&priv->baselabel, "%u:%u", + if (virAsprintf(&priv->baselabel, "+%u:+%u", (unsigned int) user, (unsigned int) group) < 0) return -1; @@ -1064,7 +1064,7 @@ virSecurityDACGenLabel(virSecurityManagerPtr mgr, } break; case VIR_DOMAIN_SECLABEL_DYNAMIC: - if (virAsprintf(&seclabel->label, "%u:%u", + if (virAsprintf(&seclabel->label, "+%u:+%u", (unsigned int) priv->user, (unsigned int) priv->group) < 0) return rc; -- 1.8.3.1

2 2

[libvirt] [PATCH] storage: fix incorrect typedef
by Eric Blake 30 Oct '13

30 Oct '13

The rbd code had a confusing typedef ending in Ptr that was not actually a pointer, which made the rest of the code harder to read. This fixes things to actually pass by pointer rather than by copy. * src/storage/storage_backend_rbd.c (virStorageBackendStatePtr): Fix typedef. (virStorageBackendRBDOpenRADOSConn) (virStorageBackendRBDCloseRADOSConn) (volStorageBackendRBDRefreshVolInfo) (virStorageBackendRBDRefreshPool, virStorageBackendRBDDeleteVol) (virStorageBackendRBDCreateVol, virStorageBackendRBDRefreshVol) (virStorageBackendRBDResizeVol): Fix fallout. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- A quick git grep found no other instances of a '...Ptr' typedef that wasn't actually a pointer; but I can also add a syntax check to prevent that mistake if desired. src/storage/storage_backend_rbd.c | 46 +++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 60b48c2..4e18bf9 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -44,9 +44,9 @@ struct _virStorageBackendRBDState { }; typedef struct _virStorageBackendRBDState virStorageBackendRBDState; -typedef virStorageBackendRBDState virStorageBackendRBDStatePtr; +typedef virStorageBackendRBDState *virStorageBackendRBDStatePtr; -static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr *ptr, +static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr, virConnectPtr conn, virStoragePoolObjPtr pool) { @@ -223,21 +223,21 @@ static int virStorageBackendRBDCloseRADOSConn(virStorageBackendRBDStatePtr ptr) { int ret = 0; - if (ptr.ioctx != NULL) { + if (ptr->ioctx != NULL) { VIR_DEBUG("Closing RADOS IoCTX"); - rados_ioctx_destroy(ptr.ioctx); + rados_ioctx_destroy(ptr->ioctx); ret = -1; } - ptr.ioctx = NULL; + ptr->ioctx = NULL; - if (ptr.cluster != NULL) { + if (ptr->cluster != NULL) { VIR_DEBUG("Closing RADOS connection"); - rados_shutdown(ptr.cluster); + rados_shutdown(ptr->cluster); ret = -2; } - ptr.cluster = NULL; + ptr->cluster = NULL; - time_t runtime = time(0) - ptr.starttime; + time_t runtime = time(0) - ptr->starttime; VIR_DEBUG("RADOS connection existed for %ld seconds", runtime); return ret; @@ -249,7 +249,7 @@ static int volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol, { int ret = -1; rbd_image_t image; - if (rbd_open(ptr.ioctx, vol->name, &image, NULL) < 0) { + if (rbd_open(ptr->ioctx, vol->name, &image, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to open the RBD image '%s'"), vol->name); @@ -298,7 +298,7 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn, int ret = -1; int len = -1; char *name, *names = NULL; - virStorageBackendRBDStatePtr ptr; + virStorageBackendRBDState ptr; ptr.cluster = NULL; ptr.ioctx = NULL; @@ -373,7 +373,7 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn, name += strlen(name) + 1; - if (volStorageBackendRBDRefreshVolInfo(vol, pool, ptr) < 0) { + if (volStorageBackendRBDRefreshVolInfo(vol, pool, &ptr) < 0) { virStorageVolDefFree(vol); goto cleanup; } @@ -388,7 +388,7 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn, cleanup: VIR_FREE(names); - virStorageBackendRBDCloseRADOSConn(ptr); + virStorageBackendRBDCloseRADOSConn(&ptr); return ret; } @@ -398,7 +398,7 @@ static int virStorageBackendRBDDeleteVol(virConnectPtr conn, unsigned int flags) { int ret = -1; - virStorageBackendRBDStatePtr ptr; + virStorageBackendRBDState ptr; ptr.cluster = NULL; ptr.ioctx = NULL; @@ -431,7 +431,7 @@ static int virStorageBackendRBDDeleteVol(virConnectPtr conn, ret = 0; cleanup: - virStorageBackendRBDCloseRADOSConn(ptr); + virStorageBackendRBDCloseRADOSConn(&ptr); return ret; } @@ -439,7 +439,7 @@ static int virStorageBackendRBDCreateVol(virConnectPtr conn, virStoragePoolObjPtr pool, virStorageVolDefPtr vol) { - virStorageBackendRBDStatePtr ptr; + virStorageBackendRBDState ptr; ptr.cluster = NULL; ptr.ioctx = NULL; int order = 0; @@ -475,14 +475,14 @@ static int virStorageBackendRBDCreateVol(virConnectPtr conn, goto cleanup; } - if (volStorageBackendRBDRefreshVolInfo(vol, pool, ptr) < 0) { + if (volStorageBackendRBDRefreshVolInfo(vol, pool, &ptr) < 0) { goto cleanup; } ret = 0; cleanup: - virStorageBackendRBDCloseRADOSConn(ptr); + virStorageBackendRBDCloseRADOSConn(&ptr); return ret; } @@ -490,7 +490,7 @@ static int virStorageBackendRBDRefreshVol(virConnectPtr conn, virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, virStorageVolDefPtr vol) { - virStorageBackendRBDStatePtr ptr; + virStorageBackendRBDState ptr; ptr.cluster = NULL; ptr.ioctx = NULL; int ret = -1; @@ -507,14 +507,14 @@ static int virStorageBackendRBDRefreshVol(virConnectPtr conn, goto cleanup; } - if (volStorageBackendRBDRefreshVolInfo(vol, pool, ptr) < 0) { + if (volStorageBackendRBDRefreshVolInfo(vol, pool, &ptr) < 0) { goto cleanup; } ret = 0; cleanup: - virStorageBackendRBDCloseRADOSConn(ptr); + virStorageBackendRBDCloseRADOSConn(&ptr); return ret; } @@ -524,7 +524,7 @@ static int virStorageBackendRBDResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, unsigned long long capacity, unsigned int flags) { - virStorageBackendRBDStatePtr ptr; + virStorageBackendRBDState ptr; ptr.cluster = NULL; ptr.ioctx = NULL; rbd_image_t image = NULL; @@ -563,7 +563,7 @@ static int virStorageBackendRBDResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, cleanup: if (image != NULL) rbd_close(image); - virStorageBackendRBDCloseRADOSConn(ptr); + virStorageBackendRBDCloseRADOSConn(&ptr); return ret; } -- 1.8.3.1

2 2

[libvirt] [PATCH] apparmor: Fix typo in function name in driver struct initialization
by Peter Krempa 30 Oct '13

30 Oct '13

Commit 64a68a4a introduced a typo in the initialization of the apparmor driver structure breaking the build with apparmor enabled. --- src/security/security_apparmor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 776a470..a9f04d2 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -979,5 +979,5 @@ virSecurityDriver virAppArmorSecurityDriver = { .domainGetSecurityMountOptions = AppArmorGetMountOptions, - .getBaseLabel = AppArmoryGetBaseLabel, + .getBaseLabel = AppArmorGetBaseLabel, }; -- 1.8.3.2

2 2

[libvirt] [PATCH] LXC: don't free tty before using it in lxcContainerSetupDevices
by Gao feng 29 Oct '13

29 Oct '13

Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- .gnulib | 2 +- src/lxc/lxc_container.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gnulib b/.gnulib index 8f74258..4a5ee89 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 8f7425866463f994538584d1dd7211603b8b0550 +Subproject commit 4a5ee89c8a8be7350a8fd8ca1bacb196a190e492 diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 1ec59d5..255c711 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1042,10 +1042,10 @@ static int lxcContainerSetupDevices(char **ttyPaths, size_t nttyPaths) if (virAsprintf(&tty, "/dev/tty%zu", i+1) < 0) return -1; if (symlink(ttyPaths[i], tty) < 0) { - VIR_FREE(tty); virReportSystemError(errno, _("Failed to symlink %s to %s"), ttyPaths[i], tty); + VIR_FREE(tty); return -1; } VIR_FREE(tty); -- 1.8.3.1

2 1

[libvirt] [PATCH v2] Fix race condition reconnecting to vms & loading configs
by Daniel P. Berrange 29 Oct '13

29 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The following sequence 1. Define a persistent QMEU guest 2. Start the QEMU guest 3. Stop libvirtd 4. Kill the QEMU process 5. Start libvirtd 6. List persistent guets At the last step, the previously running persistent guest will be missing. This is because of a race condition in the QEMU driver startup code. It does 1. Load all VM state files 2. Spawn thread to reconnect to each VM 3. Load all VM config files Only at the end of step 3, does the 'virDomainObjPtr' get marked as "persistent". There is therefore a window where the thread reconnecting to the VM will remove the persistent VM from the list. The easy fix is to simply switch the order of steps 2 & 3. In addition to this though, we must only attempt to reconnect to a VM which had a non-zero PID loaded from its state file. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_driver.c | 3 +-- src/qemu/qemu_process.c | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c613967..9c3daad 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -816,8 +816,6 @@ qemuStateInitialize(bool privileged, conn = virConnectOpen(cfg->uri); - qemuProcessReconnectAll(conn, qemu_driver); - /* Then inactive persistent configs */ if (virDomainObjListLoadAllConfigs(qemu_driver->domains, cfg->configDir, @@ -828,6 +826,7 @@ qemuStateInitialize(bool privileged, NULL, NULL) < 0) goto error; + qemuProcessReconnectAll(conn, qemu_driver); virDomainObjListForEach(qemu_driver->domains, qemuDomainSnapshotLoad, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b278742..bdffdf8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3253,6 +3253,9 @@ qemuProcessReconnectHelper(virDomainObjPtr obj, struct qemuProcessReconnectData *src = opaque; struct qemuProcessReconnectData *data; + if (!obj->pid) + return 0; + if (VIR_ALLOC(data) < 0) return -1; -- 1.8.3.1

2 1

[libvirt] [PATCH] Fix leak of objects when reconnecting to QEMU instances
by Daniel P. Berrange 29 Oct '13

29 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The 'error' cleanup block in qemuProcessReconnect() had a 'return' statement in the middle of it. This caused a leak of virConnectPtr & virQEMUDriverConfigPtr instances. This was identified because netcf recently started checking its refcount in libvirtd shutdown: netcfStateCleanup:109 : internal error: Attempt to close netcf state driver with open connections Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_process.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 354e079..b278742 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3219,10 +3219,7 @@ error: if (!virDomainObjIsActive(obj)) { if (virObjectUnref(obj)) virObjectUnlock(obj); - return; - } - - if (virObjectUnref(obj)) { + } else if (virObjectUnref(obj)) { /* We can't get the monitor back, so must kill the VM * to remove danger of it ending up running twice if * user tries to start it again later -- 1.8.3.1

2 1

[libvirt] [PATCH] Push RPM deps down into libvirt-daemon-driver-XXXX sub-RPMs
by Daniel P. Berrange 29 Oct '13

29 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> For inexplicable reasons, many of the 3rd party package deps were left against the 'libvirt-daemon' RPM when the drivers were split out. This makes a minimal install heavier that it should be. Push them all down into libvirt-daemon-driver-XXX so they're only pulled in when truely needed With this change applied, a minimal install of just the libvirt-daemon-driver-lxc RPM is reduced by 41 MB on a Fedora 19 host. Fedora cloud team has requested that we cut down minimal libvirt install size as much as is possible. Fixing these deps is the biggest win without coding work, per: https://bugzilla.redhat.com/show_bug.cgi?id=1012198 Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt.spec.in | 135 +++++++++++++++++++++++++++----------------------------- 1 file changed, 66 insertions(+), 69 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index fb4d46f..48feea5 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -657,31 +657,6 @@ Requires: avahi Requires: avahi-libs %endif %endif - %if %{with_network} -Requires: dnsmasq >= 2.41 -Requires: radvd - %endif - %if %{with_network} || %{with_nwfilter} -Requires: iptables -Requires: iptables-ipv6 - %endif - %if %{with_nwfilter} -Requires: ebtables - %endif - %if %{with_netcf} && (0%{?fedora} >= 18 || 0%{?rhel} >= 7) -Requires: netcf-libs >= 0.2.2 - %endif -# needed for device enumeration - %if %{with_hal} -Requires: hal - %endif - %if %{with_udev} - %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -Requires: systemd >= 185 - %else -Requires: udev >= 145 - %endif - %endif %if %{with_polkit} %if 0%{?fedora} >= 12 || 0%{?rhel} >=6 Requires: polkit >= 0.93 @@ -689,50 +664,6 @@ Requires: polkit >= 0.93 Requires: PolicyKit >= 0.6 %endif %endif - %if %{with_storage_fs} -Requires: nfs-utils -# For mkfs -Requires: util-linux -# For glusterfs - %if 0%{?fedora} >= 11 -Requires: glusterfs-client >= 2.0.1 - %endif - %endif - %if %{with_qemu} -# From QEMU RPMs -Requires: /usr/bin/qemu-img -# For image compression -Requires: gzip -Requires: bzip2 -Requires: lzop -Requires: xz - %else - %if %{with_xen} -# From Xen RPMs -Requires: /usr/sbin/qcow-create - %endif - %endif - %if %{with_storage_lvm} -# For LVM drivers -Requires: lvm2 - %endif - %if %{with_storage_iscsi} -# For ISCSI driver -Requires: iscsi-initiator-utils - %endif - %if %{with_storage_disk} -# For disk driver -Requires: parted -Requires: device-mapper - %endif - %if %{with_storage_mpath} -# For multipath support -Requires: device-mapper - %endif - %if %{with_storage_sheepdog} -# For Sheepdog support -Requires: sheepdog - %endif %if %{with_cgconfig} Requires: libcgroup %endif @@ -788,6 +719,10 @@ Network filter configuration files for cleaning guest traffic Summary: Network driver plugin for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} +Requires: dnsmasq >= 2.41 +Requires: radvd +Requires: iptables +Requires: iptables-ipv6 %description daemon-driver-network The network driver plugin for the libvirtd daemon, providing @@ -801,6 +736,9 @@ bridge capabilities. Summary: Nwfilter driver plugin for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} +Requires: iptables +Requires: iptables-ipv6 +Requires: ebtables %description daemon-driver-nwfilter The nwfilter driver plugin for the libvirtd daemon, providing @@ -814,6 +752,17 @@ iptables and ip6tables capabilities Summary: Nodedev driver plugin for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} +# needed for device enumeration + %if %{with_hal} +Requires: hal + %endif + %if %{with_udev} + %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 +Requires: systemd >= 185 + %else +Requires: udev >= 145 + %endif + %endif %description daemon-driver-nodedev The nodedev driver plugin for the libvirtd daemon, providing @@ -827,6 +776,9 @@ capabilities. Summary: Interface driver plugin for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} + %if %{with_netcf} && (0%{?fedora} >= 18 || 0%{?rhel} >= 7) +Requires: netcf-libs >= 0.2.2 + %endif %description daemon-driver-interface The interface driver plugin for the libvirtd daemon, providing @@ -850,6 +802,45 @@ an implementation of the secret key APIs. Summary: Storage driver plugin for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} + %if %{with_storage_fs} +Requires: nfs-utils +# For mkfs +Requires: util-linux +# For glusterfs + %if 0%{?fedora} >= 11 +Requires: glusterfs-client >= 2.0.1 + %endif + %endif + %if %{with_storage_lvm} +# For LVM drivers +Requires: lvm2 + %endif + %if %{with_storage_iscsi} +# For ISCSI driver +Requires: iscsi-initiator-utils + %endif + %if %{with_storage_disk} +# For disk driver +Requires: parted +Requires: device-mapper + %endif + %if %{with_storage_mpath} +# For multipath support +Requires: device-mapper + %endif + %if %{with_storage_sheepdog} +# For Sheepdog support +Requires: sheepdog + %endif + %if %{with_qemu} +# From QEMU RPMs +Requires: /usr/bin/qemu-img + %else + %if %{with_xen} +# From Xen RPMs +Requires: /usr/sbin/qcow-create + %endif + %endif %description daemon-driver-storage The storage driver plugin for the libvirtd daemon, providing @@ -865,6 +856,12 @@ Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} # There really is a hard cross-driver dependency here Requires: libvirt-daemon-driver-network = %{version}-%{release} +Requires: /usr/bin/qemu-img +# For image compression +Requires: gzip +Requires: bzip2 +Requires: lzop +Requires: xz %description daemon-driver-qemu The qemu driver plugin for the libvirtd daemon, providing -- 1.8.3.1

2 1

[libvirt] [PATCH v4 0/3] expose baselabel for each sec model/virt type
by Giuseppe Scrivano 29 Oct '13

29 Oct '13

Now each security model can define its own base label, that describes the default security context used by libvirt to run an hypervisor process. This information is exposed to users trough the host capabilities XML. *v4 major changes - Refactor virSecurityDACSetUser and virSecurityDACSetGroup in a separate patch - virSecurityManagerGetBaseLabel never causes a VIR_ERR_NO_SUPPORT error. *v3 major changes - support LXC - merge virSecurityDACSetUser and virSecurityDACSetGroup in virSecurityDACSetUserAndGroup - DAC sets the baselabel in virSecurityDACSetUserAndGroup - Use virDomainVirtTypeToString instead of hardcoding the name Giuseppe Scrivano (3): security: use a single function to set DAC user and group security: add new internal function "virSecurityManagerGetBaseLabel" capabilities: add baselabel per sec driver/virt type to secmodel docs/schemas/capability.rng | 8 ++++ src/conf/capabilities.c | 60 +++++++++++++++++++++++++++- src/conf/capabilities.h | 14 +++++++ src/libvirt_private.syms | 2 + src/lxc/lxc_conf.c | 10 ++++- src/qemu/qemu_conf.c | 21 ++++++++-- src/security/security_apparmor.c | 8 ++++ src/security/security_dac.c | 34 +++++++++++----- src/security/security_dac.h | 7 ++-- src/security/security_driver.h | 4 ++ src/security/security_manager.c | 21 +++++++++- src/security/security_manager.h | 2 + src/security/security_nop.c | 10 +++++ src/security/security_selinux.c | 12 ++++++ src/security/security_stack.c | 9 +++++ tests/capabilityschemadata/caps-qemu-kvm.xml | 2 + tests/capabilityschemadata/caps-test3.xml | 2 + 17 files changed, 203 insertions(+), 23 deletions(-) -- 1.8.3.1

3 7

[libvirt] [PATCH] virsh: new environment variable VIRSH_HISTSIZE
by Pavel Raiskup 29 Oct '13

29 Oct '13

Allow adjust the number of commands to remember in the command history. * tools/virsh.c (vshReadlineInit): Read and sanity the VIRSH_HISTSIZE variable. (VIRSH_HISTSIZE_MAX): New constant. * tools/virsh.pod: Document VIRSH_HISTSIZE variable. --- tools/virsh.c | 17 ++++++++++++++++- tools/virsh.pod | 5 +++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/tools/virsh.c b/tools/virsh.c index bad78c9..58bc841 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2748,11 +2748,14 @@ vshReadlineCompletion(const char *text, int start, return matches; } +#define VIRSH_HISTSIZE_MAX 500000 static int vshReadlineInit(vshControl *ctl) { char *userdir = NULL; + int max_history = 500; + char *histsize_str; /* Allow conditional parsing of the ~/.inputrc file. */ rl_readline_name = "virsh"; @@ -2761,7 +2764,19 @@ vshReadlineInit(vshControl *ctl) rl_attempted_completion_function = vshReadlineCompletion; /* Limit the total size of the history buffer */ - stifle_history(500); + if ((histsize_str = getenv("VIRSH_HISTSIZE"))) { + if (virStrToLong_i(histsize_str, NULL, 10, &max_history) < 0) { + vshError(ctl, "%s", _("Bad $VIRSH_HISTSIZE value.")); + VIR_FREE(userdir); + return -1; + } else if (max_history > VIRSH_HISTSIZE_MAX || max_history < 0) { + vshError(ctl, _("$VIRSH_HISTSIZE value should be between 0 and %d"), + VIRSH_HISTSIZE_MAX); + VIR_FREE(userdir); + return -1; + } + } + stifle_history(max_history); /* Prepare to read/write history from/to the $XDG_CACHE_HOME/virsh/history file */ userdir = virGetUserCacheDirectory(); diff --git a/tools/virsh.pod b/tools/virsh.pod index 23d17c4..dac9a08 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3349,6 +3349,11 @@ The editor to use by the B<edit> and related options. The editor to use by the B<edit> and related options, if C<VISUAL> is not set. +=item VIRSH_HISTSIZE + +The number of commands to remember in the command history. The +default value is 500. + =item LIBVIRT_DEBUG=LEVEL Turn on verbose debugging of all libvirt API calls. Valid levels are -- 1.8.3.1

3 4

[libvirt] [PATCH 0/2 v2] improve auto complete in virsh
by Chen Hanxiao 29 Oct '13

29 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Chen Hanxiao (2): [libvirt]virsh: introduce member excludeOption in vshCmdOptDef and improve auto complete with it [libvirt]virsh: set --shareable and --mode's new member: excludeOption tools/virsh-domain.c | 6 ++++-- tools/virsh.c | 34 ++++++++++++++++++++++++++++++++++ tools/virsh.h | 1 + 3 files changed, 39 insertions(+), 2 deletions(-) -- 1.8.2.1

2 4

[libvirt] [PATCH v2 REPOST 0/6] Try to fix selinux/securityfs mount handling in LXC
by Daniel P. Berrange 29 Oct '13

29 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Update of https://www.redhat.com/archives/libvir-list/2013-October/msg00270.html Previously I just re-sent the one patch needing changes. This time I am reposting the whole series after rebasing. Daniel P. Berrange (6): Add virFileIsMountPoint function Remove unused 'opts' field from LXC basic mounts struct Remove pointless 'srcpath' variable in lxcContainerMountBasicFS Remove duplicate entries in lxcBasicMounts array Add flag to lxcBasicMounts to control use in user namespaces Skip any files which are not mounted on the host src/libvirt_private.syms | 1 + src/lxc/lxc_container.c | 86 +++++++++++++++++++++++++++++------------------- src/util/virfile.c | 50 ++++++++++++++++++++++++++++ src/util/virfile.h | 2 ++ 4 files changed, 105 insertions(+), 34 deletions(-) -- 1.8.3.1

2 8

[libvirt] Schedule for next release
by Daniel Veillard 29 Oct '13

29 Oct '13

Assuming we want to release around the end of the month means we ought to enter freeze next week around the 24 or 25, but I know I will be very busy and have a hard time on those days. So potentially I will try to do the freeze on the Saturday 26 for a release around Nov 1st, but there is a slight risk that the release of 1.1.4 will be postponed if I fail to this while in Edinburgh (BTW a lot of libvirt developpers will be there around the KVM forum and LinuxCon events). Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

3 3

[libvirt] [PATCH] Quick fix for config-demo.py
by Ian Main 29 Oct '13

29 Oct '13

I guess this must have been changed and the demo not updated. Fix the demo so it uses the right value. Signed-off-by: Ian Main <imain(a)redhat.com> --- examples/config-demo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/config-demo.py b/examples/config-demo.py index 367d99a..c28d8b9 100644 --- a/examples/config-demo.py +++ b/examples/config-demo.py @@ -28,7 +28,7 @@ disk.set_type(LibvirtGConfig.DomainDiskType.FILE) disk.set_guest_device_type(LibvirtGConfig.DomainDiskGuestDeviceType.DISK) disk.set_source("/tmp/foo/bar") disk.set_driver_name("qemu") -disk.set_driver_format(LibvirtGConfig.DriverType.QCOW2) +disk.set_driver_format(LibvirtGConfig.DomainDiskFormat.QCOW2) disk.set_target_bus(LibvirtGConfig.DomainDiskBus.IDE) disk.set_target_dev("hda") domain.add_device(disk) -- 1.8.1.4

3 3

[libvirt] [PATCH v2 REPOST] Try to fix selinux/securityfs mount handling in LXC
by Daniel P. Berrange 28 Oct '13

28 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Update of https://www.redhat.com/archives/libvir-list/2013-October/msg00270.html Previously I just re-sent the one patch needing changes. This time I am reposting the whole series after rebasing. Daniel P. Berrange (1): Skip any files which are not mounted on the host src/lxc/lxc_container.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) -- 1.8.3.1

1 1

[libvirt] [PATCH] Don't update dom->persistent without lock held
by Daniel P. Berrange 28 Oct '13

28 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> virDomainObjListLoadAllConfigs sets dom->persistent after having released its lock on the domain object. This exposes a possible race condition. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 562d98b..51c4e29 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17373,9 +17373,9 @@ virDomainObjListLoadAllConfigs(virDomainObjListPtr doms, notify, opaque); if (dom) { - virObjectUnlock(dom); if (!liveStatus) dom->persistent = 1; + virObjectUnlock(dom); } } -- 1.8.3.1

2 1

[libvirt] [PATCH]lxc: don't always print debug log in lxcContainerSetID
by Chen Hanxiao 28 Oct '13

28 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> lxcContainerSetID is used for user namespace. If we don't enable user namespace, don't print debug log. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 56df69e..ed1fe29 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -420,12 +420,14 @@ static int lxcContainerSetID(virDomainDefPtr def) * for this container. And user namespace is only enabled * when nuidmap&ngidmap is not zero */ - VIR_DEBUG("Set UID/GID to 0/0"); - if (def->idmap.nuidmap && - virSetUIDGID(0, 0, NULL, 0) < 0) { - virReportSystemError(errno, "%s", - _("setuid or setgid failed")); - return -1; + if (def->idmap.nuidmap) { + if (virSetUIDGID(0, 0, NULL, 0) < 0) { + virReportSystemError(errno, "%s", + _("setuid or setgid failed")); + return -1; + } else { + VIR_DEBUG("Set UID/GID to 0/0"); + } } return 0; -- 1.8.2.1

2 3

[libvirt] [PATCH 0/2] improve auto complete in virsh
by Chen Hanxiao 28 Oct '13

28 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Chen Hanxiao (2): [libvirt]virsh: introduce member exclude_option in vshCmdOptDef and improve auto complete with it [libvirt]virsh: set --shareable and --mode's new member: exclude_option tools/virsh-domain.c | 6 ++++-- tools/virsh.c | 8 ++++++++ tools/virsh.h | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) -- 1.8.2.1

2 4

Re: [libvirt] /dev/tty node in containers
by Daniel P. Berrange 25 Oct '13

25 Oct '13

On Thu, Oct 24, 2013 at 12:10:53PM -0700, Sukadev Bhattiprolu wrote: > > Is there a reason libvirt does not create /dev/tty in a LXC container ? You're not mentioning what version of libvirt you're using. This was added recently commit 9a0ac6d9c21b914f887d2a1e0051b5beffa81bd7 Author: Richard Weinberger <richard(a)nod.at> Date: Tue Jul 9 11:05:14 2013 +0100 LXC: Create /dev/tty within a container Many applications use /dev/tty to read from stdin. e.g. zypper on openSUSE. Let's create this device node to unbreak those applications. As /dev/tty is a synonym for the current controlling terminal it cannot harm the host or any other containers. Signed-off-by: Richard Weinberger <richard(a)nod.at> Available in release 1.1.1 or later. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH]doc: fix a typo in formatdomain
by Chen Hanxiao 25 Oct '13

25 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> s/no/not Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8ad755b..aa90701 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3163,7 +3163,7 @@ parameters in its <code><parameters></code> element - an <code>interfaceid</code> which is a standard uuid used to uniquely identify this particular interface to Open vSwitch (if - you do no specify one, a random interfaceid will be generated + you do not specify one, a random interfaceid will be generated for you when you first define the interface), and an optional <code>profileid</code> which is sent to Open vSwitch as the interfaces "port-profile". -- 1.8.2.1

2 1

[libvirt] [PATCH 0/3] Add complete blkiotune support for per-device with blkio cgroup
by Guan Qiang 25 Oct '13

25 Oct '13

From: Guan Qiang <hzguanqiang(a)corp.netease.com> The patches add a complete blkiotune support per-device with blkio cgroup for both lxc or qemu driver, by extending the existed 'domainSetBlkioParameters' and 'domainGetBlkioParameters' interface. Beside device weight, read/write bps and iops throttle can be set per-device with these patches. Virsh command 'blkiotune' is extended to support the above function too. Guan Qiang (3): qemu: add blkiotune support for device iops and bps throttle setting lxc: add blkiotune support for per device blkiotune: add virsh support for blkiotune interface docs/formatdomain.html.in | 8 + docs/schemas/domaincommon.rng | 28 +- include/libvirt/libvirt.h.in | 40 ++ src/conf/domain_conf.c | 115 ++- src/conf/domain_conf.h | 16 +- src/libvirt_private.syms | 4 +- src/lxc/lxc_cgroup.c | 9 +- src/lxc/lxc_driver.c | 743 +++++++++++++++++++- src/qemu/qemu_cgroup.c | 10 +- src/qemu/qemu_driver.c | 579 +++++++++++++-- src/util/vircgroup.c | 79 ++- src/util/vircgroup.h | 8 +- .../qemuxml2argv-blkiotune-device.xml | 4 + tools/virsh-domain.c | 64 ++ tools/virsh.pod | 32 +- 15 files changed, 1614 insertions(+), 125 deletions(-) -- 1.7.9.5

2 4

Re: [libvirt] [Qemu-devel] [PATCH 14/17] add new RanState RAN_STATE_FLIPPING_MIGRATE
by Eric Blake 24 Oct '13

24 Oct '13

On 10/22/2013 04:25 AM, Lei Li wrote: > Introduce new RanState RAN_STATE_FLIPPING_MIGRATE and > add it to runstate_needs_reset(). > > Signed-off-by: Lei Li <lilei(a)linux.vnet.ibm.com> > --- > qapi-schema.json | 11 +++++++---- > vl.c | 12 +++++++++++- > 2 files changed, 18 insertions(+), 5 deletions(-) > > diff --git a/qapi-schema.json b/qapi-schema.json > index 523a5b2..8178d0c 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -176,12 +176,15 @@ > # @watchdog: the watchdog action is configured to pause and has been triggered > # > # @guest-panicked: guest has been panicked as a result of guest OS panic > +# > +# @flipping-migrate: guest is paused to start unix_page_flipping migration > +# process We probably ought to enhance the docs to mention '(since 1.8)' for this field (and likewise for other enum values added after the original introduction of the enum). Last time we added a new user-visible runstate, it broke migration with older libvirt versions that weren't prepared to see the new state (hmm, I need to check if libvirt has fixed that in the meantime; adding a cc...). Paolo's advice at the time was that it is okay to require a new libvirt when using a new qemu, and that libvirt should be taught to treat all unknown RunState as if they were 'running'; although for this particular addition it might be nicer to have libvirt lump 'inmigrate' and 'flipping-migrate' to the same usage. > ## > { 'enum': 'RunState', > - 'data': [ 'debug', 'inmigrate', 'internal-error', 'io-error', 'paused', > - 'postmigrate', 'prelaunch', 'finish-migrate', 'restore-vm', > - 'running', 'save-vm', 'shutdown', 'suspended', 'watchdog', > - 'guest-panicked' ] } > + 'data': [ 'debug', 'flipping-migrate', 'inmigrate', 'internal-error', > + 'io-error', 'paused', 'postmigrate', 'prelaunch', 'finish-migrate', > + 'restore-vm', 'running', 'save-vm', 'shutdown', 'suspended', > + 'watchdog', 'guest-panicked' ] } > -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 1

Re: [libvirt] [Qemu-devel] [PATCH 14/17] add new RanState RAN_STATE_FLIPPING_MIGRATE
by Eric Blake 24 Oct '13

24 Oct '13

On 10/22/2013 07:28 AM, Lei Li wrote: >>> # @guest-panicked: guest has been panicked as a result of guest OS >>> panic >>> +# >>> +# @flipping-migrate: guest is paused to start unix_page_flipping >>> migration >>> +# process >> We probably ought to enhance the docs to mention '(since 1.8)' for this >> field (and likewise for other enum values added after the original >> introduction of the enum). > > Hi Eric, > > Sure, will do. > > BTW, I was hoping this feature could be accepted and merged to QEMU 1.7 > release. http://wiki.qemu.org/Planning/1.7 Soft freeze has already happened, so it's up to the maintainers whether there is still time to be adding this feature in 1.7 - but yes, that would affect the tag you list in your docs. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] [PATCH] Avoid Coverity DEADCODE warning
by John Ferlan 24 Oct '13

24 Oct '13

Commit '922b7fda' resulted in two DEADCODE warnings from Coverity in remoteDispatchAuthPolkit and virAccessDriverPolkitFormatProcess. Commit '604ae657' modified the daemon.c code to remove the deadcode issue, but did not do so for viracessdriverpolkit.c. This just mimics the same changes Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/access/viraccessdriverpolkit.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdriverpolkit.c index ff82583..b9907ba 100644 --- a/src/access/viraccessdriverpolkit.c +++ b/src/access/viraccessdriverpolkit.c @@ -76,8 +76,9 @@ virAccessDriverPolkitFormatProcess(const char *actionid) const char *callerTime = NULL; const char *callerUid = NULL; char *ret = NULL; - bool supportsuid = false; - static bool polkitInsecureWarned; +#ifndef PKCHECK_SUPPORTS_UID + static bool polkitInsecureWarned = false; +#endif if (!identity) { virAccessError(VIR_ERR_ACCESS_DENIED, @@ -109,19 +110,17 @@ virAccessDriverPolkitFormatProcess(const char *actionid) } #ifdef PKCHECK_SUPPORTS_UID - supportsuid = true; -#endif - if (supportsuid) { - if (virAsprintf(&ret, "%s,%s,%s", callerPid, callerTime, callerUid) < 0) - goto cleanup; - } else { - if (!polkitInsecureWarned) { - VIR_WARN("No support for caller UID with pkcheck. This deployment is known to be insecure."); - polkitInsecureWarned = true; - } - if (virAsprintf(&ret, "%s,%s", callerPid, callerTime) < 0) - goto cleanup; + if (virAsprintf(&ret, "%s,%s,%s", callerPid, callerTime, callerUid) < 0) + goto cleanup; +#else + if (!polkitInsecureWarned) { + VIR_WARN("No support for caller UID with pkcheck. " + "This deployment is known to be insecure."); + polkitInsecureWarned = true; } + if (virAsprintf(&ret, "%s,%s", callerPid, callerTime) < 0) + goto cleanup; +#endif cleanup: virObjectUnref(identity); -- 1.8.3.1

3 4

[libvirt] [PATCHv2 0/2] virsh: hide 'attach-disk --shareable'
by Eric Blake 24 Oct '13

24 Oct '13

As promised here: https://www.redhat.com/archives/libvir-list/2013-October/msg01047.html Eric Blake (2): virsh: allow alias to expand to opt=value pair virsh: undocument --shareable (--mode already covers it) tests/virshtest.c | 1 + tools/virsh-domain.c | 11 ++++------ tools/virsh.c | 58 ++++++++++++++++++++++++++++++++++++++++++++-------- tools/virsh.pod | 4 ++-- 4 files changed, 57 insertions(+), 17 deletions(-) -- 1.8.3.1

3 6

[libvirt] [PATCH] libxl: Fix possible invalid read
by Martin Kletzander 24 Oct '13

24 Oct '13

According to the following valgrind output, there seems to be a invalid limit for the iterator (captured on Fedora 19): ==3945== Invalid read of size 1 ==3945== at 0x1E1FA410: libxlVmStart (libxl_driver.c:475) ==3945== by 0x1E1FAD9A: libxlDomainCreateWithFlags (libxl_driver.c:2633) ==3945== by 0x5187D46: virDomainCreate (libvirt.c:9439) ==3945== by 0x13BAA6: remoteDispatchDomainCreateHelper (remote_dispatch.h:2910) ==3945== by 0x51DE5B9: virNetServerProgramDispatch (virnetserverprogram.c:435) ==3945== by 0x51D93E7: virNetServerHandleJob (virnetserver.c:165) ==3945== by 0x50F5BF4: virThreadPoolWorker (virthreadpool.c:144) ==3945== by 0x50F5670: virThreadHelper (virthreadpthread.c:161) ==3945== by 0x8046C52: start_thread (pthread_create.c:308) ==3945== by 0x8758E1C: clone (clone.S:113) ==3945== Address 0x23424d81 is 0 bytes after a block of size 1 alloc'd ==3945== at 0x4A08121: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==3945== by 0x50B1F8C: virAllocN (viralloc.c:189) ==3945== by 0x1E1FA3CA: libxlVmStart (libxl_driver.c:468) ==3945== by 0x1E1FAD9A: libxlDomainCreateWithFlags (libxl_driver.c:2633) ==3945== by 0x5187D46: virDomainCreate (libvirt.c:9439) ==3945== by 0x13BAA6: remoteDispatchDomainCreateHelper (remote_dispatch.h:2910) ==3945== by 0x51DE5B9: virNetServerProgramDispatch (virnetserverprogram.c:435) ==3945== by 0x51D93E7: virNetServerHandleJob (virnetserver.c:165) ==3945== by 0x50F5BF4: virThreadPoolWorker (virthreadpool.c:144) ==3945== by 0x50F5670: virThreadHelper (virthreadpthread.c:161) ==3945== by 0x8046C52: start_thread (pthread_create.c:308) ==3945== by 0x8758E1C: clone (clone.S:113) ==3945== Related: https://bugzilla.redhat.com/show_bug.cgi?id=1013045 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/libxl/libxl_driver.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index e2a6d44..4928695 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -454,6 +454,7 @@ libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm) size_t cpumaplen; int vcpu; size_t i; + size_t limit; int ret = -1; if (libxlDoNodeGetInfo(driver, &nodeinfo) < 0) @@ -470,7 +471,8 @@ libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm) cpumask = (uint8_t*) def->cputune.vcpupin[vcpu]->cpumask; - for (i = 0; i < VIR_DOMAIN_CPUMASK_LEN; ++i) { + limit = MIN(VIR_DOMAIN_CPUMASK_LEN, cpumaplen); + for (i = 0; i < limit; ++i) { if (cpumask[i]) VIR_USE_CPU(cpumap, i); } -- 1.8.4

2 2

[libvirt] failed to write to disk on vm with lvm pool
by Vasiliy Tolstov 24 Oct '13

24 Oct '13

Hi all. Today i can't mkfs.ext3 inside virual machine while install it (ubuntu 13.04). Why this happening? On other node i see that virSecurityDACSetOwnership sets perms on /dev/vg/xxx and /dev/dm-xxx, but in this host this not happening. Libvirt logs: 2013-10-24 07:50:15.639+0000: 3700: info : virNetDevProbeVnetHdr:94 : Enabling IFF_VNET_HDR 2013-10-24 07:50:15.782+0000: 3700: info : virSecurityDACSetOwnership:271 : Setting DAC user and group on '/dev/vg/402' to '108:102' 2013-10-24 07:50:15.783+0000: 3700: info : virSecurityDACSetOwnership:271 : Setting DAC user and group on '/srv/ubuntu/13.04/kernel' to '108:102' 2013-10-24 07:50:15.783+0000: 3700: info : virSecurityDACSetOwnership:271 : Setting DAC user and group on '/srv/ubuntu/13.04/initrd' to '108:102' 2013-10-24 07:50:16.386+0000: 3700: warning : virCgroupMoveTask:887 : no vm cgroup in controller 3 2013-10-24 07:50:16.386+0000: 3700: warning : virCgroupMoveTask:887 : no vm cgroup in controller 4 2013-10-24 07:50:16.386+0000: 3700: warning : virCgroupMoveTask:887 : no vm cgroup in controller 6 domainxml disk: <disk type='block' device='disk'> <driver name='qemu' type='raw' cache='none' io='native' ioeventfd='on' event_idx='off'/> <source dev='/dev/vg/402'/> <target dev='vda' bus='virtio'/> <alias name='virtio-disk0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> pool xml <pool type='logical'> <name>default</name> <uuid>2a135e38-dd92-1b4d-bd82-3aafd369d207</uuid> <capacity unit='bytes'>3000454086656</capacity> <allocation unit='bytes'>386547056640</allocation> <available unit='bytes'>2613907030016</available> <source> <device path='/dev/bcache0'/> <name>vg</name> <format type='lvm2'/> </source> <target> <path>/dev/vg</path> <permissions> <mode>0711</mode> <owner>-1</owner> <group>-1</group> </permissions> </target> </pool> qemu.log: 2013-10-24 07:50:15.777+0000: starting up LC_ALL=C PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin QEMU_AUDIO_DRV=none /usr/bin/qemu-system-x86_64 -name 402 -S -M pc-1.0 -enable-kvm -m 1024 -smp 1,sockets=1,cores=1,threads=1 -uuid 0ee50ad7-8c2b-57e9-5bee-0000571d77c1 -no-user-config -nodefaults -chardev socket,id=charmonitor,path=/var/lib/libvirt/qemu/402.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc -no-reboot -no-shutdown -kernel /srv/ubuntu/13.04/kernel -initrd /srv/ubuntu/13.04/initrd -append ks=file:///ks.cfg -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 -drive file=/dev/vg/402,if=none,id=drive-virtio-disk0,format=raw,cache=none,aio=native -device virtio-blk-pci,ioeventfd=on,event_idx=off,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 -drive if=none,id=drive-ide0-1-0,readonly=on,format=raw -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 -netdev tap,fd=22,id=hostnet0,vhost=on,vhostfd=23 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:00:01:55,bus=pci.0,addr=0x3 -chardev pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -chardev spicevmc,id=charchannel0,name=vdagent -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=com.redhat.spice.0 -chardev socket,id=charchannel1,path=/var/lib/libvirt/qemu/402.agent,server,nowait -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,name=org.mighost.agent.0 -vnc 0.0.0.0:0,password -vga std -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 char device redirected to /dev/pts/0 (label charserial0) -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru jabber: vase(a)selfip.ru

1 1

[libvirt] [libvirt-glib PATCH v2] Add filterref and filterref parameter support.
by Ian Main 24 Oct '13

24 Oct '13

This patch adds support for setting filterref's on interfaces. Also supported are parameters to the filterref's. V2: - alphabetical orderized (don't look it up!) Makefile.am - s/set_filter/set_name/ s/get_filter/get_name/ - remove trailing whitespace. - fix missing line. - add return_val_if_fail check. - moved qcow fix in demo to a new patch. - fixed new_from_xml(). Signed-off-by: Ian Main <imain(a)redhat.com> --- examples/config-demo.py | 7 + libvirt-gconfig/Makefile.am | 4 + ...-gconfig-domain-interface-filterref-parameter.c | 101 +++++++++++++ ...-gconfig-domain-interface-filterref-parameter.h | 75 ++++++++++ .../libvirt-gconfig-domain-interface-filterref.c | 157 +++++++++++++++++++++ .../libvirt-gconfig-domain-interface-filterref.h | 76 ++++++++++ libvirt-gconfig/libvirt-gconfig-domain-interface.c | 41 ++++++ libvirt-gconfig/libvirt-gconfig-domain-interface.h | 5 + libvirt-gconfig/libvirt-gconfig.h | 2 + libvirt-gconfig/libvirt-gconfig.sym | 18 +++ 10 files changed, 486 insertions(+) create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.h create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h diff --git a/examples/config-demo.py b/examples/config-demo.py index 09b9e89..367d99a 100644 --- a/examples/config-demo.py +++ b/examples/config-demo.py @@ -35,6 +35,13 @@ domain.add_device(disk) interface = LibvirtGConfig.DomainInterfaceNetwork.new() interface.set_source("default") +filterref = LibvirtGConfig.DomainInterfaceFilterref.new() +filterref.set_name("clean-traffic") +parameter = LibvirtGConfig.DomainInterfaceFilterrefParameter.new() +parameter.set_name("IP") +parameter.set_value("205.23.12.40") +filterref.add_parameter(parameter) +interface.set_filterref(filterref) domain.add_device(interface) interface = LibvirtGConfig.DomainInterfaceUser.new() diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index 35dc978..0793da1 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -47,6 +47,8 @@ GCONFIG_HEADER_FILES = \ libvirt-gconfig-domain-input.h \ libvirt-gconfig-domain-interface.h \ libvirt-gconfig-domain-interface-bridge.h \ + libvirt-gconfig-domain-interface-filterref.h \ + libvirt-gconfig-domain-interface-filterref-parameter.h \ libvirt-gconfig-domain-interface-network.h \ libvirt-gconfig-domain-interface-user.h \ libvirt-gconfig-domain-memballoon.h \ @@ -129,6 +131,8 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-domain-input.c \ libvirt-gconfig-domain-interface.c \ libvirt-gconfig-domain-interface-bridge.c \ + libvirt-gconfig-domain-interface-filterref.c \ + libvirt-gconfig-domain-interface-filterref-parameter.c \ libvirt-gconfig-domain-interface-network.c \ libvirt-gconfig-domain-interface-user.c \ libvirt-gconfig-domain-memballoon.c \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c new file mode 100644 index 0000000..e697e86 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c @@ -0,0 +1,101 @@ +/* + * libvirt-gconfig-domain-interface-filterref-parameter.c: + * libvirt filterref parameters + * + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: Ian Main <imain(a)redhat.com> + * Daniel P. Berrange <berrange(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, GVirConfigDomainInterfaceFilterrefParameterPrivate)) + +struct _GVirConfigDomainInterfaceFilterrefParameterPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainInterfaceFilterrefParameter, gvir_config_domain_interface_filterref_parameter, GVIR_CONFIG_TYPE_OBJECT); + +static void gvir_config_domain_interface_filterref_parameter_class_init(GVirConfigDomainInterfaceFilterrefParameterClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainInterfaceFilterrefParameterPrivate)); +} + +static void gvir_config_domain_interface_filterref_parameter_init(GVirConfigDomainInterfaceFilterrefParameter *parameter) +{ + g_debug("Init GVirConfigDomainInterfaceFilterrefParameter=%p", parameter); + + parameter->priv = GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_GET_PRIVATE(parameter); +} + +GVirConfigDomainInterfaceFilterrefParameter *gvir_config_domain_interface_filterref_parameter_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, + "parameter", NULL); + return GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER(object); +} + +GVirConfigDomainInterfaceFilterrefParameter * +gvir_config_domain_interface_filterref_parameter_new_from_xml(const gchar *xml, GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, + "parameter", + NULL, + xml, + error); + + return GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER(object); +} + +void gvir_config_domain_interface_filterref_parameter_set_name(GVirConfigDomainInterfaceFilterrefParameter *parameter, const gchar *name) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_PARAMETER(parameter)); + gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(parameter), + "name", name, NULL); +} + +void gvir_config_domain_interface_filterref_parameter_set_value(GVirConfigDomainInterfaceFilterrefParameter *parameter, const gchar *value) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_PARAMETER(parameter)); + gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(parameter), + "value", value, NULL); +} + +const gchar *gvir_config_domain_interface_filterref_parameter_get_name(GVirConfigDomainInterfaceFilterrefParameter *parameter) +{ + return gvir_config_object_get_attribute(GVIR_CONFIG_OBJECT(parameter), + NULL, + "name"); +} +const gchar *gvir_config_domain_interface_filterref_parameter_get_value(GVirConfigDomainInterfaceFilterrefParameter *parameter) +{ + return gvir_config_object_get_attribute(GVIR_CONFIG_OBJECT(parameter), + NULL, + "value"); +} + diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.h b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.h new file mode 100644 index 0000000..a768c84 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.h @@ -0,0 +1,75 @@ +/* + * libvirt-gconfig-domain-interface-filterref-parameter.h: + * libvirt filterref parameters + * + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: Ian Main <imain(a)redhat.com> + * Daniel P. Berrange <berrange(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER (gvir_config_domain_interface_filterref_parameter_get_type ()) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, GVirConfigDomainInterfaceFilterrefParameter)) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, GVirConfigDomainInterfaceFilterrefParameterClass)) +#define GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_PARAMETER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER)) +#define GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_PARAMETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER)) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, GVirConfigDomainInterfaceFilterrefParameterClass)) + +typedef struct _GVirConfigDomainInterfaceFilterrefParameter GVirConfigDomainInterfaceFilterrefParameter; +typedef struct _GVirConfigDomainInterfaceFilterrefParameterPrivate GVirConfigDomainInterfaceFilterrefParameterPrivate; +typedef struct _GVirConfigDomainInterfaceFilterrefParameterClass GVirConfigDomainInterfaceFilterrefParameterClass; + +struct _GVirConfigDomainInterfaceFilterrefParameter +{ + GVirConfigObject parent; + + GVirConfigDomainInterfaceFilterrefParameterPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainInterfaceFilterrefParameterClass +{ + GVirConfigObjectClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_interface_filterref_parameter_get_type(void); + +GVirConfigDomainInterfaceFilterrefParameter *gvir_config_domain_interface_filterref_parameter_new(void); + +GVirConfigDomainInterfaceFilterrefParameter * +gvir_config_domain_interface_filterref_parameter_new_from_xml(const gchar *xml, GError **error); + +void gvir_config_domain_interface_filterref_parameter_set_name(GVirConfigDomainInterfaceFilterrefParameter *parameter, const gchar *name); +void gvir_config_domain_interface_filterref_parameter_set_value(GVirConfigDomainInterfaceFilterrefParameter *parameter, const gchar *value); +const gchar *gvir_config_domain_interface_filterref_parameter_get_name(GVirConfigDomainInterfaceFilterrefParameter *parameter); +const gchar *gvir_config_domain_interface_filterref_parameter_get_value(GVirConfigDomainInterfaceFilterrefParameter *parameter); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c new file mode 100644 index 0000000..4874aee --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c @@ -0,0 +1,157 @@ +/* + * libvirt-gconfig-domain-interface-network-filterref.c: + * libvirt filter reference config. + * + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Ian Main <imain(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, GVirConfigDomainInterfaceFilterrefPrivate)) + +struct _GVirConfigDomainInterfaceFilterrefPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainInterfaceFilterref, gvir_config_domain_interface_filterref, GVIR_CONFIG_TYPE_OBJECT); + +static void gvir_config_domain_interface_filterref_class_init(GVirConfigDomainInterfaceFilterrefClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainInterfaceFilterrefPrivate)); +} + +static void gvir_config_domain_interface_filterref_init(GVirConfigDomainInterfaceFilterref *filterref) +{ + g_debug("Init GVirConfigDomainInterfaceFilterref=%p", filterref); + + filterref->priv = GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_GET_PRIVATE(filterref); +} + + +GVirConfigDomainInterfaceFilterref *gvir_config_domain_interface_filterref_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, + "filterref", NULL); + return GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF(object); +} + +GVirConfigDomainInterfaceFilterref *gvir_config_domain_interface_filterref_new_from_xml(const gchar *xml, + GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, + "filterref", NULL, xml, error); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "filter"), "filterref") != 0) { + g_object_unref(G_OBJECT(object)); + return NULL; + } + return GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF(object); +} + +void gvir_config_domain_interface_filterref_set_name(GVirConfigDomainInterfaceFilterref *filterref, + const char *filter) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(filterref)); + + gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(filterref), + "filter", filter, NULL); +} + +const char *gvir_config_domain_interface_filterref_get_name(GVirConfigDomainInterfaceFilterref *filterref) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(filterref), NULL); + return gvir_config_object_get_attribute(GVIR_CONFIG_OBJECT(filterref), + NULL, + "filter"); +} + +void gvir_config_domain_interface_filterref_add_parameter(GVirConfigDomainInterfaceFilterref *filterref, + GVirConfigDomainInterfaceFilterrefParameter *parameter) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(filterref)); + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_PARAMETER(parameter)); + + gvir_config_object_attach_add(GVIR_CONFIG_OBJECT(filterref), + GVIR_CONFIG_OBJECT(parameter)); +} + +struct GetParameterData { + GVirConfigXmlDoc *doc; + GList *parameters; +}; + + +static gboolean add_filterref_parameter(xmlNodePtr node, gpointer opaque) +{ + struct GetParameterData* data = (struct GetParameterData*)opaque; + GVirConfigObject *parameter; + + if (g_strcmp0((const gchar *)node->name, "parameter") != 0) + return TRUE; + + parameter = gvir_config_object_new_from_tree(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, + data->doc, NULL, node); + if (parameter != NULL) + data->parameters = g_list_append(data->parameters, parameter); + else + g_debug("Failed to parse %s node", node->name); + + return TRUE; +} + +/** + * gvir_config_domain_interface_filterref_get_parameters: + * @filterref: a #GVirConfigDomainInterfaceFilterref + * + * Gets the list of parameters attached to @filterref. The returned list should be + * freed with g_list_free(), after its elements have been unreffed with + * g_object_unref(). + * + * Returns: (element-type LibvirtGConfig.DomainInterfaceFilterrefParameter) (transfer full): + * a newly allocated #GList of #GVirConfigDomainInterfaceFilterrefParameter. + */ +GList *gvir_config_domain_interface_filterref_get_parameters(GVirConfigDomainInterfaceFilterref *filterref) +{ + struct GetParameterData data; + + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(filterref), NULL); + + g_object_get(G_OBJECT(filterref), "doc", &data.doc, NULL); + data.parameters = NULL; + + gvir_config_object_foreach_child(GVIR_CONFIG_OBJECT(filterref), + NULL, + add_filterref_parameter, + &data); + + if (data.doc != NULL) { + g_object_unref(G_OBJECT(data.doc)); + } + + return data.parameters; +} + diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h new file mode 100644 index 0000000..4a2bfd4 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h @@ -0,0 +1,76 @@ +/* + * libvirt-gconfig-domain-interface-network-filterref.h: libvirt filter reference config + * + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Ian Main <imain(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF (gvir_config_domain_interface_filterref_get_type ()) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, GVirConfigDomainInterfaceFilterref)) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, GVirConfigDomainInterfaceFilterrefClass)) +#define GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF)) +#define GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF)) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, GVirConfigDomainInterfaceFilterrefClass)) + +typedef struct _GVirConfigDomainInterfaceFilterref GVirConfigDomainInterfaceFilterref; +typedef struct _GVirConfigDomainInterfaceFilterrefPrivate GVirConfigDomainInterfaceFilterrefPrivate; +typedef struct _GVirConfigDomainInterfaceFilterrefClass GVirConfigDomainInterfaceFilterrefClass; + +struct _GVirConfigDomainInterfaceFilterref +{ + GVirConfigObject parent; + + GVirConfigDomainInterfaceFilterrefPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainInterfaceFilterrefClass +{ + GVirConfigObjectClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_interface_filterref_get_type(void); + +GVirConfigDomainInterfaceFilterref *gvir_config_domain_interface_filterref_new(void); + +GVirConfigDomainInterfaceFilterref * +gvir_config_domain_interface_filterref_new_from_xml(const gchar *xml, GError **error); + +void gvir_config_domain_interface_filterref_set_name(GVirConfigDomainInterfaceFilterref *filterref, + const char *filter); +const char *gvir_config_domain_interface_filterref_get_name(GVirConfigDomainInterfaceFilterref *filterref); + +void gvir_config_domain_interface_filterref_add_parameter(GVirConfigDomainInterfaceFilterref *filterref, + GVirConfigDomainInterfaceFilterrefParameter *parameter); +GList *gvir_config_domain_interface_filterref_get_parameters(GVirConfigDomainInterfaceFilterref *filterref); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface.c b/libvirt-gconfig/libvirt-gconfig-domain-interface.c index 86a0c34..ce1b3f0 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface.c @@ -131,6 +131,47 @@ const char *gvir_config_domain_interface_get_model(GVirConfigDomainInterface *in "model", "type"); } +/** + * gvir_config_domain_interface_set_filterref: + * @interface: a #GVirConfigDomainInterface + * @filterref: (allow-none): the filterref to set + */ +void gvir_config_domain_interface_set_filterref(GVirConfigDomainInterface *interface, + GVirConfigDomainInterfaceFilterref *filterref) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE(interface)); + g_return_if_fail(filterref == NULL || GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(filterref)); + + gvir_config_object_attach_replace(GVIR_CONFIG_OBJECT(interface), + "filterref", + GVIR_CONFIG_OBJECT(filterref)); +} + +/** + * gvir_config_domain_interface_get_filterref: + * @interface: a #GVirConfigDomainInterface + * + * Gets the filterref associated with the @interface + * + * Returns: (transfer full): A #GVirConfigDomainInterfaceFilterref. The returned + * object should be unreffed with g_object_unref() when no longer needed. + */ + +GVirConfigDomainInterfaceFilterref *gvir_config_domain_interface_get_filterref(GVirConfigDomainInterface *interface) +{ + GVirConfigObject *object; + + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE(interface), NULL); + + object = gvir_config_object_get_child_with_type + (GVIR_CONFIG_OBJECT(interface), + "filterref", + GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF); + + return GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF(object); +} + + G_GNUC_INTERNAL GVirConfigDomainDevice * gvir_config_domain_interface_new_from_tree(GVirConfigXmlDoc *doc, xmlNodePtr tree) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface.h b/libvirt-gconfig/libvirt-gconfig-domain-interface.h index 65c5d0b..2b0c22f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface.h @@ -27,6 +27,8 @@ #ifndef __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_H__ #define __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_H__ +#include <libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h> + G_BEGIN_DECLS #define GVIR_CONFIG_TYPE_DOMAIN_INTERFACE (gvir_config_domain_interface_get_type ()) @@ -76,6 +78,9 @@ const char *gvir_config_domain_interface_get_ifname(GVirConfigDomainInterface *i GVirConfigDomainInterfaceLinkState gvir_config_domain_interface_get_link_state(GVirConfigDomainInterface *interface); const char *gvir_config_domain_interface_get_mac(GVirConfigDomainInterface *interface); const char *gvir_config_domain_interface_get_model(GVirConfigDomainInterface *interface); +void gvir_config_domain_interface_set_filterref(GVirConfigDomainInterface *interface, + GVirConfigDomainInterfaceFilterref *filterref); +GVirConfigDomainInterfaceFilterref *gvir_config_domain_interface_get_filterref(GVirConfigDomainInterface *interface); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig.h b/libvirt-gconfig/libvirt-gconfig.h index 03e8ce7..14386b9 100644 --- a/libvirt-gconfig/libvirt-gconfig.h +++ b/libvirt-gconfig/libvirt-gconfig.h @@ -62,6 +62,8 @@ #include <libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.h> #include <libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.h> #include <libvirt-gconfig/libvirt-gconfig-domain-input.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h> #include <libvirt-gconfig/libvirt-gconfig-domain-interface.h> #include <libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.h> #include <libvirt-gconfig/libvirt-gconfig-domain-interface-network.h> diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 72eafc1..a5f8b05 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -608,6 +608,24 @@ global: gvir_config_domain_graphics_rdp_set_replace_user; gvir_config_object_new_from_xml; + + gvir_config_domain_interface_set_filterref; + gvir_config_domain_interface_get_filterref; + + gvir_config_domain_interface_filterref_get_type; + gvir_config_domain_interface_filterref_new; + gvir_config_domain_interface_filterref_new_from_xml; + gvir_config_domain_interface_filterref_set_name; + gvir_config_domain_interface_filterref_get_name; + gvir_config_domain_interface_filterref_add_parameter; + gvir_config_domain_interface_filterref_get_parameters; + gvir_config_domain_interface_filterref_parameter_get_type; + gvir_config_domain_interface_filterref_parameter_new; + gvir_config_domain_interface_filterref_parameter_new_from_xml; + gvir_config_domain_interface_filterref_parameter_set_name; + gvir_config_domain_interface_filterref_parameter_set_value; + gvir_config_domain_interface_filterref_parameter_get_name; + gvir_config_domain_interface_filterref_parameter_get_value; } LIBVIRT_GCONFIG_0.1.7; # .... define new API here using predicted next version number .... -- 1.8.1.4

2 1

[libvirt] [PATCH] virsh: fix doc typos
by Eric Blake 24 Oct '13

24 Oct '13

Reported in https://bugzilla.redhat.com/show_bug.cgi?id=1022872 * tools/virsh.pod: s/COMMMANDS/COMMANDS/ Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing as trivial. tools/virsh.pod | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 7af5503..68e6e86 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2823,7 +2823,7 @@ B<blockresize> for live resizing. =back -=head1 SECRET COMMMANDS +=head1 SECRET COMMANDS The following commands manipulate "secrets" (e.g. passwords, passphrases and encryption keys). Libvirt can store secrets independently from their use, and @@ -2870,7 +2870,7 @@ I<--no-private> to list the non-private ones. =back -=head1 SNAPSHOT COMMMANDS +=head1 SNAPSHOT COMMANDS The following commands manipulate domain snapshots. Snapshots take the disk, memory, and device state of a domain at a point-of-time, and save it @@ -3170,7 +3170,7 @@ the data contents from that point in time. =back -=head1 NWFILTER COMMMANDS +=head1 NWFILTER COMMANDS The following commands manipulate network filters. Network filters allow filtering of the network traffic coming from and going to virtual machines. -- 1.8.3.1

1 0

[libvirt] [PATCH] virsh domxml-from-native to treat SCSI as the bus type for pseries by default
by Shivaprasad G Bhat 24 Oct '13

24 Oct '13

From: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> The bus type IDE being enum Zero, the bus type on pseries system appears as IDE for all the disk types. Pseries platform needs this to appear as SCSI instead of IDE. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index abb62e9..728409f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9995,6 +9995,7 @@ error: static virDomainDiskDefPtr qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, const char *val, + virDomainDefPtr dom, int nvirtiodisk, bool old_style_ceph_args) { @@ -10018,7 +10019,11 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, if (VIR_ALLOC(def) < 0) goto cleanup; - def->bus = VIR_DOMAIN_DISK_BUS_IDE; + if (((dom->os.arch == VIR_ARCH_PPC64) && + dom->os.machine && STREQ(dom->os.machine, "pseries"))) + def->bus = VIR_DOMAIN_DISK_BUS_SCSI; + else + def->bus = VIR_DOMAIN_DISK_BUS_IDE; def->device = VIR_DOMAIN_DISK_DEVICE_DISK; def->type = VIR_DOMAIN_DISK_TYPE_FILE; @@ -11332,8 +11337,13 @@ qemuParseCommandLine(virCapsPtr qemuCaps, disk->type = VIR_DOMAIN_DISK_TYPE_FILE; if (STREQ(arg, "-cdrom")) { disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM; - if (VIR_STRDUP(disk->dst, "hdc") < 0) - goto error; + if (((def->os.arch == VIR_ARCH_PPC64) && + def->os.machine && STREQ(def->os.machine, "pseries"))) { + disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; + if (VIR_STRDUP(disk->dst, "sdc") < 0) + goto error; + } else if (VIR_STRDUP(disk->dst, "hdc") < 0) + goto error; disk->readonly = true; } else { if (STRPREFIX(arg, "-fd")) { @@ -11345,6 +11355,9 @@ qemuParseCommandLine(virCapsPtr qemuCaps, disk->bus = VIR_DOMAIN_DISK_BUS_IDE; else disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; + if (((def->os.arch == VIR_ARCH_PPC64) && + def->os.machine && STREQ(def->os.machine, "pseries"))) + disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; } if (VIR_STRDUP(disk->dst, arg + 1) < 0) goto error; @@ -11636,7 +11649,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps, } } else if (STREQ(arg, "-drive")) { WANT_VALUE(); - if (!(disk = qemuParseCommandLineDisk(xmlopt, val, + if (!(disk = qemuParseCommandLineDisk(xmlopt, val, def, nvirtiodisk, ceph_args != NULL))) goto error;

3 2

[libvirt] [PATCH] Ignore GNU Global tag files
by Martin Kletzander 23 Oct '13

23 Oct '13

... the same way we ignore other TAGS Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index db5abcd..e372876 100644 --- a/.gitignore +++ b/.gitignore @@ -233,6 +233,9 @@ /tools/virt-*-validate /tools/virt-sanlock-cleanup /update.log +GPATH +GRTAGS +GTAGS Makefile Makefile.in TAGS -- 1.8.4

2 2

[libvirt] build: fix linking virt-login-shell
by Jim Fehlig 23 Oct '13

23 Oct '13

After commit 3e2f27e1, I've noticed build failures of virt-login-shell when libapparmor-devel is installed on the build host CCLD virt-login-shell ../src/.libs/libvirt-setuid-rpc-client.a(libvirt_setuid_rpc_client_la-vircommand.o): In function `virExec': /home/jfehlig/virt/upstream/libvirt/src/util/vircommand.c:653: undefined reference to `aa_change_profile' collect2: error: ld returned 1 exit status I was about to commit an easy fix under the build-breaker rule (build-fix-1.patch), but thought to extend the notion of SECDRIVER_LIBS to SECDRIVER_CFLAGS, and use both throughout src/Makefile.am where it makes sense (build-fix-2.patch). Should I just stick with the simple fix, or is something along the lines of patch 2 preferred? Regards, Jim

5 7

[libvirt] [PATCH] build: Fix prohibit_int_ijk (and iijjkk) on RHEL 5
by Martin Kletzander 23 Oct '13

23 Oct '13

On RHEL 5, make syntax-check was failing because even strings like 'int isTempChain' matched the 'int i' rule. To be honest, I haven't found the root cause, but the change added makes it work as expected and keeps the proper behavior on newer systems as well. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: I'm not pushing this one as a build breaker since I haven't found the root cause, so feel free to object and fix it differently. cfg.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cfg.mk b/cfg.mk index 56821e2..e9da282 100644 --- a/cfg.mk +++ b/cfg.mk @@ -555,12 +555,12 @@ sc_avoid_attribute_unused_in_header: $(_sc_search_regexp) sc_prohibit_int_ijk: - @prohibit='\<(int|unsigned) ([^(]* )*(i|j|k)(\s|,|;)' \ + @prohibit='\<(int|unsigned) ([^(]* )*(i|j|k)\>(\s|,|;)' \ halt='use size_t, not int/unsigned int for loop vars i, j, k' \ $(_sc_search_regexp) sc_prohibit_loop_iijjkk: - @prohibit='\<(int|unsigned) ([^=]+ )*(ii|jj|kk)(\s|,|;)' \ + @prohibit='\<(int|unsigned) ([^=]+ )*(ii|jj|kk)\>(\s|,|;)' \ halt='use i, j, k for loop iterators, not ii, jj, kk' \ $(_sc_search_regexp) -- 1.8.4

3 7

[libvirt] [PATCH 0/5]virsh: solutions for hiding '--shareable' option
by Chen Hanxiao 23 Oct '13

23 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> As Daniel mentioned, '--shareable' should be hidden from users. But we had to take care of backwards compatibility. These patches give solutions to solve these issues. Chen Hanxiao (5): [libvirt]virsh: disable config readonly and shareable in virsh command [libvirt]virsh: introduce flags VSH_OFLAG_IGNORE [libvirt]virsh: if VSH_OFLAG_IGNORE set, don't show it in '--help' [libvirt]virsh: If VSH_OFLAG_IGNORE set, don't auto complete in virsh [libvirt]virsh: mark '--shareable' as VSH_OFLAG_IGNORE tools/virsh-domain.c | 3 ++- tools/virsh.c | 9 +++++++++ tools/virsh.h | 1 + tools/virsh.pod | 3 +-- 4 files changed, 13 insertions(+), 3 deletions(-) -- 1.8.2.1

3 19

Re: [libvirt] [RESEND][PATCHv5 1/4] add hostdev passthrough common library
by Daniel P. Berrange 23 Oct '13

23 Oct '13

On Wed, Oct 23, 2013 at 04:15:57PM +0800, Chunyan Liu wrote: > 2013/10/15 Daniel P. Berrange <berrange(a)redhat.com> > > > On Fri, Sep 13, 2013 at 11:34:34AM +0800, Chunyan Liu wrote: > > > Add hostdev passthrough common library so that it could be shared by all > > drivers > > > and maintain a global hostdev state. > > > > > > Signed-off-by: Chunyan Liu <cyliu(a)suse.com> > > > --- > > > docs/schemas/domaincommon.rng | 1 + > > > src/conf/domain_conf.c | 3 +- > > > src/conf/domain_conf.h | 1 + > > > > I'd prefer to see these changes to the XML parser be done in a separate > > patch - either before or after this patch. > > > > > diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c > > > index 0abf80b..4d6d07b 100644 > > > --- a/src/libxl/libxl_domain.c > > > +++ b/src/libxl/libxl_domain.c > > > @@ -393,6 +393,15 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr > > dev, > > > STRNEQ(def->os.type, "hvm")) > > > dev->data.chr->targetType = > > VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN; > > > > > > + if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { > > > + virDomainHostdevDefPtr hostdev = dev->data.hostdev; > > > + > > > + if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && > > > + hostdev->source.subsys.type == > > VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI && > > > + hostdev->source.subsys.u.pci.backend == > > VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT) > > > + hostdev->source.subsys.u.pci.backend = > > VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN; > > > + } > > > + > > > return 0; > > > } > > > > > > > This should be separate too. > > > > > diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c > > > new file mode 100644 > > > index 0000000..d131160 > > > --- /dev/null > > > +++ b/src/util/virhostdev.c > > > @@ -0,0 +1,1335 @@ > > > +/* virhostdev.c: hostdev management > > > + * > > > + * Copyright (C) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. > > > + * Copyright (C) 2006-2007, 2009-2013 Red Hat, Inc. > > > + * Copyright (C) 2006 Daniel P. Berrange > > > + * > > > + * This library is free software; you can redistribute it and/or > > > + * modify it under the terms of the GNU Lesser General Public > > > + * License as published by the Free Software Foundation; either > > > + * version 2.1 of the License, or (at your option) any later version. > > > + * > > > + * This library is distributed in the hope that it will be useful, > > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > > > + * Lesser General Public License for more details. > > > + * > > > + * You should have received a copy of the GNU Lesser General Public > > > + * License along with this library. If not, see > > > + * <http://www.gnu.org/licenses/>. > > > + * > > > + * Author: Chunyan Liu <cyliu(a)suse.com> > > > + * Author: Daniel P. Berrange <berrange(a)redhat.com> > > > + */ > > > + > > > +#include <config.h> > > > + > > > +#include "virhostdev.h" > > > + > > > +#include <sys/types.h> > > > +#include <sys/stat.h> > > > +#include <unistd.h> > > > +#include <stdlib.h> > > > +#include <stdio.h> > > > + > > > +#include "viralloc.h" > > > +#include "virstring.h" > > > +#include "virfile.h" > > > +#include "virerror.h" > > > +#include "virlog.h" > > > +#include "virpci.h" > > > +#include "virusb.h" > > > +#include "virscsi.h" > > > +#include "virnetdev.h" > > > +#include "virutil.h" > > > +#include "configmake.h" > > > + > > > +#define VIR_FROM_THIS VIR_FROM_NONE > > > + > > > +#define HOSTDEV_STATE_DIR LOCALSTATEDIR "/run/libvirt/hostdevmgr" > > > + > > > +struct _virHostdevManager{ > > > + char *stateDir; > > > + > > > + virPCIDeviceListPtr activePciHostdevs; > > > + virPCIDeviceListPtr inactivePciHostdevs; > > > + virUSBDeviceListPtr activeUsbHostdevs; > > > + virSCSIDeviceListPtr activeScsiHostdevs; > > > +}; > > > + > > > +static virHostdevManagerPtr hostdevMgr; > > > + > > > +static void > > > +virHostdevManagerCleanup(void) > > > +{ > > > + if (!hostdevMgr) > > > + return; > > > + > > > + virObjectUnref(hostdevMgr->activePciHostdevs); > > > + virObjectUnref(hostdevMgr->inactivePciHostdevs); > > > + virObjectUnref(hostdevMgr->activeUsbHostdevs); > > > + VIR_FREE(hostdevMgr->stateDir); > > > + > > > + VIR_FREE(hostdevMgr); > > > +} > > > + > > > +static int > > > +virHostdevOnceInit(void) > > > +{ > > > + if (VIR_ALLOC(hostdevMgr) < 0) > > > + goto error; > > > + > > > + if ((hostdevMgr->activePciHostdevs = virPCIDeviceListNew()) == NULL) > > > + goto error; > > > + > > > + if ((hostdevMgr->activeUsbHostdevs = virUSBDeviceListNew()) == NULL) > > > + goto error; > > > + > > > + if ((hostdevMgr->inactivePciHostdevs = virPCIDeviceListNew()) == > > NULL) > > > + goto error; > > > + > > > + if ((hostdevMgr->activeScsiHostdevs = virSCSIDeviceListNew()) == > > NULL) > > > + goto error; > > > + > > > + if (VIR_STRDUP(hostdevMgr->stateDir, HOSTDEV_STATE_DIR) < 0) > > > + goto error; > > > > Hmm, this is going to lead to some upgrade problems when libvirt is > > restarted with existing VMs present. I think we'll need some code > > in this initialization which looks for the old QEMU-specific path > > and if found, tries to move the data into the new location. > > > > > I'll do that. But IMO, finding and moving data in the initialization > function is a little bit painful. > The hostdevMgr->stateDir is only used to save/store net config of a SR-IOV > device, the file name could be pflinkdev_ > vfindex or pflinkdev (e.g, eth0, eth0_vf0, p1p2, p1p2_vf0, etc.), hard to > match through some fix rule. > Now that it's a upgrade requirement, and I think it only affects when an > existing VM has a hostdev that stores net config in the old stateDir, we > can also handle it the restore net config part. (To check whether filename > is in hostdevMgr->stateDir, if not and hypervisor is qemu, try to find in > old stateDir /var/run/libvirt/qemu/.) > How do you think? If that's OK. I'll posting revised version. Yeah, should be ok. Just want to minimise the amount of code to deal with back compat, whichever approach you choose. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

Re: [libvirt] Support QEMU Live Upgrade in Libvirt
by Eric Blake 23 Oct '13

23 Oct '13

On 10/23/2013 03:58 AM, Zhou Zheng Sheng wrote: > Thanks! I am now starting to investigate if we can re-use parts of > migration code after some refactoring, and how much code should be > written from scratch. I am not very clear about how the new flow looks > like. I think the migration protocol v3 is quite reasonable for dealing > with various cases and errors in the migration. After all, QEMU live > upgrade is implemented as migration under the hood, so I think common > migration management logic would be applied to it too. For example, if > QEMU live upgrade migration fails, target domain should be destroyed and > source domain should be resumed. Maybe I can re-use some of the parts in > the migration protocol v3 flow. Is it even possible to resume the original process if you have already page-flipped the memory to the destination process? I'm worried that there may be some catastrophic paths that are non-recoverable, but hope that's not the case. > > By the way. It seems my mail sent to libvir-list(a)redhat.com is not > appearing in the list. I'm already a member in the list. I see in the > subscribing web page saying first time posts need moderator approval. I > thought I've posted before. Maybe it's too long since my last activity. > I also tried to join the list again and the system sent me a mail saying > I was already a member. I sent a mail to libvir-list-owner(a)redhat.com > asking for help but no response yet. Am I blocked? Or is it just because > I didn't add a [libvirt] tag in the title? I thought the tag is added > automatically when I was posting in other lists. Would you have a look > at my subscription status? Thank you! > No idea what's going on there - I checked and didn't see anything stuck in the mod queue or any indication of blacklisting on your email address. Sometimes things just get stuck in queues somewhere, and eventually show up later. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH] network: Add a missing check in bridge_driver.c
by Hongwei Bi 23 Oct '13

23 Oct '13

Signed-off-by: Hongwei Bi <hwbi2008(a)gmail.com> --- src/network/bridge_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 8787bdb..73375f0 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1107,7 +1107,8 @@ networkStartDhcpDaemon(virNetworkDriverStatePtr driver, if (dctx == NULL) goto cleanup; - dnsmasqCapsRefresh(&driver->dnsmasqCaps, false); + if (dnsmasqCapsRefresh(&driver->dnsmasqCaps, false) < 0) + goto cleanup; ret = networkBuildDhcpDaemonCommandLine(network, &cmd, pidfile, dctx, driver->dnsmasqCaps); -- 1.8.1.2

2 2