- Devel - libvirt List Archives

[libvirt] [PATCH] news: Add an empty <change> to each <section>
by Andrea Bolognani 03 Mar '17

03 Mar '17

The generated HTML will contain <ul></ul> otherwise, which triggers an error during 'make check'. The proper fix would be not to generate the problematic HTML in the first place but, while I'm working on it, this workaround will do. --- Pushed as build-breaker. Sorry for the noise. docs/news.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index bb67619..675faa7 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -12,10 +12,13 @@ <libvirt> <release version="v3.2.0" date="unreleased"> <section title="New features"> + <change/> </section> <section title="Improvements"> + <change/> </section> <section title="Bug fixes"> + <change/> </section> </release> <release version="v3.1.0" date="2017-03-03"> -- 2.7.4

1 0

[libvirt] [PATCH] Post-release version bump to 3.2.0
by Andrea Bolognani 03 Mar '17

03 Mar '17

--- Pushed as trivial. configure.ac | 2 +- docs/news.xml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ed49daa..e61ab7b 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [3.1.0], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [3.2.0], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) diff --git a/docs/news.xml b/docs/news.xml index 3cb93c3..bb67619 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -10,6 +10,14 @@ and optionally a description where it's explained in more detail --> <libvirt> + <release version="v3.2.0" date="unreleased"> + <section title="New features"> + </section> + <section title="Improvements"> + </section> + <section title="Bug fixes"> + </section> + </release> <release version="v3.1.0" date="2017-03-03"> <section title="New features"> <change> -- 2.7.4

1 0

[libvirt] Availability of libvirt-3.1.0
by Daniel Veillard 03 Mar '17

03 Mar '17

I'm a bit late but I finally pushed the release, the signed tarball and rpms are at the usual place: ftp://libvirt.org/libvirt/ I also pushed a libvirt-python release that one can find at ftp://libvirt.org/libvirt/python/ * New features - storage: Add Virtuozzo storage backend storage pool Add new storage backend to support pool and volume management within the Virtuozzo Storage environment. Virtuozzo Storage is a highly available distributed software defined storage with built-in replication and disaster recovery. - qemu: Add support for memory backing with file source Add support in numa topology for file source inside memory backing (hugepages are not needed) Three new elements <source/>,<access/> and <allocation/> were added to <memoryBacking/> element. Also new configuration parameter memory_backing_dir was added to qemu.conf. - network: make openvswitch call timeout configurable Adding the ability to specify the timeout value in seconds for openvswitch calls in the libvirtd configuration file. - bhyve: add e1000 NIC support Add support for e1000 NIC. Previously, the only available option was virtio-net. - libxl: add tunneled migration support Add tunneled migration to libxl driver, which is always capable of strong encryption and doesn't require any extra network connection other than what's required for remote access of libvirtd. - qemu: add rendernode argument Add a new attribute 'rendernode' to <gl> spice element. - nodedev: add drm capability Add a new 'drm' capability for Direct Rendering Manager (DRM) devices, providing device type information. - Add API for individual/specific vCPU hotplug The new API allows selecting specific vCPUs to be added/removed from the VM. The existing APIs allowed only adding/removing from the end which did not play well with NUMA. * Improvements - virsh: pool-list: allow both --uuid and --name in one command Adjust the virsh-pool command to support the --uuid and/or --name options in order to print just the --name and/or --uuid of pools. - Introduce MTU to domain <interface/> and <network> Allow setting MTU size for some types of domain interface and network. - libxl: improve support for <timer> configurations Add support for multiple timers. Extend the tsc timer to support the emulate mode. Improve conversion of timer XML to/from xl.cfg. - storage: modularize the storage driver Split up the storage driver backends into loadable modules so that binary distributions don't have to compromise on shipping the storage driver with all backends which may pull in too many dependencies. * Bug fixes - nodedev: Fabric name must not be required for fc_host capability fabric_name is one of many fc_host attributes in Linux that is optional and left to the low-level driver to decide if it is implemented. For example the zfcp device driver does not provide a fabric name for an fcp host. The requirement for the existence of a fabric name has been removed by making it optional. - bhyve: change address allocation schema for SATA disks Previously, the bhyve driver assigned PCI addresses to SATA disks directly rather than assigning that to a controller and using SATA addresses for disks. It was implemented this way because bhyve has no notion of an explicit SATA controller. However, as this doesn't match libvirt's understanding of disk addresses, the bhyve driver was changed to follow the common schema and have PCI addresses for SATA controllers and SATA addresses for disks. If you're having issues because of this, it's recommended to edit the domain's XML and remove <address type='pci'> from the <disk> elements with <target bus='sata'/> and let libvirt regenerate it properly. - libxl: maximum memory fixes Fix reporting of domain maximum memory. Fix setting dom0 maximum memory. - libxl: fix disk detach when <driver> not specified - libxl: fix dom0 autoballooning with Xen 4.8 - qemu: Allow empty script path to <interface/> Historically, this was always allowed. Unfortunately, due to some rework done for 1.3.2 release a bug was dragged in which suddenly stop allowing domain with such configuration to start. Thanks everybody for your contributions for this release, be it with code, bug reports, ideas, etc.... Enjoy the release ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [RFC v2 0/2] vireventpoll implimentation using epoll
by Derbyshev Dmitriy 03 Mar '17

03 Mar '17

From: Derbyshev Dmitry <dderbyshev(a)virtuozzo.com> Provides about 20% boost on local machine with 35 vms. virEventPollDispatchHandles can also be split to pass cb via epoll data field. Should start sending as PATCH instead? Changes since v1: * ifdef supstituded by 2 .c files with vireventpollinternal.h implementations * PROBE purged Derbyshev Dmitry (2): vireventpoll: isolate common code vireventpoll implimentation using epoll configure.ac | 28 + src/Makefile.am | 12 +- src/util/vireventepoll.c | 201 +++++++ src/util/vireventpoll.c | 700 ++-------------------- src/util/{vireventpoll.c => vireventpollcommon.c} | 231 ++----- src/util/vireventpollinternal.h | 91 +++ tests/commanddata/{test14.log => test3epoll.log} | 2 + tests/commandtest.c | 4 + 8 files changed, 451 insertions(+), 818 deletions(-) create mode 100644 src/util/vireventepoll.c copy src/util/{vireventpoll.c => vireventpollcommon.c} (78%) create mode 100644 src/util/vireventpollinternal.h copy tests/commanddata/{test14.log => test3epoll.log} (94%) -- 1.9.5.msysgit.0

3 4

[libvirt] [PATCH 0/2] qemu: Tiny cleanups
by Andrea Bolognani 02 Mar '17

02 Mar '17

Andrea Bolognani (2): qemu: Don't omit parentheses qemu: Use ARCH_IS_X86() more src/qemu/qemu_capabilities.c | 17 ++++++----------- src/qemu/qemu_parse_command.c | 6 ++---- 2 files changed, 8 insertions(+), 15 deletions(-) -- 2.7.4

2 4

[libvirt] [PATCH 0/2] Test suite fixes and small cleanups
by Andrea Bolognani 02 Mar '17

02 Mar '17

Andrea Bolognani (2): qemu: Drop QEMU_CAPS_PCI_MULTIBUS tests: Fix aliases for pSeries buses src/qemu/qemu_capabilities.c | 36 ++++++++-------------- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_capspriv.h | 4 +++ tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - .../qemuxml2argv-memory-hotplug-ppc64-nonuma.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 2 +- .../qemuxml2argv-ppc64-usb-controller-legacy.args | 2 +- .../qemuxml2argv-ppc64-usb-controller.args | 4 +-- .../qemuxml2argv-ppce500-serial.args | 2 +- .../qemuxml2argv-pseries-usb-default.args | 2 +- .../qemuxml2argv-pseries-usb-kbd.args | 2 +- .../qemuxml2argv-pseries-usb-multi.args | 4 +-- tests/qemuxml2argvtest.c | 8 +++-- 25 files changed, 32 insertions(+), 51 deletions(-) -- 2.7.4

2 3

[libvirt] [PATCH] Add aarch64 to virArch
by Matwey V. Kornilov 02 Mar '17

02 Mar '17

Hello, This patch is for allowing 32-bit ARMs for aarch64 hosts. Exact 32-bit personality for aarch64 is aarch32, but there is no such arch in libvirt, so we use arvm7l instead. Matwey V. Kornilov (1): Add aarch64 to virArch src/lxc/lxc_container.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.1.4

2 2

[libvirt] [PATCH 0/3] Split out node device object into its own module
by John Ferlan 02 Mar '17

02 Mar '17

Feedback from the initial pass at RFC for making a common pool object was that it got really confusing trying to manage the multitude of changes. See patch 3 of the series: http://www.redhat.com/archives/libvir-list/2017-February/msg00519.html So while I figure out what it'll take to make a better object framework, I figure I could start splitting out things a bit to make future work a bit easier to understand. Also rather than trying to do them all in one massive series, I can do shorter series contained to each of the driver conf's. Besides let's figure out whether all the thoughts and ideas are good. I would think moving to virnodedeviceobj wouldn't be an issue (other than needing to deal with backports). However, I'm sure there could be some "alternate opinions" over whether to make static functions not start with vir[DriverSubsystem] and rather go with driverSubsystem. Changing the API's to use the Obj is mainly a consistency thing. Let's see what falls out of this before I start queuing up other ones as it's a lot of rote work! John Ferlan (3): conf: Introduce virnodedeviceobj conf: Clean up nodedev code conf: Use consistent function name prefixes for virnodedeviceobj po/POTFILES.in | 1 + src/Makefile.am | 3 +- src/conf/node_device_conf.c | 981 +++++++++-------------------------- src/conf/node_device_conf.h | 50 -- src/conf/virnodedeviceobj.c | 558 ++++++++++++++++++++ src/conf/virnodedeviceobj.h | 78 +++ src/libvirt_private.syms | 23 +- src/node_device/node_device_driver.c | 24 +- src/node_device/node_device_driver.h | 2 +- src/node_device/node_device_hal.c | 10 +- src/node_device/node_device_udev.c | 12 +- src/test/test_driver.c | 29 +- 12 files changed, 940 insertions(+), 831 deletions(-) create mode 100644 src/conf/virnodedeviceobj.c create mode 100644 src/conf/virnodedeviceobj.h -- 2.9.3

5 19

[libvirt] [PATCH] util: switch over to use keycodemapdb GIT submodule
by Daniel P. Berrange 02 Mar '17

02 Mar '17

A long time ago we imported the keymaps.csv file from GTK-VNC so we can do conversions between keycode sets. Meanwhile lots of bug fixes have gone into this CSV file and libvirt hasn't kept in sync. The keymaps.csv file and associated generator script has been pulled out of GTK-VNC into a dedicated GIT repo for use as a submodule. This allows GTK-VNC, SPICE-GTK, QEMU and libvirt to share the same master database and tools and pushing updates merely requires a submodule commit update as with gnulib. The test suite is updated to cover some extra boundary conditions. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- .gitignore | 3 +- .gitmodules | 3 + src/Makefile.am | 41 ++-- src/keycodemapdb | 1 + src/util/keymaps.csv | 464 ------------------------------------------ src/util/virkeycode-mapgen.py | 97 --------- src/util/virkeycode.c | 94 ++++----- tests/virkeycodetest.c | 5 + 8 files changed, 85 insertions(+), 623 deletions(-) create mode 160000 src/keycodemapdb delete mode 100644 src/util/keymaps.csv delete mode 100755 src/util/virkeycode-mapgen.py diff --git a/.gitignore b/.gitignore index 7b71bd1..6892885 100644 --- a/.gitignore +++ b/.gitignore @@ -159,7 +159,8 @@ /src/test_libvirt*.aug /src/test_virtlockd.aug /src/test_virtlogd.aug -/src/util/virkeymaps.h +/src/util/virkeycodetable*.h +/src/util/virkeynametable*.h /src/virt-aa-helper /src/virtlockd /src/virtlogd diff --git a/.gitmodules b/.gitmodules index 7acb1ea..cae8f18 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "gnulib"] path = .gnulib url = git://git.sv.gnu.org/gnulib.git +[submodule "src/keycodemapdb"] + path = src/keycodemapdb + url = https://gitlab.com/keycodemap/keycodemapdb.git diff --git a/src/Makefile.am b/src/Makefile.am index a85cd0d..88a0622 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -50,7 +50,7 @@ AM_LDFLAGS = $(DRIVER_MODULES_LDFLAGS) \ $(MINGW_EXTRA_LDFLAGS) \ $(NULL) -EXTRA_DIST = $(conf_DATA) util/keymaps.csv +EXTRA_DIST = $(conf_DATA) BUILT_SOURCES = CLEANFILES = @@ -132,7 +132,6 @@ UTIL_SOURCES = \ util/virjson.c util/virjson.h \ util/virkeycode.c util/virkeycode.h \ util/virkeyfile.c util/virkeyfile.h \ - util/virkeymaps.h \ util/virlease.c util/virlease.h \ util/virlockspace.c util/virlockspace.h \ util/virlog.c util/virlog.h \ @@ -190,16 +189,34 @@ UTIL_SOURCES = \ util/virxml.c util/virxml.h \ $(NULL) -EXTRA_DIST += $(srcdir)/util/keymaps.csv $(srcdir)/util/virkeycode-mapgen.py - -BUILT_SOURCES += util/virkeymaps.h -MAINTAINERCLEANFILES += util/virkeymaps.h - -util/virkeymaps.h: $(srcdir)/util/keymaps.csv \ - $(srcdir)/util/virkeycode-mapgen.py - $(MKDIR_P) util/ - $(AM_V_GEN)$(PYTHON) $(srcdir)/util/virkeycode-mapgen.py \ - <$(srcdir)/util/keymaps.csv >util/virkeymaps.h +EXTRA_DIST += $(srcdir)/keycodemapdb/data/keymaps.csv $(srcdir)/keycodemapdb/tools/keymap-gen + +util/virkeycodetable_%.h: $(srcdir)/keycodemapdb/data/keymaps.csv \ + $(srcdir)/keycodemapdb/tools/keymap-gen Makefile.am + $(AM_V_GEN)export NAME=`echo $@ | sed -e 's,util/virkeycodetable_,,' -e 's,\.h,,'` && \ + $(MKDIR_P) util/ && \ + $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \ + --lang stdc --varname virKeyCodeTable_$$NAME code-table \ + $(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > \ + $@-tmp && mv $@-tmp $@ || rm $@-tmp + +util/virkeynametable_%.h: $(srcdir)/keycodemapdb/data/keymaps.csv \ + $(srcdir)/keycodemapdb/tools/keymap-gen Makefile.am + $(AM_V_GEN)export NAME=`echo $@ | sed -e 's,util/virkeynametable_,,' -e 's,\.h,,'` && \ + $(MKDIR_P) util/ && \ + $(PYTHON) $(srcdir)/keycodemapdb/tools/keymap-gen \ + --lang stdc --varname virKeyNameTable_$$NAME name-table \ + $(srcdir)/keycodemapdb/data/keymaps.csv $$NAME > \ + $@-tmp && mv $@-tmp $@ || rm $@-tmp + +KEYCODES = linux osx atset1 atset2 atset3 xt xtkbd usb win32 rfb +KEYNAMES = linux osx win32 + +KEYTABLES = $(KEYCODES:%=util/virkeycodetable_%.h) $(KEYNAMES:%=util/virkeynametable_%.h) + +UTIL_SOURCES += $(KEYTABLES) +BUILT_SOURCES += $(KEYTABLES) +MAINTAINERCLEANFILES += $(KEYTABLES) # Internal generic driver infrastructure NODE_INFO_SOURCES = nodeinfo.h nodeinfo.c diff --git a/src/keycodemapdb b/src/keycodemapdb new file mode 160000 index 0000000..b2976e7 --- /dev/null +++ b/src/keycodemapdb @@ -0,0 +1 @@ +Subproject commit b2976e7ed714400a3967ebb430bda45d1c253c20 diff --git a/src/util/keymaps.csv b/src/util/keymaps.csv deleted file mode 100644 index 98c723b..0000000 --- a/src/util/keymaps.csv +++ /dev/null @@ -1,464 +0,0 @@ -"Linux Name","Linux Keycode","OS-X Name","OS-X Keycode","AT set1 keycode","AT set2 keycode","AT set3 keycode",XT,"XT KBD","USB Keycodes","Win32 Name","Win32 Keycode","Xwin XT","Xfree86 KBD XT" -KEY_RESERVED,0,,,,,,,,,,,, -KEY_ESC,1,Escape,0x35,1,118,8,1,1,41,VK_ESCAPE,0x1b,1,1 -KEY_1,2,ANSI_1,0x12,2,22,22,2,2,30,VK_1,0x31,2,2 -KEY_2,3,ANSI_2,0x13,3,30,30,3,3,31,VK_2,0x32,3,3 -KEY_3,4,ANSI_3,0x14,4,38,38,4,4,32,VK_3,0x33,4,4 -KEY_4,5,ANSI_4,0x15,5,37,37,5,5,33,VK_4,0x34,5,5 -KEY_5,6,ANSI_5,0x17,6,46,46,6,6,34,VK_5,0x35,6,6 -KEY_6,7,ANSI_6,0x16,7,54,54,7,7,35,VK_6,0x36,7,7 -KEY_7,8,ANSI_7,0x1a,8,61,61,8,8,36,VK_7,0x37,8,8 -KEY_8,9,ANSI_8,0x1c,9,62,62,9,9,37,VK_8,0x38,9,9 -KEY_9,10,ANSI_9,0x19,10,70,70,10,10,38,VK_9,0x39,10,10 -KEY_0,11,ANSI_0,0x1d,11,69,69,11,11,39,VK_0,0x30,11,11 -KEY_MINUS,12,ANSI_Minus,0x1b,12,78,78,12,12,45,VK_OEM_MINUS,0xbd,12,12 -KEY_EQUAL,13,ANSI_Equal,0x18,13,85,85,13,13,46,VK_OEM_PLUS,0xbb,13,13 -KEY_BACKSPACE,14,Delete,0x33,14,102,102,14,14,42,VK_BACK,0x08,14,14 -KEY_TAB,15,Tab,0x30,15,13,13,15,15,43,VK_TAB,0x09,15,15 -KEY_Q,16,ANSI_Q,0xc,16,21,21,16,16,20,VK_Q,0x51,16,16 -KEY_W,17,ANSI_W,0xd,17,29,29,17,17,26,VK_W,0x57,17,17 -KEY_E,18,ANSI_E,0xe,18,36,36,18,18,8,VK_E,0x45,18,18 -KEY_R,19,ANSI_R,0xf,19,45,45,19,19,21,VK_R,0x52,19,19 -KEY_T,20,ANSI_T,0x11,20,44,44,20,20,23,VK_T,0x54,20,20 -KEY_Y,21,ANSI_Y,0x10,21,53,53,21,21,28,VK_Y,0x59,21,21 -KEY_U,22,ANSI_U,0x20,22,60,60,22,22,24,VK_U,0x55,22,22 -KEY_I,23,ANSI_I,0x22,23,67,67,23,23,12,VK_I,0x49,23,23 -KEY_O,24,ANSI_O,0x1f,24,68,68,24,24,18,VK_O,0x4f,24,24 -KEY_P,25,ANSI_P,0x23,25,77,77,25,25,19,VK_P,0x50,25,25 -KEY_LEFTBRACE,26,ANSI_LeftBracket,0x21,26,84,84,26,26,47,VK_OEM_4,0xdb,26,26 -KEY_RIGHTBRACE,27,ANSI_RightBracket,0x1e,27,91,91,27,27,48,VK_OEM_6,0xdd,27,27 -KEY_ENTER,28,Return,0x24,28,90,90,28,28,40,VK_RETURN,0x0d,28,28 -KEY_LEFTCTRL,29,Control,0x3b,29,20,17,29,29,224,VK_LCONTROL,0xa2,29,29 -KEY_LEFTCTRL,29,Control,0x3b,29,20,17,29,29,224,VK_CONTROL,0x11,29,29 -KEY_A,30,ANSI_A,0x0,30,28,28,30,30,4,VK_A,0x41,30,30 -KEY_S,31,ANSI_S,0x1,31,27,27,31,31,22,VK_S,0x53,31,31 -KEY_D,32,ANSI_D,0x2,32,35,35,32,32,7,VK_D,0x44,32,32 -KEY_F,33,ANSI_F,0x3,33,43,43,33,33,9,VK_F,0x46,33,33 -KEY_G,34,ANSI_G,0x5,34,52,52,34,34,10,VK_G,0x47,34,34 -KEY_H,35,ANSI_H,0x4,35,51,51,35,35,11,VK_H,0x48,35,35 -KEY_J,36,ANSI_J,0x26,36,59,59,36,36,13,VK_J,0x4a,36,36 -KEY_K,37,ANSI_K,0x28,37,66,66,37,37,14,VK_K,0x4b,37,37 -KEY_L,38,ANSI_L,0x25,38,75,75,38,38,15,VK_L,0x4c,38,38 -KEY_SEMICOLON,39,ANSI_Semicolon,0x29,39,76,76,39,39,51,VK_OEM_1,0xba,39,39 -KEY_APOSTROPHE,40,ANSI_Quote,0x27,40,82,82,40,40,52,VK_OEM_2,0xbf,40,40 -KEY_GRAVE,41,ANSI_Grave,0x32,41,14,14,41,41,53,VK_OEM_3,0xc0,41,41 -KEY_SHIFT,42,Shift,0x38,42,18,18,42,42,225,VK_SHIFT,0x10,42,42 -KEY_LEFTSHIFT,42,Shift,0x38,42,18,18,42,42,225,VK_LSHIFT,0xa0,42,42 -KEY_BACKSLASH,43,ANSI_Backslash,0x2a,43,93,93,43,43,50,VK_OEM_5,0xdc,43,43 -KEY_Z,44,ANSI_Z,0x6,44,26,26,44,44,29,VK_Z,0x5a,44,44 -KEY_X,45,ANSI_X,0x7,45,34,34,45,45,27,VK_X,0x58,45,45 -KEY_C,46,ANSI_C,0x8,46,33,33,46,46,6,VK_C,0x43,46,46 -KEY_V,47,ANSI_V,0x9,47,42,42,47,47,25,VK_V,0x56,47,47 -KEY_B,48,ANSI_B,0xb,48,50,50,48,48,5,VK_B,0x42,48,48 -KEY_N,49,ANSI_N,0x2d,49,49,49,49,49,17,VK_N,0x4e,49,49 -KEY_M,50,ANSI_M,0x2e,50,58,58,50,50,16,VK_M,0x4d,50,50 -KEY_COMMA,51,ANSI_Comma,0x2b,51,65,65,51,51,54,VK_OEM_COMMA,0xbc,51,51 -KEY_DOT,52,ANSI_Period,0x2f,52,73,73,52,52,55,VK_OEM_PERIOD,0xbe,52,52 -KEY_SLASH,53,ANSI_Slash,0x2c,53,74,74,53,53,56,VK_OEM_2,0xbf,53,53 -KEY_RIGHTSHIFT,54,RightShift,0x3c,54,89,89,54,54,229,VK_RSHIFT,0xa1,54,54 -KEY_KPASTERISK,55,ANSI_KeypadMultiply,0x43,55,124,126,55,55,85,VK_MULTIPLY,0x6a,55,55 -KEY_LEFTALT,56,Option,0x3a,56,17,25,56,56,226,VK_LMENU,0xa4,56,56 -KEY_LEFTALT,56,Option,0x3a,56,17,25,56,56,226,VK_MENU,0x12,56,56 -KEY_SPACE,57,Space,0x31,57,41,41,57,57,44,VK_SPACE,0x20,57,57 -KEY_CAPSLOCK,58,CapsLock,0x39,58,88,20,58,58,57,VK_CAPITAL,0x14,58,58 -KEY_F1,59,F1,0x7a,59,5,7,59,59,58,VK_F1,0x70,59,59 -KEY_F2,60,F2,0x78,60,6,15,60,60,59,VK_F2,0x71,60,60 -KEY_F3,61,F3,0x63,61,4,23,61,61,60,VK_F3,0x72,61,61 -KEY_F4,62,F4,0x76,62,12,31,62,62,61,VK_F4,0x73,62,62 -KEY_F5,63,F5,0x60,63,3,39,63,63,62,VK_F5,0x74,63,63 -KEY_F6,64,F6,0x61,64,11,47,64,64,63,VK_F6,0x75,64,64 -KEY_F7,65,F7,0x62,65,259,55,65,65,64,VK_F7,0x76,65,65 -KEY_F8,66,F8,0x64,66,10,63,66,66,65,VK_F8,0x77,66,66 -KEY_F9,67,F9,0x65,67,1,71,67,67,66,VK_F9,0x78,67,67 -KEY_F10,68,F10,0x6d,68,9,79,68,68,67,VK_F10,0x79,68,68 -KEY_NUMLOCK,69,,,69,119,118,69,69,83,VK_NUMLOCK,0x90,69,69 -KEY_SCROLLLOCK,70,,,70,126,95,70,70,71,VK_SCROLL,0x91,70,70 -KEY_KP7,71,ANSI_Keypad7,0x59,71,108,108,71,71,95,VK_NUMPAD7,0x67,71,71 -KEY_KP8,72,ANSI_Keypad8,0x5b,72,117,117,72,72,96,VK_NUMPAD8,0x68,72,72 -KEY_KP9,73,ANSI_Keypad9,0x5c,73,125,125,73,73,97,VK_NUMPAD9,0x69,73,73 -KEY_KPMINUS,74,ANSI_KeypadMinus,0x4e,74,123,132,74,74,86,VK_SUBTRACT,0x6d,74,74 -KEY_KP4,75,ANSI_Keypad4,0x56,75,107,107,75,75,92,VK_NUMPAD4,0x64,75,75 -KEY_KP5,76,ANSI_Keypad5,0x57,76,115,115,76,76,93,VK_NUMPAD5,0x65,76,76 -KEY_KP6,77,ANSI_Keypad6,0x58,77,116,116,77,77,94,VK_NUMPAD6,0x66,77,77 -KEY_KPPLUS,78,ANSI_KeypadPlus,0x45,78,121,124,78,78,87,VK_ADD,0x6b,78,78 -KEY_KP1,79,ANSI_Keypad1,0x53,79,105,105,79,79,89,VK_NUMPAD1,0x61,79,79 -KEY_KP2,80,ANSI_Keypad2,0x54,80,114,114,80,80,90,VK_NUMPAD2,0x62,80,80 -KEY_KP3,81,ANSI_Keypad3,0x55,81,122,122,81,81,91,VK_NUMPAD3,0x63,81,81 -KEY_KP0,82,ANSI_Keypad0,0x52,82,112,112,82,82,98,VK_NUMPAD0,0x60,82,82 -KEY_KPDOT,83,ANSI_KeypadDecimal,0x41,83,113,113,83,83,99,VK_DECIMAL,0x6e,83,83 -,84,,,,,,,84,,,,, -KEY_ZENKAKUHANKAKU,85,,,118,95,,,118,148,,,, -KEY_102ND,86,,,86,97,19,,86,100,VK_OEM_102,0xe1,, -KEY_F11,87,F11,0x67,87,120,86,101,87,68,VK_F11,0x7a,, -KEY_F12,88,F12,0x6f,88,7,94,102,88,69,VK_F12,0x7b,, -KEY_RO,89,,,115,81,,,115,135,,,, -KEY_KATAKANA,90,JIS_Kana????,0x68,120,99,,,120,146,VK_KANA,0x15,, -KEY_HIRAGANA,91,,,119,98,,,119,147,,,, -KEY_HENKAN,92,,,121,100,134,,121,138,,,, -KEY_KATAKANAHIRAGANA,93,,,112,19,135,,112,136,,,0xc8,0xc8 -KEY_MUHENKAN,94,,,123,103,133,,123,139,,,, -KEY_KPJPCOMMA,95,JIS_KeypadComma,0x5f,92,39,,,92,140,,,, -KEY_KPENTER,96,ANSI_KeypadEnter,0x4c,,158,121,,284,88,,,0x64,0x64 -KEY_RIGHTCTRL,97,RightControl,0x3e,,,88,,285,228,VK_RCONTROL,0xa3,0x65,0x65 -KEY_KPSLASH,98,ANSI_KeypadDivide,0x4b,,181,119,,309,84,VK_DIVIDE,0x6f,0x68,0x68 -KEY_SYSRQ,99,,,84,260,87,,84,70,"VK_SNAPSHOT ???",0x2c,0x67,0x67 -KEY_RIGHTALT,100,RightOption,0x3d,,,57,,312,230,VK_RMENU,0xa5,0x69,0x69 -KEY_LINEFEED,101,,,,,,,91,,,,, -KEY_HOME,102,Home,0x73,,224,110,,327,74,VK_HOME,0x24,0x59,0x59 -KEY_UP,103,UpArrow,0x7e,,236,99,109,328,82,VK_UP,0x26,0x5a,0x5a -KEY_PAGEUP,104,PageUp,0x74,,201,111,,329,75,VK_PRIOR,0x21,0x5b,0x5b -KEY_LEFT,105,LeftArrow,0x7b,,203,97,111,331,80,VK_LEFT,0x25,0x5c,0x5c -KEY_RIGHT,106,RightArrow,0x7c,,205,106,112,333,79,VK_RIGHT,0x27,0x5e,0x5e -KEY_END,107,End,0x77,,225,101,,335,77,VK_END,0x23,0x5f,0x5f -KEY_DOWN,108,DownArrow,0x7d,,254,96,110,336,81,VK_DOWN,0x28,0x60,0x60 -KEY_PAGEDOWN,109,PageDown,0x79,,243,109,,337,78,VK_NEXT,0x22,0x61,0x61 -KEY_INSERT,110,,,,210,103,107,338,73,VK_INSERT,0x2d,0x62,0x62 -KEY_DELETE,111,ForwardDelete,0x75,,244,100,108,339,76,VK_DELETE,0x2e,0x63,0x63 -KEY_MACRO,112,,,,239,142,,367,,,,, -KEY_MUTE,113,Mute,0x4a,,251,156,,288,239,VK_VOLUME_MUTE,0xad,, -KEY_VOLUMEDOWN,114,VolumeDown,0x49,,,157,,302,238,VK_VOLUME_DOWN,0xae,, -KEY_VOLUMEUP,115,VolumeUp,0x48,,233,149,,304,237,VK_VOLUME_UP,0xaf,, -KEY_POWER,116,,,,,,,350,102,,,, -KEY_KPEQUAL,117,ANSI_KeypadEquals,0x51,89,15,,,89,103,,,0x76,0x76 -KEY_KPPLUSMINUS,118,,,,206,,,334,,,,, -KEY_PAUSE,119,,,,198,98,,326,72,VK_PAUSE,0x013,0x66,0x66 -KEY_SCALE,120,,,,,,,267,,,,, -KEY_KPCOMMA,121,ANSI_KeypadClear????,0x47,126,109,,,126,133,VK_SEPARATOR??,0x6c,, -KEY_HANGEUL,122,,,,,,,,144,VK_HANGEUL,0x15,, -KEY_HANJA,123,,,,,,,269,145,VK_HANJA,0x19,, -KEY_YEN,124,JIS_Yen,0x5d,125,106,,,125,137,,,0x7d,0x7d -KEY_LEFTMETA,125,Command,0x37,,,139,,347,227,VK_LWIN,0x5b,0x6b,0x6b -KEY_RIGHTMETA,126,,,,,140,,348,231,VK_RWIN,0x5c,0x6c,0x6c -KEY_COMPOSE,127,Function,0x3f,,,141,,349,101,VK_APPS,0x5d,0x6d,0x6d -KEY_STOP,128,,,,,10,,360,243,VK_BROWSER_STOP,0xa9,, -KEY_AGAIN,129,,,,,11,,261,121,,,, -KEY_PROPS,130,,,,,12,,262,118,,,, -KEY_UNDO,131,,,,,16,,263,122,,,, -KEY_FRONT,132,,,,,,,268,119,,,, -KEY_COPY,133,,,,,24,,376,124,,,, -KEY_OPEN,134,,,,,32,,100,116,,,, -KEY_PASTE,135,,,,,40,,101,125,,,, -KEY_FIND,136,,,,,48,,321,244,,,, -KEY_CUT,137,,,,,56,,316,123,,,, -KEY_HELP,138,,,,,9,,373,117,VK_HELP,0x2f,, -KEY_MENU,139,,,,,145,,286,,,,, -KEY_CALC,140,,,,174,163,,289,251,,,, -KEY_SETUP,141,,,,,,,102,,,,, -KEY_SLEEP,142,,,,,,,351,248,VK_SLEEP,0x5f,, -KEY_WAKEUP,143,,,,,,,355,,,,, -KEY_FILE,144,,,,,,,103,,,,, -KEY_SENDFILE,145,,,,,,,104,,,,, -KEY_DELETEFILE,146,,,,,,,105,,,,, -KEY_XFER,147,,,,,162,,275,,,,, -KEY_PROG1,148,,,,,160,,287,,,,, -KEY_PROG2,149,,,,,161,,279,,,,, -KEY_WWW,150,,,,,,,258,240,,,, -KEY_MSDOS,151,,,,,,,106,,,,, -KEY_SCREENLOCK,152,,,,,150,,274,249,,,, -KEY_DIRECTION,153,,,,,,,107,,,,, -KEY_CYCLEWINDOWS,154,,,,,155,,294,,,,, -KEY_MAIL,155,,,,,,,364,,,,, -KEY_BOOKMARKS,156,,,,,,,358,,,,, -KEY_COMPUTER,157,,,,,,,363,,,,, -KEY_BACK,158,,,,,,,362,241,VK_BROWSER_BACK,0xa6,, -KEY_FORWARD,159,,,,,,,361,242,VK_BROWSER_FORWARD,0xa7,, -KEY_CLOSECD,160,,,,,154,,291,,,,, -KEY_EJECTCD,161,,,,,,,108,236,,,, -KEY_EJECTCLOSECD,162,,,,,,,381,,,,, -KEY_NEXTSONG,163,,,,241,147,,281,235,VK_MEDIA_NEXT_TRACK,0xb0,, -KEY_PLAYPAUSE,164,,,,173,,,290,232,VK_MEDIA_PLAY_PAUSE,0xb3,, -KEY_PREVIOUSSONG,165,,,,250,148,,272,234,VK_MEDIA_PREV_TRACK,0xb1,, -KEY_STOPCD,166,,,,164,152,,292,233,VK_MEDIA_STOP,0xb2,, -KEY_RECORD,167,,,,,158,,305,,,,, -KEY_REWIND,168,,,,,159,,280,,,,, -KEY_PHONE,169,,,,,,,99,,,,, -KEY_ISO,170,ISO_Section,0xa,,,,,112,,,,, -KEY_CONFIG,171,,,,,,,257,,,,, -KEY_HOMEPAGE,172,,,,178,151,,306,,VK_BROWSER_HOME,0xac,, -KEY_REFRESH,173,,,,,,,359,250,VK_BROWSER_REFRESH,0xa8,, -KEY_EXIT,174,,,,,,,113,,,,, -KEY_MOVE,175,,,,,,,114,,,,, -KEY_EDIT,176,,,,,,,264,247,,,, -KEY_SCROLLUP,177,,,,,,,117,245,,,, -KEY_SCROLLDOWN,178,,,,,,,271,246,,,, -KEY_KPLEFTPAREN,179,,,,,,,374,182,,,, -KEY_KPRIGHTPAREN,180,,,,,,,379,183,,,, -KEY_NEW,181,,,,,,,265,,,,, -KEY_REDO,182,,,,,,,266,,,,, -KEY_F13,183,F13,0x69,93,47,127,,93,104,VK_F13,0x7c,0x6e,0x6e -KEY_F14,184,F14,0x6b,94,55,128,,94,105,VK_F14,0x7d,0x6f,0x6f -KEY_F15,185,F15,0x71,95,63,129,,95,106,VK_F15,0x7e,0x70,0x70 -KEY_F16,186,F16,0x6a,,,130,,85,107,VK_F16,0x7f,0x71,0x71 -KEY_F17,187,F17,0x40,,,131,,259,108,VK_F17,0x80,0x72,0x72 -KEY_F18,188,F18,0x4f,,,,,375,109,VK_F18,0x81,, -KEY_F19,189,F19,0x50,,,,,260,110,VK_F19,0x82,, -KEY_F20,190,F20,0x5a,,,,,90,111,VK_F20,0x83,, -KEY_F21,191,,,,,,,116,112,VK_F21,0x84,, -KEY_F22,192,,,,,,,377,113,VK_F22,0x85,, -KEY_F23,193,,,,,,,109,114,VK_F23,0x86,, -KEY_F24,194,,,,,,,111,115,VK_F24,0x87,, -,195,,,,,,,277,,,,, -,196,,,,,,,278,,,,, -,197,,,,,,,282,,,,, -,198,,,,,,,283,,,,, -,199,,,,,,,295,,,,, -KEY_PLAYCD,200,,,,,,,296,,,,, -KEY_PAUSECD,201,,,,,,,297,,,,, -KEY_PROG3,202,,,,,,,299,,,,, -KEY_PROG4,203,,,,,,,300,,,,, -KEY_DASHBOARD,204,,,,,,,301,,,,, -KEY_SUSPEND,205,,,,,,,293,,,,, -KEY_CLOSE,206,,,,,,,303,,,,, -KEY_PLAY,207,,,,,,,307,,VK_PLAY,0xfa,, -KEY_FASTFORWARD,208,,,,,,,308,,,,, -KEY_BASSBOOST,209,,,,,,,310,,,,, -KEY_PRINT,210,,,,,,,313,,VK_PRINT,0x2a,, -KEY_HP,211,,,,,,,314,,,,, -KEY_CAMERA,212,,,,,,,315,,,,, -KEY_SOUND,213,,,,,,,317,,,,, -KEY_QUESTION,214,,,,,,,318,,,,, -KEY_EMAIL,215,,,,,,,319,,VK_LAUNCH_MAIL,0xb4,, -KEY_CHAT,216,,,,,,,320,,,,, -KEY_SEARCH,217,,,,,,,357,,VK_BROWSER_SEARCH,0xaa,, -KEY_CONNECT,218,,,,,,,322,,,,, -KEY_FINANCE,219,,,,,,,323,,,,, -KEY_SPORT,220,,,,,,,324,,,,, -KEY_SHOP,221,,,,,,,325,,,,, -KEY_ALTERASE,222,,,,,,,276,,,,, -KEY_CANCEL,223,,,,,,,330,,,,, -KEY_BRIGHTNESSDOWN,224,,,,,,,332,,,,, -KEY_BRIGHTNESSUP,225,,,,,,,340,,,,, -KEY_MEDIA,226,,,,,,,365,,,,, -KEY_SWITCHVIDEOMODE,227,,,,,,,342,,,,, -KEY_KBDILLUMTOGGLE,228,,,,,,,343,,,,, -KEY_KBDILLUMDOWN,229,,,,,,,344,,,,, -KEY_KBDILLUMUP,230,,,,,,,345,,,,, -KEY_SEND,231,,,,,,,346,,,,, -KEY_REPLY,232,,,,,,,356,,,,, -KEY_FORWARDMAIL,233,,,,,,,270,,,,, -KEY_SAVE,234,,,,,,,341,,,,, -KEY_DOCUMENTS,235,,,,,,,368,,,,, -KEY_BATTERY,236,,,,,,,369,,,,, -KEY_BLUETOOTH,237,,,,,,,370,,,,, -KEY_WLAN,238,,,,,,,371,,,,, -KEY_UWB,239,,,,,,,372,,,,, -KEY_UNKNOWN,240,,,,,,,,,,,, -KEY_VIDEO_NEXT,241,,,,,,,,,,,, -KEY_VIDEO_PREV,242,,,,,,,,,,,, -KEY_BRIGHTNESS_CYCLE,243,,,,,,,,,,,, -KEY_BRIGHTNESS_ZERO,244,,,,,,,,,,,, -KEY_DISPLAY_OFF,245,,,,,,,,,,,, -KEY_WIMAX,246,,,,,,,,,,,, -,247,,,,,,,,,,,, -,248,,,,,,,,,,,, -,249,,,,,,,,,,,, -,250,,,,,,,,,,,, -,251,,,,,,,,,,,, -,252,,,,,,,,,,,, -,253,,,,,,,,,,,, -,254,,,,,,,,,,,, -,255,,,,182,,,,,,,, -BTN_MISC,0x100,,,,,,,,,,,, -BTN_0,0x100,,,,,,,,,VK_LBUTTON,0x01,, -BTN_1,0x101,,,,,,,,,VK_RBUTTON,0x02,, -BTN_2,0x102,,,,,,,,,VK_MBUTTON,0x04,, -BTN_3,0x103,,,,,,,,,VK_XBUTTON1,0x05,, -BTN_4,0x104,,,,,,,,,VK_XBUTTON2,0x06,, -BTN_5,0x105,,,,,,,,,,,, -BTN_6,0x106,,,,,,,,,,,, -BTN_7,0x107,,,,,,,,,,,, -BTN_8,0x108,,,,,,,,,,,, -BTN_9,0x109,,,,,,,,,,,, -BTN_MOUSE,0x110,,,,,,,,,,,, -BTN_LEFT,0x110,,,,,,,,,,,, -BTN_RIGHT,0x111,,,,,,,,,,,, -BTN_MIDDLE,0x112,,,,,,,,,,,, -BTN_SIDE,0x113,,,,,,,,,,,, -BTN_EXTRA,0x114,,,,,,,,,,,, -BTN_FORWARD,0x115,,,,,,,,,,,, -BTN_BACK,0x116,,,,,,,,,,,, -BTN_TASK,0x117,,,,,,,,,,,, -BTN_JOYSTICK,0x120,,,,,,,,,,,, -BTN_TRIGGER,0x120,,,,,,,,,,,, -BTN_THUMB,0x121,,,,,,,,,,,, -BTN_THUMB2,0x122,,,,,,,,,,,, -BTN_TOP,0x123,,,,,,,,,,,, -BTN_TOP2,0x124,,,,,,,,,,,, -BTN_PINKIE,0x125,,,,,,,,,,,, -BTN_BASE,0x126,,,,,,,,,,,, -BTN_BASE2,0x127,,,,,,,,,,,, -BTN_BASE3,0x128,,,,,,,,,,,, -BTN_BASE4,0x129,,,,,,,,,,,, -BTN_BASE5,0x12a,,,,,,,,,,,, -BTN_BASE6,0x12b,,,,,,,,,,,, -BTN_DEAD,0x12f,,,,,,,,,,,, -BTN_GAMEPAD,0x130,,,,,,,,,,,, -BTN_A,0x130,,,,,,,,,,,, -BTN_B,0x131,,,,,,,,,,,, -BTN_C,0x132,,,,,,,,,,,, -BTN_X,0x133,,,,,,,,,,,, -BTN_Y,0x134,,,,,,,,,,,, -BTN_Z,0x135,,,,,,,,,,,, -BTN_TL,0x136,,,,,,,,,,,, -BTN_TR,0x137,,,,,,,,,,,, -BTN_TL2,0x138,,,,,,,,,,,, -BTN_TR2,0x139,,,,,,,,,,,, -BTN_SELECT,0x13a,,,,,,,,,,,, -BTN_START,0x13b,,,,,,,,,,,, -BTN_MODE,0x13c,,,,,,,,,,,, -BTN_THUMBL,0x13d,,,,,,,,,,,, -BTN_THUMBR,0x13e,,,,,,,,,,,, -BTN_DIGI,0x140,,,,,,,,,,,, -BTN_TOOL_PEN,0x140,,,,,,,,,,,, -BTN_TOOL_RUBBER,0x141,,,,,,,,,,,, -BTN_TOOL_BRUSH,0x142,,,,,,,,,,,, -BTN_TOOL_PENCIL,0x143,,,,,,,,,,,, -BTN_TOOL_AIRBRUSH,0x144,,,,,,,,,,,, -BTN_TOOL_FINGER,0x145,,,,,,,,,,,, -BTN_TOOL_MOUSE,0x146,,,,,,,,,,,, -BTN_TOOL_LENS,0x147,,,,,,,,,,,, -BTN_TOUCH,0x14a,,,,,,,,,,,, -BTN_STYLUS,0x14b,,,,,,,,,,,, -BTN_STYLUS2,0x14c,,,,,,,,,,,, -BTN_TOOL_DOUBLETAP,0x14d,,,,,,,,,,,, -BTN_TOOL_TRIPLETAP,0x14e,,,,,,,,,,,, -BTN_TOOL_QUADTAP,0x14f,,,,,,,,,,,, -BTN_WHEEL,0x150,,,,,,,,,,,, -BTN_GEAR_DOWN,0x150,,,,,,,,,,,, -BTN_GEAR_UP,0x151,,,,,,,,,,,, -KEY_OK,0x160,,,,,,,,,,,, -KEY_SELECT,0x161,,,,,,,,,VK_SELECT,0x29,, -KEY_GOTO,0x162,,,,,,,,,,,, -KEY_CLEAR,0x163,,,,,,,,,,,, -KEY_POWER2,0x164,,,,,,,,,,,, -KEY_OPTION,0x165,,,,,,,,,,,, -KEY_INFO,0x166,,,,,,,,,,,, -KEY_TIME,0x167,,,,,,,,,,,, -KEY_VENDOR,0x168,,,,,,,,,,,, -KEY_ARCHIVE,0x169,,,,,,,,,,,, -KEY_PROGRAM,0x16a,,,,,,,,,,,, -KEY_CHANNEL,0x16b,,,,,,,,,,,, -KEY_FAVORITES,0x16c,,,,,,,,,VK_BROWSER_FAVOURITES,0xab,, -KEY_EPG,0x16d,,,,,,,,,,,, -KEY_PVR,0x16e,,,,,,,,,,,, -KEY_MHP,0x16f,,,,,,,,,,,, -KEY_LANGUAGE,0x170,,,,,,,,,,,, -KEY_TITLE,0x171,,,,,,,,,,,, -KEY_SUBTITLE,0x172,,,,,,,,,,,, -KEY_ANGLE,0x173,,,,,,,,,,,, -KEY_ZOOM,0x174,,,,,,,,,VK_ZOOM,0xfb,, -KEY_MODE,0x175,,,,,,,,,,,, -KEY_KEYBOARD,0x176,,,,,,,,,,,, -KEY_SCREEN,0x177,,,,,,,,,,,, -KEY_PC,0x178,,,,,,,,,,,, -KEY_TV,0x179,,,,,,,,,,,, -KEY_TV2,0x17a,,,,,,,,,,,, -KEY_VCR,0x17b,,,,,,,,,,,, -KEY_VCR2,0x17c,,,,,,,,,,,, -KEY_SAT,0x17d,,,,,,,,,,,, -KEY_SAT2,0x17e,,,,,,,,,,,, -KEY_CD,0x17f,,,,,,,,,,,, -KEY_TAPE,0x180,,,,,,,,,,,, -KEY_RADIO,0x181,,,,,,,,,,,, -KEY_TUNER,0x182,,,,,,,,,,,, -KEY_PLAYER,0x183,,,,,,,,,,,, -KEY_TEXT,0x184,,,,,,,,,,,, -KEY_DVD,0x185,,,,,,,,,,,, -KEY_AUX,0x186,,,,,,,,,,,, -KEY_MP3,0x187,,,,,,,,,,,, -KEY_AUDIO,0x188,,,,,,,,,,,, -KEY_VIDEO,0x189,,,,,,,,,,,, -KEY_DIRECTORY,0x18a,,,,,,,,,,,, -KEY_LIST,0x18b,,,,,,,,,,,, -KEY_MEMO,0x18c,,,,,,,,,,,, -KEY_CALENDAR,0x18d,,,,,,,,,,,, -KEY_RED,0x18e,,,,,,,,,,,, -KEY_GREEN,0x18f,,,,,,,,,,,, -KEY_YELLOW,0x190,,,,,,,,,,,, -KEY_BLUE,0x191,,,,,,,,,,,, -KEY_CHANNELUP,0x192,,,,,,,,,,,, -KEY_CHANNELDOWN,0x193,,,,,,,,,,,, -KEY_FIRST,0x194,,,,,,,,,,,, -KEY_LAST,0x195,,,,,,,,,,,, -KEY_AB,0x196,,,,,,,,,,,, -KEY_NEXT,0x197,,,,,,,,,,,, -KEY_RESTART,0x198,,,,,,,,,,,, -KEY_SLOW,0x199,,,,,,,,,,,, -KEY_SHUFFLE,0x19a,,,,,,,,,,,, -KEY_BREAK,0x19b,,,,,,,,,,,, -KEY_PREVIOUS,0x19c,,,,,,,,,,,, -KEY_DIGITS,0x19d,,,,,,,,,,,, -KEY_TEEN,0x19e,,,,,,,,,,,, -KEY_TWEN,0x19f,,,,,,,,,,,, -KEY_VIDEOPHONE,0x1a0,,,,,,,,,,,, -KEY_GAMES,0x1a1,,,,,,,,,,,, -KEY_ZOOMIN,0x1a2,,,,,,,,,,,, -KEY_ZOOMOUT,0x1a3,,,,,,,,,,,, -KEY_ZOOMRESET,0x1a4,,,,,,,,,,,, -KEY_WORDPROCESSOR,0x1a5,,,,,,,,,,,, -KEY_EDITOR,0x1a6,,,,,,,,,,,, -KEY_SPREADSHEET,0x1a7,,,,,,,,,,,, -KEY_GRAPHICSEDITOR,0x1a8,,,,,,,,,,,, -KEY_PRESENTATION,0x1a9,,,,,,,,,,,, -KEY_DATABASE,0x1aa,,,,,,,,,,,, -KEY_NEWS,0x1ab,,,,,,,,,,,, -KEY_VOICEMAIL,0x1ac,,,,,,,,,,,, -KEY_ADDRESSBOOK,0x1ad,,,,,,,,,,,, -KEY_MESSENGER,0x1ae,,,,,,,,,,,, -KEY_DISPLAYTOGGLE,0x1af,,,,,,,,,,,, -KEY_SPELLCHECK,0x1b0,,,,,,,,,,,, -KEY_LOGOFF,0x1b1,,,,,,,,,,,, -KEY_DOLLAR,0x1b2,,,,,,,,,,,, -KEY_EURO,0x1b3,,,,,,,,,,,, -KEY_FRAMEBACK,0x1b4,,,,,,,,,,,, -KEY_FRAMEFORWARD,0x1b5,,,,,,,,,,,, -KEY_CONTEXT_MENU,0x1b6,,,,,,,,,,,, -KEY_MEDIA_REPEAT,0x1b7,,,,,,,,,,,, -KEY_DEL_EOL,0x1c0,,,,,,,,,,,, -KEY_DEL_EOS,0x1c1,,,,,,,,,,,, -KEY_INS_LINE,0x1c2,,,,,,,,,,,, -KEY_DEL_LINE,0x1c3,,,,,,,,,,,, -KEY_FN,0x1d0,,,,,,,,,,,, -KEY_FN_ESC,0x1d1,,,,,,,,,,,, -KEY_FN_F1,0x1d2,,,,,,,,,,,, -KEY_FN_F2,0x1d3,,,,,,,,,,,, -KEY_FN_F3,0x1d4,,,,,,,,,,,, -KEY_FN_F4,0x1d5,,,,,,,,,,,, -KEY_FN_F5,0x1d6,,,,,,,,,,,, -KEY_FN_F6,0x1d7,,,,,,,,,,,, -KEY_FN_F7,0x1d8,,,,,,,,,,,, -KEY_FN_F8,0x1d9,,,,,,,,,,,, -KEY_FN_F9,0x1da,,,,,,,,,,,, -KEY_FN_F10,0x1db,,,,,,,,,,,, -KEY_FN_F11,0x1dc,,,,,,,,,,,, -KEY_FN_F12,0x1dd,,,,,,,,,,,, -KEY_FN_1,0x1de,,,,,,,,,,,, -KEY_FN_2,0x1df,,,,,,,,,,,, -KEY_FN_D,0x1e0,,,,,,,,,,,, -KEY_FN_E,0x1e1,,,,,,,,,,,, -KEY_FN_F,0x1e2,,,,,,,,,,,, -KEY_FN_S,0x1e3,,,,,,,,,,,, -KEY_FN_B,0x1e4,,,,,,,,,,,, -KEY_BRL_DOT1,0x1f1,,,,,,,,,,,, -KEY_BRL_DOT2,0x1f2,,,,,,,,,,,, -KEY_BRL_DOT3,0x1f3,,,,,,,,,,,, -KEY_BRL_DOT4,0x1f4,,,,,,,,,,,, -KEY_BRL_DOT5,0x1f5,,,,,,,,,,,, -KEY_BRL_DOT6,0x1f6,,,,,,,,,,,, -KEY_BRL_DOT7,0x1f7,,,,,,,,,,,, -KEY_BRL_DOT8,0x1f8,,,,,,,,,,,, -KEY_BRL_DOT9,0x1f9,,,,,,,,,,,, -KEY_BRL_DOT10,0x1fa,,,,,,,,,,,, -KEY_NUMERIC_0,0x200,,,,,,,,,,,, -KEY_NUMERIC_1,0x201,,,,,,,,,,,, -KEY_NUMERIC_2,0x202,,,,,,,,,,,, -KEY_NUMERIC_3,0x203,,,,,,,,,,,, -KEY_NUMERIC_4,0x204,,,,,,,,,,,, -KEY_NUMERIC_5,0x205,,,,,,,,,,,, -KEY_NUMERIC_6,0x206,,,,,,,,,,,, -KEY_NUMERIC_7,0x207,,,,,,,,,,,, -KEY_NUMERIC_8,0x208,,,,,,,,,,,, -KEY_NUMERIC_9,0x209,,,,,,,,,,,, -KEY_NUMERIC_STAR,0x20a,,,,,,,,,,,, -KEY_NUMERIC_POUND,0x20b,,,,,,,,,,,, -KEY_RFKILL,0x20c,,,,,,,,,,,, diff --git a/src/util/virkeycode-mapgen.py b/src/util/virkeycode-mapgen.py deleted file mode 100755 index 8360bfe..0000000 --- a/src/util/virkeycode-mapgen.py +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/python - -""" -Generate the big keycodes table for virkeys. -It read keymaps.csv from stdin and put the generated code to stdout. - -Please keep keymaps.csv be exactly the same as: -http://git.gnome.org/browse/gtk-vnc/plain/src/keymaps.csv. -If anything inconsistent happens, please change this file -instead of keymaps.csv which is a mirror. -""" - -import sys -import re - -cols = ( - ["linux", True], - ["linux", False], - ["os_x", True], - ["os_x", False], - ["atset1", False], - - ["atset2", False], - ["atset3", False], - ["xt", False], - ["xt_kbd", False], - ["usb", False], - - ["win32", True], - ["win32", False], - [None, False], - [None, False], - ["rfb", False], -) - -xtkbdkey_index = 8 - -def quotestring(str): - if str[0] != '"': - return '"' + str + '"' - return str - -print ''' -/* Generated file, DON'T edit it */ - -#ifndef VIRT_KEY_INTERNAL -# error do not use this; it is not a public header -#endif - -''' - -sys.stdin.readline() # eat the fist line. - -keycodes = [] - -max = 0 - -for line in sys.stdin.xreadlines(): - values = re.match("([^,]*)," * 13 + "([^,]*)$", line[0:-1]).groups() - - data = [] - for v in values: - data.append(v) - - # RFB keycodes are XT kbd keycodes with a slightly - # different encoding of 0xe0 scan codes. RFB uses - # the high bit of the first byte, instead of the low - # bit of the second byte. - rfbkey = int(data[xtkbdkey_index] or '0') - rfbkey = (rfbkey & 0x100) >> 1 | (rfbkey & 0x7f) - data.append("%d" % rfbkey) - - keycodes.append(data) - max = max + 1 - -print "#define VIR_KEYMAP_ENTRY_MAX " + str(max) - -for i in range(len(cols)): - col=cols[i] - name=col[0] - isname=col[1] - - if name is None: - continue - - if isname: - print "const char *virKeymapNames_" + name + "[] = {" - else: - print "int virKeymapValues_" + name + "[] = {" - - for entry in keycodes: - if isname: - print " " + quotestring(entry[i] or "NULL") + "," - else: - print " " + (entry[i] or "-1") + "," - - print "};\n" diff --git a/src/util/virkeycode.c b/src/util/virkeycode.c index 7880a0a..b50d917 100644 --- a/src/util/virkeycode.c +++ b/src/util/virkeycode.c @@ -22,57 +22,53 @@ #include <string.h> #include <stddef.h> - -#define VIRT_KEY_INTERNAL -#include "virkeymaps.h" - -static const char **virKeymapNames[] = { - [VIR_KEYCODE_SET_LINUX] = - virKeymapNames_linux, - [VIR_KEYCODE_SET_XT] = - NULL, - [VIR_KEYCODE_SET_ATSET1] = - NULL, - [VIR_KEYCODE_SET_ATSET2] = - NULL, - [VIR_KEYCODE_SET_ATSET3] = - NULL, - [VIR_KEYCODE_SET_OSX] = - virKeymapNames_os_x, - [VIR_KEYCODE_SET_XT_KBD] = - NULL, - [VIR_KEYCODE_SET_USB] = - NULL, - [VIR_KEYCODE_SET_WIN32] = - virKeymapNames_win32, - [VIR_KEYCODE_SET_RFB] = - NULL, +#include "virkeycodetable_atset1.h" +#include "virkeycodetable_atset2.h" +#include "virkeycodetable_atset3.h" +#include "virkeycodetable_linux.h" +#include "virkeycodetable_osx.h" +#include "virkeycodetable_rfb.h" +#include "virkeycodetable_usb.h" +#include "virkeycodetable_win32.h" +#include "virkeycodetable_xt.h" +#include "virkeycodetable_xtkbd.h" +#include "virkeynametable_linux.h" +#include "virkeynametable_osx.h" +#include "virkeynametable_win32.h" + +static const char **virKeymapNames[VIR_KEYCODE_SET_LAST] = { + [VIR_KEYCODE_SET_LINUX] = virKeyNameTable_linux, + [VIR_KEYCODE_SET_OSX] = virKeyNameTable_osx, + [VIR_KEYCODE_SET_WIN32] = virKeyNameTable_win32, }; -verify(ARRAY_CARDINALITY(virKeymapNames) == VIR_KEYCODE_SET_LAST); - -static int *virKeymapValues[] = { - [VIR_KEYCODE_SET_LINUX] = - virKeymapValues_linux, - [VIR_KEYCODE_SET_XT] = - virKeymapValues_xt, - [VIR_KEYCODE_SET_ATSET1] = - virKeymapValues_atset1, - [VIR_KEYCODE_SET_ATSET2] = - virKeymapValues_atset2, - [VIR_KEYCODE_SET_ATSET3] = - virKeymapValues_atset3, - [VIR_KEYCODE_SET_OSX] = - virKeymapValues_os_x, - [VIR_KEYCODE_SET_XT_KBD] = - virKeymapValues_xt_kbd, - [VIR_KEYCODE_SET_USB] = - virKeymapValues_usb, - [VIR_KEYCODE_SET_WIN32] = - virKeymapValues_win32, - [VIR_KEYCODE_SET_RFB] = - virKeymapValues_rfb, + +static const unsigned short *virKeymapValues[VIR_KEYCODE_SET_LAST] = { + [VIR_KEYCODE_SET_LINUX] = virKeyCodeTable_linux, + [VIR_KEYCODE_SET_XT] = virKeyCodeTable_xt, + [VIR_KEYCODE_SET_ATSET1] = virKeyCodeTable_atset1, + [VIR_KEYCODE_SET_ATSET2] = virKeyCodeTable_atset2, + [VIR_KEYCODE_SET_ATSET3] = virKeyCodeTable_atset3, + [VIR_KEYCODE_SET_OSX] = virKeyCodeTable_osx, + [VIR_KEYCODE_SET_XT_KBD] = virKeyCodeTable_xtkbd, + [VIR_KEYCODE_SET_USB] = virKeyCodeTable_usb, + [VIR_KEYCODE_SET_WIN32] = virKeyCodeTable_win32, + [VIR_KEYCODE_SET_RFB] = virKeyCodeTable_rfb, }; -verify(ARRAY_CARDINALITY(virKeymapValues) == VIR_KEYCODE_SET_LAST); + +#define VIR_KEYMAP_ENTRY_MAX ARRAY_CARDINALITY(virKeyCodeTable_linux) + +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyCodeTable_xt)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyCodeTable_atset1)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyCodeTable_atset2)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyCodeTable_atset3)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyCodeTable_osx)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyCodeTable_xtkbd)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyCodeTable_usb)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyCodeTable_win32)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyCodeTable_rfb)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyNameTable_linux)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyNameTable_osx)); +verify(ARRAY_CARDINALITY(virKeyCodeTable_linux) == ARRAY_CARDINALITY(virKeyNameTable_win32)); VIR_ENUM_IMPL(virKeycodeSet, VIR_KEYCODE_SET_LAST, "linux", diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c index d092209..a9781df 100644 --- a/tests/virkeycodetest.c +++ b/tests/virkeycodetest.c @@ -57,6 +57,9 @@ static int testKeycodeMapping(const void *data ATTRIBUTE_UNUSED) TRANSLATE(LINUX, RFB, 88, 88); TRANSLATE(LINUX, RFB, 160, 163); TRANSLATE(ATSET2, ATSET3, 259, 55); + TRANSLATE(OSX, WIN32, 90, 131); + TRANSLATE(OSX, ATSET1, 90, 0); + TRANSLATE(OSX, ATSET1, 3200, -1); #undef TRANSLATE @@ -82,6 +85,8 @@ static int testKeycodeStrings(const void *data ATTRIBUTE_UNUSED) } while (0) TRANSLATE(LINUX, "KEY_DELETE", 111); + TRANSLATE(LINUX, "KEY_RFKILL", 524); + TRANSLATE(LINUX, "KEY_WIBBLE", -1); TRANSLATE(OSX, "Function", 0x3f); TRANSLATE(WIN32, "VK_UP", 0x26); -- 2.9.3

1 0

[libvirt] [PATCH v2 00/14] Add TLS support for migration
by John Ferlan 02 Mar '17

02 Mar '17

v1: http://www.redhat.com/archives/libvir-list/2017-February/msg00897.html v1 cover letter reiterated: Patches 1, 3 -> 9 are primarily quite a bit of code motion in order to allow reuse of the "core" of the chardev TLS code. Theoretically speaking of course, these patches should work - I don't have a TLS and migration environment to test with, so between following the qemu command model on Daniel's blog and prior experience with the chardev TLS would I added the saving of a flag to the private qemu domain state, although I'm not 100% sure it was necessary. At one time I created the source TLS objects during the Begin phase, but later decided to wait until just before the migration is run. I think the main reason to have the flag would be a restart of libvirtd to let 'something' know migration using TLS was configured. I think it may only be "necessary" in order to repopulate the migSecinfo after libvirtd restart, but it's not entirely clear. By the time I started thinking more about while writing this cover letter it was too late to just remove. Also rather than create the destination host TLS objects on the fly, I modified the command line generation. That model could change to adding the TLS objects once the destination is started and before the params are set for the migration. This 'model' is also going to be used for the NBD, but I figured I'd get this posted now since it was already too long of a series. v2: Changes Reorder the patches to put the reused 'chardev' code up front. Most of these patches were "ok" along the way, but only one was officially ACK'd (and that was pushed). Patch1 is new - based off code review comment to create a common New function for secinfo allocation Patch2 is adjusted to use Patch1 Patch3 is new based on review comment and having ExitMonitor outside the virSaveLastError ... virSetError Patch4 mainly follows older logic with adjustments as suggested during code review Patch5 -> Patch8 had minor changes as a result of other suggestions Patch9 just removed the _set logic Patch10 fixed the order/placement of VIR_MIGRATE_TLS Patch11 is the old patch1 w/ the fixed #undef Patch12 is the old patch2 w/o changes Patch13 Alters the server logic to create the objects on the fly rather that via command line. It also introduces 3 helpers to perform the migration TLS manipulation Patch14 similarly uses those API's AFAIU - removal of the objects would remove the migration tls-creds, tls-hostname settings. NB: I left the cfg->migrateTLS in for now - it's very simple to remove, but there would still need to be a key on something to ensure the migrateTLS environment has been properly configured since that would mean the default environment would need to be used/configured. Setting up the default environment is keyed off having the migrateTLS defined. That's all part of the qemu_conf reading logic. John Ferlan (14): qemu: Introduce qemuDomainSecretInfoNew qemu: Introduce qemuDomainSecretMigratePrepare qemu: Move exit monitor calls in failure paths qemu: Refactor hotplug to introduce qemuDomain{Add|Del}TLSObjects qemu: Refactor qemuDomainGetChardevTLSObjects to converge code qemu: Move qemuDomainSecretChardevPrepare call qemu: Move qemuDomainPrepareChardevSourceTLS call qemu: Introduce qemuDomainGetTLSObjects qemu: Add TLS params to _qemuMonitorMigrationParams Add new migration flag VIR_MIGRATE_TLS qemu: Create #define for TLS configuration setup. conf: Introduce migrate_tls_x509_cert_dir qemu: Set up the migrate TLS objects for target qemu: Set up the migration TLS objects for source include/libvirt/libvirt-domain.h | 8 + src/qemu/libvirtd_qemu.aug | 6 + src/qemu/qemu.conf | 39 +++++ src/qemu/qemu_conf.c | 45 +++-- src/qemu/qemu_conf.h | 5 + src/qemu/qemu_domain.c | 195 +++++++++++++-------- src/qemu/qemu_domain.h | 89 ++++++---- src/qemu/qemu_hotplug.c | 343 ++++++++++++++++++++----------------- src/qemu/qemu_hotplug.h | 24 +++ src/qemu/qemu_migration.c | 200 +++++++++++++++++++++ src/qemu/qemu_migration.h | 3 +- src/qemu/qemu_monitor.c | 11 +- src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 10 ++ src/qemu/test_libvirtd_qemu.aug.in | 4 + tools/virsh-domain.c | 7 + 16 files changed, 705 insertions(+), 287 deletions(-) -- 2.9.3

5 39

[libvirt] [PATCH] qemu: command: Truncate the chardev logging file even if append is not present
by Peter Krempa 02 Mar '17

02 Mar '17

Our documentation states that the chardev logging file is truncated unless append='on' is specified. QEMU also behaves the same way and truncates the file unless we provide the argument. The new virlogd implementation did not honor if the argument was missing and continued to append to the file. Truncate the file even when the 'append' attribute is present to behave the same with both implementations and adhere to the docs. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1420205 --- src/qemu/qemu_command.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 41eecfd18..46bd2e268 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4827,7 +4827,8 @@ qemuBuildChrChardevFileStr(virLogManagerPtr logManager, int flags = 0; int logfd; - if (appendval == VIR_TRISTATE_SWITCH_OFF) + if (appendval == VIR_TRISTATE_SWITCH_ABSENT || + appendval == VIR_TRISTATE_SWITCH_OFF) flags |= VIR_LOG_MANAGER_PROTOCOL_DOMAIN_OPEN_LOG_FILE_TRUNCATE; if ((logfd = virLogManagerDomainOpenLogFile(logManager, -- 2.11.0

2 1

[libvirt] [PATCH v2 0/6] Converge Storage Pool vHBA logic with Node Device
by John Ferlan 01 Mar '17

01 Mar '17

v1: http://www.redhat.com/archives/libvir-list/2017-February/msg00963.html Changes since v1: NB: Former Patch 1 - was pushed Patch 1 - Was the old patch 2... Similar for rest of series... Altered to match the adjusted testNodeDeviceMockCreateVport from commit 2a862092 Patch 2 - reworked the code to not place the new module in src/util, but rather in src/conf as storage_adapter_conf.{c,h}. The concepts didn't change - only the name/location. Removed the changes for util/virvirscsi.c since virSCSIHostGetNameByParentaddr wouldn't be allowed to use virStorageAdapterSCSIHostPtr since it's a conf definition. Patch 3 - Unchanged, ACK'd in v1 Patch 4 - Unchanged, ACK'd in v1 Patch 5 - Unchanged... Even though there is concern over usage of API's in this manner (e.g. calling virNodeDeviceLookupSCSIHostByWWN as well as virNodeDeviceCreateXML) - the "purpose" of the exercise is a means to have the StoragePool code use the same algorithms as the node device code instead of what could be a potentially long slow journey through the sysfs file system. The key piece being the replication of the API's that find the parent in the node device object list. I suppose it would be possible to add even more API's to get that answer, but I'm not sure it'd be worthwhile at this point. As for the concern about deadlock - I understand it, but since the whole purpose of the API is to essentially utilize the nodedev create algorithm there'd be no reason for nodedev to call it. If it doesn't get ACK'd - that's OK - I can hold onto it and reconsider some other means at some point in time in the future (probably distant future too). Patch 6 - Unchanged The former patch 8 is dropped for now - needs some more "discussion" as to viability and/or need. John Ferlan (6): tests: Add createVHBAByStoragePool-by-parent to fchosttest conf: Convert virStoragePoolSourceAdapter to virStorageAdapter util: Rename virFileWaitForDevices conf: Move/rename createVport and deleteVport util: Alter virNodeDevice{Create|Delete}Vport to use nodedev APIs tests: Add more storage pool vHBA tests po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/node_device_conf.c | 332 +++++++++++++++++++++++++++++++++ src/conf/node_device_conf.h | 9 + src/conf/storage_adapter_conf.c | 291 +++++++++++++++++++++++++++++ src/conf/storage_adapter_conf.h | 89 +++++++++ src/conf/storage_conf.c | 333 ++++++++-------------------------- src/conf/storage_conf.h | 35 +--- src/libvirt_private.syms | 20 +- src/node_device/node_device_driver.c | 2 +- src/phyp/phyp_driver.c | 3 +- src/storage/storage_backend_disk.c | 6 +- src/storage/storage_backend_iscsi.c | 2 +- src/storage/storage_backend_logical.c | 4 +- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_scsi.c | 267 +++++---------------------- src/storage/storage_util.c | 2 +- src/test/test_driver.c | 99 +++++++++- src/util/virfile.h | 2 - src/util/virutil.c | 4 +- src/util/virutil.h | 2 + tests/fchosttest.c | 111 ++++++++++++ 22 files changed, 1087 insertions(+), 530 deletions(-) create mode 100644 src/conf/storage_adapter_conf.c create mode 100644 src/conf/storage_adapter_conf.h -- 2.9.3

1 6

[libvirt] [PATCH 0/3] libxl: implement virDomainObjCheckIsActive
by Sagar Ghuge 01 Mar '17

01 Mar '17

Add function which raises error if domain is not active. This is BiteSizedTask. http://wiki.libvirt.org/page/BiteSizedTasks#Add_function_that_raises_error_… Sagar Ghuge (3): libxl: Implement virDomainObjCheckIsActive change virDomainObjIsActive with virDomainObjCheckIsActive libxl: Change virDomainObjIsActive to virDomainObjCheckIsActive ...libxl-Implement-virDomainObjCheckIsActive.patch | 55 ++++ ...omainObjIsActive-with-virDomainObjCheckIs.patch | 109 ++++++++ ...e-virDomainObjIsActive-to-virDomainObjChe.patch | 298 +++++++++++++++++++++ patch1 | 52 ++++ src/conf/domain_conf.c | 15 ++ src/conf/domain_conf.h | 1 + src/libxl/libxl_driver.c | 102 ++----- src/test/test_driver.c | 35 +-- 8 files changed, 560 insertions(+), 107 deletions(-) create mode 100644 0001-libxl-Implement-virDomainObjCheckIsActive.patch create mode 100644 0002-change-virDomainObjIsActive-with-virDomainObjCheckIs.patch create mode 100644 0003-libxl-Change-virDomainObjIsActive-to-virDomainObjChe.patch create mode 100644 patch1 -- 2.9.3

3 8

[libvirt] Schedule for next release
by Daniel Veillard 01 Mar '17

01 Mar '17

Hi everybody, it's about time to think about 3.1.0, I think to be on the safe side for a March 1st release we should enter freeze at the end of the week, most likely on Friday, so if you have patches that need to get in, please make sure they are approved and pushed in time. Hope this works for everybody, thanks, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] [PATCH RFC 0/9] Introduce virPoolObj[Table]Ptr data/API's
by John Ferlan 01 Mar '17

01 Mar '17

Based of current top of git commit id '5620c6095'... I imagine things will change while this is on-list, so if there is the desire to create your own branch that's your starting point! This is perhaps more than an RFC considering I've added comments already (at least one reason why the insertions count is high). Still it's not really complete and ready for prime time, but I figured I'd put it out there for feedback. Essentially I've tried to follow the domainobj 'model' by creating an API to manage the "objects" various drivers have the need to manage. Currently there are 4 drivers using linked lists of some sort and 4 using hash tables in some manner. This implementation modifies the linked list abusers to use a common hash table. The common hash table will have uuid/name accessors. The preference remains uuid for uniqueness, but there are a couple of tables (node device, nwfilter) that don't have a uuid and thus name is unique enough for them. The genesis for this was recent patches to the storage driver that were essentially copying many lines of code and just changing the names to do the same thing. As I looked deeper at that - I found a mish-mash of object management throughout the drivers, so this is my attempt to unify that. The "goal" is to have a common look and feel to the API's so there's less thought over how a specific implementation does things. Each trip into the driver and exit can be handled in a common manner especially with respect to locks/refcnt's. Since I was splitting things apart - I also split out the object code/data *_conf.{c,h} into separate vir*obj.{c,h} files. I took some liberties with adjusting some names, modifying some other things along the way since the type A personality took over to try and follow more current coding conventions while I was in the middle of changing things. While the ultimate goal is to finish with the domain code - that's just too busy in order to make adjustments right now. Still at least that code does use a similar hash table model - so while it will be painful - it can be done later if/when this is accepted (and perhaps when we know there's a slow period for posting changes). John Ferlan (9): conf: Modify gendispatch.pl to make ACL argument opaque conf: Introduce virPoolObj and virPoolTableObj and PoolObj API's nodedev: Convert virNodeDevObj[List] to use virPoolObj[Table] interface: Convert virInterfaceObj[List] to use virPoolObj[Table] nwfilter: Convert virNWFilterObj[List] to use virPoolObj[Table] secret: Convert virSecretObj[List] to use virPoolObj[Table] volume: Convert virStorageVolObj[List] to use virPoolObj[Table] storage: Convert virStoragePoolObj[List] to use virPoolObj[Table] network: Convert virNetworkObj[List] to use virPoolObj[Table] include/libvirt/virterror.h | 1 + po/POTFILES.in | 5 + src/Makefile.am | 18 +- src/conf/domain_conf.h | 3 +- src/conf/interface_conf.c | 170 +-- src/conf/interface_conf.h | 47 +- src/conf/network_conf.c | 1308 +----------------- src/conf/network_conf.h | 133 +- src/conf/node_device_conf.c | 497 +------ src/conf/node_device_conf.h | 86 +- src/conf/nwfilter_conf.c | 381 +----- src/conf/nwfilter_conf.h | 69 +- src/conf/secret_conf.c | 3 +- src/conf/secret_conf.h | 2 +- src/conf/storage_conf.c | 925 +------------ src/conf/storage_conf.h | 128 +- src/conf/virinterfaceobj.c | 205 +++ src/conf/virinterfaceobj.h | 46 + src/conf/virnetworkobj.c | 1166 ++++++++++++++++ src/conf/virnetworkobj.h | 121 ++ src/conf/virnodedeviceobj.c | 570 ++++++++ src/conf/virnodedeviceobj.h | 86 ++ src/conf/virnwfilterobj.c | 373 +++++ src/conf/virnwfilterobj.h | 64 + src/conf/virpoolobj.c | 1184 ++++++++++++++++ src/conf/virpoolobj.h | 222 +++ src/conf/virsecretobj.c | 782 ++++------- src/conf/virsecretobj.h | 92 +- src/conf/virstorageobj.c | 1206 +++++++++++++++++ src/conf/virstorageobj.h | 143 ++ src/interface/interface_backend_netcf.c | 6 +- src/interface/interface_backend_udev.c | 5 +- src/libvirt_private.syms | 217 +-- src/network/bridge_driver.c | 1812 +++++++++++++------------ src/network/bridge_driver.h | 11 +- src/network/bridge_driver_platform.h | 3 +- src/node_device/node_device_driver.c | 388 +++--- src/node_device/node_device_driver.h | 2 +- src/node_device/node_device_hal.c | 82 +- src/node_device/node_device_udev.c | 76 +- src/nwfilter/nwfilter_driver.c | 225 ++- src/nwfilter/nwfilter_gentech_driver.c | 111 +- src/nwfilter/nwfilter_gentech_driver.h | 2 +- src/nwfilter/nwfilter_tech_driver.h | 2 +- src/rpc/gendispatch.pl | 5 +- src/secret/secret_driver.c | 187 +-- src/storage/storage_backend.h | 32 +- src/storage/storage_backend_disk.c | 309 +++-- src/storage/storage_backend_fs.c | 145 +- src/storage/storage_backend_gluster.c | 52 +- src/storage/storage_backend_iscsi.c | 65 +- src/storage/storage_backend_logical.c | 177 +-- src/storage/storage_backend_mpath.c | 37 +- src/storage/storage_backend_rbd.c | 115 +- src/storage/storage_backend_scsi.c | 57 +- src/storage/storage_backend_sheepdog.c | 89 +- src/storage/storage_backend_vstorage.c | 47 +- src/storage/storage_backend_zfs.c | 109 +- src/storage/storage_driver.c | 1952 +++++++++++++------------- src/storage/storage_driver.h | 6 +- src/storage/storage_util.c | 234 ++-- src/storage/storage_util.h | 31 +- src/test/test_driver.c | 2257 ++++++++++++++----------------- src/util/virerror.c | 1 + tests/networkxml2conftest.c | 18 +- tests/storagevolxml2argvtest.c | 16 +- 66 files changed, 10145 insertions(+), 8774 deletions(-) create mode 100644 src/conf/virinterfaceobj.c create mode 100644 src/conf/virinterfaceobj.h create mode 100644 src/conf/virnetworkobj.c create mode 100644 src/conf/virnetworkobj.h create mode 100644 src/conf/virnodedeviceobj.c create mode 100644 src/conf/virnodedeviceobj.h create mode 100644 src/conf/virnwfilterobj.c create mode 100644 src/conf/virnwfilterobj.h create mode 100644 src/conf/virpoolobj.c create mode 100644 src/conf/virpoolobj.h create mode 100644 src/conf/virstorageobj.c create mode 100644 src/conf/virstorageobj.h -- 2.7.4

6 28

[libvirt] [PATCH] testNodeDeviceMockCreateVport: Don't call public APIs
by Michal Privoznik 01 Mar '17

01 Mar '17

This function is calling public APIs (virNodeDeviceLookupByName etc.). That requires the driver lock to be unlocked and locked again. If we, however, replace the public APIs calls with the internal calls (that public APIs call anyway), we can drop the lock/unlock exercise. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/test/test_driver.c | 59 ++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 5fef3f10b..8495443db 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5626,17 +5626,16 @@ testNodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames) } -static virNodeDeviceDefPtr +static virNodeDeviceObjPtr testNodeDeviceMockCreateVport(virConnectPtr conn, const char *wwnn, const char *wwpn) { testDriverPtr driver = conn->privateData; - virNodeDevicePtr devcpy = NULL; char *xml = NULL; virNodeDeviceDefPtr def = NULL; virNodeDevCapsDefPtr caps; - virNodeDeviceObjPtr obj = NULL; + virNodeDeviceObjPtr obj = NULL, objcopy = NULL; virObjectEventPtr event = NULL; /* In the real code, we'd call virVHBAManageVport which would take the @@ -5648,9 +5647,15 @@ testNodeDeviceMockCreateVport(virConnectPtr conn, * using the scsi_host11 definition, changing the name and the * scsi_host capability fields before calling virNodeDeviceAssignDef * to add the def to the node device objects list. */ - if (!(devcpy = virNodeDeviceLookupByName(conn, "scsi_host11")) || - !(xml = virNodeDeviceGetXMLDesc(devcpy, 0)) || - !(def = virNodeDeviceDefParseString(xml, EXISTING_DEVICE, NULL))) + if (!(objcopy = virNodeDeviceFindByName(&driver->devs, "scsi_host11"))) + goto cleanup; + + xml = virNodeDeviceDefFormat(objcopy->def); + virNodeDeviceObjUnlock(objcopy); + if (!xml) + goto cleanup; + + if (!(def = virNodeDeviceDefParseString(xml, EXISTING_DEVICE, NULL))) goto cleanup; VIR_FREE(def->name); @@ -5684,23 +5689,17 @@ testNodeDeviceMockCreateVport(virConnectPtr conn, if (!(obj = virNodeDeviceAssignDef(&driver->devs, def))) goto cleanup; - virNodeDeviceObjUnlock(obj); + def = NULL; - event = virNodeDeviceEventLifecycleNew(def->name, + event = virNodeDeviceEventLifecycleNew(obj->def->name, VIR_NODE_DEVICE_EVENT_CREATED, 0); testObjectEventQueue(driver, event); cleanup: VIR_FREE(xml); - if (!obj) { - virNodeDeviceDefFree(def); - def = NULL; - } - if (devcpy) - virNodeDeviceFree(devcpy); - - return def; + virNodeDeviceDefFree(def); + return obj; } @@ -5712,8 +5711,8 @@ testNodeDeviceCreateXML(virConnectPtr conn, testDriverPtr driver = conn->privateData; virNodeDeviceDefPtr def = NULL; char *wwnn = NULL, *wwpn = NULL; - virNodeDevicePtr dev = NULL; - virNodeDeviceDefPtr newdef = NULL; + virNodeDevicePtr dev = NULL, ret = NULL; + virNodeDeviceObjPtr obj = NULL; virCheckFlags(0, NULL); @@ -5739,20 +5738,28 @@ testNodeDeviceCreateXML(virConnectPtr conn, * mocking udev. The mock routine will copy an existing vHBA and * rename a few fields to mock that. So in order to allow that to * work properly, we need to drop our lock */ - testDriverUnlock(driver); - if ((newdef = testNodeDeviceMockCreateVport(conn, wwnn, wwpn))) { - if ((dev = virNodeDeviceLookupByName(conn, newdef->name))) - ignore_value(VIR_STRDUP(dev->parent, def->parent)); - } - testDriverLock(driver); - newdef = NULL; + if (!(obj = testNodeDeviceMockCreateVport(conn, wwnn, wwpn))) + goto cleanup; + + if (!(dev = virGetNodeDevice(conn, obj->def->name))) + goto cleanup; + + VIR_FREE(dev->parent); + if (VIR_STRDUP(dev->parent, def->parent) < 0) + goto cleanup; + + ret = dev; + dev = NULL; cleanup: + if (obj) + virNodeDeviceObjUnlock(obj); testDriverUnlock(driver); virNodeDeviceDefFree(def); + virObjectUnref(dev); VIR_FREE(wwnn); VIR_FREE(wwpn); - return dev; + return ret; } static int -- 2.11.0

2 2

[libvirt] A question for external snapshots with flag“VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE”
by lizhengui 28 Feb '17

28 Feb '17

Hello, I got a question here. When we create consistent active external snapshots with flag “VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE” , the qemuDomainSnapshotFSFreeze will be called firstly to freeze all filesystems in vm, and then create snapshots. For windows vm, freezing filesystems used by vss service. If IO pressure in vm is too big or internal error happened in vss , freezing filesytems will failed , and qemuDomainSnapshotFSFreeze returns 0 which meaning that no filesystems are frozen. In the function qemuDomainSnapshotCreateActiveExternal, libvirt creates external snapshots all the same in such a situation that qemuDomainSnapshotFSFreeze returns 0, but the created snapshots are not consistent snapshots in such a situation . So shouldn't we abandon creating snapshots and goto cleanup in the situation that qemuDomainSnapshotFSFreeze returns 0? The code below: static int qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainSnapshotObjPtr snap, unsigned int flags) { virObjectEventPtr event; bool resume = false; int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; char *xml = NULL; bool memory = snap->def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; bool memory_unlink = false; bool atomic = !!(flags & VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC); bool transaction = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_TRANSACTION); int thaw = 0; /* 1 if freeze succeeded, -1 if freeze failed */ bool pmsuspended = false; virQEMUDriverConfigPtr cfg = NULL; int compressed; char *compressedpath = NULL; /* If quiesce was requested, then issue a freeze command, and a * counterpart thaw command when it is actually sent to agent. * The command will fail if the guest is paused or the guest agent * is not running, or is already quiesced. */ if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE) { int freeze = qemuDomainSnapshotFSFreeze(driver, vm, NULL, 0); if (freeze < 0) { /* the helper reported the error */ if (freeze == -2) thaw = -1; /* the command is sent but agent failed */ goto cleanup; } thaw = 1; } ...... ......

3 2

[libvirt] ANNOUNCE: libguestfs 1.36 released
by Richard W.M. Jones 28 Feb '17

28 Feb '17

I'm please to announce libguestfs 1.36, a library and a set of tools for accessing and modifying virtual machine disk images. This release represents about 7 months of work by many contributors. I'd like to call out in particular substantial code contributions from: Pino Toscano, Tomáš Golembiovský, Cédric Bosdonnat, Roman Kagan, Dawid Zamirski and Matteo Cafasso. Also our testing team: Tingting Zheng, Xiang Hua Chen, Ming Xie, Junquin Zhou and Xiaodai Wang. Amongst the new features are substantial enhancements to virt-v2v including support for Debian and Ubuntu guest conversions, and conversions from AWS; a new "virt-tail" command for following log files in guests; even more support for encrypted guests; robustness when handling Windows guests with corrupted registries; ExFAT support; GCC 7 support; and considerable internal code refactoring to make things more maintainable. Of course dozens of other features have been added, and many bugs fixed. See the release notes below for full details. You can get libguestfs 1.36 from here: Main website: http://libguestfs.org/ Source: http://libguestfs.org/download/1.36-stable/ Fedora: https://koji.fedoraproject.org/koji/packageinfo?packageID=8391 Debian/experimental: https://packages.debian.org/libguestfs0 Note for distro packagers: libmagic (part of the 'file' command line tool) is now a required build dependency. It was previously optional. Rich. ---------------------------------------------------------------------- Release notes for libguestfs 1.36 These are also available online at: http://libguestfs.org/guestfs-release-notes.1.html New features New tools Virt-tail is a new tool for following (tailing) log files within a guest, similar to the regular "tail -f" command. New features in existing tools Virt-customize, virt-get-kernel, virt-sparsify and virt-sysprep can now handle encrypted guests (Pino Toscano). Virt-builder and virt-customize now support --append-line, which is useful for adding lines to the end of configuration files. Virt-resize can now shrink and expand swap partitions (Pino Toscano). Virt-resize can now output to non-local disks (Pino Toscano). Virt-sysprep has a new operation called "backup-files" for removing editor backups, and "passwd-backups" for removing /etc/passwd- and similar. Virt-dib can now create checksums using the new --checksum option (Pino Toscano). Virt-dib can now create tgz files. In addition, extended attributes and SELinux labels are preserved in the output tar file (Pino Toscano). Virt-dib can now create squashfs files (Pino Toscano). Bash tab-completion is now available in every command line tool that is shipped. virt-v2v and virt-p2v Conversions of Debian (6+) and Ubuntu (10.04+) guests are now supported (Tomáš Golembiovský, Pino Toscano). Conversions from SUSE Xen hypervisor have now been tested (Cédric Bosdonnat). Windows conversions may now install a program "pnp_wait.exe" which prevents conflicts between the Windows Plug-and-Play Manager and our own scripts that install virtio device drivers. Enabling this requires the "pnp_wait.exe" program to be built separately (Roman Kagan). OVA files exported from AWS can now be converted (Shahar Havivi). When converting OVA files, in some circumstances virt-v2v can now read disk images directly from the OVA input file instead of needing to unpack the OVA file to a temporary directory. This can save large amounts of disk space, and is quicker (Tomáš Golembiovský). Virt-p2v can now be built on RHEL 5 (2007-era) Linux and RHEL 6, which means that 32 bit and hardware with ancient fakeraid disks can be virtualized. Binaries of virt-p2v based on these old versions of RHEL can be found at http://oirase.annexia.org/virt-p2v/ Virt-p2v can now use nbdkit (an NBD server) as an alternative to qemu- nbd. In addition, virt-p2v can use "socket activation" which is a more robust method for opening the NBD listening socket. Socket activation works with qemu-nbd or nbdkit, but requires the most up to date versions. To prevent timeouts during P2V conversions, virt-p2v inhibits power saving on the physical machine, and also sends ping packets over the ssh control and data connections. Virt-v2v no longer removes the "Processor" and "Intelppm" nodes from the Windows Registry. Xen and vCenter conversions can now be done using the libvirt backend, provided libvirt ≥ 2.1.0 is used. /dev/srX (SCSI CD-ROM) devices are ignored (Tomáš Golembiovský). When converting SUSE Linux guests, use /etc/modprobe.conf.local if it exists. Removing VMware tools from Linux guests should now work reliably (Pino Toscano). When converting OVA files, virt-v2v now checks the disk image hash contained in the manifest file, whereas previously it was ignored because of a mistake in the code. In addition, SHA256 hashes are now supported (Tomáš Golembiovský). When converting OVA files that contain compressed disk images, we now trust the "ovf:compression" attribute from the metadata instead of using content sniffing on the disk image (Tomáš Golembiovský). A new flag --vdsm-compat has been added to -o vdsm mode, allowing more efficient qcow2 images to be generated. Since the RHEV product [commercially supported version of oVirt] has now been renamed to RHV, "RHEV" was changed to "RHV" throughout the tooling. In particular, -o rhev becomes -o rhv, although the old name can be used for backwards compatibility. The "RHEV-APT" utility is only installed when the output hypervisor is oVirt or RHV. A problem with virt-v2v running out of memory when doing an SELinux relabel of the guest filesystem should now be resolved. Language bindings Setting "EXTRA_JAVAC_FLAGS" before ./configure allows you to add arbitrary flags to "javac" when compiling the Java bindings. Use of any libguestfs API which returned a single struct, from Perl or Java bindings, would have leaked memory. This has now been fixed (Pino Toscano). Inspection Inspection of Windows guests with mildly corrupted Windows Registry hives should now work instead of failing with an error. This feature requires hivex ≥ 1.3.14 (Dawid Zamirski). For Debian guests, we can now read the URL, source name, summary and full description of installed packages. For RPM-based guests we can read the URL, summary and description (Pino Toscano). Inspection of guest operating systems that use a separate /usr partition should now work more reliably (Pino Toscano). When parsing guest /etc/fstab, paths are reduced to a canonical form (eg. "///usr//local//" → "/usr/local"). Inspection of btrfs subvolumes now works where the /etc/fstab options field contains commas. /dev/cdN devices in guest /etc/fstab are ignored (Pino Toscano). Architectures and platforms Stable releases are now tested on aarch64, ppc64 and ppc64le architectures. The RISC-V architecture is now handled as a guest, and libguestfs will now at least compile on RISC-V (but probably not work as there is no usable qemu at the time of writing). Detection of S/390 and S/390x binaries and guests is now supported. Other ExFAT filesystems are now supported (Miles Wolbe). Security See also guestfs-security(1). There were no CVEs reported in this development cycle. However some security-related hardening was carried out as described below. Temporary filenames are now always generated using randomness from /dev/urandom (previously the C function random(3) was used in one case). The $TERM environment variable is now validated before passing it through to the appliance kernel command line. API New APIs "guestfs_aug_transform" Exposes the Augeas "aug_transform" API (Pino Toscano). "guestfs_find_inode" Find files by inode number (Matteo Cafasso). "guestfs_inspect_get_windows_software_hive" "guestfs_inspect_get_windows_system_hive" Return the path to the Windows "HKLM\SYSTEM" and "HKLM\SOFTWARE" hives computed during inspection. "guestfs_mksquashfs" Create a squashfs filesystem from a path (Pino Toscano). Other API changes "guestfs_add_domain" This call now handles libvirt file-based volumes correctly, where previously these would have been ignored. Also handled are disks which require libvirt authentication secrets to open (Pino Toscano). "guestfs_canonical_device_name" This call will no longer incorrectly modify Linux software RAID device names (like /dev/mdX). "guestfs_file_architecture" Previously the "file_architecture" API could return either of the strings "i386" or "i486" for 32 bit x86 binaries. It now only returns "i386" (as documented). This API can now return the following new values: "riscv32", "riscv64", "riscv128", "s390", "s390x". "guestfs_hivex_open" This now has an optional "GUESTFS_HIVEX_OPEN_UNSAFE" flag which allows certain corrupted Windows Registry hives to be opened. This feature requires hivex ≥ 1.3.14 (Dawid Zamirski). "guestfs_list_partitions" This call now returns Linux software RAID partitions. "guestfs_part_to_dev" This call now correctly handles partition names which include "p<N>" (Pino Toscano). "guestfs_set_label" This call can now change the labels of swap partitions (Pino Toscano). Build changes libmagic, the library part of the "file" command, is now required at build time (previously optional). GCC 7 is now supported. "Silent rules" are now used for OCaml programs, Java bindings. To show the full command line executed, add "V=1" on the make command line (Pino Toscano). Slow testing ("make check-slow") now covers: firstboot scripts in Linux guests; v2v conversion of a selection of real Linux guests; the virt- customize --hostname and --timezone settings; the --root-password parameter; that the serial console works in virt-builder guests. Large generated C source files, eg. the list of commands found in fish/cmds.c (and many more), have been split into smaller files to speed parallel compilation. "make maintainer-check-extra-dist" now checks that all generated files are included in the tarball. The tests no longer assume that "." is in Perl's @INC, as it is going to be removed soon (Pino Toscano). Debian hosts using UsrMerge are now supported (Pino Toscano). Header files and C structs can now have internal documentation using the special "/** ... */" comments. "@VAR@" subtitutions in "./run" are now fully quoted. This is necessary so that (eg) "./configure PYTHON=/some/path" works robustly if "/some/path" contains characters that need to be quoted (Hilko Bengen). gperf ≥ 3.1 is now supported. Kraxel's old edk2 builds can no longer be used for UEFI support. UEFI code is now fully free software, so use the versions bundled with your Linux distro instead. Virt-p2v can now be compiled on RHEL 5 (2007-era) Linux with Gtk 2.10. Internals The generator and mllib "Common_utils" modules are now shared from the same source file. A considerable amount of common code has been moved into the common directory in the source and is now compiled only once. The mini- libraries located under here are: common/edit, common/errnostring, common/miniexpect, common/options, common/parallel, common/progress, common/protocol, common/utils, common/visit, common/windows. The directory containing the main library code has moved from src → lib. All tests written in shell script now use a common file of utility functions (tests/test-functions.sh). There are several new utility functions, mainly for skipping tests. Also these test scripts can now use autoconf-like path variables like $abs_top_srcdir. UEFI paths are now stored in the generator (generator/uefi.ml). The way the generator handles actions and procedure numbers was changed quite substantially. See generator/actions_*.ml and generator/proc_nr.ml. The gnulib "getprogname" module is now used everywhere when needing/printing the program name (Pino Toscano). perl/Guestfs.c is not translatable (Nikos Skalkotos). Virt-builder templates moved from builder/website to builder/templates and there is now a single unified program which can build any template. All Windows registry utilities used by virt-customize and virt-v2v have been moved to a common module called "Registry" under mllib. All POSIX bindings have been moved to a new module called "Unix_utils" under mllib. Inspection, virt-customize and virt-v2v no longer recompute the Windows "%systemroot%", "CurrentControlSet" or paths to the "HKLM\SYSTEM" and "HKLM\SOFTWARE" hives in multiple places. Instead these are all computed once (during inspection) and passed to the other tools through various "guestfs_inspect_get_windows_*" APIs. "/dev/pts" is now available inside the appliance, so any tools we run which require a pty will now work (Pino Toscano). Most OCaml warnings have been fixed. There is now a single common function for creating temporary files ("guestfs_int_make_temp_path") (Matteo Cafasso). The $TERM environment variable is now validated before passing it through to the appliance kernel command line. Useless USB and memballoon devices are no longer created in the appliance (Laine Stump). On aarch64 we now use virtio-pci for the appliance. This is somewhat faster than virtio-mmio. Use of srandom(3) and random(3) has been minimized. In particular, temporary filenames are no longer created based on randomness returned by random(3), but /dev/urandom is used instead. Bugs fixed https://bugzilla.redhat.com/1425306 typo error in virt-tail man page https://bugzilla.redhat.com/1418283 virt-v2v: appliance runs out of memory running setfiles command https://bugzilla.redhat.com/1417549 /usr/bin/x86_64-linux-gnu-ld.bfd.real: ../common/progress/.libs/libprogress.a(libprogress_la-progress.o): undefined reference to symbol 'UP@@NCURSES_TINFO_5.0.19991023' https://bugzilla.redhat.com/1417444 *** No rule to make target '../perl/lib/Sys/Guestfs.c', needed by 'libguestfs.pot' https://bugzilla.redhat.com/1416941 compile of 1.34.3 fails with gperf 3.1 https://bugzilla.redhat.com/1414682 guestfs_canonical_device_name incorrectly returns /dev/sd0 for MD devices (/dev/md0) https://bugzilla.redhat.com/1414510 guestfs_list_filesystems does not recognize ddf partitions https://bugzilla.redhat.com/1409023 [Debian] ldmtool not installed in the appliance https://bugzilla.redhat.com/1404287 qemu-kvm cannot boot RHEL 7 kernel with TCG, hangs at "Probing EDD (edd=off to disable)..." https://bugzilla.redhat.com/1404182 RFE: virt-resize should support a URL as the outdisk https://bugzilla.redhat.com/1401474 Importing VMs from VMware is failing with error "Inspection field 'i_arch' was 'unknown'" https://bugzilla.redhat.com/1401320 RFE: Increate virt-sysprep coverage a bit https://bugzilla.redhat.com/1400205 Add --vdsm-compat=1.1 flag for VDSM https://bugzilla.redhat.com/1398070 typo error in man page https://bugzilla.redhat.com/1392798 secrets from libvirt domains are not read https://bugzilla.redhat.com/1390876 "--machine-readable" info should be updated in virt-v2v manual page https://bugzilla.redhat.com/1379289 RFE: virt-p2v should support mnemonic operations https://bugzilla.redhat.com/1378022 There is virt-v2v warning about <listen type='none'> during converting a guest which has listen type='none' in XML https://bugzilla.redhat.com/1377081 virt-p2v manual should update the new dialog information https://bugzilla.redhat.com/1375157 virt-v2v: -i ova: Permission denied when using libvirt and running as root https://bugzilla.redhat.com/1374651 Can't install qxl driver for display device in win7 guest after converting to glance by virt-v2v https://bugzilla.redhat.com/1374405 There is HTTP 404 error info when convert guest to glance by virt-v2v https://bugzilla.redhat.com/1374232 selinux relabel fails on RHEL 6.2 guests with "libguestfs error: selinux_relabel: : Success" https://bugzilla.redhat.com/1372668 Process status is not normal in windows guest after converted from kvm to rhev by virt-v2v https://bugzilla.redhat.com/1372269 Builder does not set hostname properly for Debian 8 (Jessie) https://bugzilla.redhat.com/1371843 Improve OVA import compatibility https://bugzilla.redhat.com/1370424 virt-manager coredump when vm with gluster image exists https://bugzilla.redhat.com/1367839 Cannot import VMs from Xen and VMware when using RHEL7.3 host. https://bugzilla.redhat.com/1367738 Missing bash completion scripts for: virt-diff guestunmount virt- copy-in virt-copy-out virt-customize virt-get-kernel virt-p2v-make-disk virt-p2v-make-kickstart virt-tar-in virt-tar-out virt-v2v-copy-to-local virt-win-reg https://bugzilla.redhat.com/1367615 OVMF file which is built for rhel7.3 can't be used for virt-v2v uefi conversion https://bugzilla.redhat.com/1366456 Converting rhel7 host installed on RAID:warning: fstrim: fstrim: /sysroot/: the discard operation is not supported https://bugzilla.redhat.com/1366049 RFE: libvirt backend: support handling disks stored as volume name in a pool https://bugzilla.redhat.com/1365005 Guest name is incorrect if convert guest from disk image by virt-v2v https://bugzilla.redhat.com/1362649 RFE: virt-sysprep does not utilize libguestfs encryption support https://bugzilla.redhat.com/1354507 virt-v2v conversions from vCenter do not consistently obey the proxy environment variables https://bugzilla.redhat.com/1168144 warning: fstrim: fstrim: /sysroot/: FITRIM ioctl failed: Operation not supported (ignored) when convert win2003 guest from xen server https://bugzilla.redhat.com/1161019 RFE: Only install RHEV-APT if virt-v2v -o rhev/-o vdsm option is used https://bugzilla.redhat.com/1152369 virt-v2v failed to convert RHEL 6.7 UEFI guest: no grub1/grub-legacy or grub2 configuration file was found https://bugzilla.redhat.com/1141631 [RFE] virt-v2v should support convert a guest to a dir-pool with using pool's uuid https://bugzilla.redhat.com/1134878 libvirt reports json "backing file" is missing https://bugzilla.redhat.com/1019388 firstboot scripts (virt-builder, virt-sysprep) don't work for Debian 6 & 7 guests https://bugzilla.redhat.com/737600 virt-v2v windows xp - machine dies BSOD - processr,sys - workaround provided -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 100 libraries supported. http://fedoraproject.org/wiki/MinGW

1 0

[libvirt] [PATCH] qemuDomainAttachNetDevice: Support attach of type="user"
by Michal Privoznik 28 Feb '17

28 Feb '17

https://bugzilla.redhat.com/show_bug.cgi?id=1420668 This has worked in previous releases. My commit c266b60440 broke it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_hotplug.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 97fb272f6..0c0885695 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1104,6 +1104,9 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, break; case VIR_DOMAIN_NET_TYPE_USER: + /* No preparation needed. */ + break; + case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: -- 2.11.0

2 1

[libvirt] A question for external snapshots with flag“VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE”
by WangJie (Captain) 28 Feb '17

28 Feb '17

Hello, I got a question here. When we create consistent active external snapshots with flag “VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE” , the qemuDomainSnapshotFSFreeze will be called firstly to freeze all filesystems in vm, and then create snapshots. For windows vm, freezing filesystems used by vss service. If IO pressure in vm is too big or internal error happened in vss , freezing filesytems will failed , and qemuDomainSnapshotFSFreeze returns 0 which meaning that no filesystems are frozen. In the function qemuDomainSnapshotCreateActiveExternal, libvirt creates external snapshots all the same in such a situation that qemuDomainSnapshotFSFreeze returns 0, but the created snapshots are not consistent snapshots in such a situation . So shouldn't we abandon creating snapshots and goto cleanup in the situation that qemuDomainSnapshotFSFreeze returns 0? The code below: static int qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainSnapshotObjPtr snap, unsigned int flags) { virObjectEventPtr event; bool resume = false; int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; char *xml = NULL; bool memory = snap->def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; bool memory_unlink = false; bool atomic = !!(flags & VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC); bool transaction = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_TRANSACTION); int thaw = 0; /* 1 if freeze succeeded, -1 if freeze failed */ bool pmsuspended = false; virQEMUDriverConfigPtr cfg = NULL; int compressed; char *compressedpath = NULL; /* If quiesce was requested, then issue a freeze command, and a * counterpart thaw command when it is actually sent to agent. * The command will fail if the guest is paused or the guest agent * is not running, or is already quiesced. */ if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE) { int freeze = qemuDomainSnapshotFSFreeze(driver, vm, NULL, 0); if (freeze < 0) { /* the helper reported the error */ if (freeze == -2) thaw = -1; /* the command is sent but agent failed */ goto cleanup; } thaw = 1; } ...... ......

2 2

[libvirt] [PATCH 0/4] Cache systemd presence
by Ján Tomko 28 Feb '17

28 Feb '17

Reduce the number of DBus calls required, and possibly the number of timeouts. Ján Tomko (4): Unify checking for machine1 systemd service Use macros for testing virSystemd APIs Cache the presence of machine1 service Test virSystemd APIs twice to check the cache effects src/libvirt_private.syms | 1 + src/util/virsystemd.c | 55 +++++++++++++++++++++++++++++++++++------------ src/util/virsystemdpriv.h | 33 ++++++++++++++++++++++++++++ tests/virsystemdtest.c | 40 ++++++++++++++++++---------------- 4 files changed, 96 insertions(+), 33 deletions(-) create mode 100644 src/util/virsystemdpriv.h -- 2.10.2

3 6

[libvirt] [PATCH 0/8] Converge Storage Pool vHBA logic with Node Device
by John Ferlan 28 Feb '17

28 Feb '17

Similar to the recent node device focused vHBA patches, but these focus more on adjustments to the Storage Pool vHBA logic and finally the mechanism to define a vHBA for a domain. The first patch fixes a leak found by coverity that showed up because node_device_conf had enough changes so that coverity looked harder... The second patch creates a mechanism to mock creation of the vHBA in order to test the ability for the storage pool to create a vHBA. As much as I dislike forward refs for testNodeDeviceMockCreateVport, it was better than moving all the code.... The third patch extracts out storage device mgmt into it's own set of src/util API's - similar to the existing virstoragefile, but for devices. The fourth patch was uncovered while moving code from storage_backend_scsi into node_device_conf (the fifth patch)... The fifth patch moves the createVport/deleteVport guts into the node_device_conf (although they could have moved to virvhba)... The sixth patch alters the logic to use the node_device API's as the "preferred" mechanism to create/delete the vport... The seventh patch tests the storage pool vHBA creation algorithms. The eigth patch is the reason for all this stirring of the pot. Alter the domain <controller> XML in order to allow definition of a vHBA which more or less sits between a "scsi_hostX" host device and a controller. This is in preparation for https://bugzilla.redhat.com/show_bug.cgi?id=1404962 which can take that created vHBA and automagically add the LUNs from the vHBA to the domain although that requires a bit more magic for which there are already onlist patches to let qemu driver know when a node device has been added/removed. Once all that's in place - the next step will be to converge the two sets of patches. It's a chicken/egg type problem - one has to exist before the other can truly work. John Ferlan (8): conf: Fix leak in virNodeDeviceDefParseXML tests: Add createVHBAByStoragePool-by-parent to fchosttest util: Convert virStoragePoolSourceAdapter to virStorageAdapter util: Rename virFileWaitForDevices storage: Move/rename createVport and deleteVport util: Alter virNodeDevice{Create|Delete}Vport to use nodedev APIs tests: Add more storage pool vHBA tests conf: Add vHBA controller definition to domain docs/schemas/basictypes.rng | 66 ++-- docs/schemas/domaincommon.rng | 12 +- po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/domain_audit.c | 32 ++ src/conf/domain_conf.c | 180 ++++++++++- src/conf/domain_conf.h | 2 + src/conf/node_device_conf.c | 342 ++++++++++++++++++++- src/conf/node_device_conf.h | 9 + src/conf/storage_conf.c | 338 +++++--------------- src/conf/storage_conf.h | 35 +-- src/libvirt_private.syms | 20 +- src/libxl/libxl_conf.c | 1 + src/node_device/node_device_driver.c | 2 +- src/phyp/phyp_driver.c | 3 +- src/qemu/qemu_alias.c | 5 + src/qemu/qemu_command.c | 4 + src/qemu/qemu_hotplug.c | 16 + src/storage/storage_backend_disk.c | 6 +- src/storage/storage_backend_iscsi.c | 2 +- src/storage/storage_backend_logical.c | 4 +- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_scsi.c | 267 +++------------- src/storage/storage_util.c | 2 +- src/test/test_driver.c | 101 +++++- src/util/virfile.h | 2 - src/util/virscsihost.c | 28 +- src/util/virscsihost.h | 8 +- src/util/virstoragedevice.c | 292 ++++++++++++++++++ src/util/virstoragedevice.h | 89 ++++++ src/util/virutil.c | 4 +- src/util/virutil.h | 2 + tests/fchosttest.c | 111 +++++++ .../qemuxml2argv-vhba-no-parent.xml | 38 +++ .../qemuxml2argv-vhba-parent-fabric.xml | 38 +++ .../qemuxml2argv-vhba-parent-name.xml | 38 +++ .../qemuxml2argv-vhba-parent-wwns.xml | 38 +++ .../qemuxml2xmlout-vhba-no-parent.xml | 47 +++ .../qemuxml2xmlout-vhba-parent-fabric.xml | 47 +++ .../qemuxml2xmlout-vhba-parent-name.xml | 47 +++ .../qemuxml2xmlout-vhba-parent-wwns.xml | 47 +++ tests/qemuxml2xmltest.c | 9 + 42 files changed, 1727 insertions(+), 611 deletions(-) create mode 100644 src/util/virstoragedevice.c create mode 100644 src/util/virstoragedevice.h create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-vhba-no-parent.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-vhba-parent-fabric.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-vhba-parent-name.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-vhba-parent-wwns.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-vhba-no-parent.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-vhba-parent-fabric.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-vhba-parent-name.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-vhba-parent-wwns.xml -- 2.9.3

3 24

[libvirt] [PATCH go v2] domain.go: wrong calculation of bitmask in PinVcpuFlags()
by Leonid Podolny 28 Feb '17

28 Feb '17

--- domain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domain.go b/domain.go index 2bd9852..7276ef8 100644 --- a/domain.go +++ b/domain.go @@ -1768,7 +1768,7 @@ func (d *Domain) PinVcpuFlags(vcpu uint, cpuMap []bool, flags DomainModification ccpumap := make([]C.uchar, maplen) for i := 0; i < len(cpuMap); i++ { if cpuMap[i] { - byte := (i + 7) / 8 + byte := i / 8 bit := i % 8 ccpumap[byte] |= (1 << uint(bit)) } -- 2.11.1

2 1

Re: [libvirt] [Qemu-devel] Question regarding Snapshots
by Stefan Hajnoczi 27 Feb '17

27 Feb '17

On Wed, Feb 22, 2017 at 03:06:41PM -0600, Tim Cusack wrote: > I have a scenario that perhaps not many have attempted, but I still hope > that it is possible. > > Scenario: > > I would like to have a Base Windows 7 VM in KVM/QEMU. > > I would follow the following process (confirmed it works) > > 1. Shutdown running domain > - virsh shutdown <Domain> > 2. Remove existing disk from Domain XML: > - virt-xml BASE --remove-device --disk target=hda > 3. Add Correct Disk image for Snapshot to Domain XML: > - virt-xml BASE --add-device --disk > /var/lib/libvirt/images/BASE.qcow2,format=qcow2,target=hda,bus=ide > 4. Create the snapshot with description > - virsh snapshot-create-as BASE <Model>.qcow2 "OEM, Model" --disk-only > --atomic > 5. Start Snapshot > - virsh start FA2BASE This process uses libvirt instead of QEMU commands. Adding libvirt mailing list. > > All that works, but my question and issue is this: > > Can you make a snapshot, then go back to the base and ignore that snapshot > like a closed branch, make another snapshot, and then go back and forth > from each to each? > > My reasons for needing this are that I have tools and software that doesnt > play nice together, and would like to keep them separated on different > snapshots, but never really need to have more than one up at a time. > > This would allow me to have only 1 windows license per computer, and the > ability to just change from tool to tool with simple front end to virsh to > remove the disk from the .xml and add the other one. > > So like this: > Tool A is on snapshot A > Tool B is on snapshot B > go through steps 1-5 above to go back and forth. > > I know that I can not merge things back into the base, but I really don't > need to do that, in fact, I can throw away the tool snapshots when new > tools come out, by making new snapshots from the base when new tools come > out. > > We have done this already, but we had an issue where the ability to write > to the snapshots seemed to stop. > > Reason unknown, everything worked one day and next could not write to any > snapshot, but could still load the base and work on it fine. > > This might be the wrong mailing list to post to, if so, could anyone point > out a more appropriate one? > > Tim

3 3

[libvirt] [PULL 10/11] i386: Implement query-cpu-model-expansion QMP command
by Eduardo Habkost 27 Feb '17

27 Feb '17

Implement query-cpu-model-expansion for target-i386. This should meet all the requirements while being simple. In the case of static expansion, it will use the new "base" CPU model, and in the case of full expansion, it will keep the original CPU model name+props, and append extra properties. A future follow-up should improve the implementation of type=full, so that it returns more detailed data, including every writable QOM property in the CPU object. Cc: libvir-list(a)redhat.com Cc: Jiri Denemark <jdenemar(a)redhat.com> Message-Id: <20170222190029.17243-3-ehabkost(a)redhat.com> Tested-by: Jiri Denemark <jdenemar(a)redhat.com> Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com> --- monitor.c | 4 +- target/i386/cpu.c | 191 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 193 insertions(+), 2 deletions(-) diff --git a/monitor.c b/monitor.c index f8f4a07cfb..b68944d93c 100644 --- a/monitor.c +++ b/monitor.c @@ -984,8 +984,10 @@ static void qmp_unregister_commands_hack(void) #ifndef TARGET_ARM qmp_unregister_command("query-gic-capabilities"); #endif -#if !defined(TARGET_S390X) +#if !defined(TARGET_S390X) && !defined(TARGET_I386) qmp_unregister_command("query-cpu-model-expansion"); +#endif +#if !defined(TARGET_S390X) qmp_unregister_command("query-cpu-model-baseline"); qmp_unregister_command("query-cpu-model-comparison"); #endif diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 0a71594445..139b7ea12e 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -29,10 +29,16 @@ #include "qemu/option.h" #include "qemu/config-file.h" #include "qapi/qmp/qerror.h" +#include "qapi/qmp/qstring.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qint.h" +#include "qapi/qmp/qfloat.h" #include "qapi-types.h" #include "qapi-visit.h" #include "qapi/visitor.h" +#include "qom/qom-qobject.h" #include "sysemu/arch_init.h" #if defined(CONFIG_KVM) @@ -2288,7 +2294,7 @@ static void x86_cpu_apply_props(X86CPU *cpu, PropValue *props) } } -/* Load data from X86CPUDefinition +/* Load data from X86CPUDefinition into a X86CPU object */ static void x86_cpu_load_def(X86CPU *cpu, X86CPUDefinition *def, Error **errp) { @@ -2297,6 +2303,11 @@ static void x86_cpu_load_def(X86CPU *cpu, X86CPUDefinition *def, Error **errp) char host_vendor[CPUID_VENDOR_SZ + 1]; FeatureWord w; + /*NOTE: any property set by this function should be returned by + * x86_cpu_static_props(), so static expansion of + * query-cpu-model-expansion is always complete. + */ + /* CPU models only set _minimum_ values for level/xlevel: */ object_property_set_int(OBJECT(cpu), def->level, "min-level", errp); object_property_set_int(OBJECT(cpu), def->xlevel, "min-xlevel", errp); @@ -2341,6 +2352,184 @@ static void x86_cpu_load_def(X86CPU *cpu, X86CPUDefinition *def, Error **errp) } +/* Return a QDict containing keys for all properties that can be included + * in static expansion of CPU models. All properties set by x86_cpu_load_def() + * must be included in the dictionary. + */ +static QDict *x86_cpu_static_props(void) +{ + FeatureWord w; + int i; + static const char *props[] = { + "min-level", + "min-xlevel", + "family", + "model", + "stepping", + "model-id", + "vendor", + "lmce", + NULL, + }; + static QDict *d; + + if (d) { + return d; + } + + d = qdict_new(); + for (i = 0; props[i]; i++) { + qdict_put_obj(d, props[i], qnull()); + } + + for (w = 0; w < FEATURE_WORDS; w++) { + FeatureWordInfo *fi = &feature_word_info[w]; + int bit; + for (bit = 0; bit < 32; bit++) { + if (!fi->feat_names[bit]) { + continue; + } + qdict_put_obj(d, fi->feat_names[bit], qnull()); + } + } + + return d; +} + +/* Add an entry to @props dict, with the value for property. */ +static void x86_cpu_expand_prop(X86CPU *cpu, QDict *props, const char *prop) +{ + QObject *value = object_property_get_qobject(OBJECT(cpu), prop, + &error_abort); + + qdict_put_obj(props, prop, value); +} + +/* Convert CPU model data from X86CPU object to a property dictionary + * that can recreate exactly the same CPU model. + */ +static void x86_cpu_to_dict(X86CPU *cpu, QDict *props) +{ + QDict *sprops = x86_cpu_static_props(); + const QDictEntry *e; + + for (e = qdict_first(sprops); e; e = qdict_next(sprops, e)) { + const char *prop = qdict_entry_key(e); + x86_cpu_expand_prop(cpu, props, prop); + } +} + +static void object_apply_props(Object *obj, QDict *props, Error **errp) +{ + const QDictEntry *prop; + Error *err = NULL; + + for (prop = qdict_first(props); prop; prop = qdict_next(props, prop)) { + object_property_set_qobject(obj, qdict_entry_value(prop), + qdict_entry_key(prop), &err); + if (err) { + break; + } + } + + error_propagate(errp, err); +} + +/* Create X86CPU object according to model+props specification */ +static X86CPU *x86_cpu_from_model(const char *model, QDict *props, Error **errp) +{ + X86CPU *xc = NULL; + X86CPUClass *xcc; + Error *err = NULL; + + xcc = X86_CPU_CLASS(cpu_class_by_name(TYPE_X86_CPU, model)); + if (xcc == NULL) { + error_setg(&err, "CPU model '%s' not found", model); + goto out; + } + + xc = X86_CPU(object_new(object_class_get_name(OBJECT_CLASS(xcc)))); + if (props) { + object_apply_props(OBJECT(xc), props, &err); + if (err) { + goto out; + } + } + + x86_cpu_expand_features(xc, &err); + if (err) { + goto out; + } + +out: + if (err) { + error_propagate(errp, err); + object_unref(OBJECT(xc)); + xc = NULL; + } + return xc; +} + +CpuModelExpansionInfo * +arch_query_cpu_model_expansion(CpuModelExpansionType type, + CpuModelInfo *model, + Error **errp) +{ + X86CPU *xc = NULL; + Error *err = NULL; + CpuModelExpansionInfo *ret = g_new0(CpuModelExpansionInfo, 1); + QDict *props = NULL; + const char *base_name; + + xc = x86_cpu_from_model(model->name, + model->has_props ? + qobject_to_qdict(model->props) : + NULL, &err); + if (err) { + goto out; + } + + + switch (type) { + case CPU_MODEL_EXPANSION_TYPE_STATIC: + /* Static expansion will be based on "base" only */ + base_name = "base"; + break; + case CPU_MODEL_EXPANSION_TYPE_FULL: + /* As we don't return every single property, full expansion needs + * to keep the original model name+props, and add extra + * properties on top of that. + */ + base_name = model->name; + if (model->has_props && model->props) { + props = qdict_clone_shallow(qobject_to_qdict(model->props)); + } + break; + default: + error_setg(&err, "Unsupportted expansion type"); + goto out; + } + + if (!props) { + props = qdict_new(); + } + x86_cpu_to_dict(xc, props); + + ret->model = g_new0(CpuModelInfo, 1); + ret->model->name = g_strdup(base_name); + ret->model->props = QOBJECT(props); + ret->model->has_props = true; + +out: + object_unref(OBJECT(xc)); + if (err) { + error_propagate(errp, err); + qapi_free_CpuModelExpansionInfo(ret); + ret = NULL; + } + return ret; +} + X86CPU *cpu_x86_init(const char *cpu_model) { return X86_CPU(cpu_generic_init(TYPE_X86_CPU, cpu_model)); -- 2.11.0.259.g40922b1

1 0