xen4.2: removed; I don't want to deal with additional patches...
Get a 64bit CPU and run Xen >= 4.4 instead.
This commit is contained in:
parent
7c10aa76b0
commit
ad48dcebae
|
@ -455,12 +455,6 @@ libxenstat.so.0 xen-libs-4.2.2_2
|
|||
libblktapctl.so.1.0 xen-libs-4.2.2_2
|
||||
libblktap.so.3.0 xen-libs-4.2.2_2
|
||||
libfsimage.so.1.0 xen-libs-4.2.2_2
|
||||
libxenctrl.so.4.2 xen4.2-libs-4.2.3_1
|
||||
libxenguest.so.4.2 xen4.2-libs-4.2.3_1
|
||||
libxenstore.so.3.0 xen4.2-libs-4.2.3_1
|
||||
libvhd.so.1.0 xen4.2-libs-4.2.3_1
|
||||
libxlutil.so.1.0 xen4.2-libs-4.2.3_1
|
||||
libxenlight.so.2.0 xen4.2-libs-4.2.3_1
|
||||
libbabl-0.1.so.0 babl-0.1.10_1
|
||||
libgegl-0.2.so.0 gegl-0.2.0_1
|
||||
libiculx.so.49 icu-libs-49.1.2_1
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
xen4.2
|
|
@ -1 +0,0 @@
|
|||
xen4.2
|
|
@ -1 +0,0 @@
|
|||
xen4.2
|
|
@ -1,9 +0,0 @@
|
|||
[Unit]
|
||||
Description=Mount /proc/xen files
|
||||
ConditionPathExists=/proc/xen
|
||||
RefuseManualStop=true
|
||||
|
||||
[Mount]
|
||||
What=xenfs
|
||||
Where=/proc/xen
|
||||
Type=xenfs
|
|
@ -1 +0,0 @@
|
|||
d /run/xen 0755 root root -
|
|
@ -1,10 +0,0 @@
|
|||
[Unit]
|
||||
Description=mount xenstore file system
|
||||
ConditionPathExists=/proc/xen
|
||||
RefuseManualStop=true
|
||||
|
||||
[Mount]
|
||||
What=xenstore
|
||||
Where=/var/lib/xenstored
|
||||
Type=tmpfs
|
||||
Options=mode=755
|
|
@ -1,7 +0,0 @@
|
|||
xen-evtchn
|
||||
xen-gntdev
|
||||
xen-gntalloc
|
||||
xen-blkback
|
||||
xen-netback
|
||||
xen-pciback
|
||||
xen-acpi-processor
|
|
@ -1,17 +0,0 @@
|
|||
[Unit]
|
||||
Description=Xenconsoled - handles logging from guest consoles and hypervisor
|
||||
Requires=proc-xen.mount
|
||||
After=proc-xen.mount xenstored.service
|
||||
ConditionPathExists=/proc/xen
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
Environment=XENCONSOLED_ARGS=
|
||||
Environment=XENCONSOLED_LOG=none
|
||||
Environment=XENCONSOLED_LOG_DIR=/var/log/xen/console
|
||||
PIDFile=/var/run/xenconsoled.pid
|
||||
ExecStartPre=/usr/bin/grep -q control_d /proc/xen/capabilities
|
||||
ExecStart=/usr/bin/xenconsoled --log=${XENCONSOLED_LOG} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
|
@ -1,13 +0,0 @@
|
|||
[Unit]
|
||||
Description=xen domU service for domain %i
|
||||
Requires=xenstored.service
|
||||
ConditionVirtualization=xen
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
RemainAfterExit=yes
|
||||
ExecStart=/usr/bin/xl create /etc/xen/conf/%i.cfg
|
||||
ExecStop=/usr/bin/xl shutdown %i
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
|
@ -1,15 +0,0 @@
|
|||
[Unit]
|
||||
Description=Xendomains - start and stop guests on boot and shutdown
|
||||
Requires=proc-xen.mount xenstored.service
|
||||
After=proc-xen.mount xenstored.service xenconsoled.service
|
||||
ConditionPathExists=/proc/xen
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
RemainAfterExit=true
|
||||
ExecStartPre=/usr/bin/grep -q control_d /proc/xen/capabilities
|
||||
ExecStart=/etc/xen/scripts/xendomains start
|
||||
ExecStop=/etc/xen/scripts/xendomains stop
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
|
@ -1,18 +0,0 @@
|
|||
[Unit]
|
||||
Description=Xenstored - daemon managing xenstore file system
|
||||
Requires=proc-xen.mount var-lib-xenstored.mount systemd-tmpfiles-setup.service
|
||||
After=proc-xen.mount var-lib-xenstored.mount systemd-tmpfiles-setup.service
|
||||
Before=libvirtd.service libvirt-guests.service
|
||||
RefuseManualStop=true
|
||||
ConditionPathExists=/proc/xen
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
Environment=XENSTORED_ARGS=
|
||||
PIDFile=/var/run/xenstored.pid
|
||||
ExecStartPre=/usr/bin/grep -q control_d /proc/xen/capabilities
|
||||
ExecStart=/usr/bin/xenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS
|
||||
ExecStartPost=/usr/bin/xenstore-write "/local/domain/0/name" "Domain-0"
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
|
@ -1,265 +0,0 @@
|
|||
Do not redefine READ and WRITE, which are defined in linux/fs.h. Instead prefix them
|
||||
with XEN to avoid namespace clash.
|
||||
|
||||
--- tools/blktap2/include/blktaplib.h.orig 2011-01-10 11:10:18.362560374 +0100
|
||||
+++ tools/blktap2/include/blktaplib.h 2011-01-10 11:11:53.007679832 +0100
|
||||
@@ -197,8 +197,8 @@ typedef struct msg_lock {
|
||||
int uuid_len;
|
||||
} msg_lock_t;
|
||||
|
||||
-#define READ 0
|
||||
-#define WRITE 1
|
||||
+#define XEN_READ 0
|
||||
+#define XEN_WRITE 1
|
||||
|
||||
/*Control Messages between manager and tapdev*/
|
||||
#define CTLMSG_PARAMS 1
|
||||
--- tools/blktap/lib/blktaplib.h.orig 2011-01-10 11:12:38.633561491 +0100
|
||||
+++ tools/blktap/lib/blktaplib.h 2011-01-10 11:12:47.110717080 +0100
|
||||
@@ -195,8 +195,8 @@ typedef struct msg_pid {
|
||||
pid_t pid;
|
||||
} msg_pid_t;
|
||||
|
||||
-#define READ 0
|
||||
-#define WRITE 1
|
||||
+#define XEN_READ 0
|
||||
+#define XEN_WRITE 1
|
||||
|
||||
/*Control Messages between manager and tapdev*/
|
||||
#define CTLMSG_PARAMS 1
|
||||
--- tools/blktap/drivers/blktapctrl.c.orig 2010-08-25 12:22:07.000000000 +0200
|
||||
+++ tools/blktap/drivers/blktapctrl.c 2011-01-10 11:30:15.176697136 +0100
|
||||
@@ -128,13 +128,13 @@ static int get_tapdisk_pid(blkif_t *blki
|
||||
{
|
||||
int ret;
|
||||
|
||||
- if ((ret = write_msg(blkif->fds[WRITE], CTLMSG_PID, blkif, NULL))
|
||||
+ if ((ret = write_msg(blkif->fds[XEN_WRITE], CTLMSG_PID, blkif, NULL))
|
||||
<= 0) {
|
||||
DPRINTF("Write_msg failed - CTLMSG_PID(%d)\n", ret);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
- if ((ret = read_msg(blkif->fds[READ], CTLMSG_PID_RSP, blkif))
|
||||
+ if ((ret = read_msg(blkif->fds[XEN_READ], CTLMSG_PID_RSP, blkif))
|
||||
<= 0) {
|
||||
DPRINTF("Read_msg failure - CTLMSG_PID(%d)\n", ret);
|
||||
return -EINVAL;
|
||||
@@ -576,8 +576,8 @@ static int connect_qemu(blkif_t *blkif,
|
||||
}
|
||||
|
||||
DPRINTF("Using tapdisk-ioemu connection\n");
|
||||
- blkif->fds[READ] = dom0_readfd;
|
||||
- blkif->fds[WRITE] = dom0_writefd;
|
||||
+ blkif->fds[XEN_READ] = dom0_readfd;
|
||||
+ blkif->fds[XEN_WRITE] = dom0_writefd;
|
||||
|
||||
if (refresh_pid) {
|
||||
get_tapdisk_pid(blkif);
|
||||
@@ -587,8 +587,8 @@ static int connect_qemu(blkif_t *blkif,
|
||||
} else if (access(rdctldev, R_OK | W_OK) == 0) {
|
||||
/* Use existing pipe to the device model */
|
||||
DPRINTF("Using qemu-dm connection\n");
|
||||
- blkif->fds[READ] = open_ctrl_socket(wrctldev);
|
||||
- blkif->fds[WRITE] = open_ctrl_socket(rdctldev);
|
||||
+ blkif->fds[XEN_READ] = open_ctrl_socket(wrctldev);
|
||||
+ blkif->fds[XEN_WRITE] = open_ctrl_socket(rdctldev);
|
||||
} else {
|
||||
/* No device model => try with tapdisk-ioemu */
|
||||
DPRINTF("No device model\n");
|
||||
@@ -598,7 +598,7 @@ static int connect_qemu(blkif_t *blkif,
|
||||
free(rdctldev);
|
||||
free(wrctldev);
|
||||
|
||||
- if (blkif->fds[READ] == -1 || blkif->fds[WRITE] == -1)
|
||||
+ if (blkif->fds[XEN_READ] == -1 || blkif->fds[XEN_WRITE] == -1)
|
||||
return -1;
|
||||
|
||||
DPRINTF("Attached to qemu blktap pipes\n");
|
||||
@@ -621,10 +621,10 @@ static int connect_tapdisk(blkif_t *blki
|
||||
"%s/tapctrlwrite%d", BLKTAP_CTRL_DIR, minor) == -1)
|
||||
goto fail;
|
||||
|
||||
- blkif->fds[READ] = open_ctrl_socket(rdctldev);
|
||||
- blkif->fds[WRITE] = open_ctrl_socket(wrctldev);
|
||||
+ blkif->fds[XEN_READ] = open_ctrl_socket(rdctldev);
|
||||
+ blkif->fds[XEN_WRITE] = open_ctrl_socket(wrctldev);
|
||||
|
||||
- if (blkif->fds[READ] == -1 || blkif->fds[WRITE] == -1)
|
||||
+ if (blkif->fds[XEN_READ] == -1 || blkif->fds[XEN_WRITE] == -1)
|
||||
goto fail;
|
||||
|
||||
/*launch the new process*/
|
||||
@@ -683,8 +683,8 @@ static int blktapctrl_new_blkif(blkif_t
|
||||
|
||||
} else {
|
||||
DPRINTF("Process exists!\n");
|
||||
- blkif->fds[READ] = exist->fds[READ];
|
||||
- blkif->fds[WRITE] = exist->fds[WRITE];
|
||||
+ blkif->fds[XEN_READ] = exist->fds[XEN_READ];
|
||||
+ blkif->fds[XEN_WRITE] = exist->fds[XEN_WRITE];
|
||||
}
|
||||
|
||||
add_disktype(blkif, type);
|
||||
@@ -703,13 +703,13 @@ static int blktapctrl_new_blkif(blkif_t
|
||||
|
||||
/* Both of the following read and write calls will block up to
|
||||
* max_timeout val*/
|
||||
- if (write_msg(blkif->fds[WRITE], CTLMSG_PARAMS, blkif, ptr)
|
||||
+ if (write_msg(blkif->fds[XEN_WRITE], CTLMSG_PARAMS, blkif, ptr)
|
||||
<= 0) {
|
||||
DPRINTF("Write_msg failed - CTLMSG_PARAMS\n");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
- if (read_msg(blkif->fds[READ], CTLMSG_IMG, blkif) <= 0) {
|
||||
+ if (read_msg(blkif->fds[XEN_READ], CTLMSG_IMG, blkif) <= 0) {
|
||||
DPRINTF("Read_msg failure - CTLMSG_IMG\n");
|
||||
goto fail;
|
||||
}
|
||||
@@ -725,12 +725,12 @@ fail:
|
||||
static int map_new_blktapctrl(blkif_t *blkif)
|
||||
{
|
||||
DPRINTF("Received a poll for a new devmap\n");
|
||||
- if (write_msg(blkif->fds[WRITE], CTLMSG_NEWDEV, blkif, NULL) <= 0) {
|
||||
+ if (write_msg(blkif->fds[XEN_WRITE], CTLMSG_NEWDEV, blkif, NULL) <= 0) {
|
||||
DPRINTF("Write_msg failed - CTLMSG_NEWDEV\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
- if (read_msg(blkif->fds[READ], CTLMSG_NEWDEV_RSP, blkif) <= 0) {
|
||||
+ if (read_msg(blkif->fds[XEN_READ], CTLMSG_NEWDEV_RSP, blkif) <= 0) {
|
||||
DPRINTF("Read_msg failed - CTLMSG_NEWDEV_RSP\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
@@ -743,15 +743,15 @@ static int unmap_blktapctrl(blkif_t *blk
|
||||
{
|
||||
DPRINTF("Unmapping vbd\n");
|
||||
|
||||
- if (write_msg(blkif->fds[WRITE], CTLMSG_CLOSE, blkif, NULL) <= 0) {
|
||||
+ if (write_msg(blkif->fds[XEN_WRITE], CTLMSG_CLOSE, blkif, NULL) <= 0) {
|
||||
DPRINTF("Write_msg failed - CTLMSG_CLOSE\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (del_disktype(blkif)) {
|
||||
DPRINTF("Closing communication pipe to pid %d\n", blkif->tappid);
|
||||
- close(blkif->fds[WRITE]);
|
||||
- close(blkif->fds[READ]);
|
||||
+ close(blkif->fds[XEN_WRITE]);
|
||||
+ close(blkif->fds[XEN_READ]);
|
||||
}
|
||||
|
||||
return 0;
|
||||
--- tools/blktap/drivers/tapdisk.c.orig 2011-01-10 11:33:42.160375869 +0100
|
||||
+++ tools/blktap/drivers/tapdisk.c 2011-01-10 11:36:42.820168882 +0100
|
||||
@@ -138,10 +138,10 @@ static inline int LOCAL_FD_SET(fd_set *r
|
||||
if (ptr->tap_fd) {
|
||||
FD_SET(ptr->tap_fd, readfds);
|
||||
td_for_each_disk(ptr->s, dd) {
|
||||
- if (dd->io_fd[READ])
|
||||
- FD_SET(dd->io_fd[READ], readfds);
|
||||
- maxfds = (dd->io_fd[READ] > maxfds ?
|
||||
- dd->io_fd[READ] : maxfds);
|
||||
+ if (dd->io_fd[INPUT])
|
||||
+ FD_SET(dd->io_fd[INPUT], readfds);
|
||||
+ maxfds = (dd->io_fd[INPUT] > maxfds ?
|
||||
+ dd->io_fd[INPUT] : maxfds);
|
||||
}
|
||||
maxfds = (ptr->tap_fd > maxfds ? ptr->tap_fd : maxfds);
|
||||
}
|
||||
@@ -380,7 +380,7 @@ static int read_msg(char *buf)
|
||||
struct td_state *s = NULL;
|
||||
fd_list_entry_t *entry;
|
||||
|
||||
- length = read(fds[READ], buf, MSG_SIZE);
|
||||
+ length = read(fds[INPUT], buf, MSG_SIZE);
|
||||
|
||||
if (length > 0 && length >= sizeof(msg_hdr_t))
|
||||
{
|
||||
@@ -435,7 +435,7 @@ static int read_msg(char *buf)
|
||||
msg->type = CTLMSG_IMG_FAIL;
|
||||
msg->len = msglen;
|
||||
}
|
||||
- len = write(fds[WRITE], buf, msglen);
|
||||
+ len = write(fds[OUTPUT], buf, msglen);
|
||||
free(path);
|
||||
return 1;
|
||||
|
||||
@@ -457,7 +457,7 @@ static int read_msg(char *buf)
|
||||
: CTLMSG_NEWDEV_FAIL);
|
||||
msg->len = msglen;
|
||||
|
||||
- len = write(fds[WRITE], buf, msglen);
|
||||
+ len = write(fds[OUTPUT], buf, msglen);
|
||||
return 1;
|
||||
|
||||
case CTLMSG_CLOSE:
|
||||
@@ -479,7 +479,7 @@ static int read_msg(char *buf)
|
||||
process = getpid();
|
||||
msg_pid->pid = process;
|
||||
|
||||
- len = write(fds[WRITE], buf, msglen);
|
||||
+ len = write(fds[OUTPUT], buf, msglen);
|
||||
return 1;
|
||||
|
||||
default:
|
||||
@@ -782,12 +782,12 @@ int main(int argc, char *argv[])
|
||||
signal (SIGINT, sig_handler);
|
||||
|
||||
/*Open the control channel*/
|
||||
- fds[READ] = open(argv[1],O_RDWR|O_NONBLOCK);
|
||||
- fds[WRITE] = open(argv[2],O_RDWR|O_NONBLOCK);
|
||||
+ fds[INPUT] = open(argv[1],O_RDWR|O_NONBLOCK);
|
||||
+ fds[OUTPUT] = open(argv[2],O_RDWR|O_NONBLOCK);
|
||||
|
||||
- if ( (fds[READ] < 0) || (fds[WRITE] < 0) )
|
||||
+ if ( (fds[INPUT] < 0) || (fds[OUTPUT] < 0) )
|
||||
{
|
||||
- DPRINTF("FD open failed [%d,%d]\n", fds[READ], fds[WRITE]);
|
||||
+ DPRINTF("FD open failed [%d,%d]\n", fds[INPUT], fds[OUTPUT]);
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
@@ -803,8 +803,8 @@ int main(int argc, char *argv[])
|
||||
{
|
||||
ret = 0;
|
||||
FD_ZERO(&readfds);
|
||||
- FD_SET(fds[READ], &readfds);
|
||||
- maxfds = fds[READ];
|
||||
+ FD_SET(fds[INPUT], &readfds);
|
||||
+ maxfds = fds[INPUT];
|
||||
|
||||
/*Set all tap fds*/
|
||||
LOCAL_FD_SET(&readfds);
|
||||
@@ -822,10 +822,10 @@ int main(int argc, char *argv[])
|
||||
tapdev_info_t *info = ptr->s->ring_info;
|
||||
|
||||
td_for_each_disk(ptr->s, dd) {
|
||||
- if (dd->io_fd[READ] &&
|
||||
- FD_ISSET(dd->io_fd[READ],
|
||||
+ if (dd->io_fd[INPUT] &&
|
||||
+ FD_ISSET(dd->io_fd[INPUT],
|
||||
&readfds)) {
|
||||
- io_done(dd, READ);
|
||||
+ io_done(dd, INPUT);
|
||||
progress_made = 1;
|
||||
}
|
||||
}
|
||||
@@ -851,13 +851,13 @@ int main(int argc, char *argv[])
|
||||
ptr = ptr->next;
|
||||
}
|
||||
|
||||
- if (FD_ISSET(fds[READ], &readfds))
|
||||
+ if (FD_ISSET(fds[INPUT], &readfds))
|
||||
read_msg(buf);
|
||||
}
|
||||
}
|
||||
free(buf);
|
||||
- close(fds[READ]);
|
||||
- close(fds[WRITE]);
|
||||
+ close(fds[INPUT]);
|
||||
+ close(fds[OUTPUT]);
|
||||
|
||||
ptr = fd_start;
|
||||
while (ptr != NULL) {
|
|
@ -1,65 +0,0 @@
|
|||
$NetBSD: patch-.._docs_man_xl.cfg.pod.5,v 1.2 2013/06/17 13:47:20 wiz Exp $
|
||||
|
||||
--- docs/man/xl.cfg.pod.5.orig 2013-04-23 16:42:55.000000000 +0000
|
||||
+++ docs/man/xl.cfg.pod.5
|
||||
@@ -4,13 +4,13 @@ xl.cfg - XL Domain Configuration File Sy
|
||||
|
||||
=head1 SYNOPSIS
|
||||
|
||||
- /etc/xen/xldomain
|
||||
+ /etc/xen/xldomain
|
||||
|
||||
=head1 DESCRIPTION
|
||||
|
||||
To create a VM (a domain in Xen terminology, sometimes called a guest)
|
||||
with xl requires the provision of a domain config file. Typically
|
||||
-these live in `/etc/xen/DOMAIN.cfg` where DOMAIN is the name of the
|
||||
+these live in `/etc/xen/DOMAIN.cfg` where DOMAIN is the name of the
|
||||
domain.
|
||||
|
||||
=head1 SYNTAX
|
||||
@@ -392,6 +392,8 @@ enable this option only for trusted VMs
|
||||
|
||||
=item B<pci_permissive=BOOLEAN>
|
||||
|
||||
+=over 4
|
||||
+
|
||||
(PV only) Changes the default value of 'permissive' for all PCI
|
||||
devices for this VM. This can still be overridden on a per-device
|
||||
basis. This option should be enabled with caution: it gives the guest
|
||||
@@ -426,6 +428,8 @@ administrator control.
|
||||
|
||||
=back
|
||||
|
||||
+=back
|
||||
+
|
||||
=head2 Paravirtualised (PV) Guest Specific Options
|
||||
|
||||
The following options apply only to Paravirtual guests.
|
||||
@@ -680,8 +684,6 @@ frequency changes.
|
||||
|
||||
=back
|
||||
|
||||
-=back
|
||||
-
|
||||
Please see F<docs/misc/tscmode.txt> for more information on this option.
|
||||
|
||||
=item B<localtime=BOOLEAN>
|
||||
@@ -692,6 +694,8 @@ Set the real time clock to local time or
|
||||
|
||||
Set the real time clock offset in seconds. 0 by default.
|
||||
|
||||
+=back
|
||||
+
|
||||
=head3 Support for Paravirtualisation of HVM Guests
|
||||
|
||||
The following options allow Paravirtualised features (such as devices)
|
||||
@@ -1142,7 +1146,7 @@ See L<qemu(1)> for more information.
|
||||
|
||||
=head1 FILES
|
||||
|
||||
-F</etc/xen/NAME.cfg>
|
||||
+F</etc/xen/NAME.cfg>
|
||||
F</var/xen/dump/NAME>
|
||||
F<docs/misc/tscmode.txt>
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
$NetBSD: patch-.._docs_man_xl.pod.1,v 1.2 2013/06/17 13:47:20 wiz Exp $
|
||||
|
||||
--- docs/man/xl.pod.1.orig 2013-04-23 16:42:55.000000000 +0000
|
||||
+++ docs/man/xl.pod.1
|
||||
@@ -34,10 +34,10 @@ each of those subcommands.
|
||||
|
||||
=over 4
|
||||
|
||||
-=item start the script B</etc/init.d/xencommons> at boot time
|
||||
+=item start the script B</etc/rc.d/xencommons> at boot time
|
||||
|
||||
Most B<xl> operations rely upon B<xenstored> and B<xenconsoled>: make
|
||||
-sure you start the script B</etc/init.d/xencommons> at boot time to
|
||||
+sure you start the script B</etc/rc.d/xencommons> at boot time to
|
||||
initialize all the daemons needed by B<xl>.
|
||||
|
||||
=item setup a B<xenbr0> bridge in dom0
|
||||
@@ -51,7 +51,7 @@ setup the bridge.
|
||||
|
||||
If you specify the amount of memory dom0 has, passing B<dom0_mem> to
|
||||
Xen, it is highly recommended to disable B<autoballoon>. Edit
|
||||
-B</etc/xen/xl.conf> and set it to 0.
|
||||
+B</etc/xen/xl.conf> and set it to 0.
|
||||
|
||||
=item run xl as B<root>
|
||||
|
||||
@@ -157,7 +157,7 @@ B<EXAMPLES>
|
||||
|
||||
xl create DebianLenny
|
||||
|
||||
-This creates a domain with the file /etc/xen/DebianLenny, and returns as
|
||||
+This creates a domain with the file /etc/xen/DebianLenny, and returns as
|
||||
soon as it is run.
|
||||
|
||||
=back
|
||||
@@ -851,8 +851,6 @@ The following is the effect of combining
|
||||
|
||||
=item B<-p [pool] -d>... : Illegal
|
||||
|
||||
-=item
|
||||
-
|
||||
=back
|
||||
|
||||
=item B<sched-credit2> [I<OPTIONS>]
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-qemu-xen_qemu-doc.texi,v 1.1 2013/06/17 13:54:02 wiz Exp $
|
||||
|
||||
Avoid encoding issues in pod2man.
|
||||
|
||||
--- tools/qemu-xen/qemu-doc.texi.orig 2013-04-05 23:39:54.000000000 +0000
|
||||
+++ tools/qemu-xen/qemu-doc.texi
|
||||
@@ -225,7 +225,7 @@ VGA BIOS.
|
||||
QEMU uses YM3812 emulation by Tatsuyuki Satoh.
|
||||
|
||||
QEMU uses GUS emulation (GUSEMU32 @url{http://www.deinmeister.de/gusemu/})
|
||||
-by Tibor "TS" Schütz.
|
||||
+by Tibor "TS" Schuetz.
|
||||
|
||||
Note that, by default, GUS shares IRQ(7) with parallel ports and so
|
||||
qemu must be told to not have parallel ports to have working GUS
|
|
@ -1,22 +0,0 @@
|
|||
--- tools/qemu-xen/Makefile.target.orig 2013-06-04 15:51:15.320999319 +0200
|
||||
+++ tools/qemu-xen/Makefile.target 2013-06-04 15:51:37.360864318 +0200
|
||||
@@ -205,7 +205,7 @@ obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virt
|
||||
obj-$(CONFIG_KVM) += kvm.o kvm-all.o
|
||||
obj-$(CONFIG_NO_KVM) += kvm-stub.o
|
||||
obj-y += memory.o
|
||||
-LIBS+=-lz
|
||||
+LIBS+=-lz -lrt
|
||||
|
||||
QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
|
||||
QEMU_CFLAGS += $(VNC_SASL_CFLAGS)
|
||||
--- tools/qemu-xen-traditional/Makefile.target
|
||||
+++ tools/qemu-xen-traditional/Makefile.target
|
||||
@@ -520,7 +520,7 @@
|
||||
OBJS+=block-raw-posix.o
|
||||
endif
|
||||
|
||||
-LIBS+=-lz
|
||||
+LIBS+=-lz -lm -lrt
|
||||
ifdef CONFIG_ALSA
|
||||
LIBS += -lasound
|
||||
endif
|
|
@ -1,144 +0,0 @@
|
|||
# Template file for 'xen'
|
||||
pkgname=xen4.2
|
||||
version=4.2.4
|
||||
wrksrc=xen-${version}
|
||||
revision=2
|
||||
short_desc="The Xen hypervisor Utilities (4.2.x series)"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://xen.org"
|
||||
license="GPL-2"
|
||||
distfiles="http://bits.xensource.com/oss-xen/release/$version/xen-$version.tar.gz"
|
||||
checksum=e23e6292affd7a6d82da99527e8bf3964e57eb7322144c67c2025692b1a21550
|
||||
|
||||
# Update this if support for ARM7 is added.
|
||||
only_for_archs="i686 x86_64"
|
||||
lib32disabled=yes
|
||||
|
||||
hostmakedepends="which wget bison pkg-config"
|
||||
makedepends="lzo-devel openssl-devel e2fsprogs-devel zlib-devel gnutls-devel>=3.1.5
|
||||
libbluetooth-devel pciutils-devel libX11-devel libXext-devel SDL-devel MesaLib-devel
|
||||
ncurses-devel liblzma-devel python-devel yajl-devel libuuid-devel libglib-devel iproute2
|
||||
bridge-utils dev86 acpica-utils"
|
||||
|
||||
if [ "${XBPS_MACHINE}" = "x86_64" ]; then
|
||||
makedepends+=" gcc-multilib"
|
||||
fi
|
||||
|
||||
depends="iproute2 bridge-utils xen-hypervisor"
|
||||
|
||||
make_dirs="
|
||||
/var/lib/xenstored 755 root root
|
||||
/var/lib/xen/xenpaging 755 root root
|
||||
/var/xen/dump 755 root root
|
||||
/etc/xen/auto 755 root root"
|
||||
conf_files="
|
||||
/etc/default/xendomains
|
||||
/etc/default/xencommons
|
||||
/etc/xen/xl.conf"
|
||||
nostrip_files="
|
||||
openbios-ppc
|
||||
openbios-sparc32
|
||||
openbios-sparc64
|
||||
palcode-clipper"
|
||||
pycompile_module="xen grub"
|
||||
provides="xen-${version}_${revision}"
|
||||
replaces="xen>=0"
|
||||
|
||||
do_configure() {
|
||||
unset CC LD AR AS RANLIB CPP CFLAGS CPPFLAGS LDFLAGS
|
||||
./configure ${configure_args}
|
||||
}
|
||||
|
||||
do_build() {
|
||||
if [ "${XBPS_MACHINE}" = "x86_64" ]; then
|
||||
install -d ${DESTDIR}/usr/lib
|
||||
cd ${DESTDIR}/usr
|
||||
ln -sf lib lib64
|
||||
fi
|
||||
cd ${wrksrc}
|
||||
unset CC LD AR AS RANLIB CPP CFLAGS CPPFLAGS LDFLAGS
|
||||
make ${makejobs} DISTDIR=${wrksrc}/${pkgver}-distdir
|
||||
}
|
||||
|
||||
do_install() {
|
||||
if [ "${XBPS_MACHINE}" = "x86_64" ]; then
|
||||
install -d ${DESTDIR}/usr/lib
|
||||
cd ${DESTDIR}/usr
|
||||
ln -sf lib lib64
|
||||
cd ${wrksrc}
|
||||
fi
|
||||
unset CC LD AR AS RANLIB CPP CFLAGS CPPFLAGS LDFLAGS
|
||||
make DESTDIR=${DESTDIR} install
|
||||
|
||||
# Move example config files into correct directory.
|
||||
vmkdir usr/share/examples/xen
|
||||
mv ${DESTDIR}/etc/xen/x*example* ${DESTDIR}/usr/share/examples/xen
|
||||
mv ${DESTDIR}/etc/xen/cpupool ${DESTDIR}/usr/share/examples/xen
|
||||
|
||||
mv ${DESTDIR}/etc/init.d/xendomains ${DESTDIR}/etc/xen/scripts
|
||||
|
||||
# Remove useless stuff.
|
||||
rm -rf ${DESTDIR}/etc/init.d ${DESTDIR}/usr/local
|
||||
rm -f ${DESTDIR}/install.sh ${DESTDIR}/usr/lib64
|
||||
rm -rf ${DESTDIR}/usr/bin/qemu-*-xen
|
||||
rm -rf ${DESTDIR}/usr/share/qemu-xen
|
||||
rm -f ${DESTDIR}/boot/xen{,-4,-4.2}.gz
|
||||
rm -f ${DESTDIR}/usr/sbin/xen-python-path
|
||||
rm -f ${DESTDIR}/{install,COPYING,README,usr/lib/lib}
|
||||
rm -rf ${DESTDIR}/etc/{hotplug,udev}
|
||||
|
||||
# Move bash-completion to the correct dir.
|
||||
vmkdir usr/share/bash-completion/completions
|
||||
mv ${DESTDIR}/etc/bash_completion.d/* \
|
||||
${DESTDIR}/usr/share/bash-completion/completions
|
||||
|
||||
# Install systemd services.
|
||||
vmkdir usr/lib/systemd/system
|
||||
install -m644 ${FILESDIR}/*.{mount,service} ${DESTDIR}/usr/lib/systemd/system
|
||||
vmkdir usr/lib/modules-load.d
|
||||
install -m644 ${FILESDIR}/xen.conf ${DESTDIR}/usr/lib/modules-load.d
|
||||
install -Dm644 ${FILESDIR}/tmpfiles.d-xen.conf \
|
||||
${DESTDIR}/usr/lib/tmpfiles.d/xen.conf
|
||||
|
||||
# Move bins to /usr/bin.
|
||||
mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin/
|
||||
|
||||
# Drop xen/xm stuff (obsolete).
|
||||
rm -f ${DESTDIR}/usr/bin/{xm,xend}
|
||||
rm -f ${DESTDIR}/etc/xen/*.{sxp,xml}
|
||||
rm -f ${DESTDIR}/usr/share/man/man5/{xmdomain.cfg,xend-config.sxp}.5
|
||||
rm -f ${DESTDIR}/usr/share/man/man1/xm.1
|
||||
rm -f ${DESTDIR}/usr/share/doc/xen/html/man/xm.1.html
|
||||
rm -f ${DESTDIR}/usr/share/doc/xen/html/man/{xmdomain.cfg,xend-config.sxp}.5.html
|
||||
rm -f ${DESTDIR}/usr/share/examples/xen/xmexample*
|
||||
}
|
||||
|
||||
xen4.2-hypervisor_package() {
|
||||
short_desc="Xen hypervisor (4.2 series)"
|
||||
provides="xen-hypervisor-${version}_${revision}"
|
||||
replaces="xen-hypervisor>=0"
|
||||
nostrip_files="xen-syms-${version}"
|
||||
pkg_install() {
|
||||
vmove boot
|
||||
}
|
||||
}
|
||||
|
||||
xen4.2-devel_package() {
|
||||
short_desc+=" - development files"
|
||||
provides="xen-devel-${version}_${revision}"
|
||||
replaces="xen-devel>=0"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove "usr/lib/*.a"
|
||||
vmove "usr/lib/*.so"
|
||||
}
|
||||
}
|
||||
|
||||
xen4.2-libs_package() {
|
||||
short_desc+=" - runtime libraries"
|
||||
provides="xen-libs-${version}_${revision}"
|
||||
replaces="xen-libs>=0"
|
||||
pkg_install() {
|
||||
vmove "usr/lib/*.so.*"
|
||||
}
|
||||
}
|
|
@ -1,8 +0,0 @@
|
|||
case "${ACTION}" in
|
||||
post)
|
||||
# Regenerates GRUB menu if it's installed.
|
||||
if [ -x usr/sbin/grub-mkconfig ]; then
|
||||
usr/sbin/grub-mkconfig -o boot/grub/grub.cfg
|
||||
fi
|
||||
;;
|
||||
esac
|
Loading…
Reference in New Issue