dist-git conversion

#2781)

.gitignore

@@ -1,4 +1 @@
-/.build*.log
-/x86_64/
-/*.src.rpm
-/qemu-*.tar.xz
+qemu-0.6.1.tar.gz

95-kvm-ppc64-memlock.conf

@@ -1,12 +0,0 @@
-# The KVM HV implementation on Power can require a significant amount
-# of unswappable memory (about half of which also needs to be host
-# physically contiguous) to hold the guest's Hash Page Table (HPT) -
-# roughly 1/64th of the guest's RAM size, minimum 16MiB.
-#
-# These limits allow unprivileged users to start smallish VMs, such as
-# those used by libguestfs.
-#
-# https://bugzilla.redhat.com/show_bug.cgi?id=1293024
-#
-*	hard	memlock		65536
-*	soft	memlock		65536

99-qemu-guest-agent.rules

@@ -1,2 +0,0 @@
-SUBSYSTEM=="virtio-ports", ATTR{name}=="org.qemu.guest_agent.0", \
-  TAG+="systemd" ENV{SYSTEMD_WANTS}="qemu-guest-agent.service"

bridge.conf

@@ -1 +0,0 @@
-allow virbr0

kvm-x86.modprobe.conf

@@ -1,11 +0,0 @@
-###
-### This configuration file was provided by the qemu package.
-### Feel free to update as needed.
-###
-
-###
-### Set these options to enable nested virtualization
-###
-
-#options kvm_intel nested=1
-#options kvm_amd nested=1

qemu-0.6.1-build.patch

@@ -0,0 +1,48 @@
+--- qemu-0.6.1/Makefile.strip	2005-02-13 14:38:23.000000000 +0000
++++ qemu-0.6.1/Makefile	2005-02-13 14:42:27.000000000 +0000
+@@ -1,6 +1,6 @@
+ -include config-host.mak
+ 
+-CFLAGS=-Wall -O2 -g -fno-strict-aliasing 
++CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing 
+ ifdef CONFIG_DARWIN
+ CFLAGS+= -mdynamic-no-pic
+ endif
+@@ -45,7 +45,7 @@
+ install: all 
+ 	mkdir -p "$(bindir)"
+ ifndef CONFIG_WIN32
+-	install -m 755 -s $(TOOLS) "$(bindir)"
++	install -m 755 $(TOOLS) "$(bindir)"
+ endif
+ 	mkdir -p "$(datadir)"
+ 	install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \
+--- qemu-0.6.1/Makefile.target.strip	2005-02-13 14:38:19.000000000 +0000
++++ qemu-0.6.1/Makefile.target	2005-02-13 14:42:49.000000000 +0000
+@@ -7,7 +7,7 @@
+ VPATH+=:$(SRC_PATH)/linux-user
+ DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
+ endif
+-CFLAGS=-Wall -O2 -g -fno-strict-aliasing
++CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing
+ LDFLAGS=-g
+ LIBS=
+ HELPER_CFLAGS=$(CFLAGS)
+@@ -148,7 +148,7 @@
+ ifeq ($(ARCH),alpha)
+ # -msmall-data is not used because we want two-instruction relocations
+ # for the constant constructions
+-OP_CFLAGS=-Wall -O2 -g
++OP_CFLAGS=$(RPM_OPT_FLAGS) -Wall
+ # Ensure there's only a single GP
+ CFLAGS += -msmall-data
+ LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld
+@@ -397,7 +397,7 @@
+ 
+ install: all 
+ ifneq ($(PROGS),)
+-	install -m 755 -s $(PROGS) "$(bindir)"
++	install -m 755 $(PROGS) "$(bindir)"
+ endif
+ 
+ ifneq ($(wildcard .depend),)

qemu-ga.sysconfig

@@ -1,19 +0,0 @@
-# This is a systemd environment file, not a shell script.
-# It provides settings for "/lib/systemd/system/qemu-guest-agent.service".
-
-# Comma-separated blacklist of RPCs to disable, or empty list to enable all.
-#
-# You can get the list of RPC commands using "qemu-ga --blacklist='?'".
-# There should be no spaces between commas and commands in the blacklist.
-#BLACKLIST_RPC=guest-file-open,guest-file-close,guest-file-read,guest-file-write,guest-file-seek,guest-file-flush,guest-exec,guest-exec-status
-
-# Fsfreeze hook script specification.
-#
-# FSFREEZE_HOOK_PATHNAME=/dev/null           : disables the feature.
-#
-# FSFREEZE_HOOK_PATHNAME=/path/to/executable : enables the feature with the
-# specified binary or shell script.
-#
-# FSFREEZE_HOOK_PATHNAME=                    : enables the feature with the
-# default value (invoke "qemu-ga --help" to interrogate).
-FSFREEZE_HOOK_PATHNAME=/etc/qemu-ga/fsfreeze-hook

qemu-guest-agent.service

@@ -1,19 +0,0 @@
-[Unit]
-Description=QEMU Guest Agent
-BindsTo=dev-virtio\x2dports-org.qemu.guest_agent.0.device
-After=dev-virtio\x2dports-org.qemu.guest_agent.0.device
-IgnoreOnIsolate=True
-
-[Service]
-UMask=0077
-EnvironmentFile=/etc/sysconfig/qemu-ga
-ExecStart=/usr/bin/qemu-ga \
-  --method=virtio-serial \
-  --path=/dev/virtio-ports/org.qemu.guest_agent.0 \
-  --blacklist=${BLACKLIST_RPC} \
-  -F${FSFREEZE_HOOK_PATHNAME}
-Restart=always
-RestartSec=0
-
-[Install]
-WantedBy=dev-virtio\x2dports-org.qemu.guest_agent.0.device

qemu-kvm.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Libvirt introspects the binary using -M none. In that case, don't try
-# to init KVM, which will fail and be noisy if the host has kvm disabled
-opts="-machine accel=kvm"
-if echo "$@" | grep -q " -M none "; then
-    opts=
-fi
-
-exec /usr/bin/qemu-system-x86_64 $opts "$@"

qemu.init

@@ -0,0 +1,96 @@
+#!/bin/sh
+#
+# qemu	Allow users to run non-native Linux programs by just clicking on them
+#	(or typing ./file.exe)
+#
+# chkconfig: 2345 35 98
+# description: Allow users to run non-native Linux programs by just clicking \
+#	       on them (or typing ./file.exe)
+
+. /etc/rc.d/init.d/functions
+RETVAL=0
+QEMU=/usr/bin
+
+start() {
+	cpu=`uname -m`
+        case "$cpu" in
+	    i386|i486|i586|i686|i86pc|BePC)
+		cpu="i386"
+		;;
+	    "Power Macintosh"|ppc|ppc64)
+		cpu="ppc"
+		;;
+	    armv4l|armv5l)
+		cpu="arm"
+		;;
+	esac
+
+	echo -n $"Registering binary handler for qemu applications"
+	/sbin/modprobe binfmt_misc &>/dev/null
+	if [ "$cpu" != i386 -a -x $QEMU/qemu-i386 -a -d /usr/qemu-i386 ] ; then
+	    echo ":qemu-i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff\xff:$QEMU/qemu-i386:" > /proc/sys/fs/binfmt_misc/register
+	    echo ":qemu-i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff\xff:$QEMU/qemu-i386:" > /proc/sys/fs/binfmt_misc/register
+	fi
+	if [ "$cpu" != arm -a -x $QEMU/qemu-arm -a -d /usr/qemu-arm ] ; then
+	    echo   ":qemu-arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff\xff:$QEMU/qemu-arm:" > /proc/sys/fs/binfmt_misc/register
+	fi
+	if [ "$cpu" != ppc -a -x $QEMU/qemu-ppc -a -d /usr/qemu-ppc ] ; then
+	    echo   ":ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff\xff:$QEMU/qemu-ppc:" > /proc/sys/fs/binfmt_misc/register
+	echo do ppc
+	fi
+	if [ "$cpu" != sparc -a -x $QEMU/qemu-sparc -a -d /usr/qemu-sparc ] ; then
+	    echo   ":qemu-sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff\xff:$QEMU/qemu-sparc:" > /proc/sys/fs/binfmt_misc/register
+	fi
+	echo
+}
+
+stop() {
+	echo -n $"Unregistering binary handler for qemu applications"
+	for a in i386 i486 ppc arm sparc ] ; do 
+	    [ -r /proc/sys/fs/binfmt_misc/qemu-$a ] && echo "-1" >/proc/sys/fs/binfmt_misc/qemu-$a
+	done
+	echo
+}
+
+reload() {
+	stop
+	start
+}
+
+qemu_status() {
+	if ls /proc/sys/fs/binfmt_misc/qemu-* &>/dev/null; then 
+		echo $"qemu binary format handlers are registered."
+		return 0
+	else
+		echo $"qemu binary format handlers are not registered."
+		return 3
+	fi
+}
+
+case "$1" in
+	start)
+		start
+		;;
+	stop)
+		stop
+		;;
+	status)
+		qemu_status
+		RETVAL=$?
+		;;
+	restart)
+		stop
+		start
+		;;
+	condrestart)
+		if qemu_status &>/dev/null; then
+			stop
+			start
+		fi
+		;;
+	*)
+		echo $"Usage: $prog {start|stop|status|restart|condrestart}"
+		exit 1
+esac
+exit $RETVAL
+

sources

@@ -1 +1 @@
-SHA512 (qemu-5.2.0-rc4.tar.xz) = 47e918392609c34f904962e5759125485407ae52c273053729054300e10fc67fc7ed443c9af25d1d852a5f5c70eee125c703ce15d0e571068848f405de33db3b
+f1b5e103321832d2786dd4110f6c8ae4  qemu-0.6.1.tar.gz