The patch which adjusts the options for IPFire in the libvirtd.conf does not apply in a newer version of libvirt. Creating this patch is harder than to use a separate config file.

This separate config file also enables us to adjust options much faster.

Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- config/libvirt/libvirtd.conf | 501 ++++++++++++++++++ lfs/libvirt | 3 +- ...-options-in-libvirtd.conf-for-IPFire.patch | 35 -- 3 files changed, 503 insertions(+), 36 deletions(-) create mode 100644 config/libvirt/libvirtd.conf delete mode 100644 src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch

diff --git a/config/libvirt/libvirtd.conf b/config/libvirt/libvirtd.conf new file mode 100644 index 000000000..dc4ba4cb6 --- /dev/null +++ b/config/libvirt/libvirtd.conf @@ -0,0 +1,501 @@ +# Master libvirt daemon configuration file +# + +################################################################# +# +# Network connectivity controls +# + +# Flag listening for secure TLS connections on the public TCP/IP port. +# NB, must pass the --listen flag to the libvirtd process for this to +# have any effect. +# +# This setting is not required or honoured if using systemd socket +# activation. +# +# It is necessary to setup a CA and issue server certificates before +# using this capability. +# +# This is enabled by default, uncomment this to disable it +listen_tls = 0 + +# Listen for unencrypted TCP connections on the public TCP/IP port. +# NB, must pass the --listen flag to the libvirtd process for this to +# have any effect. +# +# This setting is not required or honoured if using systemd socket +# activation. +# +# Using the TCP socket requires SASL authentication by default. Only +# SASL mechanisms which support data encryption are allowed. This is +# DIGEST_MD5 and GSSAPI (Kerberos5) +# +# This is disabled by default, uncomment this to enable it. +#listen_tcp = 1 + + + +# Override the port for accepting secure TLS connections +# This can be a port number, or service name +# +# This setting is not required or honoured if using systemd socket +# activation with systemd version >= 227 +# +#tls_port = "16514" + +# Override the port for accepting insecure TCP connections +# This can be a port number, or service name +# +# This setting is not required or honoured if using systemd socket +# activation with systemd version >= 227 +# +#tcp_port = "16509" + + +# Override the default configuration which binds to all network +# interfaces. This can be a numeric IPv4/6 address, or hostname +# +# This setting is not required or honoured if using systemd socket +# activation. +# +# If the libvirtd service is started in parallel with network +# startup (e.g. with systemd), binding to addresses other than +# the wildcards (0.0.0.0/::) might not be available yet. +# +listen_addr = "127.0.0.1" + + +################################################################# +# +# UNIX socket access controls +# + +# Set the UNIX domain socket group ownership. This can be used to +# allow a 'trusted' set of users access to management capabilities +# without becoming root. +# +# This setting is not required or honoured if using systemd socket +# activation. +# +# This is restricted to 'root' by default. +unix_sock_group = "libvirt-remote" + +# Set the UNIX socket permissions for the R/O socket. This is used +# for monitoring VM status only +# +# This setting is not required or honoured if using systemd socket +# activation. +# +# Default allows any user. If setting group ownership, you may want to +# restrict this too. +unix_sock_ro_perms = "0770" + +# Set the UNIX socket permissions for the R/W socket. This is used +# for full management of VMs +# +# This setting is not required or honoured if using systemd socket +# activation. +# +# Default allows only root. If PolicyKit is enabled on the socket, +# the default will change to allow everyone (eg, 0777) +# +# If not using PolicyKit and setting group ownership for access +# control, then you may want to relax this too. +unix_sock_rw_perms = "0770" + +# Set the UNIX socket permissions for the admin interface socket. +# +# This setting is not required or honoured if using systemd socket +# activation. +# +# Default allows only owner (root), do not change it unless you are +# sure to whom you are exposing the access to. +#unix_sock_admin_perms = "0700" + +# Set the name of the directory in which sockets will be found/created. +# +# This setting is not required or honoured if using systemd socket +# activation with systemd version >= 227 +# +#unix_sock_dir = "/var/run/libvirt" + + + +################################################################# +# +# Authentication. +# +# - none: do not perform auth checks. If you can connect to the +# socket you are allowed. This is suitable if there are +# restrictions on connecting to the socket (eg, UNIX +# socket permissions), or if there is a lower layer in +# the network providing auth (eg, TLS/x509 certificates) +# +# - sasl: use SASL infrastructure. The actual auth scheme is then +# controlled from /etc/sasl2/libvirt.conf. For the TCP +# socket only GSSAPI & DIGEST-MD5 mechanisms will be used. +# For non-TCP or TLS sockets, any scheme is allowed. +# +# - polkit: use PolicyKit to authenticate. This is only suitable +# for use on the UNIX sockets. The default policy will +# require a user to supply their own password to gain +# full read/write access (aka sudo like), while anyone +# is allowed read/only access. +# +# Set an authentication scheme for UNIX read-only sockets +# By default socket permissions allow anyone to connect +# +# To restrict monitoring of domains you may wish to enable +# an authentication mechanism here +#auth_unix_ro = "none" + +# Set an authentication scheme for UNIX read-write sockets +# By default socket permissions only allow root. If PolicyKit +# support was compiled into libvirt, the default will be to +# use 'polkit' auth. +# +# If the unix_sock_rw_perms are changed you may wish to enable +# an authentication mechanism here +#auth_unix_rw = "none" + +# Change the authentication scheme for TCP sockets. +# +# If you don't enable SASL, then all TCP traffic is cleartext. +# Don't do this outside of a dev/test scenario. For real world +# use, always enable SASL and use the GSSAPI or DIGEST-MD5 +# mechanism in /etc/sasl2/libvirt.conf +#auth_tcp = "sasl" + +# Change the authentication scheme for TLS sockets. +# +# TLS sockets already have encryption provided by the TLS +# layer, and limited authentication is done by certificates +# +# It is possible to make use of any SASL authentication +# mechanism as well, by using 'sasl' for this option +#auth_tls = "none" + + +# Change the API access control scheme +# +# By default an authenticated user is allowed access +# to all APIs. Access drivers can place restrictions +# on this. By default the 'nop' driver is enabled, +# meaning no access control checks are done once a +# client has authenticated with libvirtd +# +#access_drivers = [ "polkit" ] + +################################################################# +# +# TLS x509 certificate configuration +# + +# Use of TLS requires that x509 certificates be issued. The default locations +# for the certificate files is as follows: +# +# /etc/pki/CA/cacert.pem - The CA master certificate +# /etc/pki/libvirt/servercert.pem - The server certificate signed with +# the cacert.pem +# /etc/pki/libvirt/private/serverkey.pem - The server private key +# +# It is possible to override the default locations by altering the 'key_file', +# 'cert_file', and 'ca_file' values and uncommenting them below. +# +# NB, overriding the default of one location requires uncommenting and +# possibly additionally overriding the other settings. +# + +# Override the default server key file path +# +#key_file = "/etc/pki/libvirt/private/serverkey.pem" + +# Override the default server certificate file path +# +#cert_file = "/etc/pki/libvirt/servercert.pem" + +# Override the default CA certificate path +# +#ca_file = "/etc/pki/CA/cacert.pem" + +# Specify a certificate revocation list. +# +# Defaults to not using a CRL, uncomment to enable it +#crl_file = "/etc/pki/CA/crl.pem" + + + +################################################################# +# +# Authorization controls +# + + +# Flag to disable verification of our own server certificates +# +# When libvirtd starts it performs some sanity checks against +# its own certificates. +# +# Default is to always run sanity checks. Uncommenting this +# will disable sanity checks which is not a good idea +#tls_no_sanity_certificate = 1 + +# Flag to disable verification of client certificates +# +# Client certificate verification is the primary authentication mechanism. +# Any client which does not present a certificate signed by the CA +# will be rejected. +# +# Default is to always verify. Uncommenting this will disable +# verification - make sure an IP whitelist is set +#tls_no_verify_certificate = 1 + + +# A whitelist of allowed x509 Distinguished Names +# This list may contain wildcards such as +# +# "C=GB,ST=London,L=London,O=Red Hat,CN=*" +# +# See the POSIX fnmatch function for the format of the wildcards. +# +# NB If this is an empty list, no client can connect, so comment out +# entirely rather than using empty list to disable these checks +# +# By default, no DN's are checked +#tls_allowed_dn_list = ["DN1", "DN2"] + + +# A whitelist of allowed SASL usernames. The format for username +# depends on the SASL authentication mechanism. Kerberos usernames +# look like username@REALM +# +# This list may contain wildcards such as +# +# "*@EXAMPLE.COM" +# +# See the POSIX fnmatch function for the format of the wildcards. +# +# NB If this is an empty list, no client can connect, so comment out +# entirely rather than using empty list to disable these checks +# +# By default, no Username's are checked +#sasl_allowed_username_list = ["joe@EXAMPLE.COM", "fred@EXAMPLE.COM" ] + + +# Override the compile time default TLS priority string. The +# default is usually "NORMAL" unless overridden at build time. +# Only set this is it is desired for libvirt to deviate from +# the global default settings. +# +#tls_priority="NORMAL" + + +################################################################# +# +# Processing controls +# + +# The maximum number of concurrent client connections to allow +# over all sockets combined. +#max_clients = 5000 + +# The maximum length of queue of connections waiting to be +# accepted by the daemon. Note, that some protocols supporting +# retransmission may obey this so that a later reattempt at +# connection succeeds. +#max_queued_clients = 1000 + +# The maximum length of queue of accepted but not yet +# authenticated clients. The default value is 20. Set this to +# zero to turn this feature off. +#max_anonymous_clients = 20 + +# The minimum limit sets the number of workers to start up +# initially. If the number of active clients exceeds this, +# then more threads are spawned, up to max_workers limit. +# Typically you'd want max_workers to equal maximum number +# of clients allowed +#min_workers = 5 +#max_workers = 20 + + +# The number of priority workers. If all workers from above +# pool are stuck, some calls marked as high priority +# (notably domainDestroy) can be executed in this pool. +#prio_workers = 5 + +# Limit on concurrent requests from a single client +# connection. To avoid one client monopolizing the server +# this should be a small fraction of the global max_workers +# parameter. +#max_client_requests = 5 + +# Same processing controls, but this time for the admin interface. +# For description of each option, be so kind to scroll few lines +# upwards. + +#admin_min_workers = 1 +#admin_max_workers = 5 +#admin_max_clients = 5 +#admin_max_queued_clients = 5 +#admin_max_client_requests = 5 + +################################################################# +# +# Logging controls +# + +# Logging level: 4 errors, 3 warnings, 2 information, 1 debug +# basically 1 will log everything possible +# +# WARNING: USE OF THIS IS STRONGLY DISCOURAGED. +# +# WARNING: It outputs too much information to practically read. +# WARNING: The "log_filters" setting is recommended instead. +# +# WARNING: Journald applies rate limiting of messages and so libvirt +# WARNING: will limit "log_level" to only allow values 3 or 4 if +# WARNING: journald is the current output. +# +# WARNING: USE OF THIS IS STRONGLY DISCOURAGED. +#log_level = 3 + +# Logging filters: +# A filter allows to select a different logging level for a given category +# of logs. The format for a filter is one of: +# +# level:match +# level:+match +# +# where 'match' is a string which is matched against the category +# given in the VIR_LOG_INIT() at the top of each libvirt source +# file, e.g., "remote", "qemu", or "util.json". The 'match' in the +# filter matches using shell wildcard syntax (see 'man glob(7)'). +# The 'match' is always treated as a substring match. IOW a match +# string 'foo' is equivalent to '*foo*'. +# +# If 'match' contains the optional "+" prefix, it tells libvirt +# to log stack trace for each message matching name. +# +# 'level' is the minimal level where matching messages should +# be logged: +# +# 1: DEBUG +# 2: INFO +# 3: WARNING +# 4: ERROR +# +# Multiple filters can be defined in a single @log_filters, they just need +# to be separated by spaces. Note that libvirt performs "first" match, i.e. +# if there are concurrent filters, the first one that matches will be applied, +# given the order in @log_filters. +# +# A typical need is to capture information from a hypervisor driver, +# public API entrypoints and some of the utility code. Some utility +# code is very verbose and is generally not desired. Taking the QEMU +# hypervisor as an example, a suitable filter string for debugging +# might be to turn off object, json & event logging, but enable the +# rest of the util code: +# +#log_filters="1:qemu 1:libvirt 4:object 4:json 4:event 1:util" + +# Logging outputs: +# An output is one of the places to save logging information +# The format for an output can be: +# level:stderr +# output goes to stderr +# level:syslog:name +# use syslog for the output and use the given name as the ident +# level:file:file_path +# output to a file, with the given filepath +# level:journald +# output to journald logging system +# In all cases 'level' is the minimal priority, acting as a filter +# 1: DEBUG +# 2: INFO +# 3: WARNING +# 4: ERROR +# +# Multiple outputs can be defined, they just need to be separated by spaces. +# e.g. to log all warnings and errors to syslog under the libvirtd ident: +#log_outputs="3:syslog:libvirtd" + + +################################################################## +# +# Auditing +# +# This setting allows usage of the auditing subsystem to be altered: +# +# audit_level == 0 -> disable all auditing +# audit_level == 1 -> enable auditing, only if enabled on host (default) +# audit_level == 2 -> enable auditing, and exit if disabled on host +# +#audit_level = 2 +# +# If set to 1, then audit messages will also be sent +# via libvirt logging infrastructure. Defaults to 0 +# +#audit_logging = 1 + +################################################################### +# UUID of the host: +# Host UUID is read from one of the sources specified in host_uuid_source. +# +# - 'smbios': fetch the UUID from 'dmidecode -s system-uuid' +# - 'machine-id': fetch the UUID from /etc/machine-id +# +# The host_uuid_source default is 'smbios'. If 'dmidecode' does not provide +# a valid UUID a temporary UUID will be generated. +# +# Another option is to specify host UUID in host_uuid. +# +# Keep the format of the example UUID below. UUID must not have all digits +# be the same. + +# NB This default all-zeros UUID will not work. Replace +# it with the output of the 'uuidgen' command and then +# uncomment this entry +#host_uuid = "00000000-0000-0000-0000-000000000000" +#host_uuid_source = "smbios" + +################################################################### +# Keepalive protocol: +# This allows libvirtd to detect broken client connections or even +# dead clients. A keepalive message is sent to a client after +# keepalive_interval seconds of inactivity to check if the client is +# still responding; keepalive_count is a maximum number of keepalive +# messages that are allowed to be sent to the client without getting +# any response before the connection is considered broken. In other +# words, the connection is automatically closed approximately after +# keepalive_interval * (keepalive_count + 1) seconds since the last +# message received from the client. If keepalive_interval is set to +# -1, libvirtd will never send keepalive requests; however clients +# can still send them and the daemon will send responses. When +# keepalive_count is set to 0, connections will be automatically +# closed after keepalive_interval seconds of inactivity without +# sending any keepalive messages. +# +#keepalive_interval = 5 +#keepalive_count = 5 + +# +# These configuration options are no longer used. There is no way to +# restrict such clients from connecting since they first need to +# connect in order to ask for keepalive. +# +#keepalive_required = 1 +#admin_keepalive_required = 1 + +# Keepalive settings for the admin interface +#admin_keepalive_interval = 5 +#admin_keepalive_count = 5 + +################################################################### +# Open vSwitch: +# This allows to specify a timeout for openvswitch calls made by +# libvirt. The ovs-vsctl utility is used for the configuration and +# its timeout option is set by default to 5 seconds to avoid +# potential infinite waits blocking libvirt. +# +#ovs_timeout = 5 diff --git a/lfs/libvirt b/lfs/libvirt index 882aa7c8d..bdfd2e4af 100644 --- a/lfs/libvirt +++ b/lfs/libvirt @@ -78,7 +78,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libvirt/0001-Change-default-behavior-of-libvirt-guests.sh-for-IPF.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc \ --with-openssl --without-sasl \ --without-uml --without-vbox --without-lxc --without-esx --without-vmware --without-openvz \ @@ -95,5 +94,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) mv /usr/libexec/libvirt-guests.sh /etc/rc.d/init.d/libvirt-guests # Backup install -v -m 644 $(DIR_SRC)/config/backup/includes/libvirt /var/ipfire/backup/addons/includes/libvirt + # Install libvirtd.conf + cp -fv $(DIR_SRC)/config/libvirt/libvirtd.conf /etc/libvirt @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch b/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch deleted file mode 100644 index ff6cb629a..000000000 --- a/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 69d6e8ce6c636f78d1db0eebe7fb1cc02ae4fb9a Mon Sep 17 00:00:00 2001 -From: Jonatan Schlag jonatan.schlag@ipfire.org -Date: Mon, 6 Jun 2016 19:40:50 +0200 -Subject: [PATCH 2/2] Change options in libvirtd.conf for IPFire - -Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org - ---- a/src/remote/libvirtd.conf~ 2018-10-24 09:12:31.045030419 +0100 -+++ b/src/remote/libvirtd.conf 2018-10-24 09:12:33.443109098 +0100 -@@ -82,14 +82,14 @@ - # without becoming root. - # - # This is restricted to 'root' by default. --#unix_sock_group = "libvirt" -+unix_sock_group = "libvirt-remote" - - # Set the UNIX socket permissions for the R/O socket. This is used - # for monitoring VM status only - # - # Default allows any user. If setting group ownership, you may want to - # restrict this too. --#unix_sock_ro_perms = "0777" -+unix_sock_ro_perms = "0770" - - # Set the UNIX socket permissions for the R/W socket. This is used - # for full management of VMs -@@ -99,7 +99,7 @@ - # - # If not using PolicyKit and setting group ownership for access - # control, then you may want to relax this too. --#unix_sock_rw_perms = "0770" -+unix_sock_rw_perms = "0770" - - # Set the UNIX socket permissions for the admin interface socket. - #

This was requested in the forum:

https://forum.ipfire.org/viewtopic.php?f=17&t=21872&p=120243&hil...

Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- config/rootfiles/packages/libvirt | 2 ++ lfs/libvirt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/rootfiles/packages/libvirt b/config/rootfiles/packages/libvirt index 57cbfcef7..db6554a34 100644 --- a/config/rootfiles/packages/libvirt +++ b/config/rootfiles/packages/libvirt @@ -94,6 +94,8 @@ usr/lib/libvirt/lock-driver/lockd.so #usr/lib/libvirt/storage-backend #usr/lib/libvirt/storage-backend/libvirt_storage_backend_fs.la usr/lib/libvirt/storage-backend/libvirt_storage_backend_fs.so +#usr/lib/libvirt/storage-backend/libvirt_storage_backend_logical.la +usr/lib/libvirt/storage-backend/libvirt_storage_backend_logical.so #usr/lib/libvirt/storage-file #usr/lib/libvirt/storage-file/libvirt_storage_file_fs.la usr/lib/libvirt/storage-file/libvirt_storage_file_fs.so diff --git a/lfs/libvirt b/lfs/libvirt index ffea3ea9c..fdf6fcdcf 100644 --- a/lfs/libvirt +++ b/lfs/libvirt @@ -84,7 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --without-firewalld --without-network --with-interface --with-virtualport --with-macvtap --without-wireshark-dissector \ --disable-nls --without-avahi --without-test-suite --without-dbus \ --with-qemu-user=nobody --with-qemu-group=kvm \ - --with-storage-dir --with-storage-fs --without-storage-lvm --without-storage-iscsi \ + --with-storage-dir --with-storage-fs --with-storage-lvm --without-storage-iscsi \ --without-storage-scsi --without-storage-mpath --without-storage-disk --without-storage-rbd --without-storage-sheepdog --without-storage-gluster --without-storage-zfs cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install

Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- config/rootfiles/packages/qemu | 80 ++++++++++++++----- lfs/qemu | 7 +- src/patches/qemu-2.11.0-memfd-collision.patch | 57 ------------- 3 files changed, 63 insertions(+), 81 deletions(-) delete mode 100644 src/patches/qemu-2.11.0-memfd-collision.patch

diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index dbd900179..e5c0cd189 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -1,8 +1,10 @@ lib/udev/rules.d/65-kvm.rules +usr/bin/elf2dmp usr/bin/ivshmem-client usr/bin/ivshmem-server usr/bin/qemu usr/bin/qemu-arm +usr/bin/qemu-edid usr/bin/qemu-ga usr/bin/qemu-i386 usr/bin/qemu-img @@ -14,27 +16,53 @@ usr/bin/qemu-system-i386 usr/bin/qemu-system-x86_64 usr/bin/qemu-x86_64 usr/libexec/qemu-bridge-helper -#usr/share/doc/qemu -#usr/share/doc/qemu/qemu-doc.html -#usr/share/doc/qemu/qemu-doc.txt -#usr/share/doc/qemu/qemu-ga-ref.html -#usr/share/doc/qemu/qemu-ga-ref.txt -#usr/share/doc/qemu/qemu-qmp-ref.html -#usr/share/doc/qemu/qemu-qmp-ref.txt -#usr/share/man/man1/qemu-img.1 -#usr/share/man/man1/qemu.1 -#usr/share/man/man7/qemu-block-drivers.7 -#usr/share/man/man7/qemu-ga-ref.7 -#usr/share/man/man7/qemu-qmp-ref.7 -#usr/share/man/man8/qemu-ga.8 -#usr/share/man/man8/qemu-nbd.8 +#usr/share/applications/qemu.desktop +#usr/share/icons +#usr/share/icons/hicolor +#usr/share/icons/hicolor/128x128 +#usr/share/icons/hicolor/128x128/apps +#usr/share/icons/hicolor/128x128/apps/qemu.png +#usr/share/icons/hicolor/16x16 +#usr/share/icons/hicolor/16x16/apps +#usr/share/icons/hicolor/16x16/apps/qemu.png +#usr/share/icons/hicolor/24x24 +#usr/share/icons/hicolor/24x24/apps +#usr/share/icons/hicolor/24x24/apps/qemu.png +#usr/share/icons/hicolor/256x256 +#usr/share/icons/hicolor/256x256/apps +#usr/share/icons/hicolor/256x256/apps/qemu.png +#usr/share/icons/hicolor/32x32 +#usr/share/icons/hicolor/32x32/apps +#usr/share/icons/hicolor/32x32/apps/qemu.bmp +#usr/share/icons/hicolor/32x32/apps/qemu.png +#usr/share/icons/hicolor/48x48 +#usr/share/icons/hicolor/48x48/apps +#usr/share/icons/hicolor/48x48/apps/qemu.png +#usr/share/icons/hicolor/512x512 +#usr/share/icons/hicolor/512x512/apps +#usr/share/icons/hicolor/512x512/apps/qemu.png +#usr/share/icons/hicolor/64x64 +#usr/share/icons/hicolor/64x64/apps +#usr/share/icons/hicolor/64x64/apps/qemu.png +#usr/share/icons/hicolor/scalable +#usr/share/icons/hicolor/scalable/apps +#usr/share/icons/hicolor/scalable/apps/qemu.svg #usr/share/qemu usr/share/qemu/QEMU,cgthree.bin usr/share/qemu/QEMU,tcx.bin -usr/share/qemu/acpi-dsdt.aml usr/share/qemu/bamboo.dtb usr/share/qemu/bios-256k.bin usr/share/qemu/bios.bin +usr/share/qemu/canyonlands.dtb +usr/share/qemu/edk2-aarch64-code.fd +usr/share/qemu/edk2-arm-code.fd +usr/share/qemu/edk2-arm-vars.fd +usr/share/qemu/edk2-i386-code.fd +usr/share/qemu/edk2-i386-secure-code.fd +usr/share/qemu/edk2-i386-vars.fd +usr/share/qemu/edk2-licenses.txt +usr/share/qemu/edk2-x86_64-code.fd +usr/share/qemu/edk2-x86_64-secure-code.fd usr/share/qemu/efi-e1000.rom usr/share/qemu/efi-e1000e.rom usr/share/qemu/efi-eepro100.rom @@ -43,10 +71,17 @@ usr/share/qemu/efi-pcnet.rom usr/share/qemu/efi-rtl8139.rom usr/share/qemu/efi-virtio.rom usr/share/qemu/efi-vmxnet3.rom +usr/share/qemu/firmware +usr/share/qemu/firmware/50-edk2-i386-secure.json +usr/share/qemu/firmware/50-edk2-x86_64-secure.json +usr/share/qemu/firmware/60-edk2-aarch64.json +usr/share/qemu/firmware/60-edk2-arm.json +usr/share/qemu/firmware/60-edk2-i386.json +usr/share/qemu/firmware/60-edk2-x86_64.json +usr/share/qemu/hppa-firmware.img usr/share/qemu/keymaps usr/share/qemu/keymaps/ar usr/share/qemu/keymaps/bepo -usr/share/qemu/keymaps/common usr/share/qemu/keymaps/cz usr/share/qemu/keymaps/da usr/share/qemu/keymaps/de @@ -69,9 +104,7 @@ usr/share/qemu/keymaps/ja usr/share/qemu/keymaps/lt usr/share/qemu/keymaps/lv usr/share/qemu/keymaps/mk -usr/share/qemu/keymaps/modifiers usr/share/qemu/keymaps/nl -usr/share/qemu/keymaps/nl-be usr/share/qemu/keymaps/no usr/share/qemu/keymaps/pl usr/share/qemu/keymaps/pt @@ -88,18 +121,21 @@ usr/share/qemu/multiboot.bin usr/share/qemu/openbios-ppc usr/share/qemu/openbios-sparc32 usr/share/qemu/openbios-sparc64 +usr/share/qemu/opensbi-riscv32-virt-fw_jump.bin +usr/share/qemu/opensbi-riscv64-sifive_u-fw_jump.bin +usr/share/qemu/opensbi-riscv64-virt-fw_jump.bin usr/share/qemu/palcode-clipper usr/share/qemu/petalogix-ml605.dtb usr/share/qemu/petalogix-s3adsp1800.dtb usr/share/qemu/ppc_rom.bin +usr/share/qemu/pvh.bin usr/share/qemu/pxe-e1000.rom usr/share/qemu/pxe-eepro100.rom usr/share/qemu/pxe-ne2k_pci.rom usr/share/qemu/pxe-pcnet.rom usr/share/qemu/pxe-rtl8139.rom usr/share/qemu/pxe-virtio.rom -usr/share/qemu/qemu-icon.bmp -usr/share/qemu/qemu_logo_no_text.svg +usr/share/qemu/qemu-nsis.bmp usr/share/qemu/qemu_vga.ndrv usr/share/qemu/s390-ccw.img usr/share/qemu/s390-netboot.img @@ -108,9 +144,13 @@ usr/share/qemu/skiboot.lid usr/share/qemu/slof.bin usr/share/qemu/spapr-rtas.bin usr/share/qemu/trace-events-all +usr/share/qemu/u-boot-sam460-20100605.bin usr/share/qemu/u-boot.e500 +usr/share/qemu/vgabios-ati.bin +usr/share/qemu/vgabios-bochs-display.bin usr/share/qemu/vgabios-cirrus.bin usr/share/qemu/vgabios-qxl.bin +usr/share/qemu/vgabios-ramfb.bin usr/share/qemu/vgabios-stdvga.bin usr/share/qemu/vgabios-virtio.bin usr/share/qemu/vgabios-vmware.bin diff --git a/lfs/qemu b/lfs/qemu index 9fdb6b7b6..0a8cdb544 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -24,7 +24,7 @@

include Config

-VER = 2.11.0 +VER = 4.1.0

THISAPP = qemu-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 x86_64 PROG = qemu -PAK_VER = 24 +PAK_VER = 25

DEPS = "libusbredir sdl spice libseccomp"

@@ -45,7 +45,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 335994a755bc655e88a87aeb36bfc0b9 +$(DL_FILE)_MD5 = 5862fc984bb955c4c24427d3bceddca5

install : $(TARGET)

@@ -78,7 +78,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-2.11.0-memfd-collision.patch cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --enable-kvm --disable-bluez --disable-attr \ --target-list="i386-linux-user x86_64-linux-user arm-linux-user i386-softmmu x86_64-softmmu arm-softmmu" \ diff --git a/src/patches/qemu-2.11.0-memfd-collision.patch b/src/patches/qemu-2.11.0-memfd-collision.patch deleted file mode 100644 index 62e8d3800..000000000 --- a/src/patches/qemu-2.11.0-memfd-collision.patch +++ /dev/null @@ -1,57 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton ross.burton@intel.com - -From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini pbonzini@redhat.com -Date: Tue, 28 Nov 2017 11:51:27 +0100 -Subject: [PATCH] memfd: fix configure test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Recent glibc added memfd_create in sys/mman.h. This conflicts with -the definition in util/memfd.c: - - /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration - -Fix the configure test, and remove the sys/memfd.h inclusion since the -file actually does not exist---it is a typo in the memfd_create(2) man -page. - -Cc: Marc-André Lureau marcandre.lureau@redhat.com -Signed-off-by: Paolo Bonzini pbonzini@redhat.com ---- - configure | 2 +- - util/memfd.c | 4 +--- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index 9c8aa5a98b..99ccc1725a 100755 ---- a/configure -+++ b/configure -@@ -3923,7 +3923,7 @@ fi - # check if memfd is supported - memfd=no - cat > $TMPC << EOF --#include <sys/memfd.h> -+#include <sys/mman.h> - - int main(void) - { -diff --git a/util/memfd.c b/util/memfd.c -index 4571d1aba8..412e94a405 100644 ---- a/util/memfd.c -+++ b/util/memfd.c -@@ -31,9 +31,7 @@ - - #include "qemu/memfd.h" - --#ifdef CONFIG_MEMFD --#include <sys/memfd.h> --#elif defined CONFIG_LINUX -+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD - #include <sys/syscall.h> - #include <asm/unistd.h> - --- -2.11.0