-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Backport some upstream qemu fixes, from Brad (maintainer) -
- Fix install(1) usage to be compatible with OpenBSD's install(1).
- Allow overriding the location of Samba's smbd,
From Brad
- Remove PROVIDE_HIDDEN and ONLY_IF_{RO,RW} from linker scripts to make
them work with older binutils versions. Fixes *-bsd-user build on
OpenBSD 4.9 which ships binutils 2.15.
From Gerd Hoffmann <kraxel at redhat dot com>- Loading branch information
Showing
7 changed files
with
171 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| $OpenBSD: patch-i386_ld,v 1.1 2011/09/21 09:02:30 sthen Exp $ | ||
| --- i386.ld.orig Sat Aug 27 18:03:15 2011 | ||
| +++ i386.ld Sat Aug 27 18:03:33 2011 | ||
| @@ -42,16 +42,16 @@ SECTIONS | ||
| .rel.plt : | ||
| { | ||
| *(.rel.plt) | ||
| - PROVIDE_HIDDEN (__rel_iplt_start = .); | ||
| + PROVIDE (__rel_iplt_start = .); | ||
| *(.rel.iplt) | ||
| - PROVIDE_HIDDEN (__rel_iplt_end = .); | ||
| + PROVIDE (__rel_iplt_end = .); | ||
| } | ||
| .rela.plt : | ||
| { | ||
| *(.rela.plt) | ||
| - PROVIDE_HIDDEN (__rela_iplt_start = .); | ||
| + PROVIDE (__rela_iplt_start = .); | ||
| *(.rela.iplt) | ||
| - PROVIDE_HIDDEN (__rela_iplt_end = .); | ||
| + PROVIDE (__rela_iplt_end = .); | ||
| } | ||
| .init : { *(.init) } =0x47ff041f | ||
| .text : |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,15 @@ | ||
| $OpenBSD: patch-net_h,v 1.3 2011/08/16 21:24:42 sthen Exp $ | ||
| --- net.h.orig Sat Jul 23 13:05:22 2011 | ||
| +++ net.h Mon Jul 25 19:29:57 2011 | ||
| @@ -177,7 +177,7 @@ int do_netdev_del(Monitor *mon, const QDict *qdict, QO | ||
| #ifdef __sun__ | ||
| #define SMBD_COMMAND "/usr/sfw/sbin/smbd" | ||
| #else | ||
| $OpenBSD: patch-net_h,v 1.4 2011/09/21 09:02:30 sthen Exp $ | ||
| --- net.h.orig Mon Aug 8 14:28:42 2011 | ||
| +++ net.h Tue Sep 6 22:49:37 2011 | ||
| @@ -174,11 +174,6 @@ int do_netdev_del(Monitor *mon, const QDict *qdict, QO | ||
|
|
||
| #define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" | ||
| #define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown" | ||
| -#ifdef __sun__ | ||
| -#define SMBD_COMMAND "/usr/sfw/sbin/smbd" | ||
| -#else | ||
| -#define SMBD_COMMAND "/usr/sbin/smbd" | ||
| +#define SMBD_COMMAND "${LOCALBASE}/libexec/smbd" | ||
| #endif | ||
| -#endif | ||
|
|
||
| void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd); | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| $OpenBSD: patch-net_slirp_c,v 1.1 2011/09/21 09:02:30 sthen Exp $ | ||
| --- net/slirp.c.orig Tue Sep 6 22:49:47 2011 | ||
| +++ net/slirp.c Tue Sep 6 22:50:01 2011 | ||
| @@ -529,7 +529,7 @@ static int slirp_smb(SlirpState* s, const char *export | ||
| fclose(f); | ||
|
|
||
| snprintf(smb_cmdline, sizeof(smb_cmdline), "%s -s %s", | ||
| - SMBD_COMMAND, smb_conf); | ||
| + CONFIG_SMBD_COMMAND, smb_conf); | ||
|
|
||
| if (slirp_add_exec(s->slirp, 0, smb_cmdline, &vserver_addr, 139) < 0) { | ||
| slirp_smb_cleanup(s); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,16 @@ | ||
| $OpenBSD: patch-qemu-options_hx,v 1.3 2011/08/16 21:24:42 sthen Exp $ | ||
| --- qemu-options.hx.orig Sat Jul 23 13:05:22 2011 | ||
| +++ qemu-options.hx Mon Jul 25 19:29:57 2011 | ||
| @@ -1257,7 +1257,7 @@ or @file{C:\WINNT\SYSTEM32\DRIVERS\ETC\LMHOSTS} (Windo | ||
| $OpenBSD: patch-qemu-options_hx,v 1.4 2011/09/21 09:02:30 sthen Exp $ | ||
| --- qemu-options.hx.orig Mon Aug 8 14:28:42 2011 | ||
| +++ qemu-options.hx Tue Sep 6 22:51:02 2011 | ||
| @@ -1256,9 +1256,9 @@ or @file{C:\WINNT\SYSTEM32\DRIVERS\ETC\LMHOSTS} (Windo | ||
|
|
||
| Then @file{@var{dir}} can be accessed in @file{\\smbserver\qemu}. | ||
|
|
||
| Note that a SAMBA server must be installed on the host OS in | ||
| -Note that a SAMBA server must be installed on the host OS in | ||
| -@file{/usr/sbin/smbd}. QEMU was tested successfully with smbd versions from | ||
| +@file{${LOCALBASE}/libexec/smbd}. QEMU was tested successfully with smbd versions from | ||
| Red Hat 9, Fedora Core 3 and OpenSUSE 11.x. | ||
| -Red Hat 9, Fedora Core 3 and OpenSUSE 11.x. | ||
| +Note that a SAMBA server must be installed on the host OS. | ||
| +QEMU was tested successfully with smbd versions from Red Hat 9, | ||
| +Fedora Core 3 and OpenSUSE 11.x. | ||
|
|
||
| @item hostfwd=[tcp|udp]:[@var{hostaddr}]:@var{hostport}-[@var{guestaddr}]:@var{guestport} | ||
| Redirect incoming TCP or UDP connections to the host port @var{hostport} to |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| $OpenBSD: patch-x86_64_ld,v 1.1 2011/09/21 09:02:30 sthen Exp $ | ||
| --- x86_64.ld.orig Sat Aug 27 18:03:20 2011 | ||
| +++ x86_64.ld Sat Aug 27 18:03:40 2011 | ||
| @@ -38,16 +38,16 @@ SECTIONS | ||
| .rel.plt : | ||
| { | ||
| *(.rel.plt) | ||
| - PROVIDE_HIDDEN (__rel_iplt_start = .); | ||
| + PROVIDE (__rel_iplt_start = .); | ||
| *(.rel.iplt) | ||
| - PROVIDE_HIDDEN (__rel_iplt_end = .); | ||
| + PROVIDE (__rel_iplt_end = .); | ||
| } | ||
| .rela.plt : | ||
| { | ||
| *(.rela.plt) | ||
| - PROVIDE_HIDDEN (__rela_iplt_start = .); | ||
| + PROVIDE (__rela_iplt_start = .); | ||
| *(.rela.iplt) | ||
| - PROVIDE_HIDDEN (__rela_iplt_end = .); | ||
| + PROVIDE (__rela_iplt_end = .); | ||
| } | ||
| .init : | ||
| { | ||
| @@ -70,8 +70,6 @@ SECTIONS | ||
| .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) } | ||
| .rodata1 : { *(.rodata1) } | ||
| .eh_frame_hdr : { *(.eh_frame_hdr) } | ||
| - .eh_frame : ONLY_IF_RO { KEEP (*(.eh_frame)) } | ||
| - .gcc_except_table : ONLY_IF_RO { *(.gcc_except_table) } | ||
| /* Adjust the address for the data segment. We want to adjust up to | ||
| the same address within the page on the next page up. */ | ||
| . = ALIGN (0x100000) - ((0x100000 - .) & (0x100000 - 1)); . = DATA_SEGMENT_ALIGN (0x100000, 0x1000); | ||
| @@ -97,8 +95,8 @@ SECTIONS | ||
| .data1 : { *(.data1) } | ||
| .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } | ||
| .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } | ||
| - .eh_frame : ONLY_IF_RW { KEEP (*(.eh_frame)) } | ||
| - .gcc_except_table : ONLY_IF_RW { *(.gcc_except_table) } | ||
| + .eh_frame : { KEEP (*(.eh_frame)) } | ||
| + .gcc_except_table : { *(.gcc_except_table) } | ||
| .dynamic : { *(.dynamic) } | ||
| .ctors : | ||
| { |